ads

web/安德森/src/layout/components/Navbar.vue

@@ -179,6 +179,7 @@ export default {
       this.$i18n.locale = this.chooseLanguage;
       // 修改页面标题
       document.title = (this.$i18n.t('loginFormTitle')).replace("PDU","");
+      window.location.reload();
     },
     handleBianJi(){
       this.$router.push({ path: "/jgbh/xtjg"}).catch(()=>{});

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

@@ -421,7 +421,15 @@
   "VPNsz":"VPN settings",
   "WIFIsz":"WIFI settings",
   "gjnr":"Alarm content",
-  "cgqmc":"Sensor name"
+  "cgqmc":"Sensor name",
+  "SMTPsz":"SMTP settings",
+  "SNMPsz":"SNMP settings",
+  "NTPsz":"NTP settings",
+  "fwztsz":"Service status settings",
+  "Telnetsz":"Telnet settings",
+  "mqbcts":"The maximum number of brokers is limited to 5",
+  "zs":"certificate",
+  "zssc":"Certificate upload"
 
 
 

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

@@ -422,5 +422,13 @@
   "VPNsz":"Настройки VPN",
   "WIFIsz":"Настройки WIFI",
   "gjnr":"Описание",
-  "cgqmc":"Тип датчика"
+  "cgqmc":"Тип датчика",
+  "SMTPsz":"Настройки SMTP",
+  "SNMPsz":"Настройки SNMP",
+  "NTPsz":"Настройки NTP",
+  "fwztsz":"HастройKи CTaTyc сервиса",
+  "Telnetsz":"Настройки Telnet",
+  "mqbcts":"Максимальное количество брокеров ограничено пятью",
+  "zs":"Сертификат",
+  "zssc":"Загрузка сертификата"
 }

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

@@ -422,7 +422,15 @@
   "VPNsz":"VPN设置",
   "WIFIsz":"WIFI设置",
   "gjnr":"告警内容",
-  "cgqmc":"传感器名称"
+  "cgqmc":"传感器名称",
+  "SMTPsz":"SMTP设置",
+  "SNMPsz":"SNMP设置",
+  "NTPsz":"NTP设置",
+  "fwztsz":"服务状态设置",
+  "Telnetsz":"Telnet设置",
+  "mqbcts":"broker最大数量限定为5个",
+  "zs":"证书",
+  "zssc":"证书上传"
 
 
 

web/安德森/src/views/fwgl/dxsz/index.vue

@@ -10,7 +10,7 @@
             <template cellspacing="0" style="width: 100%;">
               <el-form ref="form" :model="form" :rules="rules" label-width="auto"  >
 
-                <el-form-item :required="true"  :label="this.$t('zt')" prop="mode">
+                <el-form-item   :label="this.$t('zt')" prop="mode">
                   <el-select style="width: 100%" v-model="form.mode"   @change="handleSelectChange"  allow-create   clearable :filterable="false">
                     <el-option v-for="item in modes" :key="item.id" :label="$t(item.name)" :value="item.id">
                     </el-option>

web/安德森/src/views/fwgl/mqsz/index.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="auto">
-      <el-form-item :label="this.$t('fwzt')+this.$t('sz')" prop="serverName">
-        <el-select style="width: 100%" v-model="mode"   @change="handleSelectChange"   ref="multiSelect">
-          <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('fwzt')+this.$t('sz')" prop="serverName">-->
+        <!--<el-select style="width: 100%" v-model="mode"   @change="handleSelectChange"   ref="multiSelect">-->
+          <!--<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>
         <el-button type="primary"   icon="el-icon-plus"  size="mini" @click="sensorStatusAdd">{{$t('xz')}}</el-button>
       </el-form-item>
@@ -35,6 +35,7 @@
       <el-table-column :label="this.$t('dk2')" :min-width="getStringWidth(this.$t('dk2'))" prop="port" :show-overflow-tooltip="true"  />
       <el-table-column :label="this.$t('yhm2')" :min-width="getStringWidth(this.$t('yhm2'))" prop="yhm" :show-overflow-tooltip="true"  />
       <el-table-column :label="this.$t('formPassword')" :min-width="getStringWidth(this.$t('formPassword'))" prop="mm"     />
+      <el-table-column :label="this.$t('zs')" :min-width="getStringWidth(this.$t('zs'))" prop="zs"     />
       <el-table-column   :label="this.$t('ljzt')" :min-width="getStringWidth(this.$t('ljzt'))"  align="center" prop="ljzt" >
         <template slot-scope="scope">
           <span v-if="scope.row.ljzt=='2'" style="color: red">{{getDity(scope.row,'ljzt')}}</span>
@@ -49,6 +50,12 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
           >{{$t('xg')}}</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-upload"
+            @click="handleImport(scope.row)"
+          >{{$t('zssc')}}</el-button>
           <el-dropdown    style="margin-left:10px" size="mini" @command="(command) => mqttCommand(command, scope.row)" >
             <el-button icon="el-icon-d-arrow-right" size="mini" type="text" style="margin-left: 10px">{{$t('gd')}}</el-button>
             <el-dropdown-menu slot="dropdown">
