From fa7044f3ccc9a91bc2bc117d1a06f650d86554f2 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期二, 15 六月 2021 16:07:16 +0800
Subject: [PATCH] 优化联动规则加载场景列表的操作
---
src/pages/settings/components/BasicSetting.vue | 41 ++++++++++-------------------------------
1 files changed, 10 insertions(+), 31 deletions(-)
diff --git a/src/pages/settings/components/BasicSetting.vue b/src/pages/settings/components/BasicSetting.vue
index 2ffeae5..604374d 100644
--- a/src/pages/settings/components/BasicSetting.vue
+++ b/src/pages/settings/components/BasicSetting.vue
@@ -178,26 +178,8 @@
<el-tab-pane label="鏃堕棿閰嶇疆" name="timeSet" v-if="isShow('settings:timeSet')">
<el-form label-width="100px">
<el-form-item label="璁惧鏃堕棿">
- <!-- <el-input v-model="equipmentTime" placeholder="璇疯緭鍏�" size="small"></el-input> -->
{{ equipmentTime }}
</el-form-item>
-
- <!-- <el-form-item label="鏃跺尯" prop="timezone">
- <el-select
- v-model="timezone"
- placeholder="璇烽�夋嫨"
- style="width: 360px; height: 32px"
- size="small"
- @change="checkTimeZone"
- >
- <el-option
- v-for="item in timeZoneOption"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- ></el-option>
- </el-select>
- </el-form-item>-->
<div style="text-align: left;padding: 10px 0px">
<div class="time-type">NTP鏍℃椂</div>
<div style="padding: 10px 0px;">
@@ -349,15 +331,15 @@
RadioSet
},
computed: {
- timeZoneOption() {
- let options = []
- TimeZones.forEach(zone => {
- options = options.concat(zone.utc.map(v => {
- return { value: v, label: v }
- }))
- })
- return options
- },
+ // timeZoneOption() {
+ // let options = []
+ // TimeZones.forEach(zone => {
+ // options = options.concat(zone.utc.map(v => {
+ // return { value: v, label: v }
+ // }))
+ // })
+ // return options
+ // },
isAdmin() {
if (
sessionStorage.getItem("userInfo") &&
@@ -503,7 +485,6 @@
this.initResourceConfig();
this.initClockConf();
//this.markStartTime();
-
});
},
beforeDestroy() {
@@ -578,7 +559,6 @@
},
runClock() {
this.equipmentTime = this.formatTime(++this.timestamp, 'Y-M-D h:m:s');
- // console.log(this.equipmentTime)
this.clockTimer = setTimeout(() => {
this.runClock();
}, 1000)
@@ -625,7 +605,7 @@
if (this.sysinfo.ip !== this.originNetConfig.ip) {
let newUri = location.protocol + "//" + this.sysinfo.ip + ":" + this.sysinfo.server_port;
var changeIPTimer = setTimeout(() => {
- this.$alert('<strong>鎮ㄥ凡淇敼浜嗘湇鍔″櫒ip, 璇烽噸鏂扮櫥褰�</strong><a href="' + newUri + '"> ' + newUri + '<a/>', '鎻愮ず', {
+ this.$alert('<strong>鎮ㄥ凡淇敼浜嗘湇鍔″櫒ip, 璇烽噸鏂扮櫥褰�</strong><a target="_parent" href="' + newUri + '"> ' + newUri + '<a/>', '鎻愮ず', {
dangerouslyUseHTMLString: true
});
}, 10000)
@@ -720,7 +700,6 @@
message: "璁剧疆鎴愬姛"
});
}
-
this.initClockConf();
})
},
--
Gitblit v1.8.0