Skip to content

Z
zhongtong-avi-web
Commit 567db028 authored by 李志鸣's avatar 李志鸣
Browse files
Options

fix(AVI): 详细信息弹窗bug修复

parent 233168c4
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 24 deletions
src/views/Basic/DeviceBasic/list.vue
View file @ 567db028
......@@ -32,6 +32,15 @@
:tableConfig="tableConfig"
@onPageSizeChange="onPageSizeChange"
@onCurrentPageChange="onCurrentPageChange">
<template slot="equipType">
<el-table-column
label="设备类型"
show-overflow-tooltip>
<template slot-scope="scope">
<span>{{resolveEquipType(scope.row.equipType)}}</span>
</template>
</el-table-column>
</template>
<template slot="operationColumn">
<el-table-column
fixed="right"
......@@ -87,6 +96,8 @@
},
data () {
return {
// 设备分类数据
equipTypeData: [],
// 编辑设备基础数据
editDeviceBasicValue: {},
// 精准搜索关键字列表
......@@ -97,7 +108,7 @@
data: [],
fieldList: [
{ label: '车间', value: 'workshopName' },
{ label: '设备类型', value: 'equipType' },
{ label: '设备类型', value: 'equipType', slot: 'equipType' },
{ label: '设备编号', value: 'equipCode' },
{ label: '设备名称', value: 'alias' },
{ label: '设备厂商', value: 'equipFactory' }
......@@ -112,6 +123,14 @@
}
},
methods: {
// 解析设备分类名称
resolveEquipType (code) {
for (let item of this.equipTypeData) {
if (item.itemCode === code) {
return item.itemName;
}
}
},
// 点击刷新按钮
doRefreshClick () {
this.getTableList().then(response => {
......@@ -204,13 +223,22 @@
doEditDeviceDialogConfirm () {
// 获取表格数据
this.getTableList()
},
// 获取设备分类数据
getSeviceSortSelectData () {
let queryParams = { dicCode: 'DEVICE_SORT', hash: 'dicCode' };
this.$fetch('dict-item-controller/dicCode-get', queryParams).then(response => {
this.equipTypeData = _.cloneDeep(response);
});
}
},
mounted () {
setTimeout(() => {
this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 210
this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 210;
// 获取设备分类数据
this.getSeviceSortSelectData();
// 获取表格数据
this.getTableList()
this.getTableList();
}, 0)
}
}
......
src/views/Laboratory/ElectrophoresisTank/components/AddReport.vue
View file @ 567db028
......@@ -201,7 +201,7 @@
</el-col>
</el-row>
</el-form>
<p style="color: red">*各槽液至少搅拌30min后取样测试；标★项为必控项，超出范围必须调整合格后再生产；其他想为观察跟踪项，可偏离控制范围限制一个点，但不允许连续超过3天。</p>
<p style="color: red">*各槽液至少搅拌30min后取样测试；标★项为必控项，超出范围必须调整合格后再生产；其他项为观察跟踪项，可偏离控制范围限制一个点，但不允许连续超过3天。</p>
<span slot="footer" class="dialog-footer">
<el-button :loading="loadingToggle" size="small" type="primary" icon="el-icon-check" @click="doConfirmClick()">确认</el-button>
<el-button size="small" icon="el-icon-close" @click="doCancelClick()">取消</el-button>
......
src/views/Laboratory/ElectrophoresisTank/components/ViewReport.vue
View file @ 567db028
......@@ -151,7 +151,7 @@
</el-col>
</el-row>
</el-form>
<p style="color: red">*各槽液至少搅拌30min后取样测试；标★项为必控项，超出范围必须调整合格后再生产；其他想为观察跟踪项，可偏离控制范围限制一个点，但不允许连续超过3天。</p>
<p style="color: red">*各槽液至少搅拌30min后取样测试；标★项为必控项，超出范围必须调整合格后再生产；其他项为观察跟踪项，可偏离控制范围限制一个点，但不允许连续超过3天。</p>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="doExportClick()" icon="el-icon-printer">打印</el-button>
<el-button size="small" type="primary" icon="el-icon-close" @click="doCancelClick()">取消</el-button>
......
src/views/Laboratory/Pickling/components/AddReport.vue
View file @ 567db028
......@@ -201,7 +201,7 @@
</el-col>
</el-row>
</el-form>
<p style="color: red">*各槽液至少搅拌30min后取样测试；标★项为必控项，超出范围必须调整合格后再生产；其他想为观察跟踪项，可偏离控制范围限制一个点，但不允许连续超过3天。</p>
<p style="color: red">*各槽液至少搅拌30min后取样测试；标★项为必控项，超出范围必须调整合格后再生产；其他项为观察跟踪项，可偏离控制范围限制一个点，但不允许连续超过3天。</p>
<span slot="footer" class="dialog-footer">
<el-button :loading="loadingToggle" size="small" type="primary" icon="el-icon-check" @click="doConfirmClick()">确认</el-button>
<el-button size="small" icon="el-icon-close" @click="doCancelClick()">取消</el-button>
......
src/views/Laboratory/Pickling/components/ViewReport.vue
View file @ 567db028
......@@ -151,7 +151,7 @@
</el-col>
</el-row>
</el-form>
<p style="color: red">*各槽液至少搅拌30min后取样测试；标★项为必控项，超出范围必须调整合格后再生产；其他想为观察跟踪项，可偏离控制范围限制一个点，但不允许连续超过3天。</p>
<p style="color: red">*各槽液至少搅拌30min后取样测试；标★项为必控项，超出范围必须调整合格后再生产；其他项为观察跟踪项，可偏离控制范围限制一个点，但不允许连续超过3天。</p>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="doExportClick()" icon="el-icon-printer">打印</el-button>
<el-button size="small" type="primary" icon="el-icon-close" @click="doCancelClick()">取消</el-button>
......
src/views/Laboratory/Pretreatment/components/AddReport.vue
View file @ 567db028
......@@ -201,7 +201,7 @@
</el-col>
</el-row>
</el-form>
<p style="color: red">*各槽液至少搅拌30min后取样测试；标★项为必控项，超出范围必须调整合格后再生产；其他想为观察跟踪项，可偏离控制范围限制一个点，但不允许连续超过3天。</p>
<p style="color: red">*各槽液至少搅拌30min后取样测试；标★项为必控项，超出范围必须调整合格后再生产；其他项为观察跟踪项，可偏离控制范围限制一个点，但不允许连续超过3天。</p>
<span slot="footer" class="dialog-footer">
<el-button :loading="loadingToggle" size="small" type="primary" icon="el-icon-check" @click="doConfirmClick()">确认</el-button>
<el-button size="small" icon="el-icon-close" @click="doCancelClick()">取消</el-button>
......
src/views/Laboratory/Pretreatment/components/ViewReport.vue
View file @ 567db028
......@@ -151,7 +151,7 @@
</el-col>
</el-row>
</el-form>
<p style="color: red">*各槽液至少搅拌30min后取样测试；标★项为必控项，超出范围必须调整合格后再生产；其他想为观察跟踪项，可偏离控制范围限制一个点，但不允许连续超过3天。</p>
<p style="color: red">*各槽液至少搅拌30min后取样测试；标★项为必控项，超出范围必须调整合格后再生产；其他项为观察跟踪项，可偏离控制范围限制一个点，但不允许连续超过3天。</p>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="doExportClick()" icon="el-icon-printer">打印</el-button>
<el-button size="small" type="primary" icon="el-icon-close" @click="doCancelClick()">取消</el-button>
......
src/views/Monitor/components/ComplexionPaint.vue
View file @ 567db028
......@@ -709,7 +709,9 @@ export default {
this.$refs.toolRef.$refs.tooltip.style.left = left - 100 + 'px';
this.$fetch('area-controller/busNo-get', { busNo: busNub })
.then(res => {
this.BusInformation = _.cloneDeep(res);
if (!Array.isArray(res)) {
this.BusInformation = _.cloneDeep(res);
}
})
.catch(error => {
reject(error);
......
src/views/Monitor/components/Electrophoresis.vue
View file @ 567db028
......@@ -485,7 +485,9 @@ export default {
this.$refs.toolRef.$refs.tooltip.style.left = left - 100 + 'px';
this.$fetch('area-controller/busNo-get', { busNo: row })
.then(res => {
this.BusInformation = _.cloneDeep(res);
if (!Array.isArray(res)) {
this.BusInformation = _.cloneDeep(res);
}
})
.catch(error => {
reject(error);
......
src/views/Monitor/components/FinishedCar.vue
View file @ 567db028
......@@ -201,7 +201,9 @@ export default {
this.$refs.toolRef.$refs.tooltip.style.left = left - 100 + 'px';
this.$fetch('area-controller/busNo-get', { busNo: row })
.then(res => {
this.BusInformation = _.cloneDeep(res);
if (!Array.isArray(res)) {
this.BusInformation = _.cloneDeep(res);
}
})
.catch(error => {
reject(error);
......
src/views/Monitor/components/MiddleCoat.vue
View file @ 567db028
......@@ -250,7 +250,9 @@ export default {
this.$refs.toolRef.$refs.tooltip.style.left = left - 100 + 'px';
this.$fetch('area-controller/busNo-get', { busNo: row })
.then(res => {
this.BusInformation = _.cloneDeep(res);
if (!Array.isArray(res)) {
this.BusInformation = _.cloneDeep(res);
}
})
.catch(error => {
reject(error);
......
src/views/Monitor/components/Putty.vue
View file @ 567db028
......@@ -289,7 +289,9 @@ export default {
this.$refs.toolRef.$refs.tooltip.style.left = `${left}px`;
this.$fetch('area-controller/busNo-get', { busNo: busNub })
.then(res => {
this.BusInformation = _.cloneDeep(res);
if (!Array.isArray(res)) {
this.BusInformation = _.cloneDeep(res);
}
})
.catch(error => {
reject(error);
......
src/views/Monitor/components/SealedAnticorrosion.vue
View file @ 567db028
......@@ -350,7 +350,9 @@ export default {
this.$refs.toolRef.$refs.tooltip.style.left = left - 100 + 'px';
this.$fetch('area-controller/busNo-get', queryParams).then(
response => {
this.currentBusInfo = _.cloneDeep(response);
if (!Array.isArray(res)) {
this.BusInformation = _.cloneDeep(res);
}
}
);
},
......
src/views/Monitor/components/SheetMetalCar.vue
View file @ 567db028
......@@ -354,7 +354,9 @@ export default {
this.$refs.toolRef.$refs.tooltip.style.left = `${left}px`;
this.$fetch('area-controller/busNo-get', { busNo: busNub })
.then(res => {
this.BusInformation = _.cloneDeep(res);
if (!Array.isArray(res)) {
this.BusInformation = _.cloneDeep(res);
}
})
.catch(error => {
reject(error);
......
src/views/Monitor/components/Tooltip.vue
View file @ 567db028
......@@ -32,7 +32,7 @@
</p>
<p>
<span>产线: </span>
<span>{{ carStationInfo.hasOwnProperty('line') && carStationInfo.line !== null ? arStationInfo.line : '暂无' }}</span>
<span>{{ carStationInfo.hasOwnProperty('line') && carStationInfo.line !== null ? carStationInfo.line : '暂无' }}</span>
</p>
<!-- <p><span>计划完工时间: </span><span>{{ query.saleOrderNo }}</span></p> -->
<div
......@@ -49,10 +49,7 @@
*/
export default {
props: {
query: {
type: Object,
default: () => {}
}
query: {}
},
data () {
return {
......@@ -78,7 +75,7 @@ export default {
.tooltip {
position: absolute;
padding: 20px 0 0 0;
width: 260px;
width: 400px;
height: 246px;
border-radius: 9px;
background: #000000;
......@@ -96,14 +93,14 @@ export default {
span:nth-child(1) {
display: block;
width: 120px;
width: 185px;
float: left;
text-align: right;
}
span:nth-child(2) {
display: block;
float: left;
width: 110px;
width: 185px;
margin-left: 15px;
overflow: hidden;
white-space: nowrap;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment