openatc-components 0.4.91 → 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'
           }
         ]