Merge remote-tracking branch 'epmet/dev_ljj' into dev_ljj

src/api/index.js

@@ -34,7 +34,7 @@ api.interceptors.request.use(
          */
         if (store.getters['user/isLogin']) {
             request.headers.token = store.state.user.token 
-            // request.headers.token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJhcHAiOiJnb3YiLCJjbGllbnQiOiJ3ZWIiLCJleHAiOjE2MzI5NjYwODEsInVzZXJJZCI6Ijg0ODg3ZDQzMjEzN2EzMGI3YWJhYWM1MDY5ODZkNDYxIiwiaWF0IjoxNjMyMzYxMjgxfQ.CDYJNfuF7gRRDwwmB9dJQjVOj_t_3xdrgwMqxHNAleZuQHkPMu9fI32at2aPjprhN4yBc_KT_3_Yhh30SF7YzA'
+            // request.headers.token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJhcHAiOiJnb3YiLCJjbGllbnQiOiJ3ZWIiLCJleHAiOjE2MzMwNTM0NTYsInVzZXJJZCI6Ijg0ODg3ZDQzMjEzN2EzMGI3YWJhYWM1MDY5ODZkNDYxIiwiaWF0IjoxNjMyNDQ4NjU2fQ.xc2Dz5yPaNLCJsQCZnBYKgTTb88PhBZ1E5g3NaqImhHOwOE4R_OAexct7FdSs6oh3Eqzf4Bw9e7mWHkAoFeroQ'
             // request.headers.Authorization = store.state.user.token
         }
         signRequest(request)

src/views/form/statistics/analysis.vue

@@ -107,9 +107,10 @@
 
     <el-dialog :title="dialogTitle" :visible.sync="dialogTableVisible" :close-on-click-modal="false" @close="handleClose">
       <el-table :data="dialogData" max-height="400" border>
-        <el-table-column
+        <el-table-column type="index" label="序号" width="50" align="center">
-          type="index"
+          <!-- <template slot-scope="scope">
-          width="50">
+              {{ scope.row.index }}
+          </template> -->
         </el-table-column>
         <el-table-column v-for="item in dialogHeader" :key="item.formItemId" :prop="item.formItemId" :label="item.label" />
         <!-- <el-table-column property="name" label="姓名" width="200"></el-table-column>
@@ -291,8 +292,12 @@ export default {
         })
         .then((res) => {
           this.dialogData = res.data.map(item => {
+            let n = item
+            if (item.includes(',')) {
+              n = item.replace(',', '至')
+            }
             return {
-              [id]: item
+              [id]: n
             }
           })
         })

src/views/form/statistics/item.vue

@@ -80,6 +80,13 @@ export default {
               }
               return arr.length > 0 ? arr.join('，') : ''
             }
+            if (this.projectItemData.type === 'DATE_RANGE') {
+              return this.processData[`field${this.fieldItemId}`] ? this.processData[`field${this.fieldItemId}`].join('至'): ''
+            }
+            if (this.projectItemData.type === 'TIME_RANGE') {
+              return this.processData[`field${this.fieldItemId}`] ? this.processData[`field${this.fieldItemId}`].join('至'): ''
+            }
+            
             return this.processData[`field${this.fieldItemId}`] ? this.processData[`field${this.fieldItemId}`] : ''
         }
     }