From 24dc59411868067c6724faf82475714dfbca8593 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 10 Aug 2022 09:56:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/businessSupport/technologyAssessment/index.vue   | 2 +-
 jero-web/src/views/externalReports/components/addModel.vue | 2 +-
 jero-web/src/views/externalReports/index.vue               | 2 +-
 .../managementdetails/commponts/conventionalmodle.vue      | 1 +
 .../managementdetails/commponts/customexportmodle.vue      | 1 +
 .../parameter/parameterexport/components/addModel.vue      | 2 +-
 .../views/parameter/parameterlist/components/addModel.vue  | 4 ++++
 jero-web/src/views/regulationsKanban/index.vue             | 3 +--
 jero-web/src/views/system/modules/UserRoleModal.vue        | 7 ++++---
 9 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
index 56d9722e5..c47a86d66 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
@@ -86,7 +86,7 @@
         size="middle"
         :loading="loading"
         :pagination="false"
-        :scroll="{x: '100%',y:'calc(100vh)'}"
+        :scroll="{x: '100%',y:'calc(100vh - 130px)'}"
         rowKey="id"
         :data-source="dataSource"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
diff --git a/jero-web/src/views/externalReports/components/addModel.vue b/jero-web/src/views/externalReports/components/addModel.vue
index 7f2ad7395..4a8800e9a 100644
--- a/jero-web/src/views/externalReports/components/addModel.vue
+++ b/jero-web/src/views/externalReports/components/addModel.vue
@@ -3,7 +3,7 @@
       <a-modal
         :title="title"
         :maskClosable="false"
-        :width="800"
+        :width="600"
         placement="right"
         :closable="true"
         @cancel="handleCancel"
diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue
index 94a78d997..7701193c0 100644
--- a/jero-web/src/views/externalReports/index.vue
+++ b/jero-web/src/views/externalReports/index.vue
@@ -127,7 +127,7 @@
                   :loading="loading"
                   :pagination="false"
                   rowKey="id"
-                  :scroll="{x: 10}"
+                  :scroll="{x: 10,y:'calc(100vh - 130px)'}"
                   :data-source="dataSource"
                   :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
                   :columns="columns"
diff --git a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
index dd9f79b07..b2bc75a42 100644
--- a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
+++ b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
@@ -296,6 +296,7 @@ export default {
           this.confirmLoading = true
           downloadFile('report/detail/exportNormal', query.exportName+'.zip', query)
           this.confirmLoading = false
+          this.visible = false
         }
       })
     },
diff --git a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue
index 9ab92150b..18cd007ee 100644
--- a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue
+++ b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue
@@ -252,6 +252,7 @@ export default {
           this.confirmLoading = true
           downloadFile('report/detail/exportCustom', query.exportName+'.zip', query)
           this.confirmLoading = false
+          this.visible = false
         }
       })
     },
diff --git a/jero-web/src/views/parameter/parameterexport/components/addModel.vue b/jero-web/src/views/parameter/parameterexport/components/addModel.vue
index fe3bb5fb9..46f282bea 100644
--- a/jero-web/src/views/parameter/parameterexport/components/addModel.vue
+++ b/jero-web/src/views/parameter/parameterexport/components/addModel.vue
@@ -217,7 +217,7 @@ export default {
               this.visible = false
               this.$emit('addModelList')
             } else {
-              this.$message.warning(this.$t('operationFailed'))
+              this.$message.warning(res.message)
               this.confirmLoading = false
             }
           })
diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
index 66dbd7880..b0af1ec96 100644
--- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue
+++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
@@ -736,6 +736,10 @@ export default {
             })
             let querycontentList = JSON.parse(JSON.stringify(this.contentList))
             query.certCategoryParamsInfoEOList = querycontentList
+            if(this.formInline.controlType == 11){
+              query.certCategoryParamsInfoEOList = []
+              query.certCategory = ''
+            }
             this.confirmLoading = true
             Action(url, query).then((res) => {
               if (res.success) {
diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue
index ea385e32d..61e782c7b 100644
--- a/jero-web/src/views/regulationsKanban/index.vue
+++ b/jero-web/src/views/regulationsKanban/index.vue
@@ -373,8 +373,7 @@ export default {
 }
 
 .title-text {
-  width: 20%;
-  min-width: 110px;
+  width: 110px;
   color: #000F16;
   display: inline-block;
   font-weight: 500;
diff --git a/jero-web/src/views/system/modules/UserRoleModal.vue b/jero-web/src/views/system/modules/UserRoleModal.vue
index 964fa73e5..b36f87a01 100644
--- a/jero-web/src/views/system/modules/UserRoleModal.vue
+++ b/jero-web/src/views/system/modules/UserRoleModal.vue
@@ -42,9 +42,10 @@
           树操作 <a-icon type="up" />
         </a-button>
       </a-dropdown>
-      <a-popconfirm title="确定放弃编辑？" @confirm="close" okText="确定" cancelText="取消">
-        <a-button style="margin-right: .8rem">取消</a-button>
-      </a-popconfirm>
+<!--      <a-popconfirm title="确定放弃编辑？" @confirm="close" okText="确定" cancelText="取消">-->
+<!--        <a-button style="margin-right: .8rem">取消</a-button>-->
+<!--      </a-popconfirm>-->
+      <a-button @click="close()" type="primary" :loading="loading" ghost style="margin-right: 0.8rem">取消</a-button>
       <a-button @click="handleSubmit(false)" type="primary" :loading="loading" ghost style="margin-right: 0.8rem">仅保存</a-button>
       <a-button @click="handleSubmit(true)" type="primary" :loading="loading">保存并关闭</a-button>
     </div>