From c4cfd5c566d137fb60781b8b2e0057d11cf4b051 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 17:33:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/resourceDemand/device/component/management.vue | 55 ++++++-------------------------------------------------
1 files changed, 6 insertions(+), 49 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/management.vue b/src/views/CNAS/resourceDemand/device/component/management.vue
index 77e4671..ee38855 100644
--- a/src/views/CNAS/resourceDemand/device/component/management.vue
+++ b/src/views/CNAS/resourceDemand/device/component/management.vue
@@ -119,7 +119,7 @@
<el-col :span="7">
<el-form :label-position="labelPosition" :model="formData" label-width="140px" ref="ruleForm">
<!-- 瀹為獙瀹ゅ垪琛� -->
- <el-form-item label="鎵�灞為儴闂�:">
+ <el-form-item label="鎵�灞為儴闂�:" required>
<el-select :disabled="isUp" v-model="formData.subordinateDepartmentsId" placeholder="璇烽�夋嫨" size="small"
style="width:100%">
<el-option v-for="item in subordinateDepartmentsList" :key="item.value" :label="item.label"
@@ -277,7 +277,7 @@
<el-col :span="7">
<el-form :label-position="labelPosition" :model="formData2" label-width="120px" ref="ruleForm">
<!-- 瀹為獙瀹ゅ垪琛� -->
- <el-form-item label="鎵�灞為儴闂�:">
+ <el-form-item label="鎵�灞為儴闂�:" required>
<el-select v-model="formData2.subordinateDepartmentsId" placeholder="璇烽�夋嫨" size="small" style="width:100%">
<el-option v-for="item in subordinateDepartmentsList" :key="item.value" :label="item.label"
:value="item.value">
@@ -554,13 +554,10 @@
}
},
mounted() {
- // this.entityCopy = this.HaveJson(this.componentData.entity)
- // this.getPower()
this.selectEnumByCategory()
this.selectDevicePrincipal()
this.obtainItemParameterList()
this.getInsProductIds()
- // this.$customEvents.$on('largeCategory', this.handleNotification);
// 鍒濆鍖�
this.clickSidebar(this.clickNodeVal)
},
@@ -619,38 +616,6 @@
const blob = new Blob([res], { type: 'application/octet-stream' });
this.$download.saveAs(blob, '璁惧浠櫒涓�瑙堣〃.doc')
})
- },
- // 鏉冮檺鍒嗛厤
- getPower(radio) {
- let power = JSON.parse(sessionStorage.getItem('power'))
- let up = false
- let del = false
- let add = false
- let config = false
- for (var i = 0; i < power.length; i++) {
- if (power[i].menuMethod == 'upDeviceParameter') {
- up = true
- }
- if (power[i].menuMethod == 'delDeviceParameter') {
- del = true
- }
- if (power[i].menuMethod == 'addDeviceParameter') {
- add = true
- }
- if (power[i].menuMethod == 'saveDataAcquisitionConfiguration') {
- config = true
- }
- }
- if (!config) {
- this.componentData.do.splice(2, 1)
- }
- if (!up) {
- this.componentData.do.splice(1, 1)
- }
- if (!del) {
- this.componentData.do.splice(0, 1)
- }
- this.addPower = add
},
// 鑾峰彇瀛楀吀
selectEnumByCategory() {
@@ -813,6 +778,10 @@
this.$message.error('鏈緭鍏ユ牎鍑嗘湁鏁堟湡')
return
}
+ if (!this.formData.subordinateDepartmentsId) {
+ this.$message.error('鏈�夋嫨鎵�灞為儴闂�')
+ return
+ }
if (this.formData.deviceStatus === '' || this.formData.deviceStatus === null) {
this.$message.error('鏈�夋嫨褰撳墠鐘舵��')
return
@@ -834,10 +803,6 @@
}
this.upLoad = true;
upDeviceParameter(formData).then(res => {
- if (res.code === 201) {
- this.upLoad = false
- return
- }
this.$message.success('淇敼鎴愬姛')
this.upLoad = false
this.refreshTable('page')
@@ -887,10 +852,6 @@
}
this.upLoad2 = true;
addDeviceParameter(formData).then(res => {
- if (res.code === 201) {
- this.upLoad2 = false
- return
- }
this.$message.success('鎻愪氦鎴愬姛')
this.upLoad2 = false
this.refreshTable('page')
@@ -958,9 +919,6 @@
this.upLoad3 = true
numberCollect(this.configForm).then(res => {
this.upLoad3 = false
- if (res.code === 201) {
- return
- }
this.$message.success('鎿嶄綔鎴愬姛')
this.refreshTable('page')
this.dialogVisible3 = false
@@ -1007,7 +965,6 @@
})
.then(() => {
delDeviceParameter({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
this.refresh();
});
--
Gitblit v1.9.3