From d3385839dee7ab456e631317d8cd586b09c2b7dd Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Thu, 23 Jul 2020 17:02:39 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90pc=E7=AB=AF=20-=20=E4=BC=98=E5=8C=96bu?=
 =?UTF-8?q?g=E3=80=91-=E3=80=90=E4=BC=98=E5=8C=96=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E3=80=91-=EF=BC=88=E9=AD=8F=E5=87=AF=EF=BC=89-2020/07/23?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/heart/actinfo-detail-view.vue      | 18 +++++-------------
 src/views/modules/kpi/resultSuperior.vue       |  6 +++---
 .../modules/sys/resource-add-or-update.vue     |  3 ++-
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/views/modules/heart/actinfo-detail-view.vue b/src/views/modules/heart/actinfo-detail-view.vue
index 98b9917b..71a3300f 100644
--- a/src/views/modules/heart/actinfo-detail-view.vue
+++ b/src/views/modules/heart/actinfo-detail-view.vue
@@ -131,20 +131,12 @@
         <el-row>
           <el-form-item prop="actContent"
                         label="活动内容：">
-            <p v-html="dataForm.actContent"></p>
+            <div style="border:1px solid  #000000">
+              <p v-html="dataForm.actContent"></p>
+            </div>
           </el-form-item>
         </el-row>
-        <!--                <el-row>-->
-        <!--                    <el-form-item label="banner展示："-->
-        <!--                                  prop="isBanner">-->
-        <!--                        <template>-->
-        <!--                            <el-radio v-model="dataForm.isBanner"-->
-        <!--                                      label="1">是</el-radio>-->
-        <!--                            <el-radio v-model="dataForm.isBanner"-->
-        <!--                                      label="0">否</el-radio>-->
-        <!--                        </template>-->
-        <!--                    </el-form-item>-->
-        <!--                </el-row>-->
+
         <el-row>
           <el-form-item label=" "
                         v-loading="loading"
@@ -156,7 +148,7 @@
         </el-row>
 
         <el-row>
-          <el-form-item label-width="500px">
+          <el-form-item label-width="500px" style="margin-left: 300px;">
             <el-button size="small"
                        style="width: 95px"
                        @click="back">返回</el-button>
diff --git a/src/views/modules/kpi/resultSuperior.vue b/src/views/modules/kpi/resultSuperior.vue
index 0793eb55..6cf78c6c 100644
--- a/src/views/modules/kpi/resultSuperior.vue
+++ b/src/views/modules/kpi/resultSuperior.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-kpi__kpiresultsuperior}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item label="所属机构">
           <el-cascader
             v-model="deptIdList"
@@ -17,10 +17,10 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('kpi:gridResult:export')" type="success" @click="tableExport()">{{ $t('export') }}</el-button>
+          <el-button v-if="$hasPermission('kpi:gridResult:export')" type="primary" @click="tableExport()">{{ $t('export') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
diff --git a/src/views/modules/sys/resource-add-or-update.vue b/src/views/modules/sys/resource-add-or-update.vue
index e5393036..7269ac2b 100644
--- a/src/views/modules/sys/resource-add-or-update.vue
+++ b/src/views/modules/sys/resource-add-or-update.vue
@@ -183,6 +183,7 @@ export default {
         this.$refs['dataForm'].resetFields()
         this.dataForm.parentName = '一级资源'
         this.dataForm.resourceList = []
+        this.buttonFlag = false
         this.getResourceList().then(() => {
           if (this.dataForm.id) {
             this.getInfo()
@@ -249,8 +250,8 @@ export default {
             .then(({ data: res }) => {
               if (res.code !== 0) {
                 return this.$message.error(res.msg)
+                this.buttonFlag = true
               }
-              this.buttonFlag = false
               this.$message({
                 message: this.$t('prompt.success'),
                 type: 'success',