系统设置隐藏时区选框,应用中心调整商城应用板块

hanbaoshan

2020-09-27 823bf0b5540f4770e58e898ea8ee9a4d75ebeded

系统设置隐藏时区选框,应用中心调整商城应用板块

 src/components/treeMenu/index.vue

@@ -334,6 +334,8 @@
      }
    },
    dropNode(node, item, draggedItem, e) {
      console.log('dropNode',node, item,draggedItem);
      debugger
      this.TreeDataPool.dropNode(draggedItem.id, item.id)
    }
  }

 src/pages/ai/index/App.vue

@@ -142,6 +142,35 @@
                          </div>

                        </div>

                    </div>

                    <div class="wrap-box" v-for="item in storeApps" :key="item.id">

                      <div class="list-choose-item-left ">

                        <div class="list-complete-item-handle uninstall">

                          <div class="svg-wrap" v-loading="item.installLoading" element-loading-text="安装中" element-loading-background="rgba(0,0,0,.8)">

                            <div class="mask">

                              <el-button type="primary" class="bot-btn" @click="downloadApp(item)">安装</el-button>

                            </div>

                            <img

                              class="baseImg"

                              :src="item.iconBlob? 'data:image/png;base64,'+item.iconBlob:item.icon"

                              alt

                            />

                          </div>

                          <div class="alg-name">

                            <div style="padding:0px 10px 0px 10px;">

                              <span v-if="!item.isEdit">{{ item.name }}</span>

                              <el-input

                                size="small"

                                v-model="item.name"

                                v-if="item.isEdit"

                                v-focus

                                :maxlength="15"

                                @blur="inputBlur(item)"

                              ></el-input>

                            </div>

                          </div>

                        </div>

                      </div>

                    </div>

                  </div>

                </div>

              </el-tab-pane>

@@ -204,35 +233,7 @@
                  </div>

                  <p class="src-title">应用软件</p>

                  <div class="app-list flex-list">

                    <div class="wrap-box" v-for="item in storeApps" :key="item.id">

                      <div class="list-choose-item-left">

                        <div class="list-complete-item-handle">

                          <div class="svg-wrap" v-loading="item.installLoading" element-loading-text="安装中" element-loading-background="rgba(0,0,0,.8)">

                            <div class="mask">

                              <el-button type="primary" class="bot-btn" @click="downloadApp(item)">安装</el-button>

                            </div>

                            <img

                              class="baseImg"

                              :src="item.iconBlob? 'data:image/png;base64,'+item.iconBlob:item.icon"

                              alt

                            />

                          </div>

                          <div class="alg-name">

                            <div style="padding:0px 10px 0px 10px;">

                              <span v-if="!item.isEdit">{{ item.name }}</span>

                              <el-input

                                size="small"

                                v-model="item.name"

                                v-if="item.isEdit"

                                v-focus

                                :maxlength="15"

                                @blur="inputBlur(item)"

                              ></el-input>

                            </div>

                          </div>

                        </div>

                      </div>

                    </div>

                    
                  </div>

                  

                </div>

@@ -2072,6 +2073,14 @@
          max-height: 106px;

        }

      }

      &.uninstall{

        .svg-wrap{

          background-color: #ddd;

        }

        .alg-name{

          color: darkgray;

        }

      }

    }

    .dragAreaR {

      height: 100%;


 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 === "") {