@@ -340,12 +325,12 @@
+ v-model="scope.row.productId" filterable remote :remote-method="remoteMethodProduct" placeholder="请选择物品" :disabled="viewType != 'submit'">
-
+
@@ -363,7 +348,7 @@
@@ -380,7 +365,7 @@
- 取 消
+ 取 消
确 定
@@ -499,12 +484,12 @@ export default {
pos: '',
spanArr1: [],
pos1: '',
- materialData:[],
- materialId:'',
- productCurrent:1,
- productSize:100,
- productTotals:0,
- productLists:[]
+ materialData: [],
+ materialId: '',
+ productCurrent: 1,
+ productSize: 100,
+ productTotals: 0,
+ productLists: []
}
},
computed: {
@@ -518,13 +503,13 @@ export default {
val = item
}
})
- return val
+ return val?val:''
}
}
},
},
created() {
-
+
},
methods: {
closeName() {
@@ -552,61 +537,83 @@ export default {
this.assignVisible = true
},
setMaterial(row) {
- console.log('row===============>',row)
+ console.log('物料配置按钮 row===============>', row)
this.materialId = row.id
this.getProductLists()
- console.log('materialData=============>',this.materialData)
-
+ // console.log('materialData=============>',this.materialData)
+ this.materialData = row.detailGoodsList
this.materialVisible = true
},
addColumn() {
let arr = JSON.parse(JSON.stringify(this.materialData))
- arr.push({materialId:this.materialId, inventoryId:'', productId: '', productName: '', rule: '', xh: '', number: '', unit: '', price: '', productList: [] })
+ arr.push({ materialId: this.materialId, warehouseId: '', productId: '', goodsName: '', rule: '', xh: '', number: '', unit: '', price: '', productList: [] })
this.materialData = arr
},
- handleCloneSub(){
- console.log('materialData=============>',this.materialData)
+ handleCloneSub() {
+ console.log('选中物料列表 materialData=============>', this.materialData, this.materialId, this.errorForm.tableData)
+ let data = []
+
+ this.materialData.forEach(item => {
+ data.push({
+ warehouseId: item.warehouseId,//物资id
+ goodsName: item.goodsName, //物资名称
+ unit: item.unit,//单位
+ xh: item.xh,//型号
+ rule: item.rule,//规格
+ price: item.price,
+ number: item.number,//领用数量
+ productId: item.productId,//物料id
+ })
+ })
+ // 确定之后给每一条数据加上物料列表
+ this.errorForm.tableData.forEach(item => {
+ if (item.id == this.materialId) {
+ item.detailGoodsList = []
+ item.detailGoodsList = data
+ }
+ })
this.materialVisible = false
},
changeProduct(value, index) {
- console.log('val===========>',value)
- console.log('materialData===========>',this.materialData)
- console.log('materialId===========>',this.materialId)
- if(typeof value == 'string'){
- this.productLists.find(item => item.id == value).unifiedQuotation = this.productLists.find(item => item.id == value).unifiedQuotation == -1 ? 0 : this.productLists.find(item => item.id == value).unifiedQuotation
- this.materialData.filter(item => item.materialId == this.materialId)[index].price = this.productLists.find(item => item.id == value) ? this.productLists.find(item => item.id == value).unifiedQuotation * 1 : ''
- this.materialData.filter(item => item.materialId == this.materialId)[index].number = 1
- this.materialData.filter(item => item.materialId == this.materialId)[index].rule = this.productLists.find(item => item.id == value) ? this.productLists.find(item => item.id == value).rule : ''
- this.materialData.filter(item => item.materialId == this.materialId)[index].xh = this.productLists.find(item => item.id == value) ? this.productLists.find(item => item.id == value).xh : ''
- this.materialData.filter(item => item.materialId == this.materialId)[index].unit = this.productLists.find(item => item.id == value) ? this.productLists.find(item => item.id == value).unit : ''
- this.materialData.filter(item => item.materialId == this.materialId)[index].productName = this.productLists.find(item => item.id == value) ? this.productLists.find(item => item.id == value).name : ''
- this.materialData.filter(item => item.materialId == this.materialId)[index].unifiedQuotation = this.productLists.find(item => item.id == value) ? this.productLists.find(item => item.id == value).unifiedQuotation : ''
- this.materialData.filter(item => item.materialId == this.materialId)[index].inventoryId = this.productLists.find(item => item.id == value) ? this.productLists.find(item => item.id == value).inventoryId : ''
- }else if(typeof value == 'object' && value.target.value != ''){
- this.productLists.find(item => item.id == value).unifiedQuotation = this.productLists.find(item => item.id == value).unifiedQuotation == -1 ? 0 : this.productLists.find(item => item.id == value).unifiedQuotation
- this.materialData.filter(item => item.materialId == this.materialId)[index].price = this.productLists.find(item => item.id == value.target.value) ? this.productLists.find(item => item.id == value.target.value).unifiedQuotation * 1 : ''
- this.materialData.filter(item => item.materialId == this.materialId)[index].number = 1
- this.materialData.filter(item => item.materialId == this.materialId)[index].rule = this.productLists.find(item => item.id == value.target.value) ? this.productLists.find(item => item.id == value.target.value).rule : ''
- this.materialData.filter(item => item.materialId == this.materialId)[index].xh = this.productLists.find(item => item.id == value.target.value) ? this.productLists.find(item => item.id == value.target.value).xh : ''
- this.materialData.filter(item => item.materialId == this.materialId)[index].unit = this.productLists.find(item => item.id == value.target.value) ? this.productLists.find(item => item.id == value.target.value).unit : ''
- this.materialData.filter(item => item.materialId == this.materialId)[index].productName = this.productLists.find(item => item.id == value.target.value) ? this.productLists.find(item => item.id == value.target.value).name : ''
- this.materialData.filter(item => item.materialId == this.materialId)[index].unifiedQuotation = this.productLists.find(item => item.id == value.target.value) ? this.productLists.find(item => item.id == value.target.value).unifiedQuotation : ''
- this.materialData.filter(item => item.materialId == this.materialId)[index].inventoryId = this.productLists.find(item => item.id == value.target.value) ? this.productLists.find(item => item.id == value.target.value).inventoryId : ''
+ let newArr = this.productLists.find(item => item.id == value)
+
+ if (typeof value == 'string') {
+ if (newArr.length <= 0) {
+ return false
}
- // if(this.productInventoryId != ''){
- // this.productCurrent = 1
- // this.productSize = 10
- // this.getProductLists()
- // }
- },
+ newArr.unifiedQuotation = newArr.unifiedQuotation == -1 ? 0 : newArr.unifiedQuotation
+
+ this.materialData[index].price = newArr.unifiedQuotation * 1
+ // this.materialData[index].productId = newArr.productId
+ this.materialData[index].number = 1
+ this.materialData[index].rule = newArr.rule
+ this.materialData[index].xh = newArr.xh
+ this.materialData[index].unit = newArr.unit
+ this.materialData[index].goodsName = newArr.name
+ this.materialData[index].unifiedQuotation = newArr.unifiedQuotation
+ this.materialData[index].warehouseId = newArr.inventoryId
+
+ } else if (typeof value == 'object' && value.target.value != '') {
+
+ this.productLists.find(item => item.id == value).unifiedQuotation = this.productLists.find(item => item.id == value).unifiedQuotation == -1 ? 0 : this.productLists.find(item => item.id == value).unifiedQuotation
+ this.materialData[index].price = this.productLists.find(item => item.id == value.target.value) ? this.productLists.find(item => item.id == value.target.value).unifiedQuotation * 1 : ''
+ this.materialData.filter(item => item.materialId == this.materialId)[index].number = 1
+ this.materialData.filter(item => item.materialId == this.materialId)[index].rule = this.productLists.find(item => item.id == value.target.value) ? this.productLists.find(item => item.id == value.target.value).rule : ''
+ this.materialData.filter(item => item.materialId == this.materialId)[index].xh = this.productLists.find(item => item.id == value.target.value) ? this.productLists.find(item => item.id == value.target.value).xh : ''
+ this.materialData.filter(item => item.materialId == this.materialId)[index].unit = this.productLists.find(item => item.id == value.target.value) ? this.productLists.find(item => item.id == value.target.value).unit : ''
+ this.materialData.filter(item => item.materialId == this.materialId)[index].goodsName = this.productLists.find(item => item.id == value.target.value) ? this.productLists.find(item => item.id == value.target.value).name : ''
+ this.materialData.filter(item => item.materialId == this.materialId)[index].unifiedQuotation = this.productLists.find(item => item.id == value.target.value) ? this.productLists.find(item => item.id == value.target.value).unifiedQuotation : ''
+ this.materialData.filter(item => item.materialId == this.materialId)[index].warehouseId = this.productLists.find(item => item.id == value.target.value) ? this.productLists.find(item => item.id == value.target.value).inventoryId : ''
+ }
+ },
changeNumber(val, row) {
console.log('val------------->', val)
console.log('row------------->', row)
// row.price = row.price * val
// row.price = row.unifiedQuotation * val
- if(row.unifiedQuotation){
+ if (row.unifiedQuotation) {
row.price = (row.unifiedQuotation * val).toFixed(2)
- }else{
+ } else {
}
@@ -617,8 +624,8 @@ export default {
this.productCurrent++
this.getProductLists('more')
},
- getProductLists(type, val,inventoryId){
- getGoodsList({ current: this.productCurrent, size: this.productSize, name: val ? val : null}).then(res => {
+ getProductLists(type, val, inventoryId) {
+ getGoodsList({ current: this.productCurrent, size: this.productSize, name: val ? val : null }).then(res => {
if (type == 'more') {
this.productLists = this.productLists.concat(res.data.data.records)
this.productTotals = res.data.data.total
@@ -714,6 +721,16 @@ export default {
this.errorForm = res.data.data
this.dialogerror = true
let data = this.checkDeepData(res.data.data.details)
+ if (this.errorForm.repairStatus > 1) {
+ data.forEach(item => {
+ if (item.detailGoodsList.length > 0) {
+ item.isNeed = '1'
+ } else {
+ item.isNeed = '0'
+ }
+ })
+ }
+
this.errorForm.tableData = data
this.errorForm.tableData.map(item => {
item.price = item.price == -1 ? '' : item.price
@@ -737,6 +754,15 @@ export default {
this.errorForm.isOkQuality = ''
this.errorForm.isOkSecure = ''
let data = this.checkDeepData(res.data.data.details)
+ if (this.errorForm.repairStatus > 1) {
+ data.forEach(item => {
+ if (item.detailGoodsList.length > 0) {
+ item.isNeed = '1'
+ } else {
+ item.isNeed = '0'
+ }
+ })
+ }
this.errorForm.tableData = data
})
@@ -791,11 +817,12 @@ export default {
this.errorForm = res.data.data
this.dialogerror = true
let data = this.checkDeepData(res.data.data.details)
+ console.log('获取详情数据', data)
this.errorForm.tableData = data
this.errorForm.tableData.map(item => {
item.price = item.price == -1 ? '' : item.price
})
- console.log('data==========>', data)
+
}
})
},
@@ -807,6 +834,15 @@ export default {
this.errorForm = res.data.data
this.dialogerror = true
let data = this.checkDeepData(res.data.data.details)
+ if (this.errorForm.repairStatus > 1) {
+ data.forEach(item => {
+ if (item.detailGoodsList.length > 0) {
+ item.isNeed = '1'
+ } else {
+ item.isNeed = '0'
+ }
+ })
+ }
this.errorForm.tableData = data
this.errorForm.approveResult = ''
this.errorForm.approveRemark = ''
@@ -971,49 +1007,51 @@ export default {
this.$refs['errorForm'].validate((valid) => {
if (valid) {
if (this.viewType == 'submit') {
- if (this.errorForm.tableData.find(item => item.price === '')) {
- this.$message.error("请对异常的数据填写价格")
- } else {
- let query = []
- this.errorForm.tableData.map(item => {
- query.push({
- id: item.id, // 明细id
- status: item.status, //状态，0：正常，1：异常
- taskId: this.errorForm.id, // 任务ID
- floorName: item.floorName, //楼层
- deptId: item.deptId, //房间
- majorName: item.majorName, //专业名称
- checkContent: item.checkContent, //巡检内容
- craft: item.craft, //工艺要求
- period: item.period, //巡检周期 1:月， 2：季， 3：半年
- picUrl: item.picUrl, //现场图片地址
- signUrl: item.signUrl, //签字图片地址
- remark: item.remark, //备注
- price: item.price, //价格
- // isRepair 客户确认是否维修, 0:不维修， 1维修
- startTime: item.startTime, //计划开始时间
- })
+ // if (this.errorForm.tableData.find(item => item.price === '')) {
+ // this.$message.error("请对异常的数据填写价格")
+ // } else {
+ let query = []
+ this.errorForm.tableData.map(item => {
+ query.push({
+ id: item.id, // 明细id
+ status: item.status, //状态，0：正常，1：异常
+ taskId: this.errorForm.id, // 任务ID
+ floorName: item.floorName, //楼层
+ deptId: item.deptId, //房间
+ majorName: item.majorName, //专业名称
+ checkContent: item.checkContent, //巡检内容
+ craft: item.craft, //工艺要求
+ period: item.period, //巡检周期 1:月， 2：季， 3：半年
+ picUrl: item.picUrl, //现场图片地址
+ signUrl: item.signUrl, //签字图片地址
+ remark: item.remark, //备注
+ price: item.price, //价格
+ // isRepair 客户确认是否维修, 0:不维修， 1维修
+ startTime: item.startTime, //计划开始时间
+ isNeed: item.isNeed,//是否需要物料 0，1
+ detailGoodsList: item.detailGoodsList,//物料列表
})
- let params = {
- task: {
- id: this.errorForm.id,
- },
- detailList: query
+ })
+ let params = {
+ task: {
+ id: this.errorForm.id,
+ },
+ detailList: query
+ }
+ console.log('params==========>', params)
+ solutionSave(params).then(res => {
+ if (res.data.code == 200) {
+ solutionSubmit({ id: this.errorForm.id }).then(res => {
+ if (res.data.code == 200) {
+ this.$message.success('提交成功')
+ this.dialogerror = false
+ this.onLoad()
+ }
+ })
}
- console.log('params==========>', params)
- solutionSave(params).then(res => {
- if (res.data.code == 200) {
- solutionSubmit({ id: this.errorForm.id }).then(res => {
- if (res.data.code == 200) {
- this.$message.success('提交成功')
- this.dialogerror = false
- this.onLoad()
- }
- })
- }
- })
+ })
- }
+ // }
} else if (this.viewType == 'check') {
if (this.errorForm.approveResult == 1) {
supervisorConfirm({ id: this.errorForm.id }).then(res => {
diff --git a/src/views/businessManagement/inspection/task.vue b/src/views/businessManagement/inspection/task.vue
index 9fce100..4fc3410 100644
--- a/src/views/businessManagement/inspection/task.vue
+++ b/src/views/businessManagement/inspection/task.vue
@@ -1,313 +1,287 @@
-
-
-
- 生成巡检任务
-
-
-
- {{ getStatus('inspectionTask',userInfo.role_id,row.taskStatus).name }}
-
-
- 查看
- 指派
- 接单
- 巡检
- 确认
- 导出
-
-
-
-
-
-
-
-
-
+
+
+ 生成巡检任务
+ 批量导出报告
+
+
+
+ {{
+ getStatus('inspectionTask', userInfo.role_id, row.taskStatus).name }}
+
+
+ 查看
+ 指派
+ 接单
+ 巡检
+ 确认
+ 报告
+ 导出
+
+
+
+
+
+
+
+
+
-
-
-
-
- 基本信息
-
-
-
+
+
+
-
-
-
- 巡检任务
+ ">
+ 巡检任务
+
+
+
-
+ {{ item }}
+
-
+
- {{ item }}
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.status == 0 ? '正常' : '异常' }}
-
-
-
-
- ![]()
-
-
-
-
-
-
-
-
-
-
+ {{ item }}
-
-
-
-
- {{ item }}
-
-
- 关 闭
-
- 确 定
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.status == 0 ? '正常' : '异常' }}
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+ ">
+ 处理情况
-
- 处理情况
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
- 巡检配置
-
-
-
-
- 关 闭
+
+ 确 定
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
- 基本信息
-
-
-
-
-
-
-
-
-
-
-
-
+ ">
+ 巡检配置
-
- 巡检配置
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+ 取 消
- 提 交
-
-
-
- 保 存
+ 提 交
+
+
+
+ ![]()
+
+
+ @size-change="sizeChange" @refresh-change="refreshChange" @selection-change="selectSection"
+ @sort-change="sortChange">
@@ -15,31 +16,44 @@
-
- {{ getStatus('maintain',role_id,row.status).name }}
+
+ {{
+ getStatus('maintain', role_id, row.status).name }}
{{
role_id
== '1839552581620793346' ? '接单确认' : '接单' }}
+
审批
+ 批量导出报告
查看
- 接单
- 关闭
- 确认
- 驳回
- 提交
- 维修完成
- 审批
- 确认付款
- 导出
+
+ 接单
+ 关闭
+ 确认
+ 驳回
+
+
+ 审批
+
+ 维修完成
+ 提交
+ 确认付款
+ 报告
+ 日志
+
+
@@ -84,13 +98,14 @@
">
派单信息
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 巡检任务
-
-
-
+
- {{ item }}
-
+ ">
+ 巡检任务
+
+
-
+
+
+
+
+
+ 正常
+ 异常
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
-
-
-
-
-
-
-
-
+ {{ item }}
-
-
-
+
- 搜索
-
-
- 导出
-
+
+
-
-
-
- 正常
- 异常
-
-
-
-
-
-
-
-
- ![]()
-
-
-
+
+
+ 搜索
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+ ">
+ 巡检确认
-
-
- 巡检确认
-
-
-
- 取 消
+ 提 交
+
+
+
+ 保 存
- 提 交
-
-
-
- ![]()
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
-
-
-
- 基本信息
-
-
-
-
-
-
- {{ scope.row.status == 1 ? '异常' : '正常' }}
-
-
-
-
-
-
-
+ ">
+ 巡检异常清单
-
- 巡检异常清单
-
-
-
+
+
+
+ {{ scope.row.status == 1 ? '异常' : '正常' }}
+
+
+
+
+
+
+
+
+
+
+
+
-
+}
+
-
+
-
+ }
+}
+
diff --git a/src/views/businessManagement/ordinary.vue b/src/views/businessManagement/ordinary.vue
index 3ba816c..746b207 100644
--- a/src/views/businessManagement/ordinary.vue
+++ b/src/views/businessManagement/ordinary.vue
@@ -3,7 +3,8 @@
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -278,7 +227,8 @@
-
驳回详情
-
+
-
-
+
+
+ v-if="(repairForm.isNeedMaterial == 1 && dialogType != 'view' && role_id != '1839600115013713921' && role_id != '1839536982874193922' && role_id != '1839537055389515777')">
@@ -391,33 +344,39 @@
{{ scope.row.price }}元
-
+
总计:
{{ totalPrice == '' ? totalPrice : totalPrice.toFixed(2) }} 元
折扣:
-
+
折
折后金额:
- {{discountPrice == '' ? discountPrice : discountPrice.toFixed(2) }}元
+ {{ discountPrice == '' ? discountPrice : discountPrice.toFixed(2) }}元
-
维修详情
+
-
+
+
-
-
主管审批
-
+
-
+
+
-
-
-
+
-
-
+
-
客户审批
-
+
+
-
-
+
驳回详情
-
@@ -461,10 +431,11 @@
-
-
+
@@ -473,8 +444,7 @@
-->
-
@@ -483,105 +453,105 @@
v-model="repairForm.approveRemark">
- {{repairForm.status == 300 ? '主管' : repairForm.status == 102 ? '客户' : ''}}审批结果
+ {{ repairForm.status == 300
+ ?
+ '主管' : repairForm.status == 102 ? '客户' : '' }}审批结果
- 关闭
+ 关闭
提交
@@ -625,6 +595,11 @@
新 增
取 消
- 保 存
+ 保 存
提 交
@@ -340,7 +340,7 @@ export default {
}
console.log('addForm------------->',this.addForm)
this.$forceUpdate()
-
+
},
computed: {
...mapGetters(["userInfo", "permission", "systemTime"]),
@@ -358,8 +358,8 @@ export default {
// faultPosition: { node: this.deviceList.find(item => item.id == this.form.deviceName).position, data: {} },
faultPosition: this.form.faultLocation,
deviceName: this.form.deviceName,
- // faultType: this.deviceList.find(item => item.id == this.form.deviceName).type,
- faultType: this.form.faultType,
+ // faultType: this.deviceList.find(item => item.id == this.form.deviceName).type,
+ faultType: this.form.faultType,
faultDescribe: this.form.faultDescribe,
videoAttaches: this.form.videoAttaches,
picAttaches: this.form.picAttaches,
@@ -693,7 +693,7 @@ export default {
return (file) =>{
console.log('file------>',file)
if(this.addForm[index].form.videoAttaches && this.addForm[index].form.picAttaches && this.addForm[index].form.videoAttaches.length + this.addForm[index].form.picAttaches.length < 3){
- const isLt3M = file.size
+ const isLt3M = file.size
console.log('isLt2M==============>',isLt3M)
if(isLt3M > 1024 * 1024 * 3){
const r = confirm(
@@ -755,7 +755,7 @@ export default {
// 压缩后调用方法进行base64转Blob，方法写在下边
const blobImg = this.dataURItoBlob(compressData)
return blobImg
- },
+ },
/* base64转Blob对象 */
dataURItoBlob(data) {
let byteString
@@ -777,7 +777,7 @@ export default {
if (file) {
let filename = file.name;
let filetype = file.type;
-
+
const videoUrl = ffmpeg.getObjectURL(file);
// const video = document.getElementById('video');
// video.src = videoUrl;
@@ -928,8 +928,8 @@ export default {
});
}
-
-
+
+
}
}
});
@@ -1104,15 +1104,15 @@ export default {
})
this.$emit('close')
}
-
-
+
+
}
}
}
});
});
-
+
},
// 点击确定按钮
handleConfirm(index) {
@@ -1200,8 +1200,8 @@ export default {
})
}
}
-
-
+
+
}
}
}
@@ -1213,4 +1213,4 @@ export default {
}
-
\ No newline at end of file
+
diff --git a/src/views/components/requirement.vue b/src/views/components/requirement.vue
index 13f26e9..b61d90a 100644
--- a/src/views/components/requirement.vue
+++ b/src/views/components/requirement.vue
@@ -1,159 +1,578 @@
-
-
\ No newline at end of file
+
diff --git a/src/views/device/deviceSystem.vue b/src/views/device/deviceSystem.vue
index 322edc8..f42caa6 100644
--- a/src/views/device/deviceSystem.vue
+++ b/src/views/device/deviceSystem.vue
@@ -3,7 +3,7 @@
+ @size-change="sizeChange" @refresh-change="refreshChange" @selection-change="selectionChange">
{{ row.produceTime.substring(0, 10) }}
@@ -57,14 +57,20 @@
查看
编辑
- 需求提报
+
生成二维码
查看二维码
删除
-
-
-
+
@@ -289,7 +289,7 @@ export default {
handleSuccess(response, file, fileList) {
if (response.code == 200) {
this.filesList.push({
- url: response.data.link, //附件url
+ url: response.data.link, //附件url
name: response.data.originalName, //附件名称
})
}
@@ -300,7 +300,7 @@ export default {
handledrawSuccess(response, file, fileList) {
if (response.code == 200) {
this.drawfiles.push({
- url: response.data.link, //附件url
+ url: response.data.link, //附件url
name: response.data.originalName, //附件名称
})
}
@@ -634,4 +634,4 @@ export default {
}
-
\ No newline at end of file
+
diff --git a/src/views/labManagement/inspectionManagement.vue b/src/views/labManagement/inspectionManagement.vue
index 247d1ee..7aa01eb 100644
--- a/src/views/labManagement/inspectionManagement.vue
+++ b/src/views/labManagement/inspectionManagement.vue
@@ -208,7 +208,7 @@ export default {
overHidden: true,
},
{
- label: "巡检标题",
+ label: "巡检内容",
labelWidth: 120,
prop: "planContent",
overHidden: true,
@@ -578,4 +578,4 @@ export default {
.box .el-scrollbar__wrap {
overflow: scroll;
}
-
\ No newline at end of file
+
diff --git a/src/views/largeScreen/supervisory.vue b/src/views/largeScreen/supervisory.vue
new file mode 100644
index 0000000..0581c7d
--- /dev/null
+++ b/src/views/largeScreen/supervisory.vue
@@ -0,0 +1,1462 @@
+
+ {{ getStatus('maintain', role_id, row.status).name
+ {{ getStatus('maintain', role_id,
+ row.status).name
}}
@@ -74,6 +75,7 @@
需求提报
+ 批量导出报告
@@ -82,8 +84,13 @@
编辑
提交
确认
- 评价
- 导出
+ 评价
+
+ 确认
+ 日志
+ 报告
@@ -294,7 +301,7 @@
-
+
-
- 评价
-
-
-
- 1.您对本次维修的质量方面满意吗？
-
-
+
+ :style="{ background: repairForm.isOkQuality == '0' ? '#3a62d733' : 'rgb(239, 239, 239)', color: repairForm.isOkQuality == '0' ? '#3a62d7' : '#4f4f4f' }">
+ 不满意满意
-
+ 满意
+ 不满意
-
-
- 2.您对本次维修的安全方面满意吗？
-
-
+
+ :style="{ background: repairForm.isOkSecure == '0' ? '#3a62d733' : 'rgb(239, 239, 239)', color: repairForm.isOkSecure == '0' ? '#3a62d7' : '#4f4f4f' }">
+ 不满意满意
-
+ 满意
+ 不满意
-
-
3.您对本次维修的时效方面满意吗？
-
-
+
+ :style="{ background: repairForm.isOkValidity == '0' ? '#3a62d733' : 'rgb(239, 239, 239)', color: repairForm.isOkValidity == '0' ? '#3a62d7' : '#4f4f4f' }">
+ 不满意满意
-
+ 满意
+ 不满意
-
-
+
+
-
+
-
+ 签名
+
- 签名
-
-
- ![]()
-
-
+ ![]()
+
+
-
-
+
-
-
- 故障信息
-
-
-
-
- 填报人:
- {{detailForm.informantName}}
-
-
- 填报人电话:
- {{detailForm.informantPhone}}
-
-
- 故障现象描述:
- {{detailForm.faultDescribe}}
-
-
- 故障位置:
- {{detailForm.faultLocation}}
-
-
- 设备名称:
- {{detailForm.deviceName}}
-
-
- 故障专业类型:
- {{detailForm.faultType}}
-
-
- 提报时间:
- {{detailForm.fillingTime}}
-
-
- 故障图片:
-
- ![]()
-
-
-
-
- 处理情况
-
-
-
-
- 接单时间:
- {{detailForm.dispatchTime}}
-
-
- 客服意见:
- {{detailForm.customerOpinion}}
-
-
-
-
- 维修详情
-
-
-
-
- 填报人:
- {{detailForm.repairPersonName}}
-
-
- 设备名称:
- {{detailForm.deviceName}}
-
-
- 故障原因:
- {{detailForm.faultCause}}
-
-
- 处理方法:
- {{detailForm.processMethod}}
-
-
- 维修材料:
-
-
-
-
-
-
-
- 总计:{{ detailForm.totalPrice }} 元
- 折扣:{{ detailForm.discount }}折
- 折后金额:{{ detailForm.discountPrice }}元
-
-
-
-
-
+
+
+
+
+
-
\ No newline at end of file
+.container {
+ padding: 20px 150px;
+}
+
+tr {
+ // mso-height-source: auto;
+ // mso-ruby-visibility: none;
+}
+
+col {
+ // mso-width-source: auto;
+ // mso-ruby-visibility: none;
+}
+
+br {
+ // mso-data-placement: same-cell;
+}
+
+ruby {
+ ruby-align: left;
+}
+
+.style0 {
+ // mso-number-format: General;
+ // text-align: general;
+ vertical-align: middle;
+ white-space: nowrap;
+ // mso-rotate: 0;
+ // mso-background-source: auto;
+ // mso-pattern: auto;
+ color: black;
+ font-size: 11.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ // mso-generic-font-family: auto;
+ // mso-font-charset: 134;
+ border: none;
+ // mso-protection: locked visible;
+ // mso-style-id: 0;
+}
+
+.font0 {
+ color: black;
+ font-size: 11.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ // mso-generic-font-family: auto;
+ // mso-font-charset: 134;
+}
+
+.font6 {
+ color: black;
+ font-size: 11.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: Wingdings;
+ // mso-generic-font-family: auto;
+ // mso-font-charset: 2;
+}
+
+.font8 {
+ color: black;
+ font-size: 11.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ // mso-generic-font-family: auto;
+ // mso-font-charset: 134;
+}
+
+.font9 {
+ color: black;
+ font-size: 11.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ // mso-generic-font-family: auto;
+ // mso-font-charset: 134;
+}
+
+.font10 {
+ color: black;
+ font-size: 11.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: underline;
+ // text-underline-style: single;
+ // mso-generic-font-family: auto;
+ // mso-font-charset: 134;
+}
+
+.font11 {
+ color: white;
+ font-size: 11.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: underline;
+ // text-underline-style: single;
+ // mso-generic-font-family: auto;
+ // mso-font-charset: 134;
+}
+
+td {
+ // mso-style-parent: style0;
+ padding-top: 1px;
+ padding-right: 1px;
+ padding-left: 1px;
+ // mso-ignore: padding;
+ color: black;
+ font-size: 11.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ // mso-generic-font-family: auto;
+ // mso-font-charset: 134;
+ // mso-number-format: General;
+ // text-align: general;
+ vertical-align: middle;
+ border: none;
+ // mso-background-source: auto;
+ // mso-pattern: auto;
+ // mso-protection: locked visible;
+ white-space: nowrap;
+ // mso-rotate: 0;
+}
+
+.xl65 {
+ // mso-style-parent: style0;
+ vertical-align: bottom;
+}
+
+.xl66 {
+ // mso-style-parent: style0;
+ text-align: center;
+ border: .5pt solid #000;
+}
+
+.xl67 {
+ // mso-style-parent: style0;
+ // mso-generic-font-family: auto;
+ // mso-font-charset: 2;
+ text-align: center;
+ border-top: .5pt solid #000;
+ border-right: none;
+ border-bottom: .5pt solid #000;
+ border-left: none;
+}
+
+.xl68 {
+ // font-family: Wingdings;
+ // mso-generic-font-family: auto;
+ // mso-font-charset: 2;
+ text-align: center;
+ border-top: .5pt solid #000;
+ border-right: .5pt solid #000;
+ border-bottom: .5pt solid #000;
+ border-left: none;
+}
+
+.xl69 {
+ // mso-style-parent: style0;
+ text-align: center;
+ border: .5pt solid #000;
+ white-space: normal;
+}
+
+.xl70 {
+ // mso-style-parent: style0;
+ text-align: center;
+ border-top: .5pt solid #000;
+ border-right: none;
+ border-bottom: .5pt solid #000;
+ border-left: .5pt solid #000;
+ white-space: normal;
+}
+
+.xl71 {
+ // mso-style-parent: style0;
+ font-family: "Wingdings 2", serif;
+ // mso-font-charset: 2;
+ text-align: center;
+ border: .5pt solid #000;
+ white-space: normal;
+}
+
+.xl72 {
+ // mso-style-parent: style0;
+ font-size: 20.0pt;
+ text-align: center;
+}
+
+.xl73 {
+ // mso-style-parent: style0;
+ text-align: center;
+}
+
+.xl74 {
+ // mso-style-parent: style0;
+ text-align: center;
+ border-top: .5pt solid #000;
+ border-right: .5pt solid black;
+ border-bottom: .5pt solid #000;
+ border-left: .5pt solid #000;
+}
+
+.xl75 {
+ // mso-style-parent: style0;
+ text-align: left;
+ vertical-align: top;
+ border: .5pt solid #000;
+ white-space: normal;
+}
+
+.xl76 {
+ // mso-style-parent: style0;
+ text-align: left;
+ vertical-align: top;
+ border: .5pt solid #000;
+}
+
+.xl77 {
+ // mso-style-parent: style0;
+ text-align: center;
+ border-top: .5pt solid #000;
+ border-right: none;
+ border-bottom: .5pt solid #000;
+ border-left: none;
+ white-space: normal;
+}
+
+.xl78 {
+ // mso-style-parent: style0;
+ text-align: center;
+ border-top: .5pt solid #000;
+ border-right: .5pt solid #000;
+ border-bottom: .5pt solid #000;
+ border-left: none;
+ white-space: normal;
+}
+
+.xl79 {
+ // mso-style-parent: style0;
+ text-align: center;
+ vertical-align: top;
+ border: .5pt solid #000;
+ white-space: normal;
+}
+
+.xl80 {
+ // mso-style-parent: style0;
+ text-align: center;
+ vertical-align: top;
+ border: .5pt solid #000;
+}
+
+.xl81 {
+ // mso-style-parent: style0;
+ text-align: left;
+ vertical-align: top;
+ border-top: .5pt solid #000;
+ border-right: none;
+ border-bottom: none;
+ border-left: .5pt solid #000;
+ white-space: normal;
+}
+
+.xl82 {
+ // mso-style-parent: style0;
+ text-align: left;
+ vertical-align: top;
+ border-top: .5pt solid #000;
+ border-right: none;
+ border-bottom: none;
+ border-left: none;
+}
+
+.xl83 {
+ // mso-style-parent: style0;
+ text-align: left;
+ vertical-align: top;
+ border-top: .5pt solid #000;
+ border-right: .5pt solid #000;
+ border-bottom: none;
+ border-left: none;
+}
+
+.xl84 {
+ // mso-style-parent: style0;
+ text-align: left;
+ vertical-align: top;
+ border-top: none;
+ border-right: none;
+ border-bottom: .5pt solid #000;
+ border-left: .5pt solid #000;
+}
+
+.xl85 {
+ // mso-style-parent: style0;
+ text-align: left;
+ vertical-align: top;
+ border-top: none;
+ border-right: none;
+ border-bottom: .5pt solid #000;
+ border-left: none;
+}
+
+.xl86 {
+ // mso-style-parent: style0;
+ text-align: left;
+ vertical-align: top;
+ border-top: none;
+ border-right: .5pt solid #000;
+ border-bottom: .5pt solid #000;
+ border-left: none;
+}
+
+.xl87 {
+ // mso-style-parent: style0;
+ text-align: left;
+ border-top: .5pt solid #000;
+ border-right: none;
+ border-bottom: none;
+ border-left: .5pt solid #000;
+ white-space: normal;
+}
+
diff --git a/src/views/components/routingInspection.vue b/src/views/components/routingInspection.vue
index 8ad15eb..8ec8dbf 100644
--- a/src/views/components/routingInspection.vue
+++ b/src/views/components/routingInspection.vue
@@ -1,193 +1,1030 @@
- | 运营维护服务单 | + +||||||
| 客户名称 | +{{ info.informantName }} | +联系人 | +{{ info.informantName }} | +|||
| 联系电话 | +{{ info.informantPhone }} | +地址 | +{{ info.adress }} | +|||
| 故障现象： {{ info.faultDescribe }} + |
+ ||||||
| 是否在保修期 | ++ {{ !info.isMaintain ? '¨' : '√' }} + 是 + | ++ {{ info.isMaintain ? '¨' : '√' }} + 否 + | + +约定服务方式 | ++ {{ info.status != 202 ? '√' : '¨' }} + 上门 + | ++ {{ info.status == 202 ? '√' : '¨' }} + 电话 + | +|
| 故障产生原因： {{ info.faultCause }} + |
+ ||||||
| 所 用 维 修 材 料 | +||||||
| 序号 | +名称 | +数量 | +单价 | +总价 | +||
| {{ index + 1 }} | +{{ item.materialName }} | +{{ item.materialCount }} | +{{ + (item.materialPrice / item.materialCount).toFixed(2) }} | +{{ + item.materialPrice }} | +||
| {{ info.materials.length > 0 ? info.materials.length + 1 : 1 }} | +合计 | +{{ info.totalPrice + < 0 ? 0 : info.totalPrice }} | +||||
| 保
+ 修 期 内 因 客 户 自 + 身 原 因 产 生故 障 收 费 |
+
+ + 维修差旅费：-- + + + + 0 + 元； 维修费总计：{{ info.isMaintain ? info.totalPrice < 0 ? '0' : info.totalPrice : '--' }} + + + 0 + 元； + |
+ |||||
| 保 修 期 外 收 费 | ++ 维修差旅费：-- + + + 元； 维修费总计：{{ !info.isMaintain ? info.totalPrice < 0 ? '0' : info.totalPrice : '--' }} + + + 元； + | +|||||
| 故障排除方法和处理结果（详细描述）： {{ + info.processMethod }} + |
+ 客户签字
+ + + |
+ |||||
|
+ 维修工程师签名：{{ info.repairPersonName }}
+
+ 联系方式：{{ info.repairPersonPhone }}
+ + + + + 日期：{{ info.finishTime }} + + |
+ ||||||
| + | + | + | + | + | + | + |
| + | + | + | + | + | + | + |
| + | + | + | + | + | + | + |
| + | + | + | + | + | + | + |
| + | + | + | + | + | + | + |
-
+
-
-
- 基本信息
-
-
-
-
- 单位名称:
- {{ detailForm.deptName }}
-
-
-
-
- 巡检任务
-
-
-
-
- 巡检主要内容:
- {{ detailForm.taskContent }}
-
-
-
- 巡检配置:
-
-
-
- {{ scope.row.status == 1 ? '异常' : '正常' }}
-
-
-
-
-
- 是
- 否
-
-
-
-
-
-
-
-
- 处理情况
-
-
-
-
- 巡检人员:
- {{ detailForm.servicemanId }}
-
-
-
-
- 巡检配置
-
-
-
-
- 预约上门时间:
- {{ detailForm.appointTime }}
-
-
-
-
- 巡检异常清单
-
-
-
-
- 巡检配置:
-
-
-
- {{ scope.row.status == 1 ? '异常' : '正常' }}
-
-
-
-
- {{ scope.row.isRepair == 1 ? '是' : '否' }}
-
-
-
-
-
-
+
+
+
+
\ No newline at end of file
+
diff --git a/src/views/dataManagement/dataManagement.vue b/src/views/dataManagement/dataManagement.vue
index 3b7df85..1edee0c 100644
--- a/src/views/dataManagement/dataManagement.vue
+++ b/src/views/dataManagement/dataManagement.vue
@@ -174,7 +174,7 @@
| + + + {{ detailForm.deptName }}巡检报告 + | + +|||||||||||||||
| + 巡检项目名称： {{ detailForm.deptName }} | ++ | ||||||||||||||
| + 项目地址： {{ detailForm.address }} | + +|||||||||||||||
| + 巡检主要内容：{{ detailForm.taskContent }} + | +|||||||||||||||
| + 巡检人员 | +{{ + detailForm.servicemanName }} + | +{{ detailForm.startTime }} | +|||||||||||||
| + 序号 | +楼层 | +房间 | +专业名称 | +巡检内容 | +状态 | +现场照片 | +使用人签字 | +备注 | + +|||||||
| {{ index + 1 }} | +{{ item.floorName }} | + +{{ item.deptName }} | +{{ + item.deviceName }} + | +{{ item.checkContent }} | +{{ item.status == 1 ? '异常' : '正常' }} | ++ | {{ detailForm.signUrl }} | +{{ detailForm.remark }} | +|||||||
+
+
+ 关 闭
@@ -227,15 +299,16 @@
import printJS from 'print-js'
import { mapGetters } from "vuex";
import requestSub from '../components/requestSub.vue'
-import { getDeviceList, addDevice, getDetail, editDevice, deleteDevice, qrcode, importFile,getLabList } from '@/api/device/device'
+import { getDeviceList, addDevice, getDetail, editDevice, deleteDevice, qrcode, importFile, getLabList, getWorkOrderList, getMaintenanceList } from '@/api/device/device'
import { getChildList } from '@/api/system/dictbiz'
import { getDeepData } from '@/api/labManagement/inspectionManagement'
import SelectTree from '../../components/selectTree/tree'
import { downloadXls } from "@/util/util";
-import {exportBlob} from "@/api/common";
-import {dateNow} from "@/util/date";
+import { exportBlob } from "@/api/common";
+import { dateNow } from "@/util/date";
import NProgress from 'nprogress';
import 'nprogress/nprogress.css';
+import { getRepairPeople } from '@/api/operation/hand'
export default {
components: {
requestSub,
@@ -354,7 +427,7 @@ export default {
formslot: true,
search: true,
type: "select",
- dicData:[
+ dicData: [
{
label: "运行中",
value: "1",
@@ -456,17 +529,22 @@ export default {
}
]
},
- role_id:'',//角色id
+ role_id: '',//角色id
+ detailsTab: '1',//详情tab数据
+ workOrderList: [],//维修工单列表
+ maintenanceList: [],//巡检工单列表
+ repairTypeList: [],//维修类型
+ repairPersonList: [],//维修人员列表
}
},
computed: {
...mapGetters(["userInfo", "permission"]),
},
mounted() {
- if(this.$route.query.type){
+ if (this.$route.query.type) {
this.searchForm = {
...this.searchForm,
- runStatus:this.$route.query.type
+ runStatus: this.$route.query.type
}
}
this.role_id = this.userInfo.role_id
@@ -479,9 +557,38 @@ export default {
getChildList(1, 100, '1858710780677984257').then(res => {
this.periodArr = res.data.data
})
+ // 维修类型
+ getChildList(1, 100, '1869925082102702082').then(res => {
+ this.repairTypeList = res.data.data
+ })
+ // 维修人员列表
+ getRepairPeople({ isRepair: this.role_id == '1839537055389515777' ? true : false }).then(res => {
+ this.repairPersonList = res.data.data
+ })
this.onLoad()
},
methods: {
+ // 获取 维修工单列表
+
+ getWorkOrderList(id) {
+ let query = {
+ deviceId: id
+ }
+ getWorkOrderList(query).then(res => {
+ this.workOrderList = res.data.data
+ console.log('维修工单列表', this.workOrderList)
+ })
+ },
+ // 获取 巡检列表
+ getMaintenanceList(id) {
+ let query = {
+ deviceId: id
+ }
+ getMaintenanceList(query).then(res => {
+ this.maintenanceList = res.data.data
+ console.log('巡检任务列表', this.maintenanceList)
+ })
+ },
// 巡检内容修改
changeContent(val) {
let arr = val.split('；')
@@ -580,7 +687,7 @@ export default {
this.page.currentPage = currentPage;
this.onLoad()
},
- sizeChange(pageSize){
+ sizeChange(pageSize) {
this.page.pageSize = pageSize;
this.onLoad()
},
@@ -631,7 +738,7 @@ export default {
// 点击新增按钮
handleAdd() {
this.dialogTitle = '设备新增'
- this.addForm = { position: { node: undefined, data: {} },isWarran:false }
+ this.addForm = { position: { node: undefined, data: {} }, isWarran: false }
this.viewType = 'add'
this.tableData = []
this.fileList = []
@@ -665,6 +772,8 @@ export default {
this.dialogTitle = '设备查看'
this.dialogVisible = true
this.addForm.isMaintain = res.data.data.isMaintain//是否在保
+ this.getMaintenanceList(row.id) //维修列表
+ this.getWorkOrderList(row.id) //巡检列表
})
},
handleImport() {
@@ -722,6 +831,8 @@ export default {
this.addForm.isWarran = this.addForm.isWarran == 0 ? true : false
this.dialogTitle = '设备编辑'
this.dialogVisible = true
+ this.getWorkOrderList(row.id)
+ this.getMaintenanceList(row.id)
})
},
// 点击删除按钮
@@ -801,10 +912,10 @@ export default {
limsId: this.addForm.lab[0], //实验室id
floorId: this.addForm.lab[1], //楼层id
roomId: this.addForm.lab[2], //房间id
- brand:this.addForm.brand,//品牌
- isWarran:this.addForm.isWarran ? 0 : 1
+ brand: this.addForm.brand,//品牌
+ isWarran: this.addForm.isWarran ? 0 : 1
}
- console.log('query----------------->',query)
+ console.log('query----------------->', query)
if (this.viewType == 'add') {
addDevice(query).then(res => {
if (res.data.code == 200) {
@@ -839,15 +950,15 @@ export default {
})
},
onLoad(page, params = {}) {
- console.log(1111111111,this.searchForm)
+ console.log(1111111111, this.searchForm)
let query = {
name: this.searchForm.name ? this.searchForm.name : '',
position: this.searchForm.position ? this.searchForm.position : '',
type: this.searchForm.type ? this.searchForm.type : '',
current: this.page.currentPage,
- runStatus:this.searchForm.runStatus?this.searchForm.runStatus:'',//运行状态
- supplier:this.searchForm.supplier?this.searchForm.supplier:'',//供应商
- brand:this.searchForm.brand?this.searchForm.brand:'',//品牌
+ runStatus: this.searchForm.runStatus ? this.searchForm.runStatus : '',//运行状态
+ supplier: this.searchForm.supplier ? this.searchForm.supplier : '',//供应商
+ brand: this.searchForm.brand ? this.searchForm.brand : '',//品牌
size: this.page.pageSize,
}
getDeviceList(query).then(res => {
@@ -871,5 +982,9 @@ export default {
.el-dialog__headerbtn {
font-size: 20px;
}
+
+ .details_tab_box {
+ margin-bottom: 16px;
+ }
}
diff --git a/src/views/labManagement/components/addDialog.vue b/src/views/labManagement/components/addDialog.vue
index e943830..a789f36 100644
--- a/src/views/labManagement/components/addDialog.vue
+++ b/src/views/labManagement/components/addDialog.vue
@@ -17,8 +17,8 @@
+
+ 设备详情
+ 维修维保记录
+
+
+
-
+
是否在保
@@ -197,6 +203,72 @@
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
巡检内容
-
+
+
+
+
diff --git a/src/views/operation/hand.vue b/src/views/operation/hand.vue
index 696007c..886cf12 100644
--- a/src/views/operation/hand.vue
+++ b/src/views/operation/hand.vue
@@ -35,7 +35,8 @@
: ""
}}
-->
-
+
+
+ 
+
+
+
+
+
+
+
+ 设备概况
+
+
+
+
+
+
+ 巡检任务状态统计图
+
+
+
+
+
+ 维保数量统计
+
+
+
+
+
+
+ 点击上传
+
+ ![]()
+ 
+
+
+
+
+
+
+
+ 维修数量统计
+
+
+
+
+
+
+ 平均故障修复时间
+
+
+
+
+
+
+
+
+
+ 故障设备TOP5
+
+
+
+
+
+
+
+
+
+
+ 每月维修数量
+
+
+
+
+
+
+
+ 平均故障响应时间
+
+
+
+
+
-
+
+ v-show="((rowStatus == 403 || rowStatus == 406 || isEvalute) && detailForm.approveResult1 == 1) || rowStatus == 104 || rowStatus == 203 || rowStatus == 202">
-
确定
-
-
-
@@ -116,7 +116,7 @@
-
-
-
-
-
-
-
-
- -
-
-
-
- -- ---- 2024-12-13 16:40:46 --------
维修人员提交需求工单维修方案
-
- -
-
- -- ---- 2024-12-13 16:38:46 --------
维修人员接单
-
- -
-
- -- ---- 2024-12-13 16:38:46 --------
客服接单
-
- -
-
- -- ---- 2024-12-13 16:39:43 --------
山东烁今实验室提报需求工单
-
-
+
+
-
+ v-show="role_id == '1123598816738675200' || role_id == '1123598816738675201' || role_id == '1846486905193041922'|| role_id == '1846419477876510721'">
账号审核中...
@@ -28,18 +28,18 @@
{{ item.num }}
+
![]()
-
+
-
其他
+ 监控大屏
+
+
+
+
+ 
+
@@ -406,7 +411,8 @@ export default {
rateData: [],
peopleXdata:[],
peopleNum:[],
- peoplePercent:[]
+ peoplePercent:[],
+ dialogImgVisible:false,//图片预览
}
},
computed: {
@@ -426,11 +432,10 @@ export default {
},
},
mounted() {
- console.log('userInfo=============>',this.userInfo)
this.isShowMask = this.userInfo.detail.status == 1 ? false : true
this.role_id = this.userInfo.role_id
- if (this.role_id == '1123598816738675200' || this.role_id == '1123598816738675201' || this.role_id == '1846419477876510721') {
+ if (this.role_id == '1123598816738675200' || this.role_id == '1123598816738675201' || this.role_id =='1846486905193041922'|| this.role_id == '1846419477876510721') {
// 实验室角色
nextTick(() => {
if(!this.isShowMask){
@@ -482,6 +487,11 @@ export default {
}
},
methods: {
+ // 报警图片预览
+ alarmFn(){
+ console.log(44444444444)
+ this.dialogImgVisible = true
+ },
getPeopleNum(){
maintenancePersonnel({id:this.userInfo.user_id}).then(res =>{
console.log('res ==============>',res)
@@ -498,7 +508,7 @@ export default {
this.$router.push({
path:'/operation/hand',
query:item
- })
+ })
},
getRequirement(){
getList({
@@ -650,6 +660,9 @@ export default {
}
},
+ toPage(){
+ this.$router.push("/wel/supervisory")
+ },
createBarEcharts() {
var myChart = this.$echarts.init(document.getElementById('bar_echart'));
var option = {
@@ -1016,9 +1029,9 @@ export default {
display: flex;
align-items: center;
justify-content: center;
-
+
// flex-direction: column;
-
+
.item_top {
width: 100%;
@@ -1035,7 +1048,7 @@ export default {
background: linear-gradient( 90deg, #375DF9 0%, #6DB5FF 100%);
box-shadow: 0px 5px 5px 0px #B6D8FF;
-
+
.right_item{
display: flex;
@@ -1089,7 +1102,7 @@ export default {
background: linear-gradient( 90deg, #F3AC56 0%, #FFCA68 100%);
box-shadow: 0px 10px 10px 0px #FEEED0;
}
-
+
}
}
}
@@ -1203,7 +1216,7 @@ export default {
background: #FFFFFF;
border-radius: 10px;
border: 1px solid #EBEEF5;
-
+
.left_tit {
font-weight: 550;
@@ -269,6 +269,11 @@
+