@@ -94,7 +101,37 @@
         <el-button @click="cancel">{{$t('qx')}}</el-button>
       </div>
     </el-dialog>
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" :close-on-click-modal="false" :close-on-press-escape="false" append-to-body>
+      <el-form ref="form3" :model="form3"  label-width="auto">
+        <el-form-item v-if="false"  :label="this.$t('lx')" prop="uploadType">
+          <el-input  :readonly="true" v-model="form3.uploadType" />
+        </el-form-item>
+
 
+      </el-form>
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".*"
+        :action="upload.url + '?idx=' + form3.uploadType+'&type=importData&token='+this.usertoken"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :before-upload="beforeAvatarUpload"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">{{$t('drts')}}<em>{{$t('djsc')}}</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <span>{{$t('bcts')}}</span>
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">{{$t('qd')}}</el-button>
+        <el-button @click="upload.open = false">{{$t('qx')}}</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -118,6 +155,7 @@
         open: false,
         // 通道配置表单参数
         form: {},
+        form3: {},
         channelLoadTypes:["空调","服务器","交换机","路由器","计算机","显示器","灯","其他"],
         modes:[{"id":"0","name":"gb"},{"id":"1","name":"kq"}],
         ljzts:[{"id":"1","name":"ylj"},{"id":"2","name":"wlj"}],
@@ -131,6 +169,16 @@
         usertoken:"",
         mode:"",
         mode2:"",
