修改角色切换

jero-web/src/components/tableCollection/index.vue

@@ -14,14 +14,17 @@
         @change="tableOnChange"
         @onHeaderRow='onHeaderRow'
       >
-        <span slot="titleName" slot-scope="text">
+        <div :slot="'titleName'+(index+1)" v-for="(item,index) in content">
-          <span style='padding-right: 20px'>{{ text.sortOrder }} </span><a-button @click='onClickSee(text)'>查看</a-button>
+          <span style='padding-right: 20px'>{{ item.db_field_txt }} </span>
-         </span>
+          <a-button @click='onClickSee(item)'>查看</a-button>
+        </div>
+
         <span slot="operationbtn" slot-scope="record">
            <span v-if='homo === 1'>
 <!--           认证工程师  -->
            <span v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "变更"'>
-             <span @click='ondataValueTobeinitiated(record)'>{{ record.dataValue == null? '--': record.dataValue}}</span>
+             <span
+               @click='ondataValueTobeinitiated(record)'>{{ record.dataValue == null? '--': record.dataValue}}</span>
            </span>
              <span v-else>
              <span @click='dataValueTobeinitiated'>{{ record.dataValue }}</span>
@@ -63,7 +66,9 @@
       <div class="imports-footer">
         <div class="imports-footer-wrap">
 
-          <a-button class="imports-btn imports-sub" type="primary" @click="handleSubmit" v-has="'split:sarFileSplitItems:importSplitResult'">{{$t('preservation')}}</a-button>
+          <a-button class="imports-btn imports-sub" type="primary" @click="handleSubmit"
+                    v-has="'split:sarFileSplitItems:importSplitResult'">{{$t('preservation')}}
+          </a-button>
           <a-button class="imports-btn" type="primary" @click="cancleImports">{{$t('cancel')}}</a-button>
         </div>
       </div>
@@ -113,6 +118,7 @@ import { ACCESS_TOKEN } from '@/store/mutation-types'
   import axios from 'axios'
   import Vue from 'vue'
   import VueDraggableResizable from 'vue-draggable-resizable'
+
   export default {
     name: 'index',
     props: {
@@ -162,18 +168,18 @@ export default {
                 z: 1,
                 axis: 'x',
                 draggable: true,
-              resizable: false,
+                resizable: false
               },
               on: {
                 dragging: (x, y) => {
                   col.width = Math.max(x, 1)
-              },
+                }
-            },
+              }
             }
             const drag = h('vue-draggable-resizable', { ...dragProps })
             return h('th', { ...restProps, class: 'resize-table-th' }, [...children, drag])
-        },
+          }
-      },
+        }
       }
       return {
         token: Vue.ls.get(ACCESS_TOKEN),
@@ -182,6 +188,7 @@ export default {
         tableAll: false,
         indeterminate: false,
         columns: [],
+        content: [],
         selectedRowKeys: [],
         selectedRowrowValue: [],
         dataSource: [],
@@ -215,7 +222,7 @@ export default {
         Dateline: {},
         getquerySdtId: '', // 当前工程接口人的id
         areaVisibleView: false, // 查看配置得弹框
-      configDetail: {}, // 查看配置得详细信息
+        configDetail: {} // 查看配置得详细信息
       }
     },
     mounted() {
@@ -249,14 +256,17 @@ export default {
             }
           })
           .catch((error) => {
-          console.log(error);
+            console.log(error)
-        });
+          })
       },
       // 获取工程接口人
       getquerySdtList(record) {
         // 当前工程接口人的id
         this.getquerySdtId = record.id
-      getAction(this.url.getquerySdtList, {projectId: this.$route.query.id, dutyTerritory: record.dutyTerritory}).then((res) => {
+        getAction(this.url.getquerySdtList, {
+          projectId: this.$route.query.id,
+          dutyTerritory: record.dutyTerritory
+        }).then((res) => {
           if (res.success) {
             this.querySdtList = res.result
           }
@@ -293,8 +303,8 @@ export default {
             }
           })
           .catch((error) => {
-          console.log(error);
+            console.log(error)
-        });
+          })
       },
       // 工程接口人 取消
       cancleImports() {
@@ -357,6 +367,8 @@ export default {
           if (res.success) {
             var jsonHead = res.result
             this.columns = []
+            let num = 0
+            this.content = []
             jsonHead.forEach((res, index) => {
               // 配置列
               if (res.type) {
@@ -367,9 +379,11 @@ export default {
                   sorter: res.sort,
                   sortOrder: res.db_field_txt
                 })
+                num++
+                this.content.push(res)
                 this.columns[index].scopedSlots = {
                   customRender: 'detailClick',
-                  title: 'titleName'
+                  title: 'titleName' + num
                 }
                 //  非配置列
               } else {
@@ -388,6 +402,8 @@ export default {
                 }
               }
             })
+            this.columns = [...this.columns]
+            console.log(this.columns)
           }
         })
       },
@@ -397,7 +413,7 @@ export default {
       getTableListReset() {
         let params = {
           paramsManifestId: this.paramsManifest.id,
-        userTypes: this.LoginUserType,
+          userTypes: this.LoginUserType
         }
         this.loading = true
         this.$emit('listReset', '')
@@ -470,11 +486,13 @@ export default {
     .imports-footer-wrap {
       margin: 20px 0;
       text-align: center;
+
       .imports-sub {
         margin-right: 20px;
       }
     }
   }
+
   .table .ant-table-column-title {
     font-weight: bold;
   }
@@ -482,14 +500,17 @@ export default {
   .ant-table td {
     white-space: nowrap;
   }
+
   .content-text {
     width: 100%;
     display: flex;
     flex-wrap: wrap;
+
     .text-field {
       width: 50%;
       margin-bottom: 8px;
       display: flex;
+
       .text-field-left {
         width: 70px;
         display: inline-block;
@@ -528,6 +549,7 @@ export default {
     text-align: right;
     margin-top: 20px;
   }
+
   .table-draggable-handle {
     /* width: 10px !important; */
     height: 100% !important;
@@ -540,6 +562,7 @@ export default {
     transform: none !important;
     bottom: 0;
   }
+
   .resize-table-th {
     position: relative;
   }

jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue

@@ -144,7 +144,7 @@
           for (let j = 0; j < timeDataList.length; j++) {
             let time = JSON.stringify(timeDataList[j].time).slice(1, 11)
             if (time == list[i]) {
-              data.push([i, timeDataList[j].index, 14, j])
+              data.push([i, timeDataList[j].index, 12, j])
             }
           }
         }
@@ -231,6 +231,7 @@
           series: [
             {
               type: 'scatter',
+              color:['#21c9cc'],
               symbolSize: function(val) {
                 return val[2] * 2
               },