From e3887b28d6d93a8d2c47a078e9b9a0fcf6f61b09 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Tue, 9 Aug 2022 17:53:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  1 +
 jero-web/src/common/lang/zh-cn.js             |  1 +
 .../CollectionTypeDisabled/index.vue          |  8 +--
 .../src/components/TaskCutOffTime/index.vue   | 43 ++++++++--------
 .../components/TaskCutOffTime/indexonekey.vue | 44 ++++++++--------
 .../src/components/tableCollection/index1.vue |  1 -
 jero-web/src/views/externalReports/index.vue  | 51 +++++++++----------
 .../parameter/managementdetails/index.vue     | 16 +++---
 .../components/ParameterCollectionEchart.vue  |  2 +-
 9 files changed, 84 insertions(+), 83 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 3d055af07..7b30de758 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1252,4 +1252,5 @@ module.exports = {
   optionDropDownBox:'Option drop - down box',
   attachmentUpload:'file',
   textInput:'Text Input',
+  deleteNode:'If any file information exists, it will be deleted',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index ca601c3ca..1f3a08299 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1355,4 +1355,5 @@ module.exports = {
   Paraname: '参数名称',
   Parabatch: '参数批次',
   freeze:'请选择冻结配置',
+  deleteNode:'若有文件信息将同步删除',
 }
\ No newline at end of file
diff --git a/jero-web/src/components/CollectionTypeDisabled/index.vue b/jero-web/src/components/CollectionTypeDisabled/index.vue
index 2404a2e38..f5852220f 100644
--- a/jero-web/src/components/CollectionTypeDisabled/index.vue
+++ b/jero-web/src/components/CollectionTypeDisabled/index.vue
@@ -650,6 +650,7 @@
             item.dataValue = r.target.value
           }
         })
+        console.log(this.detailDate)
       },
       uploadSuccess(data) {
         let attIdList = []
@@ -672,6 +673,7 @@
             item.dataValue = attIdList.join(',')
           }
         })
+        this.$emit('update:detailDate', this.detailDate);
       },
       clickButtonToUpload(item) {
         // if (item.isLock == '1') {
@@ -690,9 +692,9 @@
       }
     },
     watch: {
-      detailDate(newold, oldold) {
-        console.log(newold, oldold, 'll')
-      },
+      // detailDate(newold, oldold) {
+      //   console.log(newold, oldold, 'll')
+      // },
       formInline: {
         handler(newOld, oldval) {
           console.log(newOld, oldval, 'll')
diff --git a/jero-web/src/components/TaskCutOffTime/index.vue b/jero-web/src/components/TaskCutOffTime/index.vue
index 30a85b887..691d36603 100644
--- a/jero-web/src/components/TaskCutOffTime/index.vue
+++ b/jero-web/src/components/TaskCutOffTime/index.vue
@@ -17,9 +17,8 @@
                 <span class="title-text-text" :title="$t('cutoffTime')">
                 {{$t('cutoffTime')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="legalTaskConfirmation">
+              <a-form-model-item class="itemModel" prop="legalTaskConfirmation" >
                 <a-date-picker class="box-input"
-                               style='width: 160px'
                                :placeholder="$t('PleaseSelect')+$t('cutoffTime')"
                                @change="onChange" @ok="onOk"
                                format="YYYY-MM-DD"
@@ -290,21 +289,20 @@ export default {
 .box-title-text {
   line-height: 1.4;
   display: flex;
+  width: 276px;
   /*align-items: center;*/
 }
 
 .title-text {
-  width: 114px;
+  width: 90px;
   text-align: right;
   display: inline-block;
-  font-weight: 500;
+  font-weight: bold;
   font-size: 14px;
   margin-right: 16px;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
-  height: 42px;
-  line-height: 48px;
 }
 
 .box-input {
@@ -325,29 +323,30 @@ export default {
 }
 
 .title-text-text {
-  margin-top: 9px;
+  margin-top: 11px;
+  display: inline-block;
 }
 
+.header-text {
+  font-size: 16px;
+  font-weight: bold;
+  margin-left: 15px;
+  /*border-bottom: 1px #d9d9d9 dashed;*/
+  height: 30px;
+  margin-bottom: 30px;
+}
 
 .formAdd {
-  margin-bottom: 40px;
+  /*margin-bottom: 40px;*/
 }
 
-
-.drawer-bootom-button {
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  z-index:100;
-  border-top: 1px solid #e8e8e8;
-  padding: 10px 16px;
-  text-align: right;
-  left: 0;
+.button-text {
+  height: 38px;
+  width: calc(100% - 120px);
+  line-height: 38px;
   background: #fff;
-  border-radius: 0 0 2px 2px;
-}
-/deep/.add-input{
-  min-height: 135px!important;
+  border: 1px #00B3BE solid;
+  color: #00B3BE;
 }
 </style>
 <style lang='less'>
diff --git a/jero-web/src/components/TaskCutOffTime/indexonekey.vue b/jero-web/src/components/TaskCutOffTime/indexonekey.vue
index 57802326e..1da4a4c82 100644
--- a/jero-web/src/components/TaskCutOffTime/indexonekey.vue
+++ b/jero-web/src/components/TaskCutOffTime/indexonekey.vue
@@ -11,7 +11,7 @@
       >
         <a-row :gutter='24'>
           <a-col :span="12">
-            <div class="box-title-text">
+            <div class="box-title-text" >
               <div class="title-text">
                 <span class="Required">*</span>
                 <span class="title-text-text" :title="$t('cutoffTime')">
@@ -19,7 +19,6 @@
               </div>
               <a-form-model-item class="itemModel" prop="legalTaskConfirmation">
                 <a-date-picker class="box-input"
-                               style='width: 160px'
                                :placeholder="$t('PleaseSelect')+$t('cutoffTime')"
                                @change="onChange" @ok="onOk"
                                format="YYYY-MM-DD"
@@ -290,20 +289,20 @@ export default {
 .box-title-text {
   line-height: 1.4;
   display: flex;
+  width: 276px;
   /*align-items: center;*/
 }
+
 .title-text {
-  width: 114px;
+  width: 90px;
   text-align: right;
   display: inline-block;
-  font-weight: 500;
+  font-weight: bold;
   font-size: 14px;
   margin-right: 16px;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
-  height: 42px;
-  line-height: 48px;
 }
 
 .box-input {
@@ -324,29 +323,30 @@ export default {
 }
 
 .title-text-text {
-  margin-top: 9px;
+  margin-top: 11px;
+  display: inline-block;
 }
 
+.header-text {
+  font-size: 16px;
+  font-weight: bold;
+  margin-left: 15px;
+  /*border-bottom: 1px #d9d9d9 dashed;*/
+  height: 30px;
+  margin-bottom: 30px;
+}
 
 .formAdd {
-  margin-bottom: 40px;
+  /*margin-bottom: 40px;*/
 }
 
-
-.drawer-bootom-button {
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  z-index:100;
-  border-top: 1px solid #e8e8e8;
-  padding: 10px 16px;
-  text-align: right;
-  left: 0;
+.button-text {
+  height: 38px;
+  width: calc(100% - 120px);
+  line-height: 38px;
   background: #fff;
-  border-radius: 0 0 2px 2px;
-}
-/deep/.add-input{
-  min-height: 135px!important;
+  border: 1px #00B3BE solid;
+  color: #00B3BE;
 }
 </style>
 <style lang='less'>
diff --git a/jero-web/src/components/tableCollection/index1.vue b/jero-web/src/components/tableCollection/index1.vue
index fcb9059c1..930ec0431 100644
--- a/jero-web/src/components/tableCollection/index1.vue
+++ b/jero-web/src/components/tableCollection/index1.vue
@@ -263,7 +263,6 @@
     watch: {
       currentPersonRole: {
         handler: function() {
-          console.log(123)
           this.getTableList()
         },
         immediate: true
diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue
index e49685c2e..94a78d997 100644
--- a/jero-web/src/views/externalReports/index.vue
+++ b/jero-web/src/views/externalReports/index.vue
@@ -41,19 +41,12 @@
                       {{title && title.length > 18?title.slice(0,17)+'...':title}}
                     </span>
                     <template #overlay>
-                      <a-menu
+                      <a-menu v-has="'externalReports:folder'"
                               @click="({ key: menuKey }) => onContextMenuClick(treeKey, menuKey, record)">
-                        <a-menu-item key="1" @click="orgAdd" v-has="'externalReports:folder'">{{$t('Addingfolder')}}
-                        </a-menu-item>
-                        <a-menu-item key="4" @click="orgAdds" v-if="deleteNode"
-                                     v-has="'externalReports:folder'">{{$t('Addingsubfolders')}}
-                        </a-menu-item>
-                        <a-menu-item key="2" @click="orgEdit" v-has="'externalReports:folder'">
-                          {{$t('Editfolder')}}
-                        </a-menu-item>
-                        <a-menu-item key="3" @click="orgDelete"
-                                     v-has="'externalReports:folder'">{{$t('Deletefolders')}}
-                        </a-menu-item>
+                        <a-menu-item key="1" @click="orgAdd" >{{$t('Addingfolder')}}</a-menu-item>
+                        <a-menu-item key="4" @click="orgAdds" v-if="deleteNode">{{$t('Addingsubfolders')}}</a-menu-item>
+                        <a-menu-item key="2" @click="orgEdit">{{$t('Editfolder')}}</a-menu-item>
+                        <a-menu-item key="3" @click="orgDelete" >{{$t('Deletefolders')}}</a-menu-item>
 
                       </a-menu>
                     </template>
@@ -72,7 +65,7 @@
                         <div class="title-text" :title="$t('fileName')">
                           <span>{{ $t('fileName') }}</span>
                         </div>
-                        <a-input class="box-input" style='width: 264px' :placeholder="$t('PleaseEnter')+$t('fileName')"
+                        <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('fileName')"
                                  v-model="queryParams.fileName"></a-input>
                       </div>
                     </a-col>
@@ -81,7 +74,7 @@
                         <div class="title-text" :title="$t('uploadedBy')">
                           <span>{{$t('uploadedBy')}}</span>
                         </div>
-                        <a-input class="box-input" style='width: 264px' :placeholder="$t('PleaseEnter')+$t('uploadedBy')"
+                        <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('uploadedBy')"
                                  v-model="queryParams.createBy"></a-input>
                       </div>
                     </a-col>
@@ -93,7 +86,6 @@
 <!--                        :placeholder="$t('PleaseSelect')+$t('uploadTime')"-->
                         <a-range-picker
                                        style='width: 264px'
-
                                        @change="onChange"
                                        format="YYYY-MM-DD"
                                        :getCalendarContainer="(trigger) => trigger.parentNode"
@@ -127,20 +119,21 @@
                 </div>
               </div>
               <div>
+<!--                :scroll="{x: 10,y:'calc(100vh - 130px)'}"-->
+
                 <a-table
                   ref="table"
                   size="middle"
                   :loading="loading"
                   :pagination="false"
-                  :scroll="{x: '100%',y:'calc(100vh - 130px)'}"
                   rowKey="id"
+                  :scroll="{x: 10}"
                   :data-source="dataSource"
                   :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
                   :columns="columns"
                 >
         <span slot="projectName" slot-scope="text,record" :title="text">
             {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }}
-          </a>
         </span>
                   <span slot="operation" slot-scope="text,record">
 <!--            <a class="text-operation" @click="handlelist(record)">{{$t('view')}}</a>-->
@@ -193,8 +186,8 @@
                         <span class="title-text-text"
                               :title="$t('Foldername')">{{$t('Foldername')}}</span>
                       </div>
-                      <a-form-model-item prop="folderName">
-                        <a-input class="box-input add-input" style='width: 239%' v-model.trim="form.folderName" :placeholder="$t('PleaseEnter')+$t('Foldername')"/>
+                      <a-form-model-item prop="folderName" style='width: 72%'>
+                        <a-input v-model="form.folderName" :min="1" :max="100" style='width: 130%' class="box-input add-input" :placeholder="$t('PleaseEnter')+$t('Foldername')" />
                       </a-form-model-item>
                     </div>
                   </a-col>
@@ -325,7 +318,7 @@ export default {
       rules: {
         folderName: [
           { required: true, message: this.$t('PleaseEnter') + this.$t('Foldername'), trigger: 'blur' },
-          { min: 1, max: 50, message: this.$t('cantExeed') + '50' + this.$t('characters'), trigger: 'blur' }
+          { min: 1, max: 100, message: this.$t('cantExeed') + '100' + this.$t('characters'), trigger: 'blur' }
         ],
         // authManageIdsName: [
         //   { required: true, message: this.$t('PleaseSelect') + this.$t('Administrativeprivileges'), trigger: 'change' },
@@ -360,17 +353,20 @@ export default {
           title: this.$t('fileName'),
           align: 'center',
           dataIndex: 'fileName',
+          width: 200
         },
         {
           title: this.$t('fileDeclaration'),
           align: 'center',
           dataIndex: 'fileDescription',
-          scopedSlots: { customRender: 'projectName' }
+          scopedSlots: { customRender: 'projectName' },
+          width: 150
         },
         {
           title: this.$t('uploadedBy'),
           align: 'center',
           dataIndex: 'createBy',
+          width: 150
         },
         // {
         //   title: this.$t('category'),
@@ -640,7 +636,7 @@ export default {
     //树形删除
     orgDelete() {
       this.$confirm({
-        content: this.$t('deleteNodes'),
+        content: this.$t('deleteNode'),
         onOk:
           async () => {
             deleteAction(`extRepo/extRepoFolder/delete`, { id: this.nodeItem.key }).then(res => {
@@ -1072,7 +1068,9 @@ export default {
   display: flex;
   /*align-items: center;*/
 }
-
+/deep/.ant-table td{
+  white-space: nowrap;
+}
 .title-text {
   width: 114px;
   text-align: right;
@@ -1227,14 +1225,15 @@ export default {
   }
 }
 
-/deep/ .ant-table-body {
-  overflow: hidden !important;
-}
+///deep/ .ant-table-body {
+//  overflow: hidden !important; ?????
+//}
 </style>
 
 <style lang="less">
 .split-item {
   .ant-form-item-label {
+
     min-width: 100px;
   }
 }
diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue
index 69c44346f..5306d884b 100644
--- a/jero-web/src/views/parameter/managementdetails/index.vue
+++ b/jero-web/src/views/parameter/managementdetails/index.vue
@@ -293,11 +293,15 @@ export default {
       this.formInline[value] = id
       this.formInline = { ...this.formInline }
     },
+    getDataSource(data) {
+      this.dataSource = data
+      console.log(this.dataSource)
+    },
     // 保存
     handlePreservation(num) {
       let _this = this
       let postDate = []
-      let data = JSON.parse(JSON.stringify(this.dataSource))
+      let data = JSON.parse(JSON.stringify(this.$refs.CollectionTabel.dataSource))
       let selectedRowKeysValue = []
       data.forEach(res => {
           selectedRowKeysValue.push(res)
@@ -306,13 +310,11 @@ export default {
       for (let i = 0; i < selectedRowKeysValue.length; i++) {
         let postDateobj = {}
         let itemIn = Object.keys(selectedRowKeysValue[i])
-        console.log(itemIn)
         for (let j = 0; j < itemIn.length; j++) {
           if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) {
             if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
               postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]]
               for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) {
-                console.log(selectedRowKeysValue[i][itemIn[j]].list[k].dataValue)
                 if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue instanceof Array) {
                   selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',')
                 }
@@ -376,9 +378,7 @@ export default {
     onSelectChange() {
 
     },
-    getDataSource(data) {
-      this.dataSource = data
-    },
+
     LoginUserType(val, currentPersonRole, userType) {
       this.RoleType = []
       if (this.currentPersonRole == '') {
@@ -419,13 +419,13 @@ export default {
     },
     pageOnChange(page, pageSize) {
       this.pageNo = page
-      this.$emit('handlePreservation')
+      // this.$emit('handlePreservation')
       this.getTableList()
     },
     SizeChange(page, pageSize) {
       this.pageNo = 1
       this.pageSize = pageSize
-      this.$emit('handlePreservation')
+      // this.$emit('handlePreservation')
       this.getTableList()
     },
   }
diff --git a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue
index 4786177ce..c5f663473 100644
--- a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue
@@ -244,7 +244,7 @@
           yAxis: yAxis,
           grid: {
             left: '10%',
-            bottom: '15%'
+            bottom: '20%'
           },
           series: [
             {