From c5a508ae17799a8f6687f2aea82536fa57f435b9 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期三, 14 十月 2020 10:27:18 +0800
Subject: [PATCH] 修复轮询周期计算
---
src/pages/settings/components/BasicSetting.vue | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/src/pages/settings/components/BasicSetting.vue b/src/pages/settings/components/BasicSetting.vue
index a862654..b6dfad5 100644
--- a/src/pages/settings/components/BasicSetting.vue
+++ b/src/pages/settings/components/BasicSetting.vue
@@ -76,7 +76,7 @@
<template slot="title">
<b class="tree-font">璇︾粏淇℃伅</b>
</template>
- <el-menu-item-group class="item-group">
+ <el-menu-item-group class="item-group desc-info">
<el-row :gutter="gutter">
<el-col :span="12" class="flex-box">
<div class="xiangqin-label">ID</div>
@@ -171,12 +171,13 @@
{{ equipmentTime }}
</el-form-item>
- <el-form-item label="鏃跺尯" prop="timezone">
+ <!-- <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"
@@ -185,7 +186,7 @@
:value="item.value"
></el-option>
</el-select>
- </el-form-item>
+ </el-form-item> -->
<div style="text-align: left;padding: 10px 0px">
<div class="time-type">NTP鏍℃椂</div>
<div style="padding: 10px 0px;">
@@ -233,7 +234,7 @@
placeholder="閫夋嫨鏃ユ湡鏃堕棿"
size="small"
value-format="yyyy-MM-dd HH:mm:ss"
- :readonly="settimeRadio"
+
:disabled="syncType === '1'"
></el-date-picker>
<el-checkbox
@@ -256,7 +257,7 @@
<el-tab-pane label="闆嗙兢绠＄悊" name="third">
<cluster-management></cluster-management>
</el-tab-pane>
- <el-tab-pane label="澶栭儴璁块棶" name="fourth">
+ <!-- <el-tab-pane label="澶栭儴璁块棶" name="fourth">
<el-menu
:default-openeds="openeds"
background-color="#fff"
@@ -296,7 +297,7 @@
</el-submenu>
</el-menu>
- </el-tab-pane>
+ </el-tab-pane> -->
<el-tab-pane label="鏉冮檺绠＄悊" name="user">
<authority-management v-if="activeName === 'user'"></authority-management>
</el-tab-pane>
@@ -464,6 +465,8 @@
// this.initAlarmConf();
this.initResourceConfig();
this.initClockConf();
+ //this.markStartTime();
+
});
},
beforeDestroy() {
@@ -546,6 +549,10 @@
}, 1000)
}
},
+ markStartTime(){
+ let timestamp = new Date().getTime() / 1000;
+ this.settime = this.formatTime(timestamp, 'Y-M-D h:m:s')
+ },
submitSysinfo() {
this.$refs["sysinfo"].validate(valid => {
if (valid) {
@@ -614,6 +621,10 @@
return false;
}
});
+ },
+ checkTimeZone(val){
+ debugger;
+
},
submitClock() {
if (this.syncType === '1') {
@@ -933,6 +944,16 @@
width: 300px;
}
}
+.desc-info{
+ margin-bottom: 14px;
+ .flex-box{
+ height: 40px;
+ line-height: 40px;
+ .xiangqin-label{
+ width: 80px;
+ }
+ }
+}
.menu-css,
.el-menu {
border-right: none;
--
Gitblit v1.8.0