From 3432c3100ccb4c3b78dc0a5f7f242bdcda503a63 Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期三, 18 六月 2025 10:45:49 +0800 Subject: [PATCH] 1、终端程序呼叫页面呼叫原因组件由输入框改为多行文本域 2、设备管理页面新增设备图片字段同时在新增和编辑设备时添加设备图片 3、设备监控以及设备看板页面新增故障状态同时替换设备图片为设备管理页面中维护的设备图片而不再是设备所属设备类型图片以及三色灯增加故障状态灯 --- src/views/dnc/base/modules/NcDeviceCharacters/NcDeviceCharactersForm.vue | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/views/dnc/base/modules/NcDeviceCharacters/NcDeviceCharactersForm.vue b/src/views/dnc/base/modules/NcDeviceCharacters/NcDeviceCharactersForm.vue index 5b707e6..27d0d7f 100644 --- a/src/views/dnc/base/modules/NcDeviceCharacters/NcDeviceCharactersForm.vue +++ b/src/views/dnc/base/modules/NcDeviceCharacters/NcDeviceCharactersForm.vue @@ -14,8 +14,8 @@ </a-form-item> </a-col> <a-col :span="24"> - <a-form-item label="鎵�灞為儴闂�" :labelCol="labelCol" :wrapperCol="wrapperCol"> - <j-dict-select-tag type="list" v-decorator="['departId']" :trigger-change="true" dictCode="sys_department,depart_name,depart_id" placeholder="璇烽�夋嫨鎵�灞為儴闂�"/> + <a-form-item label="鎵�灞炶溅闂�" :labelCol="labelCol" :wrapperCol="wrapperCol"> + <j-select-equipment-production v-model="model.departId" :multi="false" @back="backProductionInfo" :backProduction="true" :treeProductOpera="true"></j-select-equipment-production> </a-form-item> </a-col> <a-col :span="24"> @@ -43,10 +43,14 @@ import pick from 'lodash.pick' import JFormContainer from '@/components/jeecg/JFormContainer' import JDictSelectTag from "@/components/dict/JDictSelectTag" + import JSelectProduction from '@comp/jeecgbiz/JSelectProduction.vue' + import JSelectEquipmentProduction from '@comp/jeecgbiz/JSelectEquipmentProduction.vue' export default { name: 'NcDeviceCharactersForm', components: { + JSelectEquipmentProduction, + JSelectProduction, JFormContainer, JDictSelectTag, }, @@ -91,7 +95,7 @@ }, departId: { rules: [ - { required: true, message: '璇烽�夋嫨閮ㄩ棬鍒嗙粍!'}, + { required: true, message: '璇烽�夋嫨鎵�灞炶溅闂�!'}, ] }, controlSystem: { @@ -139,6 +143,14 @@ add () { this.edit({}); }, + backProductionInfo(info) { + console.log(info) + this.model.productionIds = this.model.selectedProduction; + this.nextProductionOptions = info.map((item,index,arr)=>{ + let c = {label:item.text, value: item.value+""} + return c; + }) + }, edit (record) { this.form.resetFields(); this.model = Object.assign({}, record); -- Gitblit v1.9.3