openatc-components 0.4.93 → 0.4.95

package/package.json

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

package/src/kisscomps/components/ChannelRealtimeIntersection/ChannelRealtimeIntersection.vue

@@ -12,8 +12,13 @@
   <!--通道实时状态路口图-->
 <template>
   <div class="channel-realtime-intersection">
+    <channelization
+      v-if="isDefaultShowQuhua && reset"
+       ref="channelization"
+      :AgentId="this.AgentId"
+      :crossStatusData="realTimeChannelData" />
     <IntersectionMap
-      v-if="reset"
+      v-if="!isDefaultShowQuhua && reset"
       ref="intersectionMap"
       channelType
       :crossStatusData="crossStatusData"
@@ -28,6 +33,7 @@
 import IntersectionMap from '../IntersectionMap/intersectionmap'
 import { queryDevice } from '../../../api/control.js'
 import { getMessageByCode } from '../../../utils/responseMessage.js'
+import { getChannelizatonChart } from '../../../api/cross'
 
 export default {
   name: 'channel-realtime-intersection',
@@ -81,7 +87,8 @@ export default {
     return {
       reset: true,
       crossStatusData: {},
-      isThirdSignal: false
+      isThirdSignal: false,
+      isDefaultShowQuhua: true
     }
   },
   methods: {
@@ -102,6 +109,17 @@ export default {
           this.isThirdSignal = this.thirdSignal
         }
       })
+    },
+    async getChannelizatonChart () {
+      this.isDefaultShowQuhua = false
+      getChannelizatonChart(this.agentId).then(data => {
+        if (!data.data.success) {
+          return
+        }
+        if (data.data.success === true && data.data.data !== undefined && JSON.stringify(data.data.data) !== '{}' && data.data.data.isDefaultShowQuhua === true) {
+          this.isDefaultShowQuhua = true
+        }
+      })
     }
   },
   created () {

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

@@ -839,6 +839,8 @@ export default {
       this.curChooseIconIndex = -1
       let savedTemp = JSON.parse(JSON.stringify(this.LoadedChannelizatonData))
       let arr = []
+      this.isDefaultShowQuhua = savedTemp.isDefaultShowQuhua
+      delete savedTemp.isDefaultShowQuhua
       for (const [key, value] of Object.entries(savedTemp)) {
         if (key === 'vehile') {
           this.Motorways = value

package/src/views/intersection.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <intersection-with-interface :AgentId="agentId" /> -->
+    <intersection-with-interface :AgentId="agentId" />
     <h2 class="text">实时通道路口图</h2>
     <!-- <channel-realtime-intersection
       :agentId="this.agentId"
@@ -12,13 +12,13 @@
     <!-- channelType是按通道显示方向；不传按相位显示方向 -->
     <!-- clickMode是否开启方向选择功能 -->
     <el-button @click="clear" style="color: #fff;">清空</el-button>
-    <!-- <custom-intersection-base-map
+    <custom-intersection-base-map
       ref="intersectionMap3"
       clickMode
       channelType
       :agentId="this.agentId"
       :choosedDirection="choosedDirection"
-      :choosedPedDirection="choosedPedDirection"/> -->
+      :choosedPedDirection="choosedPedDirection"/>
 
     <!-- 按通道获取相位的方向选择列表，特殊路口显示列表，普通路口显示模版路口图 -->
     <h2 class="text">非第三方配置路口图(按通道显示相位方向)</h2>
@@ -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,22 +137,18 @@
               :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"/> -->
-      <channelization
-            AgentId="16005"
-            :crossStatusData="crossStatusData2"
-            :detectorStatusData="{}" />
+        @onPhaseChange="onPhaseChange"/>
 
-    <!-- <h2 style="color: #fff;">流量统计渠化路口图</h2>
+    <h2 style="color: #fff;">流量统计渠化路口图</h2>
       <channelization-flow-statistic
       :AgentId="agentId"
       :phasesStatisticsList="phasesStatisticsList"
@@ -181,12 +177,12 @@ export default {
     return {
       roadDirection: 'right',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      agentId: '16005',
+      agentId: '1059',
       // agentId: '13013',
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzYxMTk4MTU4MzIwIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc2MTIwMTc1NiwiaWF0IjoxNzYxMTk0NTU2fQ.Y7w2piXOChLTCQR4gdPuNIUpmFZM4d2GO04Ce0xgBOk',
+      Token: 'eyJraWQiOiIxNzYxMjY5Mzk4MDQ2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc2MTI3Mjk5OSwiaWF0IjoxNzYxMjY1Nzk5fQ.5qQJQWZLDI6tav6Mhfc7W6o1fH-NFPVrefQsA6tcNoU',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',