修改禅道bug

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 }"

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"

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"

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
         }
       })
     },

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
         }
       })
     },

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
             }
           })

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) {

jero-web/src/views/regulationsKanban/index.vue

@@ -373,8 +373,7 @@ export default {
 }
 
 .title-text {
-  width: 20%;
+  width: 110px;
-  min-width: 110px;
   color: #000F16;
   display: inline-block;
   font-weight: 500;

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-popconfirm title="确定放弃编辑？" @confirm="close" okText="确定" cancelText="取消">-->
-        <a-button style="margin-right: .8rem">取消</a-button>
+<!--        <a-button style="margin-right: .8rem">取消</a-button>-->
-      </a-popconfirm>
+<!--      </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>