openatc-components 0.4.91 → 0.4.93

package/package.json

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

package/src/i18n/language/en.js

@@ -1045,7 +1045,9 @@ const en = {
         'tjunction': 'T-junction',
         'roundabout': 'Roundabout',
         'rampintersection': 'RampIntersection',
+        'rampintersection2': 'Auxiliary Road Inbound',
         'pedestriancrossing': 'PedestrianCrossing',
+        'pedestriancrossing2': 'Road Section Crossing',
         'otherIntersections': 'OtherIntersections',
         'customIntersection': 'CustomIntersection'
       },
@@ -1408,7 +1410,7 @@ const en = {
       'importtip': 'The picture format is SVG, PNG and JPG, and the size is no more than 10MB',
       'importsizeerror': 'Picture size exceeds 10MB, please re import!',
       'importtypeerror': 'Picture format error, please import again!',
-      'importcrosspicture': 'Import intersection picture',
+      'importcrosspicture': 'Intersection Map',
       'againimport': 'Re import',
       'motorway': 'Motorway',
       'bicyclelane': 'Non motorized Lane',

package/src/i18n/language/zh.js

@@ -1042,10 +1042,12 @@ const zh = {
       'annual': '全年',
       'crossShapes': {
         'crossroads': '十字路口',
-        'tjunction': '丁字路口',
+        'tjunction': 'T字路口',
         'roundabout': '环形路口',
         'rampintersection': '匝道路口',
+        'rampintersection2': '辅路汇入',
         'pedestriancrossing': '行人过街路口',
+        'pedestriancrossing2': '路段过街',
         'otherIntersections': '其他形状路口',
         'customIntersection': '自定义路口'
       },
@@ -1408,7 +1410,7 @@ const zh = {
       'importtip': '图片格式为svg、png、jpg，大小不超过10Mb',
       'importsizeerror': '图片大小超过10Mb，请重新导入!',
       'importtypeerror': '图片格式错误，请重新导入!',
-      'importcrosspicture': '导入路口图片',
+      'importcrosspicture': '路口底图',
       'againimport': '重新导入',
       'motorway': '机动车道',
       'bicyclelane': '非机动车道',

package/src/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"
@@ -86,6 +96,10 @@
           <el-button type="primary" @click="savedraw()">{{$t('openatccomponents.button.save')}}</el-button>
           <el-button type="primary" @click="importFromFile()">{{$t('openatccomponents.main.import')}}</el-button>
           <el-button type="primary" @click="exportToFile()">{{$t('openatccomponents.main.export')}}</el-button>
+          <el-switch
+            v-model="isDefaultShowQuhua"
+            active-text="渠化默认显示">
+          </el-switch>
         </div>
       </div>
       <div class="custom-edit" ref="customEdit">
@@ -306,7 +320,8 @@ export default {
       ]),
       phaseAssociatedMap: new Map(), // 关联相位Map: key 是相位ID， value 是车道数据包含direction
       dialogVisible: false,
-      LoadedChannelizatonData: {} // 从接口获取到的渠化参数，用于作为加载数据，从文件导入可修改
+      LoadedChannelizatonData: {}, // 从接口获取到的渠化参数，用于作为加载数据，从文件导入可修改
+      isDefaultShowQuhua: true // 控制总览是否默认显示渠化图的开关
     }
   },
   methods: {
@@ -782,21 +797,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 () {
@@ -827,7 +828,10 @@ export default {
     // 保存
     savedraw () {
       let temp = {}
-      temp = this.handleSaveParams()
+      temp = {
+        ...this.handleSaveParams(),
+        isDefaultShowQuhua: this.isDefaultShowQuhua
+      }
       this.saveChannelizatonChart(temp)
     },
     // 加载
@@ -1010,6 +1014,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 +1055,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/src/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/src/views/customchannelization.vue

@@ -1,12 +1,12 @@
 <template>
 <!-- 渠化绘制demo -->
   <div style="height: 100%;">
-      <custom-channelization
-        :AgentId="agentId" />
-      <!-- <CustomChannelization
+      <!-- <custom-channelization
+        :AgentId="agentId" /> -->
+      <CustomChannelization
         :AgentId="agentId"
         :tscParam="tscParams"
-        @saveCallback="saveCallback" /> -->
+        @saveCallback="saveCallback" />
   </div>
 </template>
 <script>
@@ -16,7 +16,7 @@ export default {
   name: 'custom-channelization-demo',
   data () {
     return {
-      agentId: '13000000000000000003',
+      agentId: '0',
       tscParams: {}
     }
   },
@@ -39,7 +39,7 @@ export default {
   created () {
   },
   mounted () {
-    // this.getIntersectionInfo()
+    this.getIntersectionInfo()
   },
   destroyed () {
   }

package/src/views/intersection.vue

@@ -52,13 +52,13 @@
             :roadDirection="roadDirection" /> -->
       <el-button @click="refresh">刷新特勤路口底图</el-button>
       <el-button @click="changeChoosedDir" style="color: #fff;">重置所选方向</el-button>
-      <intersection-direction-selection
+      <!-- <intersection-direction-selection
             ref="selectMap"
             agentId="16005"
             :clickMode="false"
             :choosedDirection="choosedDirection"
             :choosedPedDirection="choosedPedDirection"
-            :roadDirection="roadDirection" />
+            :roadDirection="roadDirection" /> -->
 
       <!-- <button @click="lockPhase" >相位锁定</button><br/>
       <button @click="unlockPhase" >解锁相位</button><br/>
@@ -122,7 +122,7 @@
       <!-- <Stages :stagesList="stagesList"
               :currentStage="currentStage"
               @onSelectStages="onSelectStages"></Stages> -->
-          <div style="height: 100px;">
+          <!-- <div style="height: 100px;">
             <PhaseLegend :crossStatusData="tscControlData"
               :phaseList="phaseList"
               showDataType="phase"
@@ -137,18 +137,22 @@
               :showStyle="{top:'2PX',left:'9px'}"
               :showStyles="{top:'0PX',left:'7px'}"
               ></PhaseLegend>
-          </div>
+          </div> -->
 
-      <!-- <h2 style="color: #fff;">渠化图</h2>
-      <channelization-with-interface
+      <h2 style="color: #fff;">渠化图</h2>
+      <!-- <channelization-with-interface
         ref="channelization"
         :AgentId="agentId"
         :reqUrl="reqUrl"
         :Token="Token"
         @getTscControl="getTscControl"
-        @onPhaseChange="onPhaseChange"/>
+        @onPhaseChange="onPhaseChange"/> -->
+      <channelization
+            AgentId="16005"
+            :crossStatusData="crossStatusData2"
+            :detectorStatusData="{}" />
 
-    <h2 style="color: #fff;">流量统计渠化路口图</h2>
+    <!-- <h2 style="color: #fff;">流量统计渠化路口图</h2>
       <channelization-flow-statistic
       :AgentId="agentId"
       :phasesStatisticsList="phasesStatisticsList"
@@ -177,12 +181,12 @@ export default {
     return {
       roadDirection: 'right',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      agentId: '1059',
+      agentId: '16005',
       // agentId: '13013',
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzYwNjkyMjE3ODM1IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc2MDY5NTgxNywiaWF0IjoxNzYwNjg4NjE3fQ.ZOhFCKr7YjVJ-b7mD2G9EE34Pi3XBkdk73rMT0QdP8E',
+      Token: 'eyJraWQiOiIxNzYxMTk4MTU4MzIwIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc2MTIwMTc1NiwiaWF0IjoxNzYxMTk0NTU2fQ.Y7w2piXOChLTCQR4gdPuNIUpmFZM4d2GO04Ce0xgBOk',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',
@@ -472,9 +476,9 @@ export default {
       this.$refs.selectMap.refresh()
     },
     clear () {
-      // this.choosedDirection = []
-      // this.choosedPedDirection = []
-      // this.$refs.intersectionMap3.resetCrossDiagram()
+      this.choosedDirection = []
+      this.choosedPedDirection = []
+      this.$refs.intersectionMap3.resetCrossDiagram()
     },
     changeChoosedDir () {
       this.choosedDirection = [2]