openatc-components 0.4.92 → 0.4.94

package/package.json

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

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

@@ -96,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">
@@ -316,7 +320,8 @@ export default {
       ]),
       phaseAssociatedMap: new Map(), // 关联相位Map: key 是相位ID， value 是车道数据包含direction
       dialogVisible: false,
-      LoadedChannelizatonData: {} // 从接口获取到的渠化参数，用于作为加载数据，从文件导入可修改
+      LoadedChannelizatonData: {}, // 从接口获取到的渠化参数，用于作为加载数据，从文件导入可修改
+      isDefaultShowQuhua: true // 控制总览是否默认显示渠化图的开关
     }
   },
   methods: {
@@ -823,7 +828,10 @@ export default {
     // 保存
     savedraw () {
       let temp = {}
-      temp = this.handleSaveParams()
+      temp = {
+        ...this.handleSaveParams(),
+        isDefaultShowQuhua: this.isDefaultShowQuhua
+      }
       this.saveChannelizatonChart(temp)
     },
     // 加载
@@ -831,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/customchannelization.vue

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

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: 'eyJraWQiOiIxNzYxMTgyODkxNDMzIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc2MTE4NjQ4OSwiaWF0IjoxNzYxMTc5Mjg5fQ.UHfHzNNby-Y-kee-83_4KEjESDIf4InAvmYSmVmLvk4',
+      Token: 'eyJraWQiOiIxNzYxMjY5Mzk4MDQ2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc2MTI3Mjk5OSwiaWF0IjoxNzYxMjY1Nzk5fQ.5qQJQWZLDI6tav6Mhfc7W6o1fH-NFPVrefQsA6tcNoU',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',
@@ -346,134 +342,7 @@ export default {
       tscControlData: {},
       phaseList: [],
       choosedDirection: [1, 5],
-      choosedPedDirection: [3],
-      crossStatusData2: {
-  'phase': [
-    {
-      'id': 1,
-      'type': 3,
-      'pedtype': 3
-    },
-    {
-      'id': 2,
-      'type': 1,
-      'pedtype': 1
-    },
-    {
-      'id': 3,
-      'type': 1,
-      'pedtype': 1
-    },
-    {
-      'id': 4,
-      'type': 1,
-      'pedtype': 1
-    }
-  ],
-  'mode': 0,
-  'control': 5,
-  'patternid': 2,
-  'cycle': 107,
-  'patternoffset': 0,
-  'stages': [
-    [
-      1
-    ],
-    [
-      2
-    ],
-    [
-      3
-    ],
-    [
-      4
-    ],
-    [
-      1
-    ],
-    [
-      2
-    ],
-    [
-      3
-    ],
-    [
-      4
-    ],
-    [
-      1
-    ],
-    [
-      2
-    ],
-    [
-      3
-    ],
-    [
-      4
-    ],
-    [
-      1
-    ],
-    [
-      2
-    ],
-    [
-      3
-    ],
-    [
-      4
-    ]
-  ],
-  'stages_len': [
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-  ],
-  'stages_seq': [
-    1,
-    2,
-    3,
-    4,
-    5,
-    6,
-    7,
-    8,
-    9,
-    10,
-    11,
-    12,
-    13,
-    14,
-    15,
-    16
-  ],
-  'current_stage': 1,
-  'current_stagecd': 0,
-  'offset': 0,
-  'current_phase': [
-    1
-  ],
-  'next_phase': [
-    2
-  ],
-  'rings': [],
-  'curTime': 43,
-  'syncTime': 64
-}
+      choosedPedDirection: [3]
     }
   },
   components: {