3

web/三相/src/utils/i18n/i18n-en-US.json

@@ -422,8 +422,7 @@
   "zs":"certificate",
   "zssc":"Certificate upload",
   "mqbcts":"The maximum number of brokers is limited to 5",
-  "xtpz":"system configuration",
-  "IPsz":"IP settings"
+  "xtpz":"system configuration"
 
 
 }

web/三相/src/utils/i18n/i18n-ru-RU.json

@@ -423,7 +423,6 @@
   "zs":"Сертификат",
   "zssc":"Загрузка сертификата",
   "mqbcts":"Максимальное количество брокеров ограничено пятью",
-  "xtpz":"Настройка системы",
-  "IPsz":"Настройка IP"
+  "xtpz":"Настройка системы"
 
 }

web/三相/src/utils/i18n/i18n-zh-CN.json

@@ -422,8 +422,7 @@
   "zs":"证书",
   "zssc":"证书上传",
   "mqbcts":"broker最大数量限定为5个",
-  "xtpz":"系统配置",
-  "IPsz":"IP设置"
+  "xtpz":"系统配置"
 
 
 

web/三相/src/views/rzxx/czrz/index.vue

@@ -1,49 +1,21 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
-      <!--<el-form-item :label="this.$t('xtmk')" prop="title">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.title"-->
-          <!--placeholder="请输入系统模块"-->
-          <!--clearable-->
-          <!--style="width: 240px;"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <el-form-item :label="this.$t('czry')" prop="operName">
-        <el-input
-          v-model="queryParams.operName"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item :label="this.$t('startTime')" prop="startTime">
+        <el-date-picker clearable
+                        v-model="queryParams.startTime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+        >
+        </el-date-picker>
       </el-form-item>
