迭代更新

Wenbo/web/src/utils/i18n/i18n-en-US.json

@@ -136,7 +136,7 @@
   "cgqlyz":"Sensor class threshold",
   "mc":"name",
   "bh":"number",
-  "dysxz":"Power limit value",
+  "dlsxz":"Current upper limit value",
   "dyasxxxz":"Voltage upper/lower limit value",
   "glsxz":"Power upper limit value",
   "hdlsxz":"Upper limit of power consumption",
@@ -231,7 +231,7 @@
   "czsj":"TIME",
   "czlx":"Operation type",
   "czdz":"Operation address",
-  "czdd":"Operation location",
+  "czdd":"Operation content",
   "czzt":"Operational state",
   "czrq":"Operation date",
   "czmk":"operation module",

Wenbo/web/src/utils/i18n/i18n-ru-RU.json

@@ -137,7 +137,7 @@
   "cgqlyz":"Порог класса датчиков",
   "mc":"Имя",
   "bh":"Номер",
-  "dysxz":"Верхний предел мощности",
+  "dlsxz":"Верхний предел тока",
   "dyasxxxz":"Верхний / нижний предел напряжения",
   "glsxz":"Верхний предел мощности",
   "hdlsxz":"Верхний предел энергопотребления",
@@ -233,7 +233,7 @@
   "czsj":"Время работы",
   "czlx":"Тип операции",
   "czdz":"Адрес операции",
-  "czdd":"Место проведения операций",
+  "czdd":"Содержание операции",
   "czzt":"Режим работы",
   "czrq":"Дата операции",
 

Wenbo/web/src/utils/i18n/i18n-zh-CN.json

@@ -140,7 +140,7 @@
   "cgqlyz":"传感器类阈值",
   "mc":"名称",
   "bh":"编号",
-  "dysxz":"电源上限值",
+  "dlsxz":"电流上限值",
   "dyasxxxz":"电压上限/下限值",
   "glsxz":"功率上限值",
   "hdlsxz":"耗电量上限值",
@@ -236,7 +236,7 @@
   "czsj":"操作时间",
   "czlx":"操作类型",
   "czdz":"操作地址",
-  "czdd":"操作地点",
+  "czdd":"操作内容",
   "czzt":"操作状态",
   "czrq":"操作日期",
 

Wenbo/web/src/views/jgbh/fzsz/index.vue

@@ -16,7 +16,7 @@
 
             <el-table-column :label="this.$t('mc')" prop="productChName" width="130" />
             <el-table-column :label="this.$t('bh')" prop="productChId" :show-overflow-tooltip="true" width="100" />
-            <el-table-column :label="this.$t('dysxz')" prop="currentUpperValue" :show-overflow-tooltip="true" />
+            <el-table-column :label="this.$t('dlsxz')" prop="currentUpperValue" :show-overflow-tooltip="true" />
             <el-table-column :label="this.$t('dyasxxxz')+'(V)'" prop="thresholdValue" width="300"   >
               <template slot-scope="scope">
                 <span>{{$t('zdz')}}：{{ scope.row.voltageUpperValue}} / {{$t('zxz')}}：{{ scope.row.voltageDownValue}}</span>
@@ -24,7 +24,11 @@
             </el-table-column>
             <el-table-column :label="this.$t('glsxz')+'(W)'"   prop="powerUpperValue" :show-overflow-tooltip="true" />
             <el-table-column :label="this.$t('hdlsxz')+'(Kwh)'" prop="alarmContentUpperValue"  width="150"  :show-overflow-tooltip="true" />
-            <el-table-column :label="this.$t('zt')" prop="productChStatus" width="80"  :show-overflow-tooltip="true" />
+            <el-table-column :label="this.$t('zt')" prop="productChStatus" width="80"  :show-overflow-tooltip="true" >
+              <template slot-scope="scope">
+                <span>{{getDity(scope.row,'productChStatus')}}</span>
+              </template>
+            </el-table-column>
             <el-table-column :label="this.$t('cz')" align="center"  class-name="small-padding fixed-width">
               <template slot-scope="scope" >
                 <el-button
@@ -64,44 +68,62 @@
           <el-table height="600"   :data="sensorThresholdList" :header-cell-style="{ background:'#FFFFFF',color:'#000000'}">
             <el-table-column :label="this.$t('cgqxh')" prop="sensorId" :show-overflow-tooltip="true" width="120" />
             <el-table-column :label="this.$t('cgqmc')" prop="sensorName" :show-overflow-tooltip="true" />
-            <el-table-column :label="$t('lx')" prop="sensorType" width="140" >
+            <el-table-column :label="$t('cgq')+$t('lx')" prop="sensorType" width="140" >
               <template slot-scope="scope">
                 <span>{{getDity(scope.row,'sensorType')}}</span>
               </template>
 
             </el-table-column>
-            <el-table-column :label="this.$t('ljzt')" align="center" prop="connectionStatus" />
+            <el-table-column :label="$t('yz')+$t('lx')" prop="thresholdType" width="100" />
+            <el-table-column :label="this.$t('ljzt')" align="center" prop="connectionStatus" >
+              <template slot-scope="scope">
+                <span>{{getDity(scope.row,'connectionStatus')}}</span>
+              </template>
+
+            </el-table-column>
             <el-table-column :label="this.$t('sznr')" align="center" prop="thresholdValue" />
             <el-table-column :label="this.$t('dw')" align="center" prop="unit" />
             <el-table-column :label="this.$t('cz')" align="center" width="130" class-name="small-padding fixed-width">
               <template slot-scope="scope" >
-                <el-button v-if="scope.row.sensorType=='0' || scope.row.sensorType=='4'  || scope.row.sensorType=='4' "
+                <el-button v-if="scope.row.sensorType=='0' || scope.row.sensorType=='4'  || scope.row.sensorType=='5' "
                   size="mini"
                   type="text"
                   icon="el-icon-edit"
                   @click="sensorStatusUpdate(scope.row)"
                 >{{$t('pz')}}</el-button>
 
-                <el-button v-if="scope.row.sensorType==='1' "
+                <el-button v-if="scope.row.sensorType=='1' "
                            size="mini"
                            type="text"
                            icon="el-icon-refresh"
                            @click="issueInstructionsReset(scope.row)"
                 >{{$t('fw')}}</el-button>
-                <el-button v-if="scope.row.sensorType==='3'"
+                <el-button v-if="scope.row.sensorType=='3'"
                            size="mini"
                            type="text"
                            icon="el-icon-refresh"
                            @click="issueInstructionsRelease(scope.row)"
                 >{{$t('sf')}}</el-button>
-                <el-dropdown 	  v-if="scope.row.sensorType==='6'"  style="margin-left:10px" size="mini" @command="(command) => sensorStatusHandleCommand(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">
-                    <el-dropdown-item v-if="scope.row.connectionStatus == '0'" command="sensorStatusclose" style="margin-left: 10px">{{$t('gb')}}</el-dropdown-item>
-                    <el-dropdown-item v-if="scope.row.connectionStatus == '1'" command="sensorStatusopen" style="margin-left: 10px">{{$t('kq')}}</el-dropdown-item>
-                  </el-dropdown-menu>
+                <el-button v-if="scope.row.sensorType=='6' && scope.row.connectionStatus == '0'"
+                           size="mini"
+                           type="text"
+                           icon="el-icon-refresh"
+                           @click="sensorStatusHandleCommand('sensorStatusclose', scope.row)"
+                >{{$t('gb')}}</el-button>
+                <el-button v-if="scope.row.sensorType=='6' && scope.row.connectionStatus == '1'"
+                           size="mini"
+                           type="text"
+                           icon="el-icon-refresh"
+                           @click="sensorStatusHandleCommand('sensorStatusopen', scope.row)"
+                >{{$t('kq')}}</el-button>
+                <!--<el-dropdown 	  v-if="scope.row.sensorType=='6'"  style="margin-left:10px" size="mini" @command="(command) => sensorStatusHandleCommand(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">-->
+                    <!--<el-dropdown-item v-if="scope.row.connectionStatus == '0'" command="sensorStatusclose" style="margin-left: 10px">{{$t('gb')}}</el-dropdown-item>-->
+                    <!--<el-dropdown-item v-if="scope.row.connectionStatus == '1'" command="sensorStatusopen" style="margin-left: 10px">{{$t('kq')}}</el-dropdown-item>-->
+                  <!--</el-dropdown-menu>-->
 
-                </el-dropdown>
+                <!--</el-dropdown>-->
               </template>
             </el-table-column>
           </el-table>
@@ -111,45 +133,45 @@
     </el-col>
 
     <!-- 编辑通道-->
-    <el-dialog :title="title" :visible.sync="open" width="750px" :close-on-click-modal="false" :close-on-press-escape="false" append-to-body>
-      <el-form ref="form" :model="form"  label-width="140px">
-        <el-row :span="20">
-          <el-col :span="12">
+    <el-dialog :title="title" :visible.sync="open" width="450px" :close-on-click-modal="false" :close-on-press-escape="false" append-to-body>
+      <el-form ref="form" :model="form"  label-width="150px">
+        <el-row :span="22">
+          <el-col >
         <el-form-item v-if="false"  :label="this.$t('dylx')" prop="dyType">
           <el-input :readonly="true" :disabled="true"  v-model="form.dyType" />
         </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col >
         <el-form-item :label="this.$t('mc')" prop="productChName">
           <el-input v-model="form.productChName" :disabled="true" :readonly="true" />
         </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col >
         <el-form-item v-if="false" :label="this.$t('bh')" prop="productChId">
           <el-input v-model="form.productChId" :disabled="true" :readonly="true"  />
         </el-form-item>
           </el-col>
-          <el-col :span="12">
-        <el-form-item :label="this.$t('dysxz')+'(A)'" prop="currentUpperValue">
+          <el-col >
+        <el-form-item :label="this.$t('dlsxz')+'(A)'" prop="currentUpperValue">
           <el-input v-model="form.currentUpperValue"  type="number"/>
         </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col >
         <el-form-item :label="this.$t('dysxz')+'(V)'" prop="voltageUpperValue">
           <el-input v-model="form.voltageUpperValue" type="number"/>
         </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col >
         <el-form-item :label="this.$t('dyxxz')+'(V)'" prop="voltageDownValue">
           <el-input v-model="form.voltageDownValue" type="number" />
         </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col >
         <el-form-item :label="this.$t('glsxz')+'(W)'" prop="powerUpperValue">
           <el-input v-model="form.powerUpperValue" type="number"/>
         </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col >
         <el-form-item :label="this.$t('hdlsxz')+'(Kwh)'" prop="alarmContentUpperValue">
           <el-input v-model="form.alarmContentUpperValue" type="number"/>
         </el-form-item>
@@ -162,36 +184,46 @@
       </div>
     </el-dialog>
     <!-- 配制传感器-->
-    <el-dialog :title="sensorStatusTitle" :visible.sync="sensorStatusOpen" width="750px" append-to-body>
-      <el-form  ref="sensorStatusForm" :model="sensorStatusForm"  label-width="140px">
-        <el-row :span="20">
-          <el-col :span="12">
+    <el-dialog :title="sensorStatusTitle" :visible.sync="sensorStatusOpen" width="450px" append-to-body>
+      <el-form  ref="sensorStatusForm" :model="sensorStatusForm"  label-width="150px">
+        <el-row :span="22">
+          <el-col >
             <el-form-item v-if="false" :label="this.$t('xuh')" prop="sensorId">
               <el-input   :readonly="true" :disabled="true"  v-model="sensorStatusForm.sensorId" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col>
             <el-form-item :label="this.$t('mc')" prop="sensorName">
               <el-input v-model="sensorStatusForm.sensorName" :readonly="true" :disabled="true" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item v-if="false"  :label="this.$t('lx')"  prop="sensorType">
+          <el-col >
+            <el-form-item  v-if="false"  :label="this.$t('cgq')+this.$t('lx')"  prop="sensorType">
               <el-input v-model="sensorStatusForm.sensorType" :readonly="true" :disabled="true" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col >
+            <el-form-item    :label="this.$t('cgq')+this.$t('lx')"  prop="sensorTypeName">
+              <el-input v-model="sensorStatusForm.sensorTypeName" :readonly="true" :disabled="true" />
+            </el-form-item>
+          </el-col>
+          <el-col >
+            <el-form-item :label="$t('yz')+$t('lx')" prop="thresholdType">
+              <el-input v-model="sensorStatusForm.thresholdType" :readonly="true" :disabled="true"/>
+            </el-form-item>
+          </el-col>
+          <el-col>
             <el-form-item :label="this.$t('dw')" prop="unit">
               <el-input v-model="sensorStatusForm.unit" :readonly="true" :disabled="true"/>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col>
             <el-form-item :label="this.$t('zxz')" prop="thresholdDownValue">
               <el-input v-model="sensorStatusForm.thresholdDownValue" type="number"/>
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
+          <el-col >
             <el-form-item :label="this.$t('zdz')" prop="thresholdUpperValue">
               <el-input v-model="sensorStatusForm.thresholdUpperValue" type="number" />
             </el-form-item>
@@ -250,7 +282,11 @@
         sensorStatusOpen: false, // 配置传感器
         sensorStatusTitle: '',
         sensorStatusTabs:[{"id":"0","name":"wsdcgq"},{"id":"1","name":"ywcgq"},{"id":"2","name":"sqcgq"},{"id":"3","name":"mjcgq"},{"id":"4","name":"qtcgq"},{"id":"5","name":"qyqlcgq"},{"id":"6","name":"ktcgq"}],
-        dyTypes: [{"id":"0","name":"shib"},{"id":"1","name":"td"}]
+        dyTypes: [{"id":"0","name":"shib"},{"id":"1","name":"td"}],
+        // 在线/离线
+        connectionStatuss:[{"id":"0","name":"zx"},{"id":"1","name":"lix"}],
+        // 通道状态
+        productChStatuss:[{"id":"0","name":"duank"},{"id":"1","name":"jt"}],
       };
     },
     created() {
@@ -264,7 +300,10 @@
         var name="";
         var id="";
         var formTrain=[];
-        if(type=='accessControlStatus'){
+        if(type=='productChStatus'){
+          formTrain=this.productChStatuss
+          id=row.productChStatus
+        }else  if(type=='accessControlStatus'){
           formTrain=this.accessControlStatuss
           id=row.accessControlStatus
         }else if(type=='alarmStatus'){
@@ -304,6 +343,12 @@
       /** 传感器按钮操作 */
       sensorStatusUpdate(row) {
         this.sensorStatusForm =row;
+        for (var i = 0; i < this.sensorStatusTabs.length; i++) {
+          let item = this.sensorStatusTabs[i]
+          if (row.sensorType== item.id) {
+          this.sensorStatusForm.sensorTypeName=this.$t(item.name);
+          }
+        }
         this.sensorStatusOpen = true;
         this.sensorStatusTitle = this.$t('pz');
       },
@@ -568,6 +613,7 @@
             const params={};
             params.token=this.usertoken;
             params.sensorType=this.sensorStatusForm.sensorType;
+            params.thresholdType=this.sensorStatusForm.thresholdType;
             params.sensorId=this.sensorStatusForm.sensorId;
             params.sensorName=this.sensorStatusForm.sensorName;
             params.comSlogan=this.sensorStatusForm.comSlogan;

Wenbo/web/src/views/rzxx/czrz/index.vue

@@ -81,14 +81,14 @@
       <!--<el-table-column label="日志编号" align="center" prop="operId" />-->
       <el-table-column :label="this.$t('xtmk')" align="center" prop="title" :show-overflow-tooltip="true" />
       <el-table-column :label="this.$t('czry')" align="center" prop="operName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
-      <el-table-column :label="this.$t('czdz')" align="center" prop="operIp" :show-overflow-tooltip="true" />
+      <el-table-column :label="this.$t('czdz')" align="center" prop="operIp" v-if="false" :show-overflow-tooltip="true" />
       <el-table-column :label="this.$t('czdd')" align="center" prop="operLocation" :show-overflow-tooltip="true" />
       <el-table-column :label="this.$t('czrq')" align="center" prop="operTime"  sortable="custom" :sort-orders="['descending', 'ascending']">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.operTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="this.$t('xhsj')" align="center" prop="costTime"  :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']">
+      <el-table-column :label="this.$t('xhsj')" v-if="false" align="center" prop="costTime"  :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']">
         <template slot-scope="scope">
           <span>{{ scope.row.costTime }}{{$t('hm')}}</span>
         </template>
@@ -200,7 +200,7 @@
         this.queryParams.type="listCzrzQuery";
         this.loading = true;
         logInformation(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
-          this.list = response.rows;
+          this.list = response.data;
         this.total = response.total;
         this.loading = false;
       }

Wenbo/web/src/views/rzxx/yxrz/index.vue

@@ -97,7 +97,7 @@
         this.queryParams.type="listYxrzQuery";
         this.loading = true;
         logInformation(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.list = response.rows;
+          this.list = response.data;
         this.total = response.total;
         this.loading = false;
       }

Wenbo/web/src/views/sensor/sensorStatus/index.vue

@@ -25,17 +25,17 @@
           <el-table-column   v-if="false" :label="$t('sbbh')" prop="productNumber"  />
           <el-table-column label="设备id" v-if="false" prop="productId"  />
           <el-table-column :label="$t('cgqxh')" prop="sensorId" v-if="false" :show-overflow-tooltip="true"   />
-          <el-table-column :label="$t('cgqmc')" prop="sensorName"  width="170"   :show-overflow-tooltip="true"   />
+          <el-table-column :label="$t('cgqmc')" prop="sensorName"     :show-overflow-tooltip="true"   />
           <el-table-column :label="$t('lx')" prop="sensorType" width="170"  >
             <template slot-scope="scope">
               <span>{{getDity(scope.row,'sensorType')}}</span>
             </template>
 
           </el-table-column>
-          <el-table-column :label="'COM'+$t('kh')" prop="comSlogan"  width="120" />
-          <el-table-column :label="$t('cgqsjtd')" width="170"  prop="cgqtd" />
-          <el-table-column :label="'MOSBUS'+$t('dz')" prop="sensorAddr" width="150"  align="center"  />
-          <el-table-column :label="$t('btl')"  align="center" prop="sensorBaud" width="100"/>
+          <el-table-column :label="'COM'+$t('kh')" prop="comSlogan"    />
+          <el-table-column :label="$t('cgqsjtd')"  width="170"  prop="cgqtd" />
+          <el-table-column v-if="tab.id==='0' ||  tab.id==='1' ||  tab.id==='5' ||  tab.id==='6' " :label="'MOSBUS'+$t('dz')" prop="sensorAddr" width="150"  align="center"  />
+          <el-table-column v-if="tab.id==='0' ||  tab.id==='1' ||  tab.id==='5' ||  tab.id==='6' " :label="$t('btl')"  align="center" prop="sensorBaud" width="100"/>
           <el-table-column :label="$t('jdh')" align="center" prop="jdh" width="130"/>
           <el-table-column :label="$t('ljzt')" align="center" prop="connectionStatus" width="130">
 
@@ -244,7 +244,6 @@
         form: {},
         sensorStatusForm: {}, // 传感器表单数据
         channelLoadTypes:["空1调","服务器","交换机","路由器","计算机","显示器","灯","其他"],
-        connectionStatuss:["在线","离线"], // 传感器连接状态
 
         activeName: '0', // 当前激活的标签页的 name
         sensorStatusTabs:[{"id":"0","name":"wsdcgq"},{"id":"1","name":"ywcgq"},{"id":"2","name":"sqcgq"},{"id":"3","name":"mjcgq"},{"id":"4","name":"qtcgq"},{"id":"5","name":"qyqlcgq"},{"id":"6","name":"ktcgq"}],