Merge branch 'master' of http://jiecheng2024.tpddns.cn:3000/liyuezong/SmartPDUWebCode

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

@@ -239,7 +239,7 @@
         this.validate="1";
         this.$refs.multipleTable.toggleRowSelection(row)
         var aa=this;
-        this.$modal.confirm(this.$t('qdycqm')).then(function() {
+        this.$modal.confirm(this.$t('qrsjts')).then(function() {
 
           aa.$refs.upload.submit();
         }).then(() => {
@@ -259,7 +259,7 @@
         }
         this.validate="1";
         var aa=this;
-        this.$modal.confirm(this.$t('qdycqm')).then(function() {
+        this.$modal.confirm(this.$t('qrsjts')).then(function() {
           aa.$refs.upload.submit();
         }).then(() => {
 
@@ -310,7 +310,7 @@
         switch (command) {
           case "channelopen":
             params.type="sBRestart";
-            this.$modal.confirm(this.$t('qdycqm')).then(function() {
+            this.$modal.confirm(this.$t('qrsjts')).then(function() {
               controlBoardUpgrade(params);
             }).then(() => {
               //this.$modal.msgSuccess(this.$t('zxcg'));
@@ -380,7 +380,7 @@
             params.closeInterval=this.form.closeInterval;
             params.productId=this.form.productId;
             this.loading = true;
-            this.$modal.confirm(this.$t('qdybcm')).then(function() {
+            this.$modal.confirm(this.$t('qrsjts')).then(function() {
               serviceManagement(params).then(response => {
                 this.open = false;
               this.queryChannelStatus();

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

@@ -15,33 +15,33 @@
 
     </el-form>
     <el-card style="min-height: 700px ;border-radius: 15px">
-    <el-table max-height="700" ref="multipleTable"  :data="channelList"  @selection-change="handleSelectionChange"  :header-cell-style="{ background:'#FFFFFF',color:'#000000'}">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column align="center" :label="this.$t('sbmc')" prop="productName"  />
-      <el-table-column align="center" label="产品ID"   prop="productId"  />
-      <el-table-column align="center" :label="this.$t('kzbh')" prop="productNumber"  />
-      <el-table-column align="center" :label="this.$t('tdsl')" prop="productChNumber" :show-overflow-tooltip="true"   />
-      <el-table-column align="center" :label="this.$t('gjbbh')" prop="productVersion" :show-overflow-tooltip="true"   />
-
-      <el-table-column align="center" :label="this.$t('sjrq')" prop="upgradeDate" :show-overflow-tooltip="true"   />
-      <el-table-column align="center" :label="this.$t('dqzt')" prop="status" :show-overflow-tooltip="true"   >
-        <template slot-scope="scope">
-          <span v-if="scope.row.status=='0'" style="color: red">{{getDity(scope.row,'status')}}</span>
-          <span v-else-if="scope.row.status=='1'" style="color: green">{{getDity(scope.row,'status')}}</span>
-          <span v-else style="color: #FFD966">{{getDity(scope.row,'status')}}</span>
-
-        </template>
-      </el-table-column>
-      <el-table-column :label="this.$t('cz')" align="center"  class-name="smfirmwareDateall-padding fixed-width">
-        <template slot-scope="scope" >
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleUpdate(scope.row)"
-          >{{$t('sej')}}</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+      <el-table max-height="700" ref="multipleTable"  :data="channelList"  @selection-change="handleSelectionChange"  :header-cell-style="{ background:'#FFFFFF',color:'#000000'}">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column align="center" :label="this.$t('sbmc')" prop="productName"  />
+        <el-table-column align="center" label="产品ID"   prop="productId"  />
+        <el-table-column align="center" :label="this.$t('kzbh')" prop="productNumber"  />
+        <el-table-column align="center" :label="this.$t('tdsl')" prop="productChNumber" :show-overflow-tooltip="true"   />
+        <el-table-column align="center" :label="this.$t('gjbbh')" prop="productVersion" :show-overflow-tooltip="true"   />
+
+        <el-table-column align="center" :label="this.$t('sjrq')" prop="upgradeDate" :show-overflow-tooltip="true"   />
+        <el-table-column align="center" :label="this.$t('dqzt')" prop="status" :show-overflow-tooltip="true"   >
+          <template slot-scope="scope">
+            <span v-if="scope.row.status=='0'" style="color: red">{{getDity(scope.row,'status')}}</span>
+            <span v-else-if="scope.row.status=='1'" style="color: green">{{getDity(scope.row,'status')}}</span>
+            <span v-else style="color: #FFD966">{{getDity(scope.row,'status')}}</span>
+
+          </template>
+        </el-table-column>
+        <el-table-column :label="this.$t('cz')" align="center"  class-name="smfirmwareDateall-padding fixed-width">
+          <template slot-scope="scope" >
+            <el-button
+              size="mini"
+              type="text"
+              @click="handleUpdate(scope.row)"
+            >{{$t('sej')}}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
     </el-card>
     <!-- 编辑通道-->
     <!-- 用户导入对话框 -->
@@ -51,17 +51,17 @@
           <el-input :readonly="true" :disabled="true"  v-model="form.productId" />
         </el-form-item>
         <!--<el-form-item   :label="this.$t('bbh')" prop="productVersion">-->
-          <!--<el-input  v-model="form.productVersion" />-->
+        <!--<el-input  v-model="form.productVersion" />-->
         <!--</el-form-item>-->
 
       </el-form>
       <el-upload
-           ref="upload"
+        ref="upload"
         :limit="1"
         :action="upload.url + '?productId=' + this.productId+'&type=importData&token='+this.usertoken"
-           accept=".bin, .hex"
+        accept=".bin, .hex"
         :disabled="upload.isUploading"
-           :on-change="beforeUpload"
+        :on-change="beforeUpload"
         :on-progress="handleFileUploadProgress"
         :on-success="handleFileSuccess"
         :auto-upload="false"
@@ -79,15 +79,15 @@
       </div>
     </el-dialog>
     <el-dialog :title="title" class="dialogClass" style="overflow-y: auto;" :visible.sync="open"  width="500px" :close-on-click-modal="false" :close-on-press-escape="false" append-to-body>
-        <el-col style="height: 500px;overflow-y: auto;"  >
-          <el-card  >
-            <el-collapse accordion v-model="activeNames">
-              <el-collapse-item  v-for="(item, index) in hisData" :name="index"  :title="item.productVersion+' -  '+item.versionDate">
-                  <li>{{item.updateContent}}</li>
-              </el-collapse-item>
-            </el-collapse>
-          </el-card>
-        </el-col>
+      <el-col style="height: 500px;overflow-y: auto;"  >
+        <el-card  >
+          <el-collapse accordion v-model="activeNames">
+            <el-collapse-item  v-for="(item, index) in hisData" :name="index"  :title="item.productVersion+' -  '+item.versionDate">
+              <li>{{item.updateContent}}</li>
+            </el-collapse-item>
+          </el-collapse>
+        </el-card>
+      </el-col>
 
     </el-dialog>
   </div>
@@ -160,7 +160,7 @@
     created() {
       console.log(window.location.origin)
       this.usertoken= this.$store.state.user.usertoken;
-    //  this.queryProductList();
+      //  this.queryProductList();
       this.handleQuery();
     },
     methods: {
@@ -216,7 +216,7 @@
         params.type= "listCbQuery";
         controlBoardUpgrade(params).then(response => {
           this.productList = response.data;
-        }).catch(() => {});
+      }).catch(() => {});
       },
       /** 导入按钮操作 */
       handleImport(row) {
@@ -239,7 +239,7 @@
         this.validate="1";
         this.$refs.multipleTable.toggleRowSelection(row)
         var aa=this;
-        this.$modal.confirm(this.$t('qdycqm')).then(function() {
+        this.$modal.confirm(this.$t('qrsjts')).then(function() {
 
           aa.$refs.upload.submit();
         }).then(() => {
@@ -259,13 +259,13 @@
         }
         this.validate="1";
         var aa=this;
-        this.$modal.confirm(this.$t('qdycqm')).then(function() {
+        this.$modal.confirm(this.$t('qrsjts')).then(function() {
           aa.$refs.upload.submit();
         }).then(() => {
 
         }).catch(() => {});
 
-  },
+      },
       beforeUpload(file){
         if(this.validate==""){
           var name= file.name.split('.')[1].toLowerCase() ;
@@ -289,7 +289,7 @@
         this.$modal.alert( response.msg);
         this.cancel();
         this.$refs.multipleTable.clearSelection();
-      //  this.handleQuery();
+        //  this.handleQuery();
       },
 // 提交上传文件
       submitFileForm() {
@@ -310,7 +310,7 @@
         switch (command) {
           case "channelopen":
             params.type="sBRestart";
-            this.$modal.confirm(this.$t('qdycqm')).then(function() {
+            this.$modal.confirm(this.$t('qrsjts')).then(function() {
               controlBoardUpgrade(params);
             }).then(() => {
               //this.$modal.msgSuccess(this.$t('zxcg'));
@@ -329,11 +329,11 @@
         this.queryParams.token=this.usertoken;
         this.queryParams.type="listCbQuery";
         this.loading = true;
-       // console.log(this.queryParams)
-          controlBoardUpgrade(this.queryParams).then(response => {
-            this.channelList = response.data;
+        // console.log(this.queryParams)
+        controlBoardUpgrade(this.queryParams).then(response => {
+          this.channelList = response.data;
         this.$refs.multipleTable.toggleAllSelection();
-        }).catch(() => {});
+      }).catch(() => {});
         this.loading = false;
       },
 
@@ -357,9 +357,9 @@
         // console.log(this.queryParams)
         controlBoardUpgrade(params).then(response => {
           if(response.data!=null){
-              this.hisData=response.data;
-          }
-         // this.channelList = response.data;
+          this.hisData=response.data;
+        }
+        // this.channelList = response.data;
       }).catch(() => {});
         this.loading = false;
         this.open = true;
@@ -380,7 +380,7 @@
             params.closeInterval=this.form.closeInterval;
             params.productId=this.form.productId;
             this.loading = true;
-            this.$modal.confirm(this.$t('qdybcm')).then(function() {
+            this.$modal.confirm(this.$t('qrsjts')).then(function() {
               serviceManagement(params).then(response => {
                 this.open = false;
               this.queryChannelStatus();