From 56619c9140656806e21b19b3dce764cf420276cc Mon Sep 17 00:00:00 2001 From: sjl <1716605279@qq.com> Date: Wed, 15 Jan 2025 13:26:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 1 + frontend/src/api/device/interface/device.ts | 5 ++-- frontend/src/views/home/components/table.vue | 2 +- frontend/src/views/home/tabs/dashboard.vue | 18 ++++++++++++++ .../machine/device/components/devicePopup.vue | 24 +++++++++++++++---- 5 files changed, 43 insertions(+), 7 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 0a358bb..a9ddf8c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -16,6 +16,7 @@ "Pids", "plandata", "PQDIF", + "Preinvestment", "resourcedata", "resourcename", "rmark", diff --git a/frontend/src/api/device/interface/device.ts b/frontend/src/api/device/interface/device.ts index b2e029a..c8c5952 100644 --- a/frontend/src/api/device/interface/device.ts +++ b/frontend/src/api/device/interface/device.ts @@ -56,8 +56,9 @@ export namespace Device { createTime?: string| null; //创建时间 updateBy?: string| null; //更新用户 updateTime?: string| null; //更新时间 - icdId: string; - power: string; + icdId: string| null; + power: string| null; + preinvestmentPlan: string| null; } diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue index 20a0e97..5054308 100644 --- a/frontend/src/views/home/components/table.vue +++ b/frontend/src/views/home/components/table.vue @@ -968,7 +968,7 @@ const handleTest = async (val:string) => { const data = reactive({ socketServe: socketClient.Instance, }); - const url = 'ws://192.168.1.127:7777/hello?name=cdf'; + const url = 'ws://localhost:7777/hello?name=cdf'; socketClient.Instance.connect(url); data.socketServe = socketClient.Instance; data.socketServe.registerCallBack('aaa', (res: { code: number; }) => { diff --git a/frontend/src/views/home/tabs/dashboard.vue b/frontend/src/views/home/tabs/dashboard.vue index 208ef4f..ca36235 100644 --- a/frontend/src/views/home/tabs/dashboard.vue +++ b/frontend/src/views/home/tabs/dashboard.vue @@ -276,6 +276,22 @@ const getPieData = async (id: string) => { const boundPqDevList = ref([])//根据检测计划id查询出所有已绑定的设备 const plan = findPlanById(planList.value?.data || [], id) planName.value = '所选计划:' + plan.name + //获取点击树的父节点名字 + const parentNodeName = ref('') + for (let i = 0; i < planList.value.data.length; i++) { + if (Array.isArray(planList.value.data[i].children) && planList.value.data[i].children.length > 0) { + for (let j = 0; j < planList.value.data[i].children.length; j++) { + if (planList.value.data[i].children[j].id === id) { + parentNodeName.value = planList.value.data[i].name + break; + } + } + } + } + if(parentNodeName.value === '检测中'){ + + } + select_Plan.value = plan if (plan) { //isTimeCheck.value = plan.timeCheck === 1; // 将 1 转换为 true，0 转换为 false @@ -360,6 +376,7 @@ const planDetail = () => { //功能选择css切换 const handleCheckFunction = (val: any) => { + editableTabsValue.value = '0' form.value.activeChildTabs = 0 tabsList.value.map((item: any, index: any) => { @@ -437,6 +454,7 @@ onBeforeMount(async () => { } planList.value = (await getPlanListByPattern(reqPlan)) as ResultData + console.log(planList.value.data) for (let i = 0; i < planList.value.data.length; i++) { if (Array.isArray(planList.value.data[i].children) && planList.value.data[i].children.length > 0) { currentId.value = planList.value.data[i].children[0].id; // 直接赋值第一个 children 的 id diff --git a/frontend/src/views/machine/device/components/devicePopup.vue b/frontend/src/views/machine/device/components/devicePopup.vue index 88e2361..89c2d1f 100644 --- a/frontend/src/views/machine/device/components/devicePopup.vue +++ b/frontend/src/views/machine/device/components/devicePopup.vue @@ -20,7 +20,17 @@ :value="item.id" /> - + + + + + + @@ -207,7 +217,8 @@ const disabledDate = (time: Date) => { state: 1, factorFlag:0, icdId:'', - power:'' + power:'', + preinvestmentPlan:'' }) return { dialogVisible, titleType, formContent } } @@ -236,7 +247,8 @@ const disabledDate = (time: Date) => { state: 1, factorFlag:0, icdId:'', - power:'' + power:'', + preinvestmentPlan:'' } } @@ -262,7 +274,7 @@ const baseRules: Record> = { { required: true, message: '额定电流必填！', trigger: 'blur' }, { pattern: /^\d+(\.\d+)?$/, message: '额定电流格式错误', trigger: 'blur' } ], - createId: [{ required: true, message: '出厂编号必填！', trigger: 'blur' }], + createId: [{ required: true, message: '设备序列号必填！', trigger: 'blur' }], ip: [ { required: true, message: 'IP地址必填！', trigger: 'blur' }, { pattern: /^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/, message: 'IP地址格式错误', trigger: 'blur' } @@ -284,6 +296,9 @@ const rules = computed(() => { if (scene.value === '0'){//只有电科院需要展示 dynamicRules.createDate= [{ required: true, message: '出厂日期必填！', trigger: 'blur' }]; } + if (scene.value === '1'){//只有楼下出厂需要展示 + dynamicRules.preinvestmentPlan= [{ required: true, message: '预投计划必选！', trigger: 'change' }]; + } if (scene.value !== '0') { dynamicRules.name = [{ required: true, message: '设备名称必填！', trigger: 'blur' }]; dynamicRules.hardwareVersion = [{ required: true, message: '固件版本必填！', trigger: 'blur' }]; @@ -362,6 +377,7 @@ const rules = computed(() => { // 打开弹窗，可能是新增，也可能是编辑 const open = async (sign: string, data: Device.ResPqDev,currentMode: string,currentScene: string,devType:Device.ResDev[] ) => { + console.log('打开弹窗', dictStore.getDictData('app_scene')) devTypeOptions.value = devType mode.value = currentMode scene.value = currentScene