hanbaoshan
2020-09-27 823bf0b5540f4770e58e898ea8ee9a4d75ebeded
src/pages/settings/components/BasicSetting.vue
@@ -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
@@ -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) {
@@ -615,6 +622,10 @@
        }
      });
    },
    checkTimeZone(val){
      debugger;
    },
    submitClock() {
      if (this.syncType === '1') {
        if (this.ntpServer === "") {