|
|
|
@ -65,7 +65,6 @@ |
|
|
|
:height="height" |
|
|
|
:data="dataList" |
|
|
|
border |
|
|
|
v-loading="dataListLoading" |
|
|
|
style="width: 100%;"> |
|
|
|
<el-table-column |
|
|
|
v-for="(item,index) in columnList" :key="index" |
|
|
|
@ -91,6 +90,7 @@ |
|
|
|
<template slot-scope="scope"> |
|
|
|
<a v-if="!authUpdate" type="text" size="small" @click="updateModal(scope.row)">编辑</a> |
|
|
|
<a v-if="!authDelete" type="text" size="small" @click="deleteModal(scope.row)">删除</a> |
|
|
|
<a type="text" size="small" @click="itemObjectModal(scope.row)">采集设备配置</a> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
@ -109,7 +109,7 @@ |
|
|
|
<el-dialog title="检验项目" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="500px"> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item label="BU" prop="bu" :rules="rules.bu"> |
|
|
|
<el-select v-model="modalData.bu" placeholder="请选择" :disabled="modalDisableFlag" @change="getEquipmentNoList" style="width: 456px"> |
|
|
|
<el-select v-model="modalData.bu" placeholder="请选择" :disabled="modalDisableFlag" @change="buChangeFunction" style="width: 456px"> |
|
|
|
<el-option |
|
|
|
v-for = "i in userBuList" |
|
|
|
:key = "i.buNo" |
|
|
|
@ -220,13 +220,23 @@ |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item label="采集条件路径"> |
|
|
|
<el-select multiple v-model="modalData.collectionConditionList" style="width: 456px"> |
|
|
|
<!-- <el-form-item label="采集条件路径">--> |
|
|
|
<!-- <el-select multiple v-model="modalData.collectionConditionList" style="width: 260px">--> |
|
|
|
<!-- <el-option--> |
|
|
|
<!-- v-for = "i in equipmentNoList"--> |
|
|
|
<!-- :key = "i.equipmentNo"--> |
|
|
|
<!-- :label = "i.equipmentNo"--> |
|
|
|
<!-- :value = "i.equipmentNo">--> |
|
|
|
<!-- </el-option>--> |
|
|
|
<!-- </el-select>--> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
<el-form-item label="采集数据内容"> |
|
|
|
<el-select v-model="modalData.collectionDataContent" clearable style="width: 456px"> |
|
|
|
<el-option |
|
|
|
v-for = "i in equipmentNoList" |
|
|
|
:key = "i.equipmentNo" |
|
|
|
:label = "i.equipmentNo" |
|
|
|
:value = "i.equipmentNo"> |
|
|
|
v-for = "i in dataContentList" |
|
|
|
:key = "i.contentDesc" |
|
|
|
:label = "i.contentDesc" |
|
|
|
:value = "i.contentDesc"> |
|
|
|
</el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
@ -266,7 +276,6 @@ |
|
|
|
:data="methodList" |
|
|
|
@row-dblclick="getRowData" |
|
|
|
border |
|
|
|
v-loading="dataListLoading" |
|
|
|
style="width: 100%;"> |
|
|
|
<el-table-column |
|
|
|
v-for="(item,index) in methodDetailList" :key="index" |
|
|
|
@ -290,6 +299,112 @@ |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<!-- 设备-> 快速新增 --> |
|
|
|
<el-dialog title="新增" :close-on-click-modal="false" v-drag :visible.sync="objectModelFlag" width="900px"> |
|
|
|
<div style="font-size: 12px"> |
|
|
|
<el-form :inline="true" label-position="top" :model="objectData"> |
|
|
|
<el-form-item :label="'设备编码'"> |
|
|
|
<el-input v-model="objectData.objectID" clearable style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'设备名称'"> |
|
|
|
<el-input v-model="objectData.objectDesc" clearable style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="' '"> |
|
|
|
<el-button type="primary" @click="getObjectList">查询</el-button> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
</div> |
|
|
|
<el-container style="margin-top: 0px;"> |
|
|
|
<el-main style="width: 350px; padding: 1px"> |
|
|
|
<span style="font-size: 12px" >可选设备:</span> |
|
|
|
<el-table |
|
|
|
height="400px" |
|
|
|
:data="objectList1" |
|
|
|
border |
|
|
|
ref="objectTable1" |
|
|
|
@row-click="objectClickRow1" |
|
|
|
@selection-change="selectionObject1" |
|
|
|
highlight-current-row |
|
|
|
style="width: 100%"> |
|
|
|
<el-table-column |
|
|
|
type="selection" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
width="50"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="objectID" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
min-width="80" |
|
|
|
label="设备编码"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="objectDesc" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
min-width="120" |
|
|
|
label="设备名称"> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
</el-main> |
|
|
|
<el-main style="width: 111px;padding: -1px"> |
|
|
|
<div style="margin-top: 182px;margin-left: 18px"> |
|
|
|
<el-button type="primary" @click="addObject">添加>></el-button> |
|
|
|
</div> |
|
|
|
<div style="margin-top: 15px;margin-left: 18px"> |
|
|
|
<el-button type="primary" @click="deleteObject">删除<<</el-button> |
|
|
|
</div> |
|
|
|
</el-main> |
|
|
|
<el-main style="width: 350px;padding: 1px"> |
|
|
|
<span style="font-size: 12px" >已有设备:</span> |
|
|
|
<el-table |
|
|
|
height="400px" |
|
|
|
:data="objectList2" |
|
|
|
border |
|
|
|
ref="objectTable2" |
|
|
|
@row-click="objectClickRow2" |
|
|
|
@selection-change="selectionObject2" |
|
|
|
highlight-current-row |
|
|
|
style="width: 100%"> |
|
|
|
<el-table-column |
|
|
|
type="selection" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
width="50"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="objectID" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
min-width="80" |
|
|
|
label="设备编码"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="objectDesc" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
min-width="120" |
|
|
|
label="设备名称"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
min-width="50" |
|
|
|
label="默认"> |
|
|
|
<template slot-scope="{row}"> |
|
|
|
<el-checkbox v-model="row.defaultFlag" true-label="Y" @change="(val)=>defaultChange(row)" false-label="N"></el-checkbox> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
</el-main> |
|
|
|
</el-container> |
|
|
|
<el-footer style="height:40px;margin-top: 20px;text-align:center"> |
|
|
|
<el-button type="primary" @click="updateItemObject">保存</el-button> |
|
|
|
<el-button type="primary" @click="objectModelFlag = false">关闭</el-button> |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist> |
|
|
|
|
|
|
|
<!-- 导入 --> |
|
|
|
@ -307,11 +422,17 @@ |
|
|
|
queryMethodList, // 查询检验方法 |
|
|
|
getSiteAndBuByUserName, |
|
|
|
getEquipmentNoList, // 获取采集条件路径 |
|
|
|
getDataContentList, // 获取采集数据内容 |
|
|
|
getObjectList, // 获取设备列表 |
|
|
|
getObjectListBy, |
|
|
|
addItemObject, // 新增项目设备 |
|
|
|
deleteItemObject, // 删除项目设备 |
|
|
|
updateItemObject, // 修改项目设备 |
|
|
|
} from "@/api/qc/qc.js" |
|
|
|
import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js" |
|
|
|
import Chooselist from '@/views/modules/common/Chooselist_eam' |
|
|
|
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' |
|
|
|
import qcUpload from "./qc_upload"; |
|
|
|
import qcUpload from "./qc_upload" |
|
|
|
export default { |
|
|
|
components: { |
|
|
|
Chooselist, |
|
|
|
@ -358,7 +479,6 @@ |
|
|
|
totalPage: 0, |
|
|
|
height: 200, |
|
|
|
dataList: [], |
|
|
|
dataListLoading: false, |
|
|
|
modalFlag: false, |
|
|
|
modalDisableFlag: false, |
|
|
|
modalData: { |
|
|
|
@ -390,7 +510,8 @@ |
|
|
|
collectionMethod: '', |
|
|
|
collectionMethodList: [], |
|
|
|
collectionCondition: '', |
|
|
|
collectionConditionList: [] |
|
|
|
collectionConditionList: [], |
|
|
|
collectionDataContent: '' |
|
|
|
}, |
|
|
|
// 检验项目展示标头 |
|
|
|
columnList: [ |
|
|
|
@ -819,6 +940,19 @@ |
|
|
|
authUpdate: false, |
|
|
|
authDelete: false, |
|
|
|
menuId: this.$route.meta.menuId, |
|
|
|
dataContentList: [], |
|
|
|
objectSelections1: [], |
|
|
|
objectSelections2: [], |
|
|
|
objectList1: [], |
|
|
|
objectList2: [], |
|
|
|
objectData: { |
|
|
|
site: '', |
|
|
|
buNo: '', |
|
|
|
itemNo: '', |
|
|
|
objectID: '', |
|
|
|
objectDesc: '', |
|
|
|
}, |
|
|
|
objectModelFlag: false |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
@ -846,6 +980,145 @@ |
|
|
|
}, |
|
|
|
|
|
|
|
methods: { |
|
|
|
// 默认设备 |
|
|
|
defaultChange (row) { |
|
|
|
this.objectList2 = this.objectList2.map(val => { |
|
|
|
if (val.objectID === row.objectID) { |
|
|
|
return val |
|
|
|
} |
|
|
|
val.defaultFlag = 'N' |
|
|
|
return val |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
// 绑定项目的设备 |
|
|
|
itemObjectModal (row) { |
|
|
|
this.objectSelections1 = null |
|
|
|
this.objectSelections2 = null |
|
|
|
getObjectList(row).then(({data}) => { |
|
|
|
this.objectList1 = data.row1 |
|
|
|
this.objectList2 = data.row2 |
|
|
|
}) |
|
|
|
this.objectData = { |
|
|
|
site: row.site, |
|
|
|
buNo: row.buNo, |
|
|
|
itemNo: row.itemNo, |
|
|
|
objectID: '', |
|
|
|
objectDesc: '', |
|
|
|
} |
|
|
|
this.objectModelFlag = true |
|
|
|
}, |
|
|
|
|
|
|
|
// 选择设备 |
|
|
|
getObjectList () { |
|
|
|
// 查询所有设备 |
|
|
|
getObjectListBy(this.objectData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.objectList1 = data.rows |
|
|
|
} else { |
|
|
|
this.objectList1 = [] |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
// 可选设备 |
|
|
|
objectClickRow1 (row) { |
|
|
|
this.$refs.objectTable1.toggleRowSelection(row) |
|
|
|
}, |
|
|
|
|
|
|
|
// 已有设备 |
|
|
|
objectClickRow2 (row) { |
|
|
|
this.$refs.objectTable2.toggleRowSelection(row) |
|
|
|
}, |
|
|
|
|
|
|
|
selectionObject1 (val) { |
|
|
|
this.objectSelections1 = val |
|
|
|
}, |
|
|
|
|
|
|
|
selectionObject2 (val) { |
|
|
|
this.objectSelections2 = val |
|
|
|
}, |
|
|
|
|
|
|
|
// 新增项目设备 |
|
|
|
addObject () { |
|
|
|
if (this.objectSelections1 == null || this.objectSelections1.length === 0) { |
|
|
|
this.$message.warning('请选择可选设备！') |
|
|
|
return |
|
|
|
} |
|
|
|
let inData = { |
|
|
|
site: this.objectData.site, |
|
|
|
buNo: this.objectData.buNo, |
|
|
|
itemNo: this.objectData.itemNo, |
|
|
|
objectList: this.objectSelections1 |
|
|
|
} |
|
|
|
addItemObject(inData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
getObjectList(this.objectData).then(({data}) => { |
|
|
|
this.objectList1 = data.row1 |
|
|
|
this.objectList2 = data.row2 |
|
|
|
}) |
|
|
|
this.objectSelections1 = [] |
|
|
|
} else { |
|
|
|
this.$alert(data.msg, '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
// 删除项目设备 |
|
|
|
deleteObject () { |
|
|
|
if(this.objectSelections2 == null || this.objectSelections2.length === 0){ |
|
|
|
this.$message.warning('请选择已有代理商！') |
|
|
|
return |
|
|
|
} |
|
|
|
let inData = { |
|
|
|
site: this.objectData.site, |
|
|
|
buNo: this.objectData.buNo, |
|
|
|
itemNo: this.objectData.itemNo, |
|
|
|
objectList: this.objectSelections2 |
|
|
|
} |
|
|
|
deleteItemObject(inData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
getObjectList(this.objectData).then(({data}) => { |
|
|
|
this.objectList1 = data.row1 |
|
|
|
this.objectList2 = data.row2 |
|
|
|
}) |
|
|
|
this.objectSelections2 = [] |
|
|
|
} else { |
|
|
|
this.$alert(data.msg, '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
// 修改项目设备 |
|
|
|
updateItemObject () { |
|
|
|
let inData = { |
|
|
|
site: this.objectData.site, |
|
|
|
buNo: this.objectData.buNo, |
|
|
|
itemNo: this.objectData.itemNo, |
|
|
|
objectList: this.objectList2 |
|
|
|
} |
|
|
|
updateItemObject(inData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.getDataList() |
|
|
|
this.$message({ |
|
|
|
message: '操作成功', |
|
|
|
type: 'success', |
|
|
|
duration: 1500, |
|
|
|
onClose: () => {} |
|
|
|
}) |
|
|
|
this.objectModelFlag = false |
|
|
|
} else { |
|
|
|
this.$alert(data.msg, '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
// 获取用户的bu |
|
|
|
getSiteAndBuByUserName () { |
|
|
|
let tempData = { |
|
|
|
@ -858,6 +1131,14 @@ |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
// bu改变事件 |
|
|
|
buChangeFunction () { |
|
|
|
this.modalData.collectionConditionList = '' |
|
|
|
this.modalData.collectionDataContent = '' |
|
|
|
this.getEquipmentNoList() |
|
|
|
this.getDataContentList() |
|
|
|
}, |
|
|
|
|
|
|
|
// 获取采集条件路径 |
|
|
|
getEquipmentNoList () { |
|
|
|
let tempData = { |
|
|
|
@ -870,6 +1151,18 @@ |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
// 获取采集数据内容 |
|
|
|
getDataContentList () { |
|
|
|
let tempData = { |
|
|
|
bu: this.modalData.bu |
|
|
|
} |
|
|
|
getDataContentList(tempData).then(({data}) => { |
|
|
|
if (data.code === 0) { |
|
|
|
this.dataContentList = data.rows |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
// 获取基础数据列表S |
|
|
|
getBaseList (val,type) { |
|
|
|
this.tagNo = val |
|
|
|
@ -986,9 +1279,13 @@ |
|
|
|
collectionMethod: '', |
|
|
|
collectionMethodList: [], |
|
|
|
collectionCondition: '', |
|
|
|
collectionConditionList: [] |
|
|
|
collectionConditionList: [], |
|
|
|
collectionDataContent: '' |
|
|
|
} |
|
|
|
// 获取采集条件路径 |
|
|
|
this.getEquipmentNoList() |
|
|
|
// 获取采集数据内容 |
|
|
|
this.getDataContentList() |
|
|
|
this.modalDisableFlag = false |
|
|
|
this.modalFlag = true |
|
|
|
}, |
|
|
|
@ -1024,8 +1321,12 @@ |
|
|
|
collectionMethodList: row.collectionMethod == null || row.collectionMethod === '' ? [] : row.collectionMethod.split(','), |
|
|
|
collectionCondition: row.collectionCondition, |
|
|
|
collectionConditionList: row.collectionCondition == null || row.collectionCondition === '' ? [] : row.collectionCondition.split(','), |
|
|
|
collectionDataContent: row.collectionDataContent |
|
|
|
} |
|
|
|
// 获取采集条件路径 |
|
|
|
this.getEquipmentNoList() |
|
|
|
// 获取采集数据内容 |
|
|
|
this.getDataContentList() |
|
|
|
this.modalDisableFlag = true |
|
|
|
this.modalFlag = true |
|
|
|
}, |
|
|
|
@ -1093,14 +1394,6 @@ |
|
|
|
this.$message.warning('请选择采集数据方式！') |
|
|
|
return |
|
|
|
} |
|
|
|
if (this.modalData.collectionFlag === 'Y' && (this.modalData.collectionConditionList == null || this.modalData.collectionConditionList.length === 0)) { |
|
|
|
this.$message.warning('请选择采集条件路径！') |
|
|
|
return |
|
|
|
} |
|
|
|
// if (this.modalData.collectionFlag === 'Y' && (this.modalData.collectionSourceList.length !== this.modalData.collectionMethodList.length)) { |
|
|
|
// this.$message.warning('采集数据的来源、方式不对应！') |
|
|
|
// return |
|
|
|
// } |
|
|
|
this.modalData.collectionSource = this.modalData.collectionSourceList.join(',') |
|
|
|
this.modalData.collectionMethod = this.modalData.collectionMethodList.join(',') |
|
|
|
this.modalData.collectionCondition = this.modalData.collectionConditionList.join(',') |
|
|
|
|
fengyuan_yang
2 years ago