openatc-components 0.3.80 → 0.3.82

package/src/kisscomps/components/SchemeConfig/SchemeConfig.vue

@@ -19,6 +19,7 @@
           :leave-active-class="toPage === 1 ? 'animated fadeOutRight' : 'animated fadeOutLeft' ">
             <div class="new" style="position: absolute;width: 100%;height:100%;"  v-show="(isOperation && !isClosePhase)">
               <ManualControlModalNew
+              v-if="resetcomponent"
               ref="ManualControlModalNew"
               :residentControlList="residentControlList"
               :specialControlList="specialControlList"
@@ -81,6 +82,7 @@
         <div v-else style="height: 100%;">
           <div class="new" style="position: absolute;width: 100%;height:100%;"  v-show="(isOperation && !isClosePhase)">
             <ManualControlModalNew
+            v-if="resetcomponent"
             ref="ManualControlModalNew"
             :residentControlList="residentControlList"
             :specialControlList="specialControlList"
@@ -460,13 +462,17 @@ export default {
       patternAll: [],
       patternSelect: [], // 所有方案id
       specialPage: '', // 哪一个特殊控制页面
-      nextcycleefficcontrol: [5, 6, 9, 10, 12, 19] // 下周期生效的控制方式
+      nextcycleefficcontrol: [5, 6, 9, 10, 12, 19], // 下周期生效的控制方式
+      resetcomponent: false
     }
   },
   watch: {
     agentId: {
-      handler: function (val) {
-        this.getIntersectionInfo(val)
+      handler: function (val1, val2) {
+        if (val1 !== val2) {
+          this.resetComponent()
+        }
+        this.getIntersectionInfo(val1)
       },
       // 深度观察监听
       deep: true
@@ -503,9 +509,10 @@ export default {
     this.setHost(this.reqUrl)
     this.PhaseDataModel = new PhaseDataModel(this.roadDirection)
     this.CrossDiagramMgr = new CrossDiagramMgr()
-    this.getIntersectionInfo(this.agentId)
   },
   async mounted () {
+    this.resetcomponent = true
+    this.init()
     if (this.realtimeStatusModalvisible === false) {
       this.changeStatus()
     }
@@ -516,6 +523,23 @@ export default {
     this.initData()
   },
   methods: {
+    resetComponent () {
+      this.resetcomponent = false
+      this.$nextTick(() => {
+        this.resetcomponent = true
+        this.init()
+      })
+    },
+    init () {
+      this.getIntersectionInfo(this.agentId)
+      if (this.realtimeStatusModalvisible === false) {
+        this.changeStatus()
+      }
+      this.setPropsToken(this.Token)
+      // await this.getPhase()
+      this.getFault()
+      this.initData()
+    },
     setHost (host) {
       // 获取组件外传入的token，便于独立组件调用接口
       if (host && host !== '') {

package/src/kisscomps/components/SchemeConfig/lockingPhaselControlModal/index.vue

@@ -20,10 +20,10 @@
            :model="manualInfo"
            label-width="90px">
            <el-form-item
-                :label="$t('openatccomponents.overview.greenclear')"
-                prop="intersection">
-              <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempGreenflash" size="small"></el-input-number>
-            </el-form-item>
+               :label="$t('openatccomponents.overview.duration')"
+               prop="count">
+             <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempDuration" size="small"></el-input-number>
+           </el-form-item>
 
             <el-form-item
                 :label="$t('openatccomponents.overview.yellowflash')"
@@ -44,13 +44,11 @@
           label-position="left"
           :model="manualInfo"
           label-width="90px">
-
-           <el-form-item
-               :label="$t('openatccomponents.overview.duration')"
-               prop="count">
-             <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempDuration" size="small"></el-input-number>
-           </el-form-item>
-
+          <el-form-item
+              :label="$t('openatccomponents.overview.greenclear')"
+              prop="intersection">
+            <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempGreenflash" size="small"></el-input-number>
+          </el-form-item>
            <el-form-item
                :label="$t('openatccomponents.overview.allred')"
                prop="intersection">

package/src/kisscomps/components/SchemeConfig/realtimeStatusModal/index.vue

@@ -160,7 +160,8 @@
     <div class="cross-content">
       <div class="cross-name">{{$t('openatccomponents.overview.currentstage')}}:</div>
       <div>
-      <Stages :crossStatusData="crossStatusData"
+      <Stages v-if="resetcomponent"
+              :crossStatusData="crossStatusData"
               :phaseList="phaseList"
               @onSelectStages="onSelectStages"></Stages>
       </div>
@@ -260,8 +261,27 @@ export default {
     }
 
   },
+  watch: {
+    agentId: {
+      handler: function (val1, val2) {
+        this.$nextTick(() => {
+          setTimeout(() => {
+          if (val1 !== val2) {
+        this.resetcomponent = false
+        this.$nextTick(() => {
+          this.resetcomponent = true
+        })
+        }
+        }, 100)
+        })
+      },
+      // 深度观察监听
+      deep: true
+    }
+  },
   data () {
     return {
+      resetcomponent: true
     }
   },
   methods: {

package/src/kisscomps/index.js

@@ -32,6 +32,7 @@ import XiaoKanBan from './components/XiaoKanBan/index.vue'
 import DirectionListConfiguration from './components/DirectionListConfiguration/index.js'
 import IntersectionDirectionSelection from './components/IntersectionDirectionSelection/index.js'
 import PhaseLegend from './components/PhaseLegend/index.js'
+import OverviewComponent from './components/OverviewComponent/index.js'
 import { setToken, setHost, setIsCheckPermission, setUserRoles, setPermissions } from '../utils/auth.js'
 import componentsGlobalParam from '../store/modules/globalParam'
 
@@ -73,7 +74,8 @@ const components = {
   PhaseDirectionSelect,
   DirectionListConfiguration,
   IntersectionDirectionSelection,
-  PhaseLegend
+  PhaseLegend,
+  OverviewComponent
 }
 
 const language = {

package/src/utils/conflct.js

@@ -21,34 +21,29 @@ export async function computedRelation (id) {
     (uploadData.channelGreenConflictInfo.length > 0 ? uploadData.channelGreenConflictInfo : colorArray).forEach(itemB => {
       if (itemA.id === itemB.channelid) {
         // 处理peddirection
-        if (itemA.peddirection !== undefined) {
-          itemA.peddirection.forEach(pedDir => {
-            if (pedDir > 0) {
-              results.push({
-                direction: pedDir,
-                type: 'pedphase',
-                laneConflictList: [],
-                conflictchannel: itemB.greenconflict,
-                pedConflictList: []
-              })
-            }
-          })
-        }
-
+        itemA.peddirection.forEach(pedDir => {
+          if (pedDir > 0) {
+            results.push({
+              direction: pedDir,
+              type: 'pedphase',
+              laneConflictList: [],
+              conflictchannel: itemB.greenconflict,
+              pedConflictList: []
+            })
+          }
+        })
         // 处理phasedirection
-        if (itemA.phasedirection !== undefined) {
-          itemA.phasedirection.forEach(phaseDir => {
-            if (phaseDir > 0) {
-              results.push({
-                direction: phaseDir,
-                type: 'phase',
-                conflictchannel: itemB.greenconflict,
-                laneConflictList: [],
-                pedConflictList: []
-              })
-            }
-          })
-        }
+        itemA.phasedirection.forEach(phaseDir => {
+          if (phaseDir > 0) {
+            results.push({
+              direction: phaseDir,
+              type: 'phase',
+              conflictchannel: itemB.greenconflict,
+              laneConflictList: [],
+              pedConflictList: []
+            })
+          }
+        })
       }
     })
   })
@@ -57,13 +52,9 @@ export async function computedRelation (id) {
       channel.forEach(cha => {
         if (cha.id === aaaValue) {
           if (cha.realtype === 'direction') {
-            if (cha.realdir) {
-              item.laneConflictList.push(...cha.realdir)
-            }
+            item.laneConflictList.push(...cha.realdir)
           } else if (cha.realtype === 'peddirection') {
-            if (cha.realdir) {
-              item.pedConflictList.push(...cha.realdir)
-            }
+            item.pedConflictList.push(...cha.realdir)
           }
         }
       })

package/src/views/intersection.vue

@@ -1,15 +1,16 @@
 <template>
   <div>
+    <intersection-with-interface :AgentId="agentId" />
     <h2 class="text">实时通道路口图</h2>
-    <channel-realtime-intersection
+    <!-- <channel-realtime-intersection
       :agentId="this.agentId"
       :roadDirection="roadDirection"
       :channelRealtimeStatusData="channelRealtimeStatusData"
-    />
+    /> -->
 
     <!-- 按通道获取相位的方向选择列表，特殊路口显示列表，普通路口显示模版路口图 -->
     <h2 class="text">非第三方配置路口图(按通道显示相位方向)</h2>
-    <intersection-direction-selection
+    <!-- <intersection-direction-selection
       :agentId="this.agentId"
       :choosedDirection="[14,6,13,8]"
       :choosedPedDirection="[1]"
@@ -25,7 +26,7 @@
         :choosedPedDirection="[1,2]"
         :roadDirection="roadDirection"
         @handleClickCrossIcon="handleClickCrossIcon" />
-      </div>
+      </div> -->
 
       <!-- 显示按通道获取相位的模版路口图 -->
     <h2 class="text">显示配置的相位路口图</h2>
@@ -161,12 +162,12 @@ export default {
     return {
       roadDirection: 'right',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      agentId: 'tjblfql',
+      agentId: '32050101041121000001',
       // agentId: '13013',
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzIxOTc3OTkzMTY4IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcyMTk4MTU5MywiaWF0IjoxNzIxOTc0MzkzfQ.vjgAFMJlM4FEHxT9K9lJQ_VsUx1fDubr4tYgMaVffS0',
+      Token: 'eyJraWQiOiIxNzMwODU1NTQ1NzA3IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczMDg1OTE0NSwiaWF0IjoxNzMwODUxOTQ1fQ.CBl61S3eRifl4qEtTmgVjOZGo2hqNSGQKPxG1bN-utU',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',

package/src/views/intersection2.vue

@@ -102,12 +102,12 @@ export default {
     return {
       roadDirection: 'left',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      agentId: 'cllzpl',
+      agentId: '32050101041121000001',
       // agentId: '13013',
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzEwNzU4MTU3Njk0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiIxMjM0NTYiLCJleHAiOjE3MTM4ODgwMDAsImlhdCI6MTcxMDY5MTIwMH0.vicLABPjoZEWmHr12-5FXMbjYmEKv-WSTVRROR1eOME',
+      Token: 'eyJraWQiOiIxNjkzMjkyMzI0NzUyIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6NDA5MjEzNDQwMCwiaWF0IjoxNjkwODE5MjAwfQ.97bSPcUdh4xgAqkbw96Q-NfLVhFbgK0Yo1S8KYkSwz8',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',

package/src/views/overView.vue

@@ -1,13 +1,15 @@
 <template>
   <div id="test1">
-    <overview
+    <!-- <overview
         :AgentId="agentId"
         :reqUrl="reqUrl"
         :modeName="modeName"
         :controlName="controlName"
         :isShowState="isShowState"
         :isShowMode="isShowMode"
-        :Token="Token"></overview>
+        :Token="Token"></overview> -->
+    <el-button @click="handleChangeOverview">切换overview组件</el-button>
+    <overview-component :AgentId="agentId" />
   </div>
 </template>
 
@@ -19,12 +21,23 @@ export default {
       isShowMode: true,
       modeName: '交警遥控',
       controlName: '步进',
-      agentId: 'jmlxhl',
-      Token: 'eyJraWQiOiIxNzA4OTA5NDk2ODcxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcwODk1MjY5NiwiaWF0IjoxNzA4OTA5NDk2fQ.FI0gzBQFLyQsj95LG56lVZxb6WYlr2-datNsyv6fF-I',
+      agentId: '13013',
+      agentid1: 'gjnlahql',
+      agentid2: '13013',
+      sum: 0,
+      Token: 'eyJraWQiOiIxNzI5ODIxNjcyNTQ3IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcyOTgyNTI3MiwiaWF0IjoxNzI5ODE4MDcyfQ._C-0Cf3CQYx3tpGPAF-973Km8ekzJhAm4XwpNKFgSfk',
       reqUrl: 'http://192.168.13.103:10003/openatc'
     }
   },
   methods: {
+    handleChangeOverview () {
+      if (this.sum % 2 === 0) {
+        this.agentId = this.agentid1
+      } else {
+        this.agentId = this.agentid2
+      }
+      this.sum++
+    }
   },
   watch: {
   },

package/static/styles/common.scss

@@ -11,12 +11,12 @@
 
  // 全局滚动条样式
  ::-webkit-scrollbar {
-  width: 12PX;
-  height: 12PX;
+  width: 6PX;
+  height: 6PX;
 }
 ::-webkit-scrollbar-thumb {
   // 滚动条的滑块
-  border-radius: 4px;
+  border-radius: 3PX;
   background: rgba(144, 147, 153, 0.3);
 }
 ::-webkit-scrollbar-corner{

package/static/styles/dark/theme/element-dark.scss

@@ -34,7 +34,7 @@ $--button-danger-font-color: #FFFFFF;
 $--button-success-font-color: #FFFFFF;
 $--radio-button-checked-font-color: #FFFFFF;
 $--radio-font-color: $--color-text-secondary;
-$--tag-info-color: $--color-text-placeholder;
+$--tag-info-color: #FFFFFF;
 $--tooltip-color: $--color-white;
 $--checkbox-font-color: $--color-text-secondary;
 

package/static/styles/intersection.scss

@@ -38,9 +38,6 @@
       zoom: 0.9;
       
     }
-    .centerText .text {
-      font-size: 14px;
-    }
    }
   /*当屏幕小于等于1440px的屏幕样式*/
   @media only screen and (max-width: 1440px){
@@ -49,9 +46,6 @@
       zoom: 0.8;
       
     }
-    .centerText .text {
-      font-size: 18px;
-    }
    }
    /*当屏幕小于等于1280px的屏幕样式*/
   @media only screen and (max-width: 1280px){
@@ -59,9 +53,6 @@
       // transform: scale(0.65);
       zoom: 0.65;
     }
-    .centerText .text {
-      font-size: 20px;
-    }
    }
    /*当屏幕小于等于960px的屏幕样式*/
   @media only screen and (max-width: 960px){
@@ -69,9 +60,6 @@
       // transform: scale(0.5);
       zoom: 0.5;
     }
-    .centerText .text {
-      font-size: 14px;
-    }
    }
     /*当屏幕小于等于720px的屏幕样式*/
   @media only screen and (max-width: 720px){
@@ -79,9 +67,6 @@
       // transform: scale(0.45);
       zoom: 0.45;
     }
-    .centerText .text {
-      font-size: 14px;
-    }
    }
   // 小屏幕打开首页适配样式
   .minifont {
@@ -188,4 +173,9 @@
     color: $--color-text-primary;
     font-size:30PX;
  }
+ .centerText {
+  .text {
+    font-size: 18PX;
+  }
+ }
 }

package/static/styles/light/theme/element-light.scss

@@ -34,7 +34,7 @@ $--card-background-selected: #c1e0ff;
 // $--button-success-font-color: #FFFFFF;
 // $--radio-button-checked-font-color: #FFFFFF;
 // $--radio-font-color: $--color-text-secondary;
-// $--tag-info-color: $--color-text-placeholder;
+$--tag-info-color: #303133;
 // $--tooltip-color: $--color-white;
 // $--checkbox-font-color: $--color-text-secondary;
 

package/static/styles/schemeconfig.scss

@@ -226,7 +226,7 @@
       overflow-y: auto;
     }
     .manual-common-content::-webkit-scrollbar {
-      width: 8PX;
+      width: 6PX;
     }
 }
 // 手动控制弹框
@@ -498,12 +498,12 @@
     width: 85% !important;
   }
   .el-input.is-disabled .el-input__inner {
-    text-align: center;
+    text-align: left;
   }
   .el-input-number {
     width: 100%;
     .el-input__inner {
-      text-align: center;
+      text-align: left;
     }
   }
   .el-select {
@@ -540,6 +540,9 @@
   }
   .el-input-number {
     width: 100%;
+    .el-input__inner {
+      text-align: left;
+    }
   }
   .el-input-number--mini{
     width: 100%;

package/package/kisscomps/components/OptimizeKanban/index.js

@@ -1,2 +0,0 @@
-import OptimizeKanban from './OptimizeKanban.vue'
-export default OptimizeKanban