Browse Source

系统设置完成增加温度、操作员等选项。

soft5566 3 years ago
parent
commit
33452bebda
2 changed files with 48 additions and 42 deletions
  1. 7 0
      src/api/systemSet.js
  2. 41 42
      src/views/systemSet/index.vue

+ 7 - 0
src/api/systemSet.js

@@ -19,3 +19,10 @@ export function getSet(formData) {
 		data
 	})
 }
+
+export function getSetOprator() {
+	return request({
+		url: '/airManage/adminManager.action',
+		method: 'post'
+	})
+}

+ 41 - 42
src/views/systemSet/index.vue

@@ -54,9 +54,12 @@
 								<el-input v-model="formData.overtime" maxlength="2" placeholder="请输入小时数"></el-input>
 								<span>小时预警</span>
 							</el-form-item>
-							<el-form-item prop="operator" style="display: inline-block;">
+							<el-form-item style="display: inline-block;">
 								<span>离线预警信息推送</span>
-								<el-input v-model="formData.operator" placeholder="请输入姓名"></el-input>
+								<el-select v-model="formData.cardNumber" placeholder="请选择姓名">
+									<el-option v-for="item in formData.operator" :key="item.cardNumber" :label="item.userName"
+										:value="item.cardNumber"></el-option>
+								</el-select>
 							</el-form-item>
 							<el-form-item prop="phone">
 								<span>使用问题联系方式</span>
@@ -76,7 +79,8 @@
 <script>
 	import {
 		updateSet,
-		getSet
+		getSet,
+		getSetOprator
 	} from '@/api/systemSet';
 
 	export default {
@@ -124,34 +128,6 @@
 					callback();
 				}
 			}
-			var checkSecond = (rule, value, callback) => {
-				if (!value) {
-					return callback(new Error('不能为空'));
-				}
-				setTimeout(() => {
-					var reg = /^[+]{0,1}(\d+)$/
-					if (!reg.test(value)) {
-						callback(new Error('请输入整数或0'));
-					} else if (value < 4 || value > 10) {
-						callback(new Error('范围在4-10'));
-					} else {
-						callback();
-					}
-				}, 100);
-			}
-			var checkOperator = (rule, value, callback) => {
-				if (!value) {
-					return callback(new Error('操作员不能为空'));
-				}
-				setTimeout(() => {
-					var reg = /^[\u4e00-\u9fa5]{2,3}$/
-					if (!reg.test(value)) {
-						callback(new Error('操作员请输入2-3个汉字姓名'));
-					} else {
-						callback();
-					}
-				}, 100);
-			}
 			var checkPhone = (rule, value, callback) => {
 				if (!value) {
 					return callback(new Error('请输入手机号'));
@@ -190,8 +166,8 @@
 						5: '5℃',
 						28: '28℃'
 					},
-					temperature_range: '5℃ - 28℃',
-					paramTemp: '',
+					temperature_range:  '5℃ - ' + '28℃',
+					paramTemp: '5-28',
 					is_blue: false,
 					temperatureDialogVisible: false,
 					start_tiao: '',
@@ -200,7 +176,8 @@
 					phone: '',
 					state: 1,
 					overtime: 6,
-					operator: ''
+					operator: [],
+					cardNumber: ''
 				},
 				currentPage: 1,
 				rows: 6,
@@ -215,9 +192,6 @@
 					send_start: [{
 						validator: checkStart
 					}],
-					operator: [{
-						validator: checkOperator
-					}],
 					phone: [{
 						validator: checkPhone
 					}],
@@ -229,6 +203,7 @@
 		},
 		mounted() {
 			this.get_data();
+			this.get_oprator_list_data();
 		},
 		methods: {
 			/**
@@ -249,17 +224,21 @@
 				};
 				// 开始发送请求,获取配置数据
 				getSet(params).then((res) => {
-					// console.log(res.rows[0]);
+					// console.log('getSet', res.rows[0]);
 					let r = res.rows[0];
-					let t = r.temp.split('-');
-					this.formData.temperature_range = t[0] + '℃ - ' + t[1] + '℃';
+					if (r.temp != '') {
+						let t = r.temp.split('-');
+						this.formData.temperature_range = t[0] + '℃ - ' + t[1] + '℃';
+						this.formData.temperature_range_value = [t[0], t[1]];
+						this.formData.paramTemp = t[0] + '-' + t[1];
+					}
 					this.formData.is_blue = r.is_blue == 1 ? true : false;
 					this.formData.start_tiao = r.start_tiao;
 					this.formData.send_jian = r.send_jian + '';
 					this.formData.send_start = r.send_start;
 					this.formData.phone = r.phone;
 					this.formData.state = r.state;
-					this.formData.operator = r.operator;
+					this.formData.cardNumber = r.card_number;
 					this.formData.overtime = r.overtime;
 				}).catch((err) => {
 					// console.log(err);
@@ -267,6 +246,26 @@
 				});
 			},
 			/**
+			 * 获取操作员列表
+			 */
+			get_oprator_list_data() {
+				// 开始发送请求,获取配置数据
+				getSetOprator().then((res) => {
+					// console.log('getSetOprator', res.data);
+					this.formData.operator = [];
+					for (let i = 0; i < res.data.operator.length; i++) {
+						const existingObject = this.formData.operator.find(item => item.cardNumber === res.data.operator[i].cardNumber);
+						if (!existingObject) {
+							this.formData.operator.push(res.data.operator[i]);
+						}
+					}
+					this.formData.cardNumber = res.data.cardNumber;
+				}).catch((err) => {
+					// console.log(err);
+					this.$message.error(err.message);
+				});
+			},
+			/**
 			 * 提交修改后的配置
 			 */
 			handle_submit() {
@@ -282,7 +281,7 @@
 							send_start: this.formData.send_start,
 							phone: this.formData.phone,
 							state: this.formData.state,
-							operator: this.formData.operator,
+							card_number: this.formData.cardNumber,
 							overtime: this.formData.overtime
 						};
 						// console.log(params);