openatc-components 0.3.98 → 0.3.99

package/package.json

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

package/src/kisscomps/components/OverviewComponent/index.vue

@@ -11,24 +11,9 @@
  **/
 <template>
   <div class="container-main">
-    <div v-if="onlyShowIntersectionMap" style="height: 100%;">
-      <intersection-base-map
-            v-if="curHomePage === 'Graphical'"
-            ref="intersectionMap"
-            :stateName="stateName"
-            :crossStatusData="crossStatusData"
-            :agentId="agentId"
-            :roadDirection="roadDirection" />
-          <channelization
-            v-if="curHomePage === 'Channelization'"
-             ref="channelization"
-            :AgentId="agentId"
-            :crossStatusData="crossStatusData"
-            :detectorStatusData="detectorStatusData" />
-    </div>
-    <div v-if="!onlyShowIntersectionMap" :style="{'transform': `scale(${shrink})`, 'transform-origin': 'left top', 'height': '100%'}">
+    <div class="overview-component-content" :style="{'transform': `scale(${shrink})`, 'transform-origin': 'left top', 'height': '100%'}">
       <div class="tuxingjiemian" v-show="curHomePage === 'Graphical' || curHomePage === 'Channelization'" :class="{'minifont': curBodyWidth <= 650}">
-        <div class="tuxing-left" :class="{'changeWidth': graphicMode}" ref="tuxingLeft">
+        <div :class="{'changeWidth': graphicMode, 'tuxing-left': !onlyShowIntersectionMap}" ref="tuxingLeft">
           <intersection-base-map
             v-if="curHomePage === 'Graphical'"
             ref="intersectionMap"
@@ -42,7 +27,7 @@
             :AgentId="agentId"
             :crossStatusData="crossStatusData"
             :detectorStatusData="detectorStatusData" />
-          <div class="pattern-status" v-if="!graphicMode && crossStatusData.control !== 1 && crossStatusData.control !== 2 && crossStatusData.control !== 3">
+          <div class="pattern-status" v-if="!graphicMode && !onlyShowIntersectionMap && crossStatusData.control !== 1 && crossStatusData.control !== 2 && crossStatusData.control !== 3">
             <div class="pattern-name cross-mess">{{$t('openatccomponents.overviewcomponent.patternstate')}}</div>
             <div class="pattern-message">({{$t('openatccomponents.overviewcomponent.cycle')}}: {{controlData.cycle}}  {{$t('openatccomponents.overviewcomponent.patternoffset')}}: {{controlData.patternoffset}} {{$t('openatccomponents.overviewcomponent.coordinationtime')}}: {{controlData.offset}})</div>
               <span class="pattern-explain"><el-checkbox v-model="checked">{{$t('openatccomponents.overviewcomponent.overLap')}}</el-checkbox></span>
@@ -106,7 +91,7 @@
           </div>
         </div>
 
-        <div ref="tuxingRight" class="tuxing-right">
+        <div ref="tuxingRight" class="tuxing-right" v-if="!onlyShowIntersectionMap">
           <scheme-config
             ref="rightpanel"
             :statusData="crossStatusData"

package/src/views/intersection.vue

@@ -167,7 +167,7 @@ export default {
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzMzODgxNjU0ODkzIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczMzg4NTI1NCwiaWF0IjoxNzMzODc4MDU0fQ.zo_zw_ZxQpDyGlvQkCMPt_3SeWd3z2SlcwsYKnpljOk',
+      Token: 'eyJraWQiOiIxNzMzODkzOTEyNDQwIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczMzg5NzUxMiwiaWF0IjoxNzMzODkwMzEyfQ.OItRhpJG9WM4KRZ04Nhzedyj1WhTKw2r-oKCQN8dA04',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',

package/src/views/overView.vue

@@ -9,7 +9,8 @@
         :isShowMode="isShowMode"
         :Token="Token"></overview> -->
     <el-button @click="handleChangeOverview">切换overview组件</el-button>
-    <overview-component :AgentId="agentId" />
+    <el-button @click="reverseOverviewBtMap">切换路口图和overview</el-button>
+    <overview-component :AgentId="agentId" :onlyShowIntersectionMap="isOnlyMap" />
   </div>
 </template>
 
@@ -25,8 +26,9 @@ export default {
       agentid1: 'gjnlahql',
       agentid2: '13013',
       sum: 0,
-      Token: 'eyJraWQiOiIxNzI5ODIxNjcyNTQ3IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcyOTgyNTI3MiwiaWF0IjoxNzI5ODE4MDcyfQ._C-0Cf3CQYx3tpGPAF-973Km8ekzJhAm4XwpNKFgSfk',
-      reqUrl: 'http://192.168.13.103:10003/openatc'
+      Token: 'eyJraWQiOiIxNzMzODg3MDYyMjgwIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczMzg5MDY2MiwiaWF0IjoxNzMzODgzNDYyfQ.qUJZ4lKv0WU3s3lWfYwl5ZM77n2rriYeFQ8qOwRFuzk',
+      reqUrl: 'http://192.168.13.103:10003/openatc',
+      isOnlyMap: true
     }
   },
   methods: {
@@ -37,6 +39,9 @@ export default {
         this.agentId = this.agentid2
       }
       this.sum++
+    },
+    reverseOverviewBtMap () {
+      this.isOnlyMap = !this.isOnlyMap
     }
   },
   watch: {