Merge remote-tracking branch 'origin/dev' into dev

src/main/webapp/HG/BI/components/hipi/002/left-manage-cockpit.vue

@@ -146,20 +146,18 @@ module.exports = {
       inInfo.set('inqu_status-0-depositDate',this.datapicker)
       IPLAT.EiCommunicator.send('HGSC007', 'getByProcessSumWt', inInfo, {
             onSuccess: function (res) {
-              if(undefined != res.extAttr.result[0]){
+              _this.getByProcessSumWtList = [];
+              if(res.extAttr.result.length){
                 _this.getByProcessSumWtList = res.extAttr.result[0]
-              }else {
+              }else{
                 _this.getByProcessSumWtList.push({
                   dayWeight:0,
                   monthWeight:0,
                   yearWeight:0,
                 })
               }
-
             },
-            onFail: function (err) {
-
-            }
+            onFail: function (err) {}
           },
           {async: false}
       );
@@ -172,7 +170,14 @@ module.exports = {
       inInfo.set('inqu_status-0-depositDate',this.dataPicker)
       IPLAT.EiCommunicator.send('HGSC007', 'queryBySunWt', inInfo, {
             onSuccess: function (res) {
-              _this.queryBySunWtList = res.blocks.result.extAttr.processNameList
+              console.log(res,'显示的数据')
+              if(res.extAttr.result.length){
+                _this.queryBySunWtList = res.extAttr.result
+              }else{
+                _this.queryBySunWtList =[]
+              }
+              _this.$forceUpdate();
+
             },
             onFail: function (err) {
             }

src/main/webapp/HG/BI/components/hipi/002/right-manage-cockpit.vue

@@ -34,6 +34,7 @@
               style="width: 100%">
         <el-table-column
                 v-for="(colVal,i) in columns"
+                :key="i"
                 :prop="colVal.value"
                 :align="colVal.align"
                 :label="colVal.label"
@@ -95,7 +96,7 @@ module.exports = {
           label: '进度(%)',
           align: 'center',
           value: 'schedule',
-          width:'40'
+          width:'80'
         }
       ]
     };