0604

package.json

@@ -3,8 +3,8 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "serve": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
+    "serve": "vue-cli-service serve",
-    "build": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
+    "build": "vue-cli-service build",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {

src/views/view/index.vue

@@ -2623,9 +2623,12 @@ export default {
                 json.imgUrl = './lib/icon/131.png'
               } else if(item.rotationDirection == '封道'){
                 json.imgUrl = './lib/icon/133.png'
-              } else if(item.rotationDirection == '左转'){
+              } else if(item.rotationDirection == '正向左转'){
                 json.imgUrl = './lib/icon/135.png'
               }
+            //   else if(item.rotationDirection == '反向左转'){
+            //     json.imgUrl = './lib/icon/135.png'
+            //   }
             }else if(item.direction == 1){ //上行
               if(item.rotationDirection == null || item.rotationDirection == '正向通行'){
                 json.imgUrl = './lib/icon/131.png'
@@ -2633,9 +2636,56 @@ export default {
                 json.imgUrl = './lib/icon/132.png'
               } else if(item.rotationDirection == '封道'){
                 json.imgUrl = './lib/icon/133.png'
-              } else if(item.rotationDirection == '左转'){
+              } else if(item.rotationDirection == '正向左转'){
                 json.imgUrl = './lib/icon/134.png'
               }
+            //   else if(item.rotationDirection == '反向左转'){
+            //     json.imgUrl = './lib/icon/134.png'
+            //   }
+            }
+          }
+          //风机
+                     if(item.deviceType == 11){   //车道指示灯 根据状态 展示不同方向的图片  direction  2是下行左箭头 1是上行右箭头
+            // console.log(item,item.direction,'xxxxxxxxxx')
+            if(item.direction == 2){ //下行
+              if(item.rotationDirection == null || item.rotationDirection == '正转'){
+                json.imgUrl = './lib/icon/112.gif'
+              }else if(item.rotationDirection == '反转'){
+                json.imgUrl = './lib/icon/111.gif'
+              } else if(item.rotationDirection == '停止'){
+                json.imgUrl = './lib/icon/11.png'
+              }
+
+            }else if(item.direction == 1){ //上行
+              if(item.rotationDirection == null || item.rotationDirection == '正转'){
+                json.imgUrl = './lib/icon/112.gif'
+              }else if(item.rotationDirection == '反转'){
+                json.imgUrl = './lib/icon/111.gif'
+              } else if(item.rotationDirection == '停止'){
+                json.imgUrl = './lib/icon/11.png'
+              }
+            }
+          }
+          //交通信号灯
+                         if(item.deviceType == 14){   //车道指示灯 根据状态 展示不同方向的图片  direction  2是下行左箭头 1是上行右箭头
+            // console.log(item,item.direction,'xxxxxxxxxx')
+            if(item.direction == 2){ //下行
+              if(item.rotationDirection == null || item.rotationDirection == '变绿灯'){
+                json.imgUrl = './lib/icon/143.png'
+              }else if(item.rotationDirection == '变黄灯'){
+                json.imgUrl = './lib/icon/142.png'
+              } else if(item.rotationDirection == '变红灯'){
+                json.imgUrl = './lib/icon/141.png'
+              }
+
+            }else if(item.direction == 1){ //上行
+              if(item.rotationDirection == null || item.rotationDirection == '变绿灯'){
+                json.imgUrl = './lib/icon/143.png'
+              }else if(item.rotationDirection == '变黄灯'){
+                json.imgUrl = './lib/icon/142.png'
+              } else if(item.rotationDirection == '变红灯'){
+                json.imgUrl = './lib/icon/141.png'
+              }
             }
           }
           json.position = {
@@ -3783,8 +3833,9 @@ export default {
             {
               id: '2',
               name: '封道',
-            } /*{id: '3', name: '正向转向'},{id: '4', name: '反向转向'}*/,
+            }, {id: '3', name: '正向左转'}
-            { id: '3', name: '左转' },
+            // ,{id: '4', name: '反向左转'},
+            // { id: '3', name: '左转' },
           ]
           } else {
             that.taskList = [
@@ -3804,7 +3855,8 @@ export default {
             {
               id: '2',
               name: '封道',
-            } /*{id: '3', name: '正向转向'},{id: '4', name: '反向转向'}*/,
+            },
+            //  {id: '3', name: '正向左转'},{id: '4', name: '反向左转'},
             { id: '3', name: '左转' },
           ]
           } else {
@@ -3837,7 +3889,7 @@ export default {
           .catch(error => {
             console.error('Error fetching device status:', error);
           });
-      } else if (that.dataForm.deviceType == '26' || that.dataForm.deviceType == '27'){
+      } else if (that.dataForm.deviceType == '26' || that.dataForm.deviceType == '27'|| that.dataForm.deviceType == '28'){
         //风速风向和covi展示的
         getIotDeviceStatus({
           deviceId: that.dataForm.deviceId,
@@ -3855,6 +3907,9 @@ export default {
                 }else if(json.covi && that.dataForm.deviceType == '26'){ // 风速风向
                   that.$set(that.dataForm, 'speed26', json.covi.fs)
                   that.$set(that.dataForm, 'direction26', json.covi.fx)
+                }else if(json.covi && that.dataForm.deviceType == '28'){ // 光强
+                  that.$set(that.dataForm, 'light28', json.covi.BD)
+                //   that.$set(that.dataForm, 'direction26', json.covi.BD)
                 }
               }
             }
@@ -4411,7 +4466,8 @@ export default {
             that.multipleSelection.forEach((item) => {
               let operationInstruction = ""
               if(that.dataForm.deviceType == '13'){
-                operationInstruction = json.command==0 ? '正向通行' : json.command==1 ? '反向通行' : json.command==2 ? '封道' : json.command==3 ? '左转' : ''
+                // operationInstruction = json.command==0 ? '正向通行' : json.command==1 ? '反向通行' : json.command==2 ? '封道' : json.command==3 ? '正向左转' : json.command==4 ? '反向左转': ''
+                operationInstruction = json.command==0 ? '正向通行' : json.command==1 ? '反向通行' : json.command==2 ? '封道' : json.command==3 ? '正向左转' : ''
               } else if(that.dataForm.deviceType == '14'){
                 operationInstruction = json.command==1 ? '变红' : json.command==2 ? '变黄' : json.command==3 ? '变绿' : ''
               } else if (that.dataForm.deviceType == '11') {
@@ -4451,7 +4507,8 @@ export default {
           if(that.dataForm.deviceType == '13' || that.dataForm.deviceType == '14' || that.dataForm.deviceType == '11' || that.dataForm.deviceType == '19' ){
             let operationInstruction =''
             if(that.dataForm.deviceType == '13'){
-              operationInstruction = json.command==0 ? '正向通行' : json.command==1 ? '反向通行' : json.command==2 ? '封道' : json.command==3 ? '左转' : ''
+            //   operationInstruction = json.command==0 ? '正向通行' : json.command==1 ? '反向通行' : json.command==2 ? '封道' : json.command==3 ? '正向左转' :json.command==4 ? '反向左转' : ''
+              operationInstruction = json.command==0 ? '正向通行' : json.command==1 ? '反向通行' : json.command==2 ? '封道' : json.command==3 ? '正向左转'  : ''
             } else if(that.dataForm.deviceType == '14'){
               operationInstruction = json.command==1 ? '变红' : json.command==2 ? '变黄' : json.command==3 ? '变绿' : ''
             } else if (that.dataForm.deviceType == '11') { // 风机

vue.config.js

@@ -14,6 +14,7 @@ module.exports = {
         //本地服务接口地址
         // target: 'http://link.ser99.vip:8080/zhongkai',
         target: 'http://65.73.11.246:7774',
+        // target: 'http://172.16.1.155:8009',
         // target: 'http://172.16.1.162:8233',
         // target: 'http://192.168.13.138:8233',
         // target: 'http://172.16.1.113:8012',
@@ -26,6 +27,7 @@ module.exports = {
       '/xjIotApi': {
         //集采  
         target: 'http://65.73.11.246:8083',
+        //  target: 'http://172.16.1.155:8080',
         ws: true,
         https: true,
         pathRewrite: {
@@ -35,6 +37,7 @@ module.exports = {
       '/iotApi': {
         //平台
         target: 'http://65.73.11.246:8090',
+        // target: 'http://172.16.1.155:8080',
         ws: true,
         https: true,
         pathRewrite: {