三相wifi修改

web/三相/public/i18n/i18n_deguo.js

@@ -470,7 +470,8 @@ const i18n_deguo= {
   "qy":"Aktivieren",
   "xhqd":"Signalintensität",
   "yys":"Betreiber",
-  "tel":"Telefonnummer:"
-
+  "tel":"Telefonnummer:",
+  "ztts":"Push-Benachrichtigungen pausieren",
+  "zttsts":"Die Änderung erfordert die Auswahl der Option Pause Push",
 
 }

web/三相/public/i18n/i18n_eguo.js

@@ -471,5 +471,7 @@ const i18n_eguo={
   "qy":"Включить",
   "xhqd":"Сила сигнала",
   "yys":"Оператор",
-  "tel":"Номер телефона"
+  "tel":"Номер телефона",
+  "ztts":"Приостановить толкание",
+  "zttsts":"Изменения необходимо отменить",
 }

web/三相/public/i18n/i18n_faguo.js

@@ -470,8 +470,9 @@ const i18n_faguo={
   "qy":"Activer",
   "xhqd":"Force du signal",
   "yys":"Opérateur",
-  "tel":"Numéro de téléphone"
-
+  "tel":"Numéro de téléphone",
+  "ztts":"Suspendre le push",
+  "zttsts":"Modification à cocher pause push",
 
 
 

web/三相/public/i18n/i18n_putaoya.js

@@ -470,7 +470,9 @@ const i18n_putaoya={
   "qy":"Activar",
   "xhqd":"intensidade do sinal",
   "yys":"Operador",
-  "tel":"Número de telefone:"
+  "tel":"Número de telefone:",
+  "ztts":"Pausa o empurramento",
+  "zttsts":"A modificação requer a seleção da opção 'Pause Push'"
 
 
 

web/三相/public/i18n/i18n_riben.js

@@ -470,9 +470,10 @@ const i18n_riben={
   "qy":"有効化",
   "xhqd":"しんごうきょうど",
   "yys":"オペレータ",
-  "tel":"電話番号"
-
+  "tel":"電話番号",
+  "ztts":"プッシュの一時停止",
 
+  "zttsts":"プッシュの一時停止をチェックする必要がある修正",
 
 
 

web/三相/public/i18n/i18n_xibanya.js

@@ -470,9 +470,10 @@ const i18n_xibanya={
   "qy":"Habilitar",
   "xhqd":"Intensidad de la señal",
   "yys":"Operadores",
-  "tel":"Número de teléfono"
-
+  "tel":"Número de teléfono",
+  "ztts":"Suspensión de empuje",
 
+  "zttsts":"Modificación debe marcar para suspender el empuje",
 
 
 

web/三相/public/i18n/i18n_yidali.js

@@ -470,7 +470,9 @@ const i18n_yidali={
   "qy":"Abilita",
   "xhqd":"Fortezza del segnale",
   "yys":"Operatore",
-  "tel":"Numero di telefono:"
+  "tel":"Numero di telefono:",
+  "ztts":"Metti in pausa le notifiche push",
+  "zttsts":"La modifica richiede la selezione dell'opzione Pausa Push"
 
 
 

web/三相/public/i18n/i18n_yingguo.js

@@ -470,6 +470,7 @@ const i18n_yingguo={
   "qy":"Enable",
   "xhqd":"Signal strength",
   "yys":"Operator",
-  "tel":"phone number"
-
+  "tel":"phone number",
+  "ztts":"Pause push notifications",
+  "zttsts":"Modification requires selecting 'Pause Push' option",
 }

web/三相/public/i18n/i18n_zh_CN.js

@@ -470,8 +470,9 @@ const i18n_zh_CN = {
   "qy":"启用",
   "xhqd":"信号强度",
   "yys":"运营商",
-  "tel":"电话号码"
-
+  "tel":"电话号码",
+  "ztts":"暂停推送",
+  "zttsts":"修改需勾选暂停推送"
 
 
 

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,14 +18,14 @@
                   </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('ljzt')"  >
+                  <el-input :readonly="true"   >
+                    <template slot="prefix">
+                      <span v-if="form3.ljzt==this.$t('wlj')" 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>
@@ -35,9 +35,18 @@
                 <el-form-item    :label="this.$t('tel')" prop="tel">
                   <el-input :readonly="true" v-model="form3.tel"   />
                 </el-form-item>
-
+                <el-form-item  class="aaa"   :label="this.$t('ztts')"  >
+                  <template #label>
+                    <span>{{$t('ztts')}}   </span>
+                    <el-tooltip class="item" effect="dark" :content="$t('zttsts')" placement="top">
+                      <i class="el-icon-question"></i>
+                    </el-tooltip>
+                  </template>
+                  <input type="checkbox" v-model="isChecked"   />
+                </el-form-item>
               </el-form>
               <div slot="footer" style="float: right;" class="dialog-footer">
+
                 <el-button type="primary" @click="submitForm3">{{$t('sz')}}</el-button>
               </div>
             </template>
@@ -56,6 +65,7 @@
     name: "Server",
     data() {
       return {
+        isChecked: false,
         // 服务器信息
         server: [],
         // 总体状态监控
@@ -119,7 +129,7 @@
       //4G状态
       onSocketMessageTofourgStatus(recvMessage) {
         if (recvMessage.success && recvMessage.data!=null && recvMessage.data.data!='' && recvMessage.data.data!=null) {
-          if(recvMessage.data!=null){
+          if(recvMessage.data!=null && !this.isChecked){
             this.form3.ljzt=recvMessage.data.data.ljzt;
             this.form3.xhqd=recvMessage.data.data.xhqd;
             this.form3.yys=recvMessage.data.data.yys;
@@ -341,3 +351,8 @@
   }
 
 </style>
+<style>
+  .aaa .el-form-item__label{
+    color: red;
+  }
+</style>

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

@@ -21,31 +21,39 @@
                 <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-if="form3.ljzt==this.$t('wlj')" 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="'SSID'" prop="ssid">
+                <el-form-item    :label="'SSID'"  >
                   <el-input v-model="form3.ssid"   />
                 </el-form-item>
 
-                <el-form-item :required="true" :label="this.$t('formPassword')"  prop="password">
+                <el-form-item  :label="this.$t('formPassword')"  >
                   <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>
 
                 <el-form-item :label="this.$t('IPadress')"  >
                   <el-input :readonly="true" v-model="form3.IPadress"    />
                 </el-form-item>
-
+                <el-form-item   class="aaa"   :label="this.$t('ztts')"  >
+                  <template #label>
+                    <span>{{$t('ztts')}}   </span>
+                    <el-tooltip class="item" effect="dark" :content="$t('zttsts')" placement="top">
+                      <i class="el-icon-question"></i>
+                    </el-tooltip>
+                  </template>
+                  <input type="checkbox" v-model="isChecked"   />
+                </el-form-item>
               </el-form>
               <div slot="footer" style="float: right;" class="dialog-footer">
                 <el-button type="primary" @click="submitForm3">{{$t('sz')}}</el-button>
@@ -71,10 +79,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"   />
@@ -140,6 +148,7 @@
                 <!--<el-form-item   label="MAC:" prop="mac">-->
                 <!--<el-input v-model="form.mac"    />-->
                 <!--</el-form-item>-->
+
               </el-form>
               <div slot="footer" style="float: right;" class="dialog-footer">
                 <el-button type="primary" @click="submitForm2">{{$t('qd')}}</el-button>
@@ -160,6 +169,7 @@
     name: "Server",
     data() {
       return {
+        isChecked: false,
         // 服务器信息
         server: [],
         // 总体状态监控
@@ -227,16 +237,16 @@
       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){
+          if(recvMessage.data!=null  && !this.isChecked){
             this.form3.IPadress=recvMessage.data.data.IPadress;
             this.form3.ljzt=recvMessage.data.data.ljzt;
             this.form3.password=recvMessage.data.data.password;
@@ -348,9 +358,9 @@
         communicationManagement(params).then(response => {
           if(response.data!=null){
           this.form3=response.data;
-          }
+        }
 
-        });
+      });
       },
       /** 提交按钮 */
       submitForm: function() {
@@ -370,7 +380,7 @@
               communicationManagement(params);
             }).then(() => {
               this.$modal.msgSuccess(this.$t('zxcg'));
-            }).catch(() => {});
+          }).catch(() => {});
 
 
           }
@@ -395,7 +405,7 @@
               communicationManagement(params);
             }).then(() => {
               this.$modal.msgSuccess(this.$t('zxcg'));
-            }).catch(() => {});
+          }).catch(() => {});
 
 
           }
@@ -404,6 +414,7 @@
 
       },
       submitForm3: function() {
+
         this.$refs["form3"].validate(valid => {
           if (valid) {
             const params={};
@@ -418,7 +429,7 @@
               communicationManagement(params);
             }).then(() => {
               this.$modal.msgSuccess(this.$t('zxcg'));
-            }).catch(() => {});
+          }).catch(() => {});
 
 
           }
@@ -434,7 +445,11 @@
   };
 </script>
 
-
+<style>
+  .aaa .el-form-item__label{
+    color: red;
+  }
+</style>
 <style scoped>
   .row-item {
     display: -webkit-box;
@@ -460,4 +475,5 @@
     overflow: hidden;
   }
 
+
 </style>