# Conflicts: # .env.development
@@ -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')+''
//设置超时
@@ -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,
}
@@ -528,7 +528,7 @@ export default {
//安全隐患统计
- optionCharts({type:localStorage.getItem('deptLevel')}).then((res) =>{
+ optionCharts({type:localStorage.getItem('deptLevel'),remark:'index'}).then((res) =>{
if(res.code==200){
let dataX=[];
let dataCount=[];
@@ -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>