系统时间由后台返回

web/三相/src/layout/components/Navbar.vue

@@ -81,7 +81,8 @@ export default {
         {"key":"it","value":"Italia","id":"8"}, // 意大利
         {"key":"ja","value":"日本語","id":"9"}  // 日本
       ],
-      chooseLanguage:""
+      chooseLanguage:"",
+      systemTime:null,
     }
   },
   components: {
@@ -99,7 +100,7 @@ export default {
     //console.log("--->")
     //console.log(this.$store.state.user)
    this.logoName= this.$store.state.user.name;
-  this.dataRefreh();
+
     this.queryTotal()
   },
   computed: {
@@ -223,8 +224,13 @@ export default {
         systemConfiguration({}).then(response => {
           if(response.data!=null && response.data.webSocket!=null && response.data.webSocket!=''){
             var data=response.data;
+            if(data.systemTime!=null && data.systemTime!=undefined){
+              this.systemTime=new Date(data.systemTime);
+            }
             var webSocket=data.webSocket;
+        this.dataRefreh();
             this.initWebsocket(webSocket);
+
           }
 
         });
@@ -334,7 +340,7 @@ export default {
     dataRefreh(){
       // 计时器为空，操作
       setInterval(() => {
-        var  date = new Date();
+      var date= this.systemTime ;
       var year = date.getFullYear();
       var month = date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1;
       var day = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
@@ -342,6 +348,7 @@ export default {
       var minutes = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes();
       var seconds = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
       this.dateTime= year + '-' + month + '-' + day + ' ' + hours+ ':' + minutes + ':' + seconds;
+      this.systemTime=new Date(date.getTime()+1000);
     }, 1000);
     },
 

web/三相/src/layout/components/Sidebar/Logo.vue

@@ -39,7 +39,7 @@ export default {
   data() {
     return {
       title: this.$i18n.t('loginFormTitle'),
-       logo: logoImg,
+       logo: "",
       language:[
         {"key":"zh-CN","value":"简体中文","id":"1"},
         // {"key":"zh-TW","value":"繁體中文"},

web/三相/src/views/login.vue

@@ -130,7 +130,7 @@
         uuid: "",
         type: ""
       },
-      logo:require("../assets/logo/sy.png"),
+      logo:"",
       loginRules: {
         // username: [
         //   { required: true, trigger: "blur", message: this.$i18n.t('formAccountRules') }

web/三相/src/views/txgl/fourgsz/index.vue

@@ -18,15 +18,15 @@
                   </el-select>
                 </el-form-item>
 
-                  <el-form-item      :label="this.$t('ljzt')"  >
-                    <el-input :readonly="true"   >
-                      <template slot="prefix">
-                        <span v-if="form3.ljzt=='未连接'" style=" color:red ">{{ form3.ljzt }}</span>
-                        <span v-else  style="  color:  green  ">{{ form3.ljzt }}</span>
-                      </template>
-                    </el-input>
-                  </el-form-item>
-                <el-form-item    :label="this.$t('xhqd')+'(dB)'" prop="xhqd">
+                <el-form-item      :label="this.$t('ljzt')"  >
+                  <el-input :readonly="true"   >
+                    <template slot="prefix">
+                      <span v-if="form3.ljzt=='未连接'" style=" color:red ">{{ form3.ljzt }}</span>
+                      <span v-else  style="  color:  green  ">{{ form3.ljzt }}</span>
+                    </template>
+                  </el-input>
+                </el-form-item>
+                <el-form-item    :label="this.$t('xhqd')" prop="xhqd">
                   <el-input :readonly="true" v-model="form3.xhqd"   />
                 </el-form-item>
                 <el-form-item    :label="this.$t('yys')" prop="yys">
@@ -120,10 +120,10 @@
       onSocketMessageTofourgStatus(recvMessage) {
         if (recvMessage.success && recvMessage.data!=null && recvMessage.data.data!='' && recvMessage.data.data!=null) {
           if(recvMessage.data!=null){
-            this.form3.ljzt=recvMessage.data.ljzt;
-            this.form3.xhqd=recvMessage.data.xhqd;
-            this.form3.yys=recvMessage.data.yys;
-            this.form3.tel=recvMessage.data.tel;
+            this.form3.ljzt=recvMessage.data.data.ljzt;
+            this.form3.xhqd=recvMessage.data.data.xhqd;
+            this.form3.yys=recvMessage.data.data.yys;
+            this.form3.tel=recvMessage.data.data.tel;
           }
           //  this.queryTotalStatus();
         }

web/三相/src/views/txgl/wifisz/index.vue

@@ -33,12 +33,12 @@
 
                 <el-form-item :required="true" :label="this.$t('formPassword')"  prop="password">
                   <el-input v-model="form3.password"     auto-complete="off"  :type="passwordVisible ? 'text' : 'password'" >
-                  <template slot="suffix">
+                    <template slot="suffix">
                   <span
                     class="el-icon-view"
                     @click="togglePasswordVisibility()"
                   ></span>
-                  </template>
+                    </template>
                   </el-input>
                 </el-form-item>
 
@@ -54,7 +54,7 @@
           </div>
         </el-card>
       </el-col>
-      <el-col :span="8" class="card-box" v-if="this.productParams.ip4sz=='1'">
+      <el-col :span="8" class="card-box" style="display: none" v-if="this.productParams.ip4sz=='1'">
         <el-card>
           <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> {{$t('IPV4sz')}}</span>
           </div>
@@ -71,10 +71,10 @@
                 </el-form-item>
 
                 <!--<el-form-item  :label="this.$t('IPbb')" prop="type">-->
-                  <!--<el-select   style="width: 100%" v-model="form.type"     allow-create   clearable :filterable="false">-->
-                    <!--<el-option v-for="item in types" :key="item.id" :label="$t(item.name)" :value="item.id">-->
-                    <!--</el-option>-->
-                  <!--</el-select>-->
+                <!--<el-select   style="width: 100%" v-model="form.type"     allow-create   clearable :filterable="false">-->
+                <!--<el-option v-for="item in types" :key="item.id" :label="$t(item.name)" :value="item.id">-->
+                <!--</el-option>-->
+                <!--</el-select>-->
                 <!--</el-form-item>-->
                 <el-form-item     :label="'IP '+this.$t('dz')" prop="ipaddress">
                   <el-input :disabled="showClass" v-model="form.ipaddress"   />
@@ -104,7 +104,7 @@
           </div>
         </el-card>
       </el-col>
-      <el-col :span="8" class="card-box" v-if="this.productParams.ip6sz=='1'">
+      <el-col :span="8" class="card-box" style="display: none"   v-if="this.productParams.ip6sz=='1'">
         <el-card>
           <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> {{$t('IPV6sz')}}</span>
           </div>
@@ -227,18 +227,20 @@
       this.queryIp3();
       setTimeout(()=>{
         this.queryIp();
-      },1000) ;
+    },1000) ;
       setTimeout(()=>{
         this.queryIp2();
-      },1500)
+    },1500)
     },
     methods: {
       //wifi状态
       onSocketMessageToWifiStatus(recvMessage) {
         if (recvMessage.success && recvMessage.data!=null && recvMessage.data.data!='' && recvMessage.data.data!=null) {
           if(recvMessage.data!=null){
-            this.form3.IPadress=recvMessage.data.IPadress;
-            this.form3.ljzt=recvMessage.data.ljzt;
+            this.form3.IPadress=recvMessage.data.data.IPadress;
+            this.form3.ljzt=recvMessage.data.data.ljzt;
+            this.form3.password=recvMessage.data.data.password;
+            this.form3.ssid=recvMessage.data.data.ssid;
           }
           //  this.queryTotalStatus();
         }
@@ -346,9 +348,9 @@
         communicationManagement(params).then(response => {
           if(response.data!=null){
           this.form3=response.data;
-          }
+        }
 
-        });
+      });
       },
       /** 提交按钮 */
       submitForm: function() {
@@ -368,7 +370,7 @@
               communicationManagement(params);
             }).then(() => {
               this.$modal.msgSuccess(this.$t('zxcg'));
-            }).catch(() => {});
+          }).catch(() => {});
 
 
           }
@@ -393,7 +395,7 @@
               communicationManagement(params);
             }).then(() => {
               this.$modal.msgSuccess(this.$t('zxcg'));
-            }).catch(() => {});
+          }).catch(() => {});
 
 
           }
@@ -416,7 +418,7 @@
               communicationManagement(params);
             }).then(() => {
               this.$modal.msgSuccess(this.$t('zxcg'));
-            }).catch(() => {});
+          }).catch(() => {});
 
 
           }