+        upload: {
+          // 是否显示弹出层（用户导入）
+          open: false,
+          // 弹出层标题（用户导入）
+          title: "",
+          // 是否禁用上传
+          isUploading: false,
+          // 上传的地址
+          url: window.location.origin+"/pdu/serviceManagementUpload"
+        }
       };
     },
     created() {
@@ -139,6 +187,35 @@
       this.queryChannelStatus2(); // 查询状态
     },
     methods: {
+      beforeAvatarUpload(file) {
+        if(file==null){
+          this.$modal.msgSuccess(this.$t('zxcg'));
+        }
+      },
+
+      /** 导入按钮操作 */
+      handleImport(row) {
+          this.upload.title = this.$t('zssc'); // todo
+        this.upload.open = true;
+        this.form3.uploadType =row.idx;
+      },
+
+// 文件上传中处理
+      handleFileUploadProgress(event, file, fileList) {
+        this.upload.isUploading = true;
+      },
+// 文件上传成功处理
+      handleFileSuccess(response, file, fileList) {
+        this.upload.open = false;
+        this.upload.isUploading = false;
+        this.$refs.upload.clearFiles();
+        this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", this.$t("drjg"), { dangerouslyUseHTMLString: true });
+        this.handleQuery();
+      },
+// 提交上传文件
+      submitFileForm() {
+        this.$refs.upload.submit();
+      },
       getStringWidth(text) {
         //console.log('text', text)
         const font = '14px Arial'
@@ -243,6 +320,7 @@
         serviceManagement(this.queryParams).then(response => {
           this.mode = response.data.mode;
           this.mode2 = response.data.mode;
+
       }).catch(() => {});
         this.loading = false;
       },
@@ -267,6 +345,7 @@
         serviceManagement(this.queryParams).then(response => {
           if(response.data!=null){
           this.channelList = response.data;
+          this.total= response.data.length;
           }
 
       }).catch(() => {});
@@ -274,6 +353,10 @@
       },
       //新增传感器
       sensorStatusAdd(){
+        if( this.total>=5){
+          this.$modal.alert(this.$t('mqbcts'));
+          return;
+        }
         this.form ={};
         this.open = true;
         this.title = this.$t('xz');

web/安德森/src/views/fwgl/ntpsz/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> NTP {{$t('sz')}}</span>
+          <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i>  {{$t('NTPsz')}}</span>
           </div>
 
           <div class="el-table el-table--enable-row-hover el-table--medium">

web/安德森/src/views/fwgl/smtpsz/index.vue

@@ -4,7 +4,7 @@
       <el-col :span="14" class="card-box">
 
         <el-card>
-          <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> SMTP{{$t('sz')}}</span>
+          <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> {{$t('SMTPsz')}}</span>
           </div>
 
           <div class="el-table el-table--enable-row-hover el-table--medium">

web/安德森/src/views/fwgl/snmpsz/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> SNMP {{$t('sz')}}</span>
+          <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i>  {{$t('SNMPsz')}}</span>
           </div>
 
           <div class="el-table el-table--enable-row-hover el-table--medium">

web/安德森/src/views/fwgl/telnetsz/index.vue

@@ -3,14 +3,14 @@
     <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> Telnet{{$t('sz')}}</span>
+          <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> {{$t('Telnetsz')}}</span>
           </div>
 
           <div class="el-table el-table--enable-row-hover el-table--medium">
             <template cellspacing="0" style="width: 100%;">
               <el-form ref="form" :model="form" :rules="rules" label-width="auto"  >
 
-                <el-form-item :required="true" :label="this.$t('zt')" prop="mode">
+                <el-form-item   :label="this.$t('zt')" prop="mode">
                   <el-select style="width: 100%" v-model="form.mode"   @change="handleSelectChange"  allow-create   clearable :filterable="false">
                     <el-option v-for="item in modes" :key="item.id" :label="$t(item.name)" :value="item.id">
                     </el-option>

web/安德森/src/views/power/channelstatus/index.vue

@@ -29,8 +29,8 @@
       <el-table-column label="设备id" v-if="false" prop="productId"   />
       <el-table-column fixed  :label="this.$t('tdmc')" :min-width="getStringWidth(this.$t('tdmc'))"  prop="productChName"   />
       <el-table-column fixed  :label="this.$t('tdh')" :min-width="getStringWidth(this.$t('tdh'))"  prop="productChId" :show-overflow-tooltip="true"   />
-  <el-table-column  align="center"  :label="this.$t('MACadress')" :min-width="getStringWidth(this.$t('MACadress'))+50"  prop="MACadress" :show-overflow-tooltip="true"   />
-  <el-table-column align="center"   :label="this.$t('IPadress')" :min-width="getStringWidth(this.$t('IPadress'))+50"  prop="IPadress" :show-overflow-tooltip="true"   />
+  <!--<el-table-column  align="center"  :label="this.$t('MACadress')" :min-width="getStringWidth(this.$t('MACadress'))+50"  prop="MACadress" :show-overflow-tooltip="true"   />-->
+  <!--<el-table-column align="center"   :label="this.$t('IPadress')" :min-width="getStringWidth(this.$t('IPadress'))+50"  prop="IPadress" :show-overflow-tooltip="true"   />-->
 
       <el-table-column :label="this.$t('sxxx')" :min-width="getStringWidth(this.$t('sxxx'))"  prop="productPhOrder" :show-overflow-tooltip="true"   >
         <template slot-scope="scope">
@@ -260,7 +260,8 @@
         // 通道状态
         productChStatuss:[{"id":"0","name":"duank"},{"id":"1","name":"jt"},{"id":"-1","name":"lix"}],
         //3相类型
-        productPhOrders:[{"id":"L1","name":"sxax"},{"id":"L2","name":"sxbx"},{"id":"L3","name":"sxcx"},],
+        // productPhOrders:[{"id":"L1","name":"sxax"},{"id":"L2","name":"sxbx"},{"id":"L3","name":"sxcx"},],
+        productPhOrders:[{"id":"L1","name":"L1"},{"id":"L2","name":"L2"},{"id":"L3","name":"L3"},],
         // 输出类型
         outputTypes:[{"id":"1","name":"sx"},{"id":"2","name":"dx"}],
         // 输出状态
@@ -339,7 +340,7 @@
         this.outOpen=true;
       },
       objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-        if (columnIndex === 0 || columnIndex === 1  || columnIndex === 2 || columnIndex === 3 || columnIndex === 4 || columnIndex === 10 || columnIndex === 11 || columnIndex === 12 || columnIndex === 13 || columnIndex === 14 || columnIndex === 15 || columnIndex === 16 || columnIndex === 17 || columnIndex === 18 || columnIndex === 19 || columnIndex === 20  || columnIndex === 21 || columnIndex === 22  || columnIndex === 23 ) {
+        if (columnIndex === 0 || columnIndex === 1  || columnIndex === 2  || columnIndex === 8 || columnIndex === 9 || columnIndex === 10 || columnIndex === 11 || columnIndex === 12 || columnIndex === 13 || columnIndex === 14 || columnIndex === 15 || columnIndex === 16 || columnIndex === 17 || columnIndex === 18  || columnIndex === 19 || columnIndex === 20  || columnIndex === 21 ) {
 
           if (rowIndex % 3 === 0) {
             return {

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

@@ -150,7 +150,6 @@
         this.form =row;
       },
       beforeUpload(file){
-        alert(22)
 if(file==null){
   this.$modal.msgSuccess(this.$t('zxcg'));
 }
@@ -164,7 +163,7 @@ if(file==null){
         this.upload.open = false;
         this.upload.isUploading = false;
         this.$refs.upload.clearFiles();
-        this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+        this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", this.$t("drjg"), { dangerouslyUseHTMLString: true });
         this.handleQuery();
       },
 // 提交上传文件

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

@@ -98,7 +98,7 @@
         ref="upload"
         :limit="1"
         accept=".xml"
-        :action="upload.url + '?uploadType=' + form.uploadType+'&type=importData&token='+this.usertoken"
+        :action="upload.url + '?type=importData&token='+this.usertoken"
         :disabled="upload.isUploading"
         :on-progress="handleFileUploadProgress"
         :before-upload="beforeAvatarUpload"
@@ -211,7 +211,7 @@
         this.upload.open = false;
         this.upload.isUploading = false;
         this.$refs.upload.clearFiles();
-        this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", $t("drjg"), { dangerouslyUseHTMLString: true });
+        this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", this.$t("drjg"), { dangerouslyUseHTMLString: true });
         this.getList();
       },
 // 提交上传文件