heyang

.env.development

@@ -6,6 +6,8 @@ NODE_ENV=development
 VUE_APP_ENV = 'development'
 
 # ####################接口配置####################
+# 柴
+ VUE_APP_BASE_API = '192.168.1.9:8080'
 # 韩
 # VUE_APP_BASE_API =  '192.168.1.20:8080'
 # 飞
@@ -13,7 +15,7 @@ VUE_APP_ENV = 'development'
 # 88服务器
 # VUE_APP_BASE_API = '192.168.1.88/labSystem'
 # 43服务器
- VUE_APP_BASE_API = '192.168.1.43/labSystem/'
+# VUE_APP_BASE_API = '192.168.1.43/labSystem/'
 # 柴
 # VUE_APP_BASE_API = '192.168.1.9:8080'
 # 暨大

src/utils/request.js

@@ -37,7 +37,7 @@ axios.defaults.withCredentials = false;
 
 // 允许跨域
 axios.defaults.headers.post["Access-Control-Allow-Origin-Type"] = "*";
-//axios.defaults.headers.common["Authorization"] = 'Bearer 5c9a6c56-14f1-46b2-ba14-c7d203817a9c';//`Bearer ${localStorage.getItem('access_token')`;
+//axios.defaults.headers.common["Authorization"] = 'Bearer 54834617-dc67-425a-bf29-d3a8cdff9cc3';//`Bearer ${localStorage.getItem('access_token')`;
 axios.defaults.headers.common["Authorization"] = 'Bearer '+localStorage.getItem('Authorization')+''
 
 //设置超时

src/views/dangerDetail.vue

@@ -200,6 +200,7 @@ export default {
       let obj={
         'type':localStorage.getItem('deptLevel'),
         'subId':this.editForm.subId,
+        'optionId':this.editForm.optionId,
         'startTime':this.editForm.beginTimeStr,
         'endTime':this.editForm.endTimeStr,
       }

src/views/labPersonDetail.vue

@@ -59,7 +59,7 @@
                     <el-tooltip placement="left"  :open-delay="1000" effect="dark">
                       <div slot="content"><i style="width: 80px;display: inline-block;color: #1ED0F8;">姓名</i> <i  style="width: 140px;display: inline-block;color: #1ED0F8;">签到时间</i></div>
                       <div slot="content" :key="index" v-for="(item,index) in scope.row.groupLabPersonTip"><i style="width: 80px;display: inline-block;">{{item.name}}</i> <i style="width: 140px;display: inline-block;">{{item.time}}</i></div>
-                      <div>{{scope.row.groupLabPerson.substr(0, 20) + "..."}}</div>
+                      <div >{{scope.row.groupLabPerson.length>30?scope.row.groupLabPerson.substr(0, 20) + "...": scope.row.groupLabPerson}}</div>
                     </el-tooltip>
                   </template>
                 </el-table-column>
@@ -147,7 +147,7 @@ export default {
             _this.tableData.forEach(function (item) {
               list=item.groupUserName.split(',')//字符串逗号切割数组 [欧杨@@2023-04-03 16:15:46,王瑾@@2023-04-03 15:00:52]
               let list3=[];
-              let list4=['欧杨','王瑾','欧杨','王瑾','欧杨','王瑾','欧杨','王瑾','欧杨','王瑾',];
+              let list4=[];
               list.forEach(function (item2) {
                 list2=item2.split('@@')//[欧杨,2023-04-03 16:15:46]
                 list3.push({name:list2[0],time:list2[1]})//获取名称和时间