-      <!--<el-form-item :label="this.$t('zt')" prop="status">-->
-        <!--<el-select-->
-          <!--v-model="queryParams.status"-->
-          <!--placeholder="操作状态"-->
-          <!--clearable-->
-          <!--style="width: 240px"-->
-        <!--&gt;-->
-          <!--<el-option-->
-            <!--v-for="dict in dict.type.sys_common_status"-->
-            <!--:key="dict.value"-->
-            <!--:label="dict.label"-->
-            <!--:value="dict.value"-->
-          <!--/>-->
-        <!--</el-select>-->
-      <!--</el-form-item>-->
-      <el-form-item :label="this.$t('czsj')">
-        <el-date-picker
-          v-model="dateRange"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          :start-placeholder="this.$t('el.datepicker.startDate')"
-          :end-placeholder="this.$t('el.datepicker.endDate')"
-
-        ></el-date-picker>
+      <el-form-item :label="this.$t('endTime')" prop="endTime">
+        <el-date-picker clearable
+                        v-model="queryParams.endTime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+        >
+        </el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('ss')}}</el-button>
@@ -189,6 +161,8 @@
         // 查询参数
         queryParams: {
           pageNum: 1,
+          startTime:"",
+          endTime:"",
           pageSize: 10,
           operIp: undefined,
           title: undefined,
@@ -200,15 +174,28 @@
     },
     created() {
       this.usertoken= this.$store.state.user.usertoken;
+      var  date = new Date();
+      this.queryParams.endTime=this.getNowDateTime(date);
+      date.setHours(date.getHours() - 168);
+      this.queryParams.startTime=this.getNowDateTime(date);
       this.getList();
     },
     methods: {
+      getNowDateTime(date){
+        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();
+        var hours = date.getHours() < 10 ? "0" + date.getHours() : date.getHours();
+        var minutes = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes();
+        var seconds = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
+        return year + '-' + month + '-' + day + ' ' + hours+ ':' + minutes + ':' + seconds;
+      },
       /** 查询登录日志 */
       getList() {
         this.queryParams.token=this.usertoken;
         this.queryParams.type="listCzrzQuery";
         this.loading = true;
-        logInformation(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
+        logInformation(this.queryParams).then( response => {
           this.list = response.data;
         this.total = response.total;
         this.loading = false;
@@ -261,7 +248,7 @@
       handleExport() {
         this.queryParams.token=this.usertoken;
         this.queryParams.type ="exportCzrz";
-        var url=window.location.origin+"/pdu/logInformation?token="+this.usertoken+"&type=exportCzrz";
+        var url=window.location.origin+"/pdu/logInformation?token="+this.usertoken+"&type=exportCzrz&startTime="+this.queryParams.startTime+"&endTime="+this.queryParams.endTime;
         window.open(url,'_blank');
       //   this.download('pdu/logInformation', {
       //     ...this.queryParams

web/三相/src/views/rzxx/yxrz/index.vue

@@ -1,16 +1,21 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="auto">
-      <el-form-item :label="this.$t('rq')">
-        <el-date-picker
-          v-model="dateRange"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          :start-placeholder="this.$t('el.datepicker.startDate')"
-          :end-placeholder="this.$t('el.datepicker.endDate')"
-        ></el-date-picker>
+      <el-form-item :label="this.$t('startTime')" prop="startTime">
+        <el-date-picker clearable
+                        v-model="queryParams.startTime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item :label="this.$t('endTime')" prop="endTime">
+        <el-date-picker clearable
+                        v-model="queryParams.endTime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+        >
+        </el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('ss')}}</el-button>
@@ -86,6 +91,8 @@
         defaultSort: {prop: 'loginTime', order: 'descending'},
         // 查询参数
         queryParams: {
+          startTime:"",
+          endTime:"",
           pageNum: 1,
           pageSize: 10,
           ipaddr: undefined,
@@ -96,15 +103,28 @@
     },
     created() {
       this.usertoken= this.$store.state.user.usertoken;
+      var  date = new Date();
+      this.queryParams.endTime=this.getNowDateTime(date);
+      date.setHours(date.getHours() - 168);
+      this.queryParams.startTime=this.getNowDateTime(date);
       this.getList();
     },
     methods: {
+      getNowDateTime(date){
+        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();
+        var hours = date.getHours() < 10 ? "0" + date.getHours() : date.getHours();
+        var minutes = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes();
+        var seconds = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
+        return year + '-' + month + '-' + day + ' ' + hours+ ':' + minutes + ':' + seconds;
+      },
       /** 查询登录日志列表 */
       getList() {
         this.queryParams.token=this.usertoken;
         this.queryParams.type="listYxrzQuery";
         this.loading = true;
-        logInformation(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        logInformation(this.queryParams).then(response => {
           this.list = response.data;
         this.total = response.total;
         this.loading = false;
@@ -147,7 +167,7 @@
       handleExport() {
         this.queryParams.token=this.usertoken;
         this.queryParams.type ="exportYxrz";
-        var url=window.location.origin+"/pdu/logInformation?token="+this.usertoken+"&type=exportYxrz";
+        var url=window.location.origin+"/pdu/logInformation?token="+this.usertoken+"&type=exportYxrz&startTime="+this.queryParams.startTime+"&endTime="+this.queryParams.endTime;
         window.open(url,'_blank');
 
       //   this.download('pdu/logInformation', {

web/三相/src/views/sbwh/pzdrdc/index.vue

@@ -13,7 +13,7 @@
                 icon="el-icon-upload"
                 size="mini"
                 @click="handleImport('2')"
-              >{{$t('dr')}}</el-button>
+              >{{this.$t('cgqpz')}}{{$t('dr')}}</el-button>
             </el-col>
             <el-col :span="1.5">
                 <el-button
@@ -22,7 +22,7 @@
                   icon="el-icon-download"
                   size="mini"
                   @click="handleExport('2')"
-                >{{$t('dc')}}</el-button>
+                >{{this.$t('cgqpz')}}{{$t('dc')}}</el-button>
             </el-col>
           </el-row>
           </el-card>
@@ -39,7 +39,7 @@
                 size="mini"
                 @click="handleImport('0')"
                 v-hasPermi="['tool:gen:import']"
-              >{{$t('dr')}}</el-button>
+              >{{this.$t('gjyzpz')}}{{$t('dr')}}</el-button>
             </el-col>
             <el-col :span="1.5">
               <el-button
@@ -49,7 +49,7 @@
                 size="mini"
                 @click="handleExport('0')"
                 v-hasPermi="['system:dict:export']"
-              >{{$t('dc')}}</el-button>
+              >{{this.$t('gjyzpz')}}{{$t('dc')}}</el-button>
             </el-col>
           </el-row>
 
@@ -66,7 +66,7 @@
                 size="mini"
                 @click="handleImport('1')"
                 v-hasPermi="['tool:gen:import']"
-              >{{$t('dr')}}</el-button>
+              >{{this.$t('fwglpz')}}{{$t('dr')}}</el-button>
             </el-col>
             <el-col :span="1.5">
               <el-button
@@ -76,7 +76,7 @@
                 size="mini"
                 @click="handleExport('1')"
                 v-hasPermi="['system:dict:export']"
-              >{{$t('dc')}}</el-button>
+              >{{this.$t('fwglpz')}}{{$t('dc')}}</el-button>
             </el-col>
           </el-row>
           </el-card>
@@ -92,7 +92,7 @@
                 size="mini"
                 @click="handleImport('3')"
                 v-hasPermi="['tool:gen:import']"
-              >{{$t('dr')}}</el-button>
+              >{{this.$t('xtpz')}}{{$t('dr')}}</el-button>
             </el-col>
             <el-col :span="1.5">
               <el-button
@@ -102,7 +102,7 @@
                 size="mini"
                 @click="handleExport('3')"
                 v-hasPermi="['system:dict:export']"
-              >{{$t('dc')}}</el-button>
+              >{{this.$t('xtpz')}}{{$t('dc')}}</el-button>
             </el-col>
           </el-row>
           </el-card>
@@ -202,10 +202,14 @@
     },
     created() {
       this.usertoken= this.$store.state.user.usertoken;
-    // this.handleQuery();
+      this.handleQuery();
     },
 
     methods: {
+      handleClick(tab, event) {
+        this.tabName=tab.name;
+       alert(tab.name)
+      },
       // 导入前校验
       beforeAvatarUpload(file) {
        var name= file.name.split('.')[1].toLowerCase() ;

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

@@ -2,7 +2,7 @@
   <div class="app-container">
 
     <el-row>
-      <el-col :span="12" class="card-box">
+      <el-col :span="8" class="card-box">
         <el-card>
           <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> {{$t('WIFIsz')}}</span>
           </div>
@@ -27,9 +27,9 @@
           </div>
         </el-card>
       </el-col>
-      <el-col :span="12" class="card-box">
+      <el-col :span="8" class="card-box">
         <el-card>
-          <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> {{$t('IPsz')}}</span>
+          <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> {{$t('IPV4sz')}}</span>
           </div>
 
           <div class="el-table el-table--enable-row-hover el-table--medium">
@@ -43,12 +43,12 @@
                   </el-select>
                 </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-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-form-item>-->
                 <el-form-item     :label="'IP '+this.$t('dz')" prop="ipaddress">
                   <el-input :disabled="showClass" v-model="form.ipaddress"   />
                 </el-form-item>
@@ -77,50 +77,50 @@
           </div>
         </el-card>
       </el-col>
-      <!--<el-col :span="8" class="card-box">-->
-        <!--<el-card>-->
-          <!--<div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> {{$t('IPV6sz')}}</span>-->
-          <!--</div>-->
-
-          <!--<div class="el-table el-table&#45;&#45;enable-row-hover el-table&#45;&#45;medium">-->
-            <!--<template cellspacing="0" style="width: 100%;">-->
-              <!--<el-form ref="form2" :model="form2"  :rules="rules3" label-width="auto">-->
-
-                <!--<el-form-item   :label="this.$t('xzms')" prop="mode">-->
-                  <!--<el-select style="width: 100%" v-model="form2.mode"   @change="handleSelectChange2"  allow-create   clearable filterable>-->
-                    <!--<el-option v-for="item in modes" :key="item.id" :label="$t(item.name)" :value="item.id">-->
-                    <!--</el-option>-->
-                  <!--</el-select>-->
-                <!--</el-form-item>-->
+      <el-col :span="8" class="card-box">
+        <el-card>
+          <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> {{$t('IPV6sz')}}</span>
+          </div>
 
-                <!--<el-form-item   :label="'IPV6 '+this.$t('dz')" prop="ipaddress">-->
-                  <!--<el-input  :disabled="showClass2" v-model="form2.ipaddress"   />-->
-                <!--</el-form-item>-->
+          <div class="el-table el-table--enable-row-hover el-table--medium">
+            <template cellspacing="0" style="width: 100%;">
+              <el-form ref="form2" :model="form2"  :rules="rules3" label-width="auto">
 
-                <!--<el-form-item     :label="this.$t('zwym2')" prop="mask">-->
-                  <!--<el-input :disabled="showClass2" v-model="form2.mask"    />-->
-                <!--</el-form-item>-->
+                <el-form-item   :label="this.$t('xzms')" prop="mode">
+                  <el-select style="width: 100%" v-model="form2.mode"   @change="handleSelectChange2"  allow-create   clearable filterable>
+                    <el-option v-for="item in modes" :key="item.id" :label="$t(item.name)" :value="item.id">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
 
-                <!--<el-form-item     :label="this.$t('wg')" prop="gateway">-->
-                  <!--<el-input :disabled="showClass2" v-model="form2.gateway"    />-->
-                <!--</el-form-item>-->
-                <!--<el-form-item     label="DNS1:" prop="dns1">-->
-                  <!--<el-input :disabled="showClass2" v-model="form2.dns1"    />-->
-                <!--</el-form-item>-->
-                <!--<el-form-item    label="DNS2:" prop="dns2">-->
-                  <!--<el-input :disabled="showClass2" v-model="form2.dns2"    />-->
+                <el-form-item   :label="'IPV6 '+this.$t('dz')" prop="ipaddress">
+                  <el-input  :disabled="showClass2" v-model="form2.ipaddress"   />
+                </el-form-item>
+
+                <el-form-item     :label="this.$t('zwym2')" prop="mask">
+                  <el-input :disabled="showClass2" v-model="form2.mask"    />
+                </el-form-item>
+
+                <el-form-item     :label="this.$t('wg')" prop="gateway">
+                  <el-input :disabled="showClass2" v-model="form2.gateway"    />
+                </el-form-item>
+                <el-form-item     label="DNS1:" prop="dns1">
+                  <el-input :disabled="showClass2" v-model="form2.dns1"    />
+                </el-form-item>
+                <el-form-item    label="DNS2:" prop="dns2">
+                  <el-input :disabled="showClass2" v-model="form2.dns2"    />
+                </el-form-item>
+                <!--<el-form-item   label="MAC:" prop="mac">-->
+                <!--<el-input v-model="form.mac"    />-->
                 <!--</el-form-item>-->
-                <!--&lt;!&ndash;<el-form-item   label="MAC:" prop="mac">&ndash;&gt;-->
-                <!--&lt;!&ndash;<el-input v-model="form.mac"    />&ndash;&gt;-->
-                <!--&lt;!&ndash;</el-form-item>&ndash;&gt;-->
-              <!--</el-form>-->
-              <!--<div slot="footer" style="float: right;" class="dialog-footer">-->
-                <!--<el-button type="primary" @click="submitForm2">{{$t('qd')}}</el-button>-->
-              <!--</div>-->
-            <!--</template>-->
-          <!--</div>-->
-        <!--</el-card>-->
-      <!--</el-col>-->
+              </el-form>
+              <div slot="footer" style="float: right;" class="dialog-footer">
+                <el-button type="primary" @click="submitForm2">{{$t('qd')}}</el-button>
+              </div>
+            </template>
+          </div>
+        </el-card>
+      </el-col>
     </el-row>
 
   </div>
@@ -189,9 +189,9 @@
       setTimeout(()=>{
         this.queryIp();
       },1000) ;
-      // setTimeout(()=>{
-      //   this.queryIp2();
-      // },1500)
+      setTimeout(()=>{
+        this.queryIp2();
+      },1500)
     },
     methods: {
 
@@ -299,7 +299,7 @@
           if (valid) {
             const params={};
             params.token=this.usertoken;
-            params.type=this.form.type;
+            params.type="WIFIIPV4Save";
             params.mode=this.form.mode;
             params.ipaddress=this.form.ipaddress;
             params.mask=this.form.mask;

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

@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="12" class="card-box">
         <el-card>
-          <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> {{$t('IPsz')}}</span>
+          <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> {{$t('IPV4sz')}}</span>
           </div>
 
           <div class="el-table el-table--enable-row-hover el-table--medium">
@@ -17,12 +17,12 @@
                         </el-option>
                       </el-select>
                     </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-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-form-item>-->
                     <el-form-item    :label="'IP '+this.$t('dz')" prop="ipaddress">
                       <el-input :disabled="showClass" v-model="form.ipaddress"   />
                     </el-form-item>
@@ -51,50 +51,50 @@
           </div>
         </el-card>
       </el-col>
-      <!--<el-col :span="12" class="card-box">-->
-        <!--<el-card>-->
-          <!--<div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> {{$t('IPV6sz')}}</span>-->
-          <!--</div>-->
+      <el-col :span="12" class="card-box">
+        <el-card>
+          <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> {{$t('IPV6sz')}}</span>
+          </div>
 
-          <!--<div class="el-table el-table&#45;&#45;enable-row-hover el-table&#45;&#45;medium">-->
-            <!--<template cellspacing="0" style="width: 100%;">-->
-              <!--<el-form ref="form2" :model="form2" :rules="rules2"  label-width="auto">-->
+          <div class="el-table el-table--enable-row-hover el-table--medium">
+            <template cellspacing="0" style="width: 100%;">
+              <el-form ref="form2" :model="form2" :rules="rules2"  label-width="auto">
 
-                <!--<el-form-item   :label="this.$t('xzms')" prop="mode">-->
-                  <!--<el-select style="width: 100%" v-model="form2.mode"   @change="handleSelectChange2"  allow-create   clearable :filterable="false">-->
-                    <!--<el-option v-for="item in modes" :key="item.id" :label="$t(item.name)" :value="item.id">-->
-                    <!--</el-option>-->
-                  <!--</el-select>-->
-                <!--</el-form-item>-->
+                <el-form-item   :label="this.$t('xzms')" prop="mode">
+                  <el-select style="width: 100%" v-model="form2.mode"   @change="handleSelectChange2"  allow-create   clearable :filterable="false">
+                    <el-option v-for="item in modes" :key="item.id" :label="$t(item.name)" :value="item.id">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
 
-                <!--<el-form-item    :label="'IPV6 '+this.$t('dz')" prop="ipaddress">-->
-                  <!--<el-input  :disabled="showClass2"  v-model="form2.ipaddress"   />-->
-                <!--</el-form-item>-->
+                <el-form-item    :label="'IPV6 '+this.$t('dz')" prop="ipaddress">
+                  <el-input  :disabled="showClass2"  v-model="form2.ipaddress"   />
+                </el-form-item>
 
-                <!--<el-form-item    :label="this.$t('zwym2')" prop="mask">-->
-                  <!--<el-input  :disabled="showClass2"  v-model="form2.mask"    />-->
-                <!--</el-form-item>-->
+                <el-form-item    :label="this.$t('zwym2')" prop="mask">
+                  <el-input  :disabled="showClass2"  v-model="form2.mask"    />
+                </el-form-item>
 
-                <!--<el-form-item    :label="this.$t('wg')" prop="gateway">-->
-                  <!--<el-input  :disabled="showClass2"  v-model="form2.gateway"    />-->
-                <!--</el-form-item>-->
-                <!--<el-form-item     label="DNS1:" prop="dns1">-->
-                  <!--<el-input  :disabled="showClass2"  v-model="form2.dns1"    />-->
-                <!--</el-form-item>-->
-                <!--<el-form-item     label="DNS2:" prop="dns2">-->
-                  <!--<el-input    :disabled="showClass2"  v-model="form2.dns2"    />-->
+                <el-form-item    :label="this.$t('wg')" prop="gateway">
+                  <el-input  :disabled="showClass2"  v-model="form2.gateway"    />
+                </el-form-item>
+                <el-form-item     label="DNS1:" prop="dns1">
+                  <el-input  :disabled="showClass2"  v-model="form2.dns1"    />
+                </el-form-item>
+                <el-form-item     label="DNS2:" prop="dns2">
+                  <el-input    :disabled="showClass2"  v-model="form2.dns2"    />
+                </el-form-item>
+                <!--<el-form-item   label="MAC:" prop="mac">-->
+                <!--<el-input v-model="form.mac"    />-->
                 <!--</el-form-item>-->
-                <!--&lt;!&ndash;<el-form-item   label="MAC:" prop="mac">&ndash;&gt;-->
-                <!--&lt;!&ndash;<el-input v-model="form.mac"    />&ndash;&gt;-->
-                <!--&lt;!&ndash;</el-form-item>&ndash;&gt;-->
-              <!--</el-form>-->
-              <!--<div slot="footer" style="float: right;" class="dialog-footer">-->
-                <!--<el-button type="primary" @click="submitForm2">{{$t('qd')}}</el-button>-->
-              <!--</div>-->
-            <!--</template>-->
-          <!--</div>-->
-        <!--</el-card>-->
-      <!--</el-col>-->
+              </el-form>
+              <div slot="footer" style="float: right;" class="dialog-footer">
+                <el-button type="primary" @click="submitForm2">{{$t('qd')}}</el-button>
+              </div>
+            </template>
+          </div>
+        </el-card>
+      </el-col>
     </el-row>
 
   </div>
@@ -154,9 +154,9 @@
     created() {
       this.usertoken= this.$store.state.user.usertoken;
       this.queryIp();
-      // setTimeout(()=>{
-      //   this.queryIp2();
-      // },1000)
+      setTimeout(()=>{
+        this.queryIp2();
+      },1000)
     },
     methods: {
 
@@ -250,7 +250,7 @@
           if (valid) {
             const params={};
             params.token=this.usertoken;
-            params.type=this.form.type;
+            params.type="WkIPV4Save";
             params.mode=this.form.mode;
             params.ipaddress=this.form.ipaddress;
             params.mask=this.form.mask;

web/安德森/src/utils/i18n/i18n-en-US.json

@@ -431,8 +431,7 @@
   "zs":"certificate",
   "zssc":"Certificate upload",
   "IPbb":"IP version",
-  "xtpz":"system configuration",
-  "IPsz":"IP settings"
+  "xtpz":"system configuration"
 
 
 

web/安德森/src/utils/i18n/i18n-ru-RU.json

@@ -432,6 +432,5 @@
   "zs":"Сертификат",
   "zssc":"Загрузка сертификата",
   "xtpz":"Настройка системы",
-  "IPbb":"Версия IP",
-  "IPsz":"Настройка IP"
+  "IPbb":"Версия IP"
 }

web/安德森/src/utils/i18n/i18n-zh-CN.json

@@ -432,8 +432,7 @@
   "zs":"证书",
   "zssc":"证书上传",
   "xtpz":"系统配置",
-  "IPbb":"IP版本",
-  "IPsz":"IP设置"
+  "IPbb":"IP版本"
 
 
 

web/安德森/src/views/rzxx/czrz/index.vue

@@ -1,49 +1,21 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
-      <!--<el-form-item :label="this.$t('xtmk')" prop="title">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.title"-->
-          <!--placeholder="请输入系统模块"-->
-          <!--clearable-->
-          <!--style="width: 240px;"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <el-form-item :label="this.$t('czry')" prop="operName">
-        <el-input
-          v-model="queryParams.operName"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item :label="this.$t('startTime')" prop="startTime">
+        <el-date-picker clearable
+                        v-model="queryParams.startTime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+        >
+        </el-date-picker>
       </el-form-item>
-      <!--<el-form-item :label="this.$t('zt')" prop="status">-->
-        <!--<el-select-->
-          <!--v-model="queryParams.status"-->
-          <!--placeholder="操作状态"-->
-          <!--clearable-->
-          <!--style="width: 240px"-->
-        <!--&gt;-->
-          <!--<el-option-->
-            <!--v-for="dict in dict.type.sys_common_status"-->
-            <!--:key="dict.value"-->
-            <!--:label="dict.label"-->
-            <!--:value="dict.value"-->
-          <!--/>-->
-        <!--</el-select>-->
-      <!--</el-form-item>-->
-      <el-form-item :label="this.$t('czsj')">
-        <el-date-picker
-          v-model="dateRange"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          :start-placeholder="this.$t('el.datepicker.startDate')"
-          :end-placeholder="this.$t('el.datepicker.endDate')"
-
-        ></el-date-picker>
+      <el-form-item :label="this.$t('endTime')" prop="endTime">
+        <el-date-picker clearable
+                        v-model="queryParams.endTime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+        >
+        </el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('ss')}}</el-button>
@@ -189,6 +161,8 @@
         // 查询参数
         queryParams: {
           pageNum: 1,
+          startTime:"",
+          endTime:"",
           pageSize: 10,
           operIp: undefined,
           title: undefined,
@@ -200,15 +174,28 @@
     },
     created() {
       this.usertoken= this.$store.state.user.usertoken;
+      var  date = new Date();
+      this.queryParams.endTime=this.getNowDateTime(date);
+      date.setHours(date.getHours() - 168);
+      this.queryParams.startTime=this.getNowDateTime(date);
       this.getList();
     },
     methods: {
+      getNowDateTime(date){
+        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();
+        var hours = date.getHours() < 10 ? "0" + date.getHours() : date.getHours();
+        var minutes = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes();
+        var seconds = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
+        return year + '-' + month + '-' + day + ' ' + hours+ ':' + minutes + ':' + seconds;
+      },
       /** 查询登录日志 */
       getList() {
         this.queryParams.token=this.usertoken;
         this.queryParams.type="listCzrzQuery";
         this.loading = true;
-        logInformation(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
+        logInformation(this.queryParams).then( response => {
           this.list = response.data;
         this.total = response.total;
         this.loading = false;
@@ -261,7 +248,7 @@
       handleExport() {
         this.queryParams.token=this.usertoken;
         this.queryParams.type ="exportCzrz";
-        var url=window.location.origin+"/pdu/logInformation?token="+this.usertoken+"&type=exportCzrz";
+        var url=window.location.origin+"/pdu/logInformation?token="+this.usertoken+"&type=exportCzrz&startTime="+this.queryParams.startTime+"&endTime="+this.queryParams.endTime;
         window.open(url,'_blank');
       //   this.download('pdu/logInformation', {
       //     ...this.queryParams

web/安德森/src/views/rzxx/yxrz/index.vue

@@ -1,16 +1,21 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="auto">
-      <el-form-item :label="this.$t('rq')">
-        <el-date-picker
-          v-model="dateRange"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          :start-placeholder="this.$t('el.datepicker.startDate')"
-          :end-placeholder="this.$t('el.datepicker.endDate')"
-        ></el-date-picker>
+      <el-form-item :label="this.$t('startTime')" prop="startTime">
+        <el-date-picker clearable
+                        v-model="queryParams.startTime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item :label="this.$t('endTime')" prop="endTime">
+        <el-date-picker clearable
+                        v-model="queryParams.endTime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+        >
+        </el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('ss')}}</el-button>
@@ -41,9 +46,9 @@
     <!--</el-row>-->
     <el-card style="min-height: 600px ;border-radius: 15px">
     <el-table max-height="600"  :data="list"   :header-cell-style="{ background:'#FFFFFF',color:'#000000'}" >
-      <el-table-column :label="this.$t('rq')" align="center" prop="alarmDate"  width="150"   />
-      <el-table-column :label="this.$t('sj')" align="center" prop="alarmTime"  width="150"   />
-      <el-table-column :label="this.$t('lx')" align="center" prop="type" width="150" :show-overflow-tooltip="true" />
+      <el-table-column :label="this.$t('rq')" align="center" prop="alarmDate"  width="250"   />
+      <!--<el-table-column :label="this.$t('sj')" align="center" prop="alarmTime"  width="150"   />-->
+      <el-table-column :label="this.$t('lx')" align="center" prop="type" width="250" :show-overflow-tooltip="true" />
       <el-table-column :label="this.$t('nrms')" align="center" prop="content" :show-overflow-tooltip="true" />
     </el-table>
     </el-card>
@@ -86,6 +91,8 @@
         defaultSort: {prop: 'loginTime', order: 'descending'},
         // 查询参数
         queryParams: {
+          startTime:"",
+          endTime:"",
           pageNum: 1,
           pageSize: 10,
           ipaddr: undefined,
@@ -96,15 +103,28 @@
     },
     created() {
       this.usertoken= this.$store.state.user.usertoken;
+      var  date = new Date();
+      this.queryParams.endTime=this.getNowDateTime(date);
+      date.setHours(date.getHours() - 168);
+      this.queryParams.startTime=this.getNowDateTime(date);
       this.getList();
     },
     methods: {
+      getNowDateTime(date){
+        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();
+        var hours = date.getHours() < 10 ? "0" + date.getHours() : date.getHours();
+        var minutes = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes();
+        var seconds = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
+        return year + '-' + month + '-' + day + ' ' + hours+ ':' + minutes + ':' + seconds;
+      },
       /** 查询登录日志列表 */
       getList() {
         this.queryParams.token=this.usertoken;
         this.queryParams.type="listYxrzQuery";
         this.loading = true;
-        logInformation(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        logInformation(this.queryParams).then(response => {
           this.list = response.data;
         this.total = response.total;
         this.loading = false;
@@ -147,7 +167,7 @@
       handleExport() {
         this.queryParams.token=this.usertoken;
         this.queryParams.type ="exportYxrz";
-        var url=window.location.origin+"/pdu/logInformation?token="+this.usertoken+"&type=exportYxrz";
+        var url=window.location.origin+"/pdu/logInformation?token="+this.usertoken+"&type=exportYxrz&startTime="+this.queryParams.startTime+"&endTime="+this.queryParams.endTime;
         window.open(url,'_blank');
 
       //   this.download('pdu/logInformation', {

web/安德森/src/views/sbwh/pzdrdc/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
 
     <el-col :span="24" class="card-box">
-      <el-tabs v-model="tabName" type="card" @tab-click="handleClick" >
+      <el-tabs v-model="tabName" type="card" >
         <el-tab-pane :label="this.$t('cgqpz')" name="tab1">
           <el-card style="min-height: 700px ;border-radius: 15px">
             <el-row :gutter="10" class="mb8">
@@ -13,7 +13,7 @@
                   icon="el-icon-upload"
                   size="mini"
                   @click="handleImport('2')"
-                >{{$t('dr')}}</el-button>
+                >{{this.$t('cgqpz')}}{{$t('dr')}}</el-button>
               </el-col>
               <el-col :span="1.5">
                 <el-button
@@ -22,7 +22,7 @@
                   icon="el-icon-download"
                   size="mini"
                   @click="handleExport('2')"
-                >{{$t('dc')}}</el-button>
+                >{{this.$t('cgqpz')}}{{$t('dc')}}</el-button>
               </el-col>
             </el-row>
           </el-card>
@@ -39,7 +39,7 @@
                   size="mini"
                   @click="handleImport('0')"
                   v-hasPermi="['tool:gen:import']"
-                >{{$t('dr')}}</el-button>
+                >{{this.$t('gjyzpz')}}{{$t('dr')}}</el-button>
               </el-col>
               <el-col :span="1.5">
                 <el-button
@@ -49,7 +49,7 @@
                   size="mini"
                   @click="handleExport('0')"
                   v-hasPermi="['system:dict:export']"
-                >{{$t('dc')}}</el-button>
+                >{{this.$t('gjyzpz')}}{{$t('dc')}}</el-button>
               </el-col>
             </el-row>
 
@@ -66,7 +66,7 @@
                   size="mini"
                   @click="handleImport('1')"
                   v-hasPermi="['tool:gen:import']"
-                >{{$t('dr')}}</el-button>
+                >{{this.$t('fwglpz')}}{{$t('dr')}}</el-button>
               </el-col>
               <el-col :span="1.5">
                 <el-button
@@ -76,7 +76,7 @@
                   size="mini"
                   @click="handleExport('1')"
                   v-hasPermi="['system:dict:export']"
-                >{{$t('dc')}}</el-button>
+                >{{this.$t('fwglpz')}}{{$t('dc')}}</el-button>
               </el-col>
             </el-row>
           </el-card>
@@ -92,7 +92,7 @@
                   size="mini"
                   @click="handleImport('3')"
                   v-hasPermi="['tool:gen:import']"
-                >{{$t('dr')}}</el-button>
+                >{{this.$t('xtpz')}}{{$t('dr')}}</el-button>
               </el-col>
               <el-col :span="1.5">
                 <el-button
@@ -102,7 +102,7 @@
                   size="mini"
                   @click="handleExport('3')"
                   v-hasPermi="['system:dict:export']"
-                >{{$t('dc')}}</el-button>
+                >{{this.$t('xtpz')}}{{$t('dc')}}</el-button>
               </el-col>
             </el-row>
           </el-card>
@@ -206,6 +206,10 @@
     },
 
     methods: {
+      handleClick(tab, event) {
+        this.tabName=tab.name;
+        alert(tab.name)
+      },
       // 导入前校验
       beforeAvatarUpload(file) {
         var name= file.name.split('.')[1].toLowerCase() ;

web/安德森/src/views/txgl/wifisz/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
 
     <el-row>
-      <el-col :span="12" class="card-box">
+      <el-col :span="8" class="card-box">
         <el-card>
           <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> {{$t('WIFIsz')}}</span>
           </div>
@@ -27,9 +27,9 @@
           </div>
         </el-card>
       </el-col>
-      <el-col :span="12" class="card-box">
+      <el-col :span="8" class="card-box">
         <el-card>
-          <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> {{$t('IPsz')}}</span>
+          <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> {{$t('IPV4sz')}}</span>
           </div>
 
           <div class="el-table el-table--enable-row-hover el-table--medium">
@@ -43,12 +43,12 @@
                   </el-select>
                 </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-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-form-item>-->
                 <el-form-item     :label="'IP '+this.$t('dz')" prop="ipaddress">
                   <el-input :disabled="showClass" v-model="form.ipaddress"   />
                 </el-form-item>
@@ -77,50 +77,50 @@
           </div>
         </el-card>
       </el-col>
-      <!--<el-col :span="8" class="card-box">-->
-      <!--<el-card>-->
-      <!--<div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> {{$t('IPV6sz')}}</span>-->
-      <!--</div>-->
-
-      <!--<div class="el-table el-table&#45;&#45;enable-row-hover el-table&#45;&#45;medium">-->
-      <!--<template cellspacing="0" style="width: 100%;">-->
-      <!--<el-form ref="form2" :model="form2"  :rules="rules3" label-width="auto">-->
-
-      <!--<el-form-item   :label="this.$t('xzms')" prop="mode">-->
-      <!--<el-select style="width: 100%" v-model="form2.mode"   @change="handleSelectChange2"  allow-create   clearable filterable>-->
-      <!--<el-option v-for="item in modes" :key="item.id" :label="$t(item.name)" :value="item.id">-->
-      <!--</el-option>-->
-      <!--</el-select>-->
-      <!--</el-form-item>-->
-
-      <!--<el-form-item   :label="'IPV6 '+this.$t('dz')" prop="ipaddress">-->
-      <!--<el-input  :disabled="showClass2" v-model="form2.ipaddress"   />-->
-      <!--</el-form-item>-->
-
-      <!--<el-form-item     :label="this.$t('zwym2')" prop="mask">-->
-      <!--<el-input :disabled="showClass2" v-model="form2.mask"    />-->
-      <!--</el-form-item>-->
-
-      <!--<el-form-item     :label="this.$t('wg')" prop="gateway">-->
-      <!--<el-input :disabled="showClass2" v-model="form2.gateway"    />-->
-      <!--</el-form-item>-->
-      <!--<el-form-item     label="DNS1:" prop="dns1">-->
-      <!--<el-input :disabled="showClass2" v-model="form2.dns1"    />-->
-      <!--</el-form-item>-->
-      <!--<el-form-item    label="DNS2:" prop="dns2">-->
-      <!--<el-input :disabled="showClass2" v-model="form2.dns2"    />-->
-      <!--</el-form-item>-->
-      <!--&lt;!&ndash;<el-form-item   label="MAC:" prop="mac">&ndash;&gt;-->
-      <!--&lt;!&ndash;<el-input v-model="form.mac"    />&ndash;&gt;-->
-      <!--&lt;!&ndash;</el-form-item>&ndash;&gt;-->
-      <!--</el-form>-->
-      <!--<div slot="footer" style="float: right;" class="dialog-footer">-->
-      <!--<el-button type="primary" @click="submitForm2">{{$t('qd')}}</el-button>-->
-      <!--</div>-->
-      <!--</template>-->
-      <!--</div>-->
-      <!--</el-card>-->
-      <!--</el-col>-->
+      <el-col :span="8" class="card-box">
+        <el-card>
+          <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> {{$t('IPV6sz')}}</span>
+          </div>
+
+          <div class="el-table el-table--enable-row-hover el-table--medium">
+            <template cellspacing="0" style="width: 100%;">
+              <el-form ref="form2" :model="form2"  :rules="rules3" label-width="auto">
+
+                <el-form-item   :label="this.$t('xzms')" prop="mode">
+                  <el-select style="width: 100%" v-model="form2.mode"   @change="handleSelectChange2"  allow-create   clearable filterable>
+                    <el-option v-for="item in modes" :key="item.id" :label="$t(item.name)" :value="item.id">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+
+                <el-form-item   :label="'IPV6 '+this.$t('dz')" prop="ipaddress">
+                  <el-input  :disabled="showClass2" v-model="form2.ipaddress"   />
+                </el-form-item>
+
+                <el-form-item     :label="this.$t('zwym2')" prop="mask">
+                  <el-input :disabled="showClass2" v-model="form2.mask"    />
+                </el-form-item>
+
+                <el-form-item     :label="this.$t('wg')" prop="gateway">
+                  <el-input :disabled="showClass2" v-model="form2.gateway"    />
+                </el-form-item>
+                <el-form-item     label="DNS1:" prop="dns1">
+                  <el-input :disabled="showClass2" v-model="form2.dns1"    />
+                </el-form-item>
+                <el-form-item    label="DNS2:" prop="dns2">
+                  <el-input :disabled="showClass2" v-model="form2.dns2"    />
+                </el-form-item>
+                <!--<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>
+              </div>
+            </template>
+          </div>
+        </el-card>
+      </el-col>
     </el-row>
 
   </div>
@@ -189,9 +189,9 @@
       setTimeout(()=>{
         this.queryIp();
     },1000) ;
-      // setTimeout(()=>{
-      //   this.queryIp2();
-      // },1500)
+      setTimeout(()=>{
+        this.queryIp2();
+    },1500)
     },
     methods: {
 
@@ -299,7 +299,7 @@
           if (valid) {
             const params={};
             params.token=this.usertoken;
-            params.type=this.form.type;
+            params.type="WIFIIPV4Save";
             params.mode=this.form.mode;
             params.ipaddress=this.form.ipaddress;
             params.mask=this.form.mask;

web/安德森/src/views/txgl/wksz/index.vue

@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="12" class="card-box">
         <el-card>
-          <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> {{$t('IPsz')}}</span>
+          <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> {{$t('IPV4sz')}}</span>
           </div>
 
           <div class="el-table el-table--enable-row-hover el-table--medium">
@@ -17,12 +17,12 @@
                     </el-option>
                   </el-select>
                 </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-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-form-item>-->
                 <el-form-item    :label="'IP '+this.$t('dz')" prop="ipaddress">
                   <el-input :disabled="showClass" v-model="form.ipaddress"   />
                 </el-form-item>
@@ -51,50 +51,50 @@
           </div>
         </el-card>
       </el-col>
-      <!--<el-col :span="12" class="card-box">-->
-      <!--<el-card>-->
-      <!--<div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> {{$t('IPV6sz')}}</span>-->
-      <!--</div>-->
+      <el-col :span="12" class="card-box">
+        <el-card>
+          <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> {{$t('IPV6sz')}}</span>
+          </div>
 
-      <!--<div class="el-table el-table&#45;&#45;enable-row-hover el-table&#45;&#45;medium">-->
-      <!--<template cellspacing="0" style="width: 100%;">-->
-      <!--<el-form ref="form2" :model="form2" :rules="rules2"  label-width="auto">-->
+          <div class="el-table el-table--enable-row-hover el-table--medium">
+            <template cellspacing="0" style="width: 100%;">
+              <el-form ref="form2" :model="form2" :rules="rules2"  label-width="auto">
 
-      <!--<el-form-item   :label="this.$t('xzms')" prop="mode">-->
-      <!--<el-select style="width: 100%" v-model="form2.mode"   @change="handleSelectChange2"  allow-create   clearable :filterable="false">-->
-      <!--<el-option v-for="item in modes" :key="item.id" :label="$t(item.name)" :value="item.id">-->
-      <!--</el-option>-->
-      <!--</el-select>-->
-      <!--</el-form-item>-->
+                <el-form-item   :label="this.$t('xzms')" prop="mode">
+                  <el-select style="width: 100%" v-model="form2.mode"   @change="handleSelectChange2"  allow-create   clearable :filterable="false">
+                    <el-option v-for="item in modes" :key="item.id" :label="$t(item.name)" :value="item.id">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
 
-      <!--<el-form-item    :label="'IPV6 '+this.$t('dz')" prop="ipaddress">-->
-      <!--<el-input  :disabled="showClass2"  v-model="form2.ipaddress"   />-->
-      <!--</el-form-item>-->
+                <el-form-item    :label="'IPV6 '+this.$t('dz')" prop="ipaddress">
+                  <el-input  :disabled="showClass2"  v-model="form2.ipaddress"   />
+                </el-form-item>
 
-      <!--<el-form-item    :label="this.$t('zwym2')" prop="mask">-->
-      <!--<el-input  :disabled="showClass2"  v-model="form2.mask"    />-->
-      <!--</el-form-item>-->
+                <el-form-item    :label="this.$t('zwym2')" prop="mask">
+                  <el-input  :disabled="showClass2"  v-model="form2.mask"    />
+                </el-form-item>
 
-      <!--<el-form-item    :label="this.$t('wg')" prop="gateway">-->
-      <!--<el-input  :disabled="showClass2"  v-model="form2.gateway"    />-->
-      <!--</el-form-item>-->
-      <!--<el-form-item     label="DNS1:" prop="dns1">-->
-      <!--<el-input  :disabled="showClass2"  v-model="form2.dns1"    />-->
-      <!--</el-form-item>-->
-      <!--<el-form-item     label="DNS2:" prop="dns2">-->
-      <!--<el-input    :disabled="showClass2"  v-model="form2.dns2"    />-->
-      <!--</el-form-item>-->
-      <!--&lt;!&ndash;<el-form-item   label="MAC:" prop="mac">&ndash;&gt;-->
-      <!--&lt;!&ndash;<el-input v-model="form.mac"    />&ndash;&gt;-->
-      <!--&lt;!&ndash;</el-form-item>&ndash;&gt;-->
-      <!--</el-form>-->
-      <!--<div slot="footer" style="float: right;" class="dialog-footer">-->
-      <!--<el-button type="primary" @click="submitForm2">{{$t('qd')}}</el-button>-->
-      <!--</div>-->
-      <!--</template>-->
-      <!--</div>-->
-      <!--</el-card>-->
-      <!--</el-col>-->
+                <el-form-item    :label="this.$t('wg')" prop="gateway">
+                  <el-input  :disabled="showClass2"  v-model="form2.gateway"    />
+                </el-form-item>
+                <el-form-item     label="DNS1:" prop="dns1">
+                  <el-input  :disabled="showClass2"  v-model="form2.dns1"    />
+                </el-form-item>
+                <el-form-item     label="DNS2:" prop="dns2">
+                  <el-input    :disabled="showClass2"  v-model="form2.dns2"    />
+                </el-form-item>
+                <!--<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>
+              </div>
+            </template>
+          </div>
+        </el-card>
+      </el-col>
     </el-row>
 
   </div>
@@ -154,9 +154,9 @@
     created() {
       this.usertoken= this.$store.state.user.usertoken;
       this.queryIp();
-      // setTimeout(()=>{
-      //   this.queryIp2();
-      // },1000)
+      setTimeout(()=>{
+        this.queryIp2();
+    },1000)
     },
     methods: {
 
@@ -250,7 +250,7 @@
           if (valid) {
             const params={};
             params.token=this.usertoken;
-            params.type=this.form.type;
+            params.type="WkIPV4Save";
             params.mode=this.form.mode;
             params.ipaddress=this.form.ipaddress;
             params.mask=this.form.mask;