From 65a5e8c7ec6d6eab78b76c5831eaf40c30e23c61 Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期五, 13 九月 2024 14:56:50 +0800 Subject: [PATCH] 1、设备管理页面设备种类字段改成重要程度字段;新增设备异常状态字段,若表格记录的设备状态不为正常时,则标红此表格记录 2、设备利用率、设备开动率、班次利用率以及设备综合效率分析新增按照重要程度字段查询表格数据;左侧树数据新增参数key,用来过滤异常状态设备 3、设备利用率页面新增设备型号字段 --- src/views/mdc/base/modules/alarmManager/alarmManagerEdit.vue | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/views/mdc/base/modules/alarmManager/alarmManagerEdit.vue b/src/views/mdc/base/modules/alarmManager/alarmManagerEdit.vue index c269a76..4955e2e 100644 --- a/src/views/mdc/base/modules/alarmManager/alarmManagerEdit.vue +++ b/src/views/mdc/base/modules/alarmManager/alarmManagerEdit.vue @@ -29,9 +29,9 @@ </a-form-item> </a-col> <a-col :span="24"> - <a-form-item label="鏄惁杩囨护" :labelCol="labelCol" :wrapperCol="wrapperCol"> + <a-form-item label="鏄惁鍚敤" :labelCol="labelCol" :wrapperCol="wrapperCol"> <!--<j-switch v-model="model.isUse"></j-switch>--> - <a-switch v-model="isUse"/> + <a-switch v-model="isUse"/> <!--<a-radio-group v-model="model.isUse">--> <!--<a-radio :value="1">--> <!--鏄�--> @@ -103,6 +103,16 @@ // required: true, message: '璇烽�夋嫨鐝埗!', // }], // }, + alarmCode:{ + rules: [{ + required: true, message: '璇疯緭鍏ユ姤璀﹀彿!', + }], + }, + alarmContent:{ + rules: [{ + required: true, message: '璇疯緭鍏ユ姤璀﹀唴瀹�!', + }], + }, }, url: { // add: '/mdc/alarmInfo/add', @@ -124,6 +134,7 @@ this.model = Object.assign({}, record) this.visible = true this.$nextTick(() => { + this.isUse=record.isUse===0?true:false this.form.setFieldsValue(pick(this.model, 'alarmCode', 'alarmContent','driveType')) }) }, @@ -160,7 +171,7 @@ // that.$message.success("娣诲姞鎴愬姛") that.$notification.success({ message:'娑堟伅', - description:"娣诲姞鎴愬姛" + description:"淇敼鎴愬姛" }); // that.$message.success(res.message) that.$emit('ok', res.result) -- Gitblit v1.9.3