From 6a2689a44840490a64cf66b37eb09e45eb1da244 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 24 九月 2024 16:03:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/business/OperaPlatformWindow.vue | 68 ++++++++++++---------------------
1 files changed, 25 insertions(+), 43 deletions(-)
diff --git a/admin/src/components/business/OperaPlatformWindow.vue b/admin/src/components/business/OperaPlatformWindow.vue
index c0157fb..c03564e 100644
--- a/admin/src/components/business/OperaPlatformWindow.vue
+++ b/admin/src/components/business/OperaPlatformWindow.vue
@@ -1,60 +1,42 @@
<template>
- <GlobalWindow
- :title="title"
- width="50%"
- :visible.sync="visible"
- :confirm-working="isWorking"
- @confirm="confirm"
- >
+ <GlobalWindow :title="title" width="50%" :visible.sync="visible" :confirm-working="isWorking" @confirm="confirm">
<el-form :model="form" ref="form" :rules="rules">
- <el-form-item label="鏈堝彴鍚嶇О锛�" >
- <span>{{form.name}}</span>
+ <el-form-item label="鏈堝彴鍚嶇О锛�">
+ <span>{{ form.name }}</span>
</el-form-item>
<el-form-item label="鏈堝彴缂栫爜锛�" prop="code">
- <el-input v-model="form.code" placeholder="璇疯緭鍏ユ湀鍙扮紪鐮�" v-trim/>
- <span class="tip-warn"><i class="el-icon-warning"></i>璇存槑锛氬搴擶MS绯荤粺涓殑缂栫爜</span>
+ <el-input v-model="form.code" placeholder="璇疯緭鍏ユ湀鍙扮紪鐮�" v-trim />
+ <span class="tip-warn"><i class="el-icon-warning"></i>璇存槑锛氬搴擶MS绯荤粺涓殑缂栫爜</span>
</el-form-item>
<el-form-item label="鎵�灞炴湀鍙板垎缁勶細" prop="groupId">
- <el-select v-model="form.groupId" >
- <el-option
- v-for="item in groupList"
- :key="item.id"
- :label="item.name"
- :value="item.id">
+ <el-select v-model="form.groupId">
+ <el-option v-for="item in groupList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="骞挎挱璁惧锛�" prop="broadcastIds">
- <el-select v-model="form.broadcastIds" multiple >
- <el-option
- v-for="item in broadcastList"
- :key="item.id"
- :label="item.name"
- :value="item.id">
+ <el-select v-model="form.broadcastIds" multiple>
+ <el-option v-for="item in broadcastList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="LED璁惧锛�" prop="ledIds">
- <el-select v-model="form.ledIds" multiple >
- <el-option
- v-for="item in ledList"
- :key="item.id"
- :label="item.name"
- :value="item.id">
+ <el-select v-model="form.ledIds" multiple>
+ <el-option v-for="item in ledList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鍚屾椂浣滀笟鏁伴噺锛�" prop="workingNum" >
- <el-input type="number" v-model="form.workingNum" placeholder="璇疯緭鍏ュ悓鏃朵綔涓氭暟閲�" v-trim/>
+ <el-form-item label="鍚屾椂浣滀笟鏁伴噺锛�" prop="workingNum">
+ <el-input type="number" v-model="form.workingNum" placeholder="璇疯緭鍏ュ悓鏃朵綔涓氭暟閲�" v-trim />
</el-form-item>
<el-form-item label="鏈堝彴浣滀笟鏁堢巼(涓囧彧/灏忔椂)锛�" prop="workRate">
- <el-input type="number" v-model="form.workRate" placeholder="璇疯緭鍏ユ湀鍙颁綔涓氭晥鐜�(涓囧彧/灏忔椂)" v-trim/>
+ <el-input type="number" v-model="form.workRate" placeholder="璇疯緭鍏ユ湀鍙颁綔涓氭晥鐜�(涓囧彧/灏忔椂)" v-trim />
</el-form-item>
<el-form-item label="浣滀笟瓒呮椂鎶ヨ鏃堕棿(鍒嗛挓)锛�" prop="workTimeoutAlarmTime">
- <el-input type="number" v-model="form.workTimeoutAlarmTime" placeholder="璇疯緭鍏ヤ綔涓氳秴鏃舵姤璀︽椂闂�(鍒嗛挓)" v-trim/>
+ <el-input type="number" v-model="form.workTimeoutAlarmTime" placeholder="璇疯緭鍏ヤ綔涓氳秴鏃舵姤璀︽椂闂�(鍒嗛挓)" v-trim />
</el-form-item>
- <el-form-item label="鍋滅暀瓒呮椂鎶ヨ鏃堕棿(鍒嗛挓锛夛細" prop="stayTmeoutAlarmTime">
- <el-input type="number" v-model="form.stayTmeoutAlarmTime" placeholder="璇疯緭鍏ュ仠鐣欒秴鏃舵姤璀︽椂闂�(鍒嗛挓)" v-trim/>
+ <el-form-item label="鍋滅暀瓒呮椂鎶ヨ鏃堕棿(鍒嗛挓锛夛細" prop="stayTimeoutAlarmTime">
+ <el-input type="number" v-model="form.stayTimeoutAlarmTime" placeholder="璇疯緭鍏ュ仠鐣欒秴鏃舵姤璀︽椂闂�(鍒嗛挓)" v-trim />
</el-form-item>
</el-form>
</GlobalWindow>
@@ -70,7 +52,7 @@
name: 'OperaPlatformWindow',
extends: BaseOpera,
components: { GlobalWindow },
- data () {
+ data() {
return {
// 琛ㄥ崟鏁版嵁
groupList: [],
@@ -86,7 +68,7 @@
endTime: '',
workingNum: 1,
workRate: '',
- stayTmeoutAlarmTime: '',
+ stayTimeoutAlarmTime: '',
workTimeoutAlarmTime: '',
},
// 楠岃瘉瑙勫垯
@@ -95,7 +77,7 @@
}
}
},
- created () {
+ created() {
this.config({
api: '/platform/platform',
'field.id': 'id'
@@ -107,7 +89,7 @@
* @title 绐楀彛鏍囬
* @target 缂栬緫鐨勫璞�
*/
- open (title, target) {
+ open(title, target) {
this.title = title
this.visible = true
this.loadGroupList()
@@ -130,19 +112,19 @@
this.form.workingNum = this.form.workingNum || 1
})
},
- loadGroupList () {
+ loadGroupList() {
allList({})
.then(res => {
this.groupList = res || []
})
},
- loadLedList () {
+ loadLedList() {
deviceList({ type: 2 })
.then(res => {
this.ledList = res || []
})
},
- loadBroadcastList () {
+ loadBroadcastList() {
deviceList({ type: 3 })
.then(res => {
this.broadcastList = res || []
@@ -152,7 +134,7 @@
}
</script>
<style scoped>
-.labelTip{
+.labelTip {
font-size: 12px;
color: #666666;
}
--
Gitblit v1.9.3