Squashed commit of the following:
commitd082dc2fbc
Author: dong <58670809@qq.com> Date: Wed Apr 19 10:41:17 2023 +0800 修改收令单位不显示调度命令问题 commitc52925960c
Merge:a3bc0de08
1f5d891c5
Author: joylink_zhangsai <1021828630@qq.com> Date: Tue Apr 18 16:25:03 2023 +0800 Merge remote-tracking branch 'origin/test' into test commita3bc0de08a
Author: joylink_zhangsai <1021828630@qq.com> Date: Tue Apr 18 16:24:34 2023 +0800 处理列车异常显示问题 by fan commit1f5d891c55
Author: dong <58670809@qq.com> Date: Mon Apr 17 14:40:39 2023 +0800 修改苏电院交控线路顶部菜单展开后没法收回去问题 commit0d50ac586b
Author: dong <58670809@qq.com> Date: Mon Apr 17 13:26:39 2023 +0800 修改弹窗没有高度问题 commit73c9c0777e
Author: dong <58670809@qq.com> Date: Fri Apr 14 16:25:38 2023 +0800 去掉实训管理查询项缓存
This commit is contained in:
parent
c020d69150
commit
f2039927db
@ -155,7 +155,7 @@ class Painter {
|
||||
trainDevice.instance && this.mapInstanceLevel[deviceType.Train].remove(trainDevice.instance);
|
||||
trainDevice.instance = null;
|
||||
trainDevice.zrOptions = this.$jmap.$options;
|
||||
this.add(trainDevice);
|
||||
curModel.sectionModel.instance && this.add(trainDevice);
|
||||
});
|
||||
|
||||
if (this.screenFlag) {
|
||||
|
@ -38,18 +38,18 @@
|
||||
<span style="margin-left: 10px">{{ getStateInfo(scope.row.rcvCompanies).time || '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="发令单位">
|
||||
<el-table-column label="发令单位" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
<span style="margin-left: 10px">{{ scope.row.sendCompany ? scope.row.sendCompany.name : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="sender" label="发令人" />
|
||||
<el-table-column prop="sender" label="发令人" show-overflow-tooltip />
|
||||
<el-table-column label="签否">
|
||||
<template slot-scope="scope">
|
||||
<span style="margin-left: 10px">{{ getSignedStatus(getStateInfo(scope.row.rcvCompanies)) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="签收人">
|
||||
<el-table-column label="签收人" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
<span style="margin-left: 10px">{{ getSignedBy(scope.row.rcvCompanies) || '' }}</span>
|
||||
</template>
|
||||
@ -352,7 +352,10 @@ export default {
|
||||
},
|
||||
findDisCmdObj(obj, val) {
|
||||
return Object.values(obj).find(item => {
|
||||
return item.rcvCompanies[0].id == val;
|
||||
const find = item.rcvCompanies.find(ii => {
|
||||
return ii.id == val;
|
||||
});
|
||||
return find;
|
||||
});
|
||||
},
|
||||
searchCmd() {
|
||||
|
@ -1324,20 +1324,16 @@ export default {
|
||||
console.log('tabClick');
|
||||
},
|
||||
selectionChange(selection) {
|
||||
this.command.rcvCompanies = [];
|
||||
selection.forEach(item => {
|
||||
const find = this.command.rcvCompanies.find(every => {
|
||||
return item.code == every.code;
|
||||
});
|
||||
if (!find) {
|
||||
const obj = {
|
||||
name: item.name,
|
||||
rsCompany: true,
|
||||
cpType: item.cpType,
|
||||
code: item.code,
|
||||
...item
|
||||
};
|
||||
this.command.rcvCompanies.push(obj);
|
||||
}
|
||||
const obj = {
|
||||
name: item.name,
|
||||
rsCompany: true,
|
||||
cpType: item.cpType,
|
||||
code: item.code,
|
||||
...item
|
||||
};
|
||||
this.command.rcvCompanies.push(obj);
|
||||
});
|
||||
},
|
||||
getCompanyIdList(sum) {
|
||||
|
Loading…
Reference in New Issue
Block a user