openatc-components 0.2.39 → 0.2.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openatc-components",
-  "version": "0.2.39",
+  "version": "0.2.41",
   "description": "A Vue.js project",
   "author": "openatc developer",
   "private": false,

package/src/kisscomps/components/Stages/index.vue

@@ -28,18 +28,18 @@
                           :showWalk="item[0].peddirection"
                           :Width="'40'"
                           :Height="'40'" /> -->
-              <xdr-dir-selector Width="75PX" Height="75PX" Widths="65px" Heights="65px" :Data="showStyle" :Datas="showStyles" :showlist="dirListSetTheme(item)"></xdr-dir-selector>
-              <div style="height:80px;display:flex;flex-direction:row;justify-content:center;align-items:end;">
-                <div class="current-stage-num" style="width:20%;" :style="{color: themeColor}">{{index + 1}}</div>
+              <xdr-dir-selector :Width="dirWidth" :Height="dirHeight" :Widths="dirWidths" :Heights="dirHeights" :Data="showStyle" :Datas="showStyles" :showlist="dirListSetTheme(item)"></xdr-dir-selector>
+              <div style="display:flex;flex-direction:row;justify-content:center;align-items:end;" :style="{height: StageHeight}">
+                <div class="current-stage-num" style="width:20%;" :style="{color: themeColor, fontSize: numSize}">{{index + 1}}</div>
                 <div style="width:70%;">
-                  <i class="iconfont icon-feijidongche" :style="{color: themeColor}" style="font-size:11PX;color:#606266;margin-left:10PX" v-if="item[item.length-1].controltype === 6"></i>
-                  <i class="iconfont icon-lukouzhilu" :style="{color: themeColor2}" style="font-size:16PX;color:#454545;margin-left:10PX" v-if="item[item.length-1].controltype === 1"></i>
-                  <i class="iconfont icon-BRT" :style="{color: themeColor2}" style="font-size:11PX;color:#454545;margin-left:10PX" v-if="item[item.length-1].controltype === 4"></i>
+                  <i class="iconfont icon-feijidongche" :style="{color: themeColor, fontSize: iconSize}" style="font-size:11PX;color:#606266;margin-left:10PX" v-if="item[item.length-1].controltype === 6"></i>
+                  <i class="iconfont icon-lukouzhilu" :style="{color: themeColor2, fontSize: iconSize2}" style="font-size:16PX;color:#454545;margin-left:10PX" v-if="item[item.length-1].controltype === 1"></i>
+                  <i class="iconfont icon-BRT" :style="{color: themeColor2, fontSize: iconSize}" style="font-size:11PX;color:#454545;margin-left:10PX" v-if="item[item.length-1].controltype === 4"></i>
                   <div style="transform:scale(0.65);margin-left:10PX">
                     <i class="iconfont icon-xuxiangwei-xin" :style="{color: themeColor2}" style="font-size:5PX;color:#454545;" v-if="item[item.length-1].controltype === 99"></i>
                   </div>
-                  <i class="iconfont icon-gongjiaoche" :style="{color: themeColor}" style="font-size:11PX;color:#606266;margin-left:10PX" v-if="item[item.length-1].controltype === 3"></i>
-                  <i class="iconfont icon-youguidianche" :style="{color: themeColor}" style="font-size:11PX;color:#606266;margin-left:10PX" v-if="item[item.length-1].controltype === 5"></i>
+                  <i class="iconfont icon-gongjiaoche" :style="{color: themeColor, fontSize: iconSize}" style="font-size:11PX;color:#606266;margin-left:10PX" v-if="item[item.length-1].controltype === 3"></i>
+                  <i class="iconfont icon-youguidianche" :style="{color: themeColor, fontSize: iconSize}" style="font-size:11PX;color:#606266;margin-left:10PX" v-if="item[item.length-1].controltype === 5"></i>
                   <div v-if="presetStageIndex === index + 1" style="color:red;width:50px;position:absolute;right:0px;bottom:5px;font-size:11px;">{{presetText}}</div>
                 </div>
               </div>
@@ -105,18 +105,40 @@ export default {
     StageHeight: {
       type: String,
       default: '80px'
-    }
-  },
-  data () {
-    return {
-      showStyle:{
+    },
+    dirWidth: {
+      type: String,
+      default: '75PX'
+    },
+    dirHeight: {
+      type: String,
+      default: '75PX'
+    },
+    dirWidths: {
+      type: String,
+      default: '65PX'
+    },
+    dirHeights: {
+      type: String,
+      default: '65PX'
+    },
+    showStyle: {
+      type: Object,
+      default: () => ({
         top:'7PX',
         left:'13px'
-      },
-      showStyles:{
+      })
+    },
+    showStyles: {
+      type: Object,
+      default: () => ({
         top:'5PX',
         left:'12px'
-      },
+      })
+    }
+  },
+  data () {
+    return {
       presetStageIndex: -1,
       side: {key: 'pedphase1653818707546719', phaseid: 1, id: 1, name: '东人行横道'},
       // stagesList: [],
@@ -150,9 +172,38 @@ export default {
       return {
         zoom: this.zoom
       }
+    },
+    iconSize () {
+      const fontsize = parseInt(this.dirWidth.replace(/px$/, ""));
+      return fontsize / 75 * 11 + 'px'
+    },
+    iconSize2 () {
+      const fontsize = parseInt(this.dirWidth.replace(/px$/, ""));
+      return fontsize / 75 * 16 + 'px'
+    },
+    numSize () {
+      const fontsize = parseInt(this.dirWidth.replace(/px$/, ""));
+      const newfontsize = fontsize / 75 * 12
+      if (newfontsize < 10) {
+        return 10 + 'px'
+      } else {
+        return newfontsize + 'px'
+      }
     }
   },
   watch: {
+    // phaseList: {
+    //   handler: function (val, oldVal) {
+    //     console.log(val, 'phaseList')
+    //     // debugger
+    //   }
+    // },
+    // crossStatusData: {
+    //   handler: function (val, oldVal) {
+    //     console.log(val, 'crossStatusData')
+    //     // debugger
+    //   }
+    // },
     preselectStages: { 
       handler: function (val, oldVal) {
         if(this.preselectStages === -1 && this.preselectModel !== -1) {

package/src/kisscomps/components/XRDDirSelector/XRDDirSelector.vue

@@ -1034,7 +1034,9 @@ export default {
         for (let j = 0; j < this.peoplestatus.length; j++) {
           if (showlist[0].peddirection[i].name === this.peoplestatus[j].name) {
             this.peoplestatus[j].isshow = true
-            this.peoplestatus[j].color = showlist[0].peddirection[i].color
+            if (showlist[0].peddirection[i].color) {
+              this.peoplestatus[j].color = showlist[0].peddirection[i].color
+            }
           }
         }
       }

package/src/views/intersection.vue

@@ -144,7 +144,7 @@ export default {
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzE1NzM1NTU3NjcxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxNTc3ODc1NywiaWF0IjoxNzE1NzM1NTU3fQ.7ED5tQWYBpdv7HcBjZ_KSZprkcstns9ybCCwcrj5qZQ',
+      Token: 'eyJraWQiOiIxNzE1ODM5MzY0NDQ2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxNTg4MjU2NCwiaWF0IjoxNzE1ODM5MzY0fQ.WHWB7t9rw-GX8QkWq8TygTLSFpxSoG2QxUJTdblZVu8',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',

package/src/views/overView.vue

@@ -19,8 +19,8 @@ export default {
       isShowMode: true,
       modeName: '交警遥控',
       controlName: '步进',
-      agentId: 'jmlxhl',
-      Token: 'eyJraWQiOiIxNzE1NzM1NTU3NjcxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxNTc3ODc1NywiaWF0IjoxNzE1NzM1NTU3fQ.7ED5tQWYBpdv7HcBjZ_KSZprkcstns9ybCCwcrj5qZQ',
+      agentId: 'cllzpl',
+      Token: 'eyJraWQiOiIxNzE1ODM5MzY0NDQ2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxNTg4MjU2NCwiaWF0IjoxNzE1ODM5MzY0fQ.WHWB7t9rw-GX8QkWq8TygTLSFpxSoG2QxUJTdblZVu8',
       reqUrl: 'http://192.168.13.103:10003/openatc'
     }
   },