修改禅道已知bug

jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue

@@ -796,7 +796,7 @@
           this.currentPersonRole = val.length >= 1 ? val[0].value : ''
         }
         this.RoleType = val
-        this.formInlineRoleSwitching.roleSwitchingCode = JSON.parse(localStorage.getItem('currentPersonRole')) === null ? this.currentPersonRole : JSON.parse(localStorage.getItem('currentPersonRole'))
+        this.formInlineRoleSwitching.roleSwitchingCode = val[0].value
         this.formInlineRoleSwitching = { ...this.formInlineRoleSwitching }
       },
       // 表格所选中得行内容
@@ -969,27 +969,33 @@
       ishandleSubmit() {
         let _this = this
         let postDate = []
-        console.log(this.selectedRowKeysValue)
-        this.selectedRowKeysValue.forEach((item, index) => {
+        for (let i = 0; i < this.selectedRowKeysValue.length; i++) {
           let postDateobj = {}
-          Object.keys(item).forEach((itemIn, index) => {
-            if (itemIn !== 'sdt') {
-              if (item[itemIn] instanceof Object && !(item[itemIn] instanceof Array)) {
-                postDateobj[itemIn] = item[itemIn]
-                item[itemIn].list.forEach((item, index) => {
-                  if (item.type == 'pull_more') {
-                    item.dataValue = item.dataValue.join(',')
+          let itemIn = Object.keys(this.selectedRowKeysValue[i])
+          for (let j = 0; j < itemIn.length; j++) {
+            if (itemIn[j] !== 'sdt') {
+              if (this.selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(this.selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
+                postDateobj[itemIn[j]] = this.selectedRowKeysValue[i][itemIn[j]]
+                for (let k = 0; k < this.selectedRowKeysValue[i][itemIn[j]].list.length; k++) {
+                  if (this.selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') {
+                    this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',')
                   }
-                  if (item.type == 'text' && item.dataValue !== null) {
-                    item.dataValue = item.dataValue.toString()
+                  if (this.selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) {
+                    this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString()
                   }
-                })
+                  if (!this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue && this.selectedRowKeysValue[i][itemIn[j]].list[k].isMust == '1'
+                    && this.selectedRowKeysValue[i][itemIn[j]].list[k].isLock == '0') {
+                    this.$message.warning(this.selectedRowKeysValue[i].nioNumber + ',' + this.$t('requiredParametersEmpty'))
+                    return
+                  }
+                }
               }
             }
-          })
-          postDateobj.id = item.id
+          }
+          postDateobj.id = this.selectedRowKeysValue[i].id
           postDate.push(postDateobj)
-        })
+        }
+
         let configDataList = { configDataList: postDate }
         if (this.selectedRowKeys.length == 0) {
           this.$message.warning(this.$t('selectLeastOne'))

jero-web/src/views/projectManagement/components/TaskParameterCollection.vue

@@ -49,16 +49,18 @@
         :dataSource='dataSource'
         :pagination='false'
         :loading='loading'
-        :scroll="{x: 600}"
+        :scroll="{x: '100%',y:'calc(100vh - 320px)'}"
         :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
         @change='handleTableChange'>
         <span slot="paramsManifestClick" slot-scope="text,record">
-          <a @click="paramsManifestClick(record)">
+          <a class="textName" :title="text" @click="paramsManifestClick(record)">
             {{ text && text.length > 50 ? text.slice(0, 49) + '...' : text }}
           </a>
         </span>
         <span slot="collectionCompletionTime" slot-scope="text,record">
-            {{record.finishTime ? record.finishTime : '-'}}
+            <span class="textName" :title="record.finishTime">
+              {{record.finishTime ? record.finishTime : '-'}}
+            </span>
         </span>
         <span slot="operation" slot-scope="text,record">
             <a class="text-operation" @click="configure(record)">{{$t('configure')}}</a>
@@ -129,43 +131,50 @@
             title: this.$t('title'),
             align: 'center',
             dataIndex: 'title',
+            width: 240,
             scopedSlots: { customRender: 'paramsManifestClick' }
           },
           {
             title: this.$t('status'),
             align: 'center',
             width: 80,
+            ellipsis: true,
             dataIndex: 'state'
           },
           {
             title: this.$t('parameterTemplateName'),
             align: 'center',
             width: 180,
+            ellipsis: true,
             dataIndex: 'paramsTemplateName'
           },
           {
             title: this.$t('collectionCompletionTime'),
             align: 'center',
             dataIndex: 'finishTime',
-            width: 130,
+            width: 160,
+            ellipsis: true,
             scopedSlots: { customRender: 'collectionCompletionTime' }
           },
           {
             title: this.$t('Version'),
             align: 'center',
             width: 50,
+            ellipsis: true,
             dataIndex: 'version'
           },
           {
             title: this.$t('creator'),
             align: 'center',
             width: 110,
+            ellipsis: true,
             dataIndex: 'createBy'
           },
           {
             title: this.$t('createTime'),
             align: 'center',
             width: 160,
+            ellipsis: true,
             dataIndex: 'createTime'
           },
           {
@@ -517,6 +526,19 @@
   /deep/ .add-padding {
     margin-left: -89px !important;
   }
+
+  .textName {
+    width: 100%;
+    overflow: hidden;
+    display: -webkit-box;
+    text-overflow: ellipsis;
+    /*! autoprefixer: off */
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1;
+    /*! autoprefixer: on;*/
+    text-justify: inter-ideograph;
+    word-break: break-all
+  }
 </style>
 <style>
   .box-input .ant-select-selection {