2023-03-21 update

1. 调整部分lockType 和 controlType 的值传递
2. 调整矩阵中  rpm 和  左侧名称的显示.

.env.development

@@ -1,15 +1,16 @@
-VUE_APP_API=http://11.0.118.57:8100
-VUE_APP_WARNING=http://11.0.118.57:8075
-VUE_APP_SHARDINGURL=http://11.0.118.57:8075
-VUE_APP_ADAPTERURL=http://11.0.118.57:8011
-VUE_APP_APIS=11.0.118.57:8100
-VUE_APP_ADAPTERURLS=11.0.118.57:8011
+#VUE_APP_API=http://11.0.118.57:8100
+#VUE_APP_WARNING=http://11.0.118.57:8075
+#VUE_APP_SHARDINGURL=http://11.0.118.57:8075
+#VUE_APP_ADAPTERURL=http://11.0.118.57:8011
+#VUE_APP_APIS=11.0.118.57:8100
+#VUE_APP_ADAPTERURLS=11.0.118.57:8011
+
 VUE_APP_ENV=SX
 #SX 山西 / HB 河北
 
-#VUE_APP_API=http://192.168.10.18:8099
-#VUE_APP_WARNING=http://192.168.10.18:8075
-#VUE_APP_SHARDINGURL=http://192.168.10.18:8075
-#VUE_APP_ADAPTERURL=http://192.168.10.18:8011
-#VUE_APP_APIS=192.168.10.18:8099
-#VUE_APP_ADAPTERURLS=192.168.10.18:8011
+VUE_APP_API=http://192.168.10.12:8099
+VUE_APP_WARNING=http://192.168.10.12:8075
+VUE_APP_SHARDINGURL=http://192.168.10.12:8075
+VUE_APP_ADAPTERURL=http://192.168.10.12:8011
+VUE_APP_APIS=192.168.10.12:8099
+VUE_APP_ADAPTERURLS=192.168.10.12:8011

src/components/BasicInformationDetail.vue

@@ -613,8 +613,8 @@ export default {
             stationId: item.stationId,
             projectId: item.projectId,
             modelId: item.modelId,
-            controlType: item.controlType,
-            lockType: item.lockType,
+            controlType: item.controlType+'',
+            lockType: Number(item.lockType)>=9? '8' : item.lockType+'',
             userName: `system_${bd.LoginUser.name}`,
             userId: 0,
           };

src/components/allMatrices.vue

@@ -600,8 +600,8 @@ export default {
             stationId: item.stationId,
             projectId: item.projectId,
             modelId: item.modelId,
-            controlType: item.controlType,
-            lockType: item.lockType,
+            controlType: item.controlType+'',
+            lockType: Number(item.lockType)>=9? '8' : item.lockType+'',
             userName: `system_${bd.LoginUser.name}`,
             userId: 0,
             auto: false,

src/components/control/areaCard.vue

@@ -539,8 +539,8 @@ export default {
             stationId: item.stationId,
             projectId: item.projectId,
             modelId: item.modelId,
-            controlType: item.controlType,
-            lockType: item.lockType,
+            controlType: item.controlType+'',
+            lockType: Number(item.lockType)>=9? '8' : item.lockType+'',
             userName: `system_${bd.LoginUser.name}`,
             userId: 0,
             auto: this.current === 0 ? true : false,

src/components/control/controlAllArea.vue

@@ -594,7 +594,7 @@ export default {
             projectId: item.projectId,
             modelId: item.modelId,
             controlType: item.controlType + '',
-            lockType: item.lockType + '',
+            lockType: Number(item.lockType)>=9? '8' : item.lockType+'',
             userName: `system_${bd.LoginUser.name}`,
             userId: 0,
             auto: false,
@@ -641,8 +641,8 @@ export default {
             stationId: item.stationId,
             projectId: item.projectId,
             modelId: item.modelId,
-            controlType: item.controlType + '',
-            lockType: item.lockType + '',
+            controlType: item.controlType,
+            lockType: item.lockType,
             userName: `system_${bd.LoginUser.name}`,
             userId: 0,
           };

src/components/matrixBlock.vue

@@ -22,10 +22,9 @@
         <div
           :class="item.active ? 'left-' + item.status : 'unleft-' + item.status"
         >
-          <div>{{ getName(item, 'top') }}</div>
-          <div>{{ getName(item, 'bot') }}</div>
-          <!-- <div>{{ item.windturbineId.slice(0, 2) }}</div>
-        <div>{{ item.code }}</div> -->
+          <!-- <div>{{ getName(item, 'top') }}</div>
+          <div>{{ getName(item, 'bot') }}</div> -->
+          <div>{{ item.code }}</div>
         </div>
         <div
           :class="
@@ -39,7 +38,7 @@
           <div class="rightrow">
             {{
               item.modelId.indexOf("105") >= 0
-                ? (item.rollSpeed * 9.55).toFixed(2)
+                ? (item.rollSpeed).toFixed(2)
                 : item.rollSpeed.toFixed(2)
             }}
             rpm

src/components/matrixBlockPv.vue

@@ -23,10 +23,9 @@
         <div
           :class="item.active ? 'left-' + item.status : 'unleft-' + item.status"
         >
-          <div>{{ getName(item, 'top') }}</div>
-          <div>{{ getName(item, 'bot') }}</div>
-          <!-- <div>{{ item.windturbineId.slice(0, 2) }}</div>
-        <div>{{ item.code }}</div> -->
+          <!-- <div>{{ getName(item, 'top') }}</div>
+          <div>{{ getName(item, 'bot') }}</div> -->
+          <div>{{ item.code }}</div>
         </div>
         <div
           :class="

src/components/temperatureMatrix.vue

@@ -454,8 +454,8 @@ export default {
             stationId: item.stationId,
             projectId: item.projectId,
             modelId: item.modelId,
-            controlType: Number(msg.controlType),
-            lockType: item.lockType,
+            controlType: msg.controlType+'',
+            lockType: Number(item.lockType)>=9? '8' : item.lockType+'',
             userName: `system_${bd.LoginUser.name}`,
             userId: 0,
             auto: false,

src/components/unpaidMatrixBlock.vue

@@ -15,10 +15,9 @@
               item.active ? 'left-' + item.status : 'unleft-' + item.status
             "
           >
-            <div>{{ item.windturbineId.slice(0, 2) }}</div>
-            <div>{{ item.windturbineId.slice(5) }}</div>
             <!-- <div>{{ item.windturbineId.slice(0, 2) }}</div>
-            <div>{{ item.code }}</div> -->
+            <div>{{ item.windturbineId.slice(5) }}</div> -->
+            <div>{{ item.code }}</div>
           </div>
           <div
             :class="
@@ -32,7 +31,7 @@
             <div class="rightrow">
               {{
                 item.modelId.indexOf("105") >= 0
-                  ? (item.rollSpeed * 9.55).toFixed(2)
+                  ? (item.rollSpeed).toFixed(2)
                   : item.rollSpeed.toFixed(2)
               }}
               rpm

src/components/unpaidMatrixBlockPv.vue

@@ -15,11 +15,9 @@
               item.active ? 'left-' + item.status : 'unleft-' + item.status
             "
           >
-            <div style="white-space:nowrap">{{ getName(item, 'top') }}</div>
-            <div style="white-space:nowrap">{{ getName(item, 'bot') }}</div><!-- item.id.slice(5) -->
-
-            <!-- <div>{{ item.windturbineId.slice(0, 2) }}</div>
-            <div>{{ item.code }}</div> -->
+            <!-- <div style="white-space:nowrap">{{ getName(item, 'top') }}</div>
+            <div style="white-space:nowrap">{{ getName(item, 'bot') }}</div> -->
+            <div>{{ item.code }}</div>
           </div>
           <div
             :class="

src/utils/BackgroundData.js

@@ -300,8 +300,8 @@ export default class BackgroundData {
                 stationId: wb.stationId,
                 projectId: wb.projectId,
                 modelId: wb.modelId,
-                controlType: wb.controlType,
-                lockType: wb.lockType,
+                controlType: wb.controlType+'',
+                lockType: Number(wb.lockType)>=9? '8' : wb.lockType+'',
                 userName: automatic?'system_'+this.LoginUser.name:this.LoginUser.name,
                 userId: this.LoginUser.id,
             };
@@ -322,8 +322,8 @@ export default class BackgroundData {
                 stationId: wb.stationId,
                 projectId: wb.projectId,
                 modelId: wb.modelId,
-                controlType: wb.controlType,
-                lockType: wb.lockType,
+                controlType: wb.controlType+'',
+                lockType: Number(wb.lockType)>=9? '8' : wb.lockType+'',
                 userName: 'system',
                 userId: 0,
             };