openatc-components 0.4.90 → 0.4.92

package/config/index.js

@@ -15,7 +15,7 @@
 const fs = require('fs');
 const path = require('path')
 let VUE_APP_PROXY_API_TARGET = "http://127.0.0.1:8080"
-let VUE_APP_PROXY_MAIN_TARGET = "http://192.168.13.103:10003/openatc"
+let VUE_APP_PROXY_MAIN_TARGET = "http://192.168.14.122:10003/openatc"
 let VUE_APP_PROXY_SOCKET_TARGET = "http://127.0.0.1:8080"
 const localFile = path.resolve(__dirname, 'dev.local.js');
 if (fs.existsSync(localFile)) {

package/package/kisscomps/components/DrawChannelization/drawsvg/index.draw.vue

@@ -19,7 +19,17 @@
         <!-- 绘制功能 -->
         <div class="draw-function">
           <div class="again-import">
-            <span class="import-label">{{$t('openatccomponents.channelizationmap.importcrosspicture')}}</span>
+            <el-dropdown @command="handleChangeCrossShapes">
+              <el-button type="primary" class="cross-shapes-btn">
+                {{$t('openatccomponents.channelizationmap.importcrosspicture')}}<i class="el-icon-arrow-down el-icon--right"></i>
+              </el-button>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="101">{{$t('openatccomponents.importTemp.crossShapes.crossroads')}}</el-dropdown-item>
+                <el-dropdown-item command="100">{{$t('openatccomponents.importTemp.crossShapes.tjunction')}}</el-dropdown-item>
+                <el-dropdown-item command="103">{{$t('openatccomponents.importTemp.crossShapes.rampintersection2')}}</el-dropdown-item>
+                <el-dropdown-item command="104">{{$t('openatccomponents.importTemp.crossShapes.pedestriancrossing2')}}</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
             <el-button
               class="again-import-btn"
               type="primary"
@@ -782,21 +792,7 @@ export default {
       // }
       this.index = 0
       this.curChooseIcon = {}
-      axios.get('./img/CrossRoadsSvg.svg').then((val) => {
-        if (!val.data || val.data === '') return
-        this.CrossMapData = {
-            index: -2,
-            icontype: 'crossmap',
-            x: 435,
-            y: 325,
-            w: 870,
-            h: 650,
-            angle: 0,
-            imgfilesrc: '',
-            svgstr: val.data,
-            type: 'vectorgraph'
-        }
-      })
+      this.reloadDefaultCrossMap('CrossRoad.svg')
     },
     // 取消
     cancledraw () {
@@ -1010,6 +1006,39 @@ export default {
       el.click()
       // 移除链接释放资源
       urlObject.revokeObjectURL(url)
+    },
+    handleChangeCrossShapes (shape) {
+      switch (shape) {
+        case '100':
+          this.reloadDefaultCrossMap('TCrossRoad.svg')
+          break
+        case '101':
+          this.reloadDefaultCrossMap('CrossRoad.svg')
+          break
+        case '103':
+          this.reloadDefaultCrossMap('RampRoad.svg')
+          break
+        case '104':
+          this.reloadDefaultCrossMap('PedCrossingRoad.svg')
+          break
+      }
+    },
+    reloadDefaultCrossMap (imgname) {
+      axios.get(`./img/${imgname}`).then((val) => {
+        if (!val.data || val.data === '') return
+        this.CrossMapData = {
+            index: -2,
+            icontype: 'crossmap',
+            x: 435,
+            y: 325,
+            w: 870,
+            h: 650,
+            angle: 0,
+            imgfilesrc: '',
+            svgstr: val.data,
+            type: 'vectorgraph'
+        }
+      })
     }
   },
   mounted () {
@@ -1018,5 +1047,11 @@ export default {
 }
 </script>
 
-<style lang="css" rel="stylesheet/scss">
+<style lang="css" rel="stylesheet/scss" scoped>
+.cross-shapes-btn {
+  height: 32PX;
+  width: 90PX;
+  line-height: 32PX;
+  padding: 0;
+}
 </style>

package/package/kisscomps/components/DrawChannelization/drawsvg/phaseAssociatedComponent.vue

@@ -112,7 +112,7 @@ export default {
         return data.direction.map(dir => {
           return {
             id: dir,
-            peddirection: this.getshowped(data.peddirection),
+            peddirection: data.peddirection ? this.getshowped(data.peddirection) : [],
             color: '#1E1E1E'
           }
         })
@@ -120,7 +120,7 @@ export default {
         return [
           {
             id: '',
-            peddirection: this.getshowped(data.peddirection),
+            peddirection: data.peddirection ? this.getshowped(data.peddirection) : [],
             color: '#1E1E1E'
           }
         ]

package/package/kisscomps/components/IntersectionDirectionSelection/IntersectionDirectionSelection.vue

@@ -148,6 +148,10 @@ export default {
     refresh () {
       // 刷新底图
       this.$refs.intersectionMap2.resetCrossDiagram()
+    },
+    refreshArrow () {
+      // 高亮箭头按最新数据刷新
+      this.$refs.intersectionMap2.refreshArrow()
     }
   },
   mounted () {

package/package/kisscomps/components/IntersectionMap/crossDirection/baseImg/SidewalkClickSvg.vue

@@ -1263,8 +1263,10 @@ export default {
     init () {
       this.sidewalkData = JSON.parse(JSON.stringify(this.Data))
       this.getPedDirection()
-      this.handleStatus()
-      this.IconAddEvent()
+      this.$nextTick(() => {
+        this.handleStatus()
+        this.IconAddEvent()
+      })
     }
   },
   mounted () {

package/package/kisscomps/components/IntersectionMap/crossDirection/crossDiagram.vue

@@ -879,7 +879,16 @@ export default {
           return
         }
         this.isLoaded = true
-        this.tempType = res.data.data.type
+        this.InfoRes = res
+        this.handleInfo(res)
+      })
+    },
+    refreshArrow () {
+      // 刷新所选方向箭头，不重新请求接口
+      this.handleInfo(this.InfoRes)
+    },
+    handleInfo (res) {
+      this.tempType = res.data.data.type
         // 获取车道相位、行人相位信息（坐标、名称）
         this.mainType = this.tempType.split('-')[0]
         this.mainDirection = this.tempType.split('-')[1]
@@ -888,13 +897,11 @@ export default {
           this.getMergeDirections()
         }
         if (this.isVipRoute && !this.isThirdSignal && !this.isRcp) {
-          alert('1')
           // 特勤、分组管控下，非第三方设备且不是rcp协议，按通道显示相位方向；第三方设备和rcp协议还是按路口相位配置显示相位方向
           this.getChannelInfo()
           return
         }
         if (this.channelType && !this.isThirdSignal) {
-          alert('2')
           this.getChannelInfo()
           return
         }
@@ -915,7 +922,6 @@ export default {
             this.contrloType = 'ring'
           }
         }
-      })
     },
     getTempCrossInfo (res) {
       this.crossInfo = res.data.data.param
@@ -938,7 +944,6 @@ export default {
         this.drawDefaultPhaseIcon()
       }
       if ((this.isVipRoute && this.isThirdSignal) || (this.isVipRoute && this.isRcp)) {
-        alert('3')
         this.LanePhaseData = this.CrossDiagramMgr.compare(this.LanePhaseData, this.overlapLanePhaseData, 'type', 'nostatus')
         // console.log(this.LanePhaseData)
         this.sidewalkPhaseData = this.CrossDiagramMgr.compare(this.sidewalkPhaseData, this.overlapsidewalkPhaseData, 'pedtype', 'nostatus')
@@ -1370,7 +1375,6 @@ export default {
       const targetIds = [4, 8, 12, 16] // 掉头相位后画
       this.LanePhaseData = this.LanePhaseData.filter(item => !targetIds.includes(item.id)).concat(this.LanePhaseData.filter(item => targetIds.includes(item.id)))
       if (!this.isThirdSignal && this.isVipRoute && !this.isRcp) {
-        alert('4')
         await this.getConflictList()
         this.handleClickedPhase()
         this.compLanePhaseData = JSON.parse(JSON.stringify(this.LanePhaseData))
@@ -1421,7 +1425,7 @@ export default {
       this.EmitAllChoosedDirection(curClickedPhase)
     },
     handleClickedPedPhase () {
-      if (!this.isThirdSignal) {
+      if (!this.isThirdSignal && !this.isRcp) {
         this.inneChoosedPedDirection = this.inneChoosedPedDirection.filter(dir => this.pedConflictList.indexOf(dir) === -1)
       }
       // 排他

package/package/kisscomps/components/IntersectionMap/intersectionmap.vue

@@ -191,6 +191,11 @@ export default {
         this.reset = true
       })
     },
+    refreshArrow () {
+      this.$nextTick(() => {
+        this.$refs.crossDiagram.refreshArrow()
+      })
+    },
     getParentSize () {
       // 获取最外层dom尺寸，适配准备
       var _this = this