openatc-components 0.3.79 → 0.3.80

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

@@ -212,8 +212,8 @@ export default {
       Detector: [], // 管理所有检测器
       DetectorChart: [], // 管理所有检测器统计图
       motorwayicon: '',
-      IconLengh: 33,
-      IconWdith: 109,
+      IconLengh: 60,
+      IconWdith: 134,
       textareaW: 200,
       textareaH: 100,
       pedW: 206,
@@ -389,8 +389,8 @@ export default {
         h: this.IconWdith,
         angle: 0
       }
-      this.IconLengh = 33
-      this.IconWdith = 109
+      this.IconLengh = 60
+      this.IconWdith = 134
       let Motorwaysitem = {
         index: this.index,
         id: this.motorid,

package/src/kisscomps/components/IntersectionMap/crossDirection/crossDiagram.vue

@@ -315,11 +315,10 @@ export default {
     },
     agentId: {
       handler: function (val1, val2) {
-        if (val1 !== val2 && val2 !== undefined) {
+        if (val1 !== val2) {
           this.init()
         }
-      },
-      immediate: true
+      }
     }
   },
   data () {
@@ -703,7 +702,7 @@ export default {
     },
     getIntersectionInfo () {
       // 获取路口信息
-      const agentid = this.agentId
+      const agentid = this.agentId || '0'
       getIntersectionInfo(agentid).then(res => {
         if (!res.data.success) {
           this.isLoaded = false
@@ -1054,8 +1053,8 @@ export default {
     },
     handleRepeatRealdir (channelList) {
       // 按realdir去掉重复方向的数据
-      let dirChannelList = channelList.filter(ele => ele.type === 0 || ele.type === 1 || ele.type === 3)
-      let pedDirChannelList = channelList.filter(ele => ele.type === 2)
+      let dirChannelList = channelList.filter(ele => ele.realdir !== undefined && (ele.type === 0 || ele.type === 1 || ele.type === 3))
+      let pedDirChannelList = channelList.filter(ele => ele.realdir !== undefined && ele.type === 2)
       let map = new Map()
       let map2 = new Map()
       dirChannelList.forEach(ele => {

package/src/kisscomps/components/IntersectionMap/intersectionmap.vue

@@ -74,7 +74,8 @@ export default {
     //   default: 0
     // },
     agentId: {
-      type: String
+      type: String,
+      default: '0'
     },
     graphicMode: {
       type: Boolean,
@@ -154,13 +155,6 @@ export default {
           this.reset = true
         }
       }
-    },
-    agentId: {
-      handler: function (val1, val2) {
-        if (val1 !== val2 && val1 !== undefined) {
-          this.resetCrossDiagram()
-        }
-      }
     }
   },
   created () {
@@ -170,7 +164,9 @@ export default {
   },
   mounted () {
     this.getParentSize()
-    this.reset = true
+    if (this.isVipRoute || this.channelType) {
+      this.reset = true
+    }
   },
   updated () {
   },

package/src/kisscomps/components/IntersectionWithInterface/IntersectionWithInterface.vue

@@ -59,7 +59,8 @@ export default {
       default: ''
     },
     AgentId: {
-      type: String
+      type: String,
+      default: '0'
     },
     Token: {
       type: String,
@@ -92,7 +93,7 @@ export default {
   },
   watch: {
     AgentId: {
-      handler: function (val) {
+      handler: function (val, oldVal) {
         this.agentId = val
       },
       // 深度观察监听
@@ -242,7 +243,6 @@ export default {
         _this.port = String(devParams.port)
         _this.protocol = res.data.data.protocol
         _this.agentId = res.data.data.agentid
-        console.log('%%%%%%', res.data.data)
         if (res.data.data.name) {
           _this.agentName = res.data.data.name
         }

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

@@ -19,7 +19,6 @@
           :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"
@@ -82,7 +81,6 @@
         <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"
@@ -462,17 +460,13 @@ export default {
       patternAll: [],
       patternSelect: [], // 所有方案id
       specialPage: '', // 哪一个特殊控制页面
-      nextcycleefficcontrol: [5, 6, 9, 10, 12, 19], // 下周期生效的控制方式
-      resetcomponent: false
+      nextcycleefficcontrol: [5, 6, 9, 10, 12, 19] // 下周期生效的控制方式
     }
   },
   watch: {
     agentId: {
-      handler: function (val1, val2) {
-        if (val1 !== val2) {
-          this.resetComponent()
-        }
-        this.getIntersectionInfo(val1)
+      handler: function (val) {
+        this.getIntersectionInfo(val)
       },
       // 深度观察监听
       deep: true
@@ -509,10 +503,9 @@ 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()
     }
@@ -523,23 +516,6 @@ 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.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>
+                :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.yellowflash')"
@@ -44,11 +44,13 @@
           label-position="left"
           :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>
+
+           <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.allred')"
                prop="intersection">

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

@@ -160,8 +160,7 @@
     <div class="cross-content">
       <div class="cross-name">{{$t('openatccomponents.overview.currentstage')}}:</div>
       <div>
-      <Stages v-if="resetcomponent"
-              :crossStatusData="crossStatusData"
+      <Stages :crossStatusData="crossStatusData"
               :phaseList="phaseList"
               @onSelectStages="onSelectStages"></Stages>
       </div>
@@ -261,27 +260,8 @@ 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,7 +32,6 @@ 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'
 
@@ -74,8 +73,7 @@ const components = {
   PhaseDirectionSelect,
   DirectionListConfiguration,
   IntersectionDirectionSelection,
-  PhaseLegend,
-  OverviewComponent
+  PhaseLegend
 }
 
 const language = {

package/src/node_modules/.package_versions.json

@@ -0,0 +1 @@
+{}

package/src/utils/conflct.js

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

package/src/views/intersection.vue

@@ -1,16 +1,15 @@
 <template>
   <div>
-    <intersection-with-interface AgentId="32050101041121000001" />
     <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]"
@@ -26,7 +25,7 @@
         :choosedPedDirection="[1,2]"
         :roadDirection="roadDirection"
         @handleClickCrossIcon="handleClickCrossIcon" />
-      </div> -->
+      </div>
 
       <!-- 显示按通道获取相位的模版路口图 -->
     <h2 class="text">显示配置的相位路口图</h2>
@@ -167,7 +166,7 @@ export default {
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzMwNzczNjcyNTM3IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczMDc3NzI3MiwiaWF0IjoxNzMwNzcwMDcyfQ.JPncwKnHwk99oP9M3drkTkVv5ciKJ1qzWqp2U5xXRfw',
+      Token: 'eyJraWQiOiIxNzIxOTc3OTkzMTY4IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcyMTk4MTU5MywiaWF0IjoxNzIxOTc0MzkzfQ.vjgAFMJlM4FEHxT9K9lJQ_VsUx1fDubr4tYgMaVffS0',
       // 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: '32050101041121000001',
+      agentId: 'cllzpl',
       // agentId: '13013',
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNjkzMjkyMzI0NzUyIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6NDA5MjEzNDQwMCwiaWF0IjoxNjkwODE5MjAwfQ.97bSPcUdh4xgAqkbw96Q-NfLVhFbgK0Yo1S8KYkSwz8',
+      Token: 'eyJraWQiOiIxNzEwNzU4MTU3Njk0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiIxMjM0NTYiLCJleHAiOjE3MTM4ODgwMDAsImlhdCI6MTcxMDY5MTIwMH0.vicLABPjoZEWmHr12-5FXMbjYmEKv-WSTVRROR1eOME',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',

package/src/views/overView.vue

@@ -1,15 +1,13 @@
 <template>
   <div id="test1">
-    <!-- <overview
+    <overview
         :AgentId="agentId"
         :reqUrl="reqUrl"
         :modeName="modeName"
         :controlName="controlName"
         :isShowState="isShowState"
         :isShowMode="isShowMode"
-        :Token="Token"></overview> -->
-    <el-button @click="handleChangeOverview">切换overview组件</el-button>
-    <overview-component :AgentId="agentId" />
+        :Token="Token"></overview>
   </div>
 </template>
 
@@ -21,23 +19,12 @@ export default {
       isShowMode: true,
       modeName: '交警遥控',
       controlName: '步进',
-      agentId: '13013',
-      agentid1: 'gjnlahql',
-      agentid2: '13013',
-      sum: 0,
-      Token: 'eyJraWQiOiIxNzI5ODIxNjcyNTQ3IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcyOTgyNTI3MiwiaWF0IjoxNzI5ODE4MDcyfQ._C-0Cf3CQYx3tpGPAF-973Km8ekzJhAm4XwpNKFgSfk',
+      agentId: 'jmlxhl',
+      Token: 'eyJraWQiOiIxNzA4OTA5NDk2ODcxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcwODk1MjY5NiwiaWF0IjoxNzA4OTA5NDk2fQ.FI0gzBQFLyQsj95LG56lVZxb6WYlr2-datNsyv6fF-I',
       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: 6PX;
-  height: 6PX;
+  width: 12PX;
+  height: 12PX;
 }
 ::-webkit-scrollbar-thumb {
   // 滚动条的滑块
-  border-radius: 3PX;
+  border-radius: 4px;
   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: #FFFFFF;
+$--tag-info-color: $--color-text-placeholder;
 $--tooltip-color: $--color-white;
 $--checkbox-font-color: $--color-text-secondary;
 

package/static/styles/intersection.scss

@@ -38,6 +38,9 @@
       zoom: 0.9;
       
     }
+    .centerText .text {
+      font-size: 14px;
+    }
    }
   /*当屏幕小于等于1440px的屏幕样式*/
   @media only screen and (max-width: 1440px){
@@ -46,6 +49,9 @@
       zoom: 0.8;
       
     }
+    .centerText .text {
+      font-size: 18px;
+    }
    }
    /*当屏幕小于等于1280px的屏幕样式*/
   @media only screen and (max-width: 1280px){
@@ -53,6 +59,9 @@
       // transform: scale(0.65);
       zoom: 0.65;
     }
+    .centerText .text {
+      font-size: 20px;
+    }
    }
    /*当屏幕小于等于960px的屏幕样式*/
   @media only screen and (max-width: 960px){
@@ -60,6 +69,9 @@
       // transform: scale(0.5);
       zoom: 0.5;
     }
+    .centerText .text {
+      font-size: 14px;
+    }
    }
     /*当屏幕小于等于720px的屏幕样式*/
   @media only screen and (max-width: 720px){
@@ -67,6 +79,9 @@
       // transform: scale(0.45);
       zoom: 0.45;
     }
+    .centerText .text {
+      font-size: 14px;
+    }
    }
   // 小屏幕打开首页适配样式
   .minifont {
@@ -173,9 +188,4 @@
     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: #303133;
+// $--tag-info-color: $--color-text-placeholder;
 // $--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: 6PX;
+      width: 8PX;
     }
 }
 // 手动控制弹框
@@ -498,12 +498,12 @@
     width: 85% !important;
   }
   .el-input.is-disabled .el-input__inner {
-    text-align: left;
+    text-align: center;
   }
   .el-input-number {
     width: 100%;
     .el-input__inner {
-      text-align: left;
+      text-align: center;
     }
   }
   .el-select {
@@ -540,9 +540,6 @@
   }
   .el-input-number {
     width: 100%;
-    .el-input__inner {
-      text-align: left;
-    }
   }
   .el-input-number--mini{
     width: 100%;

package/package/kisscomps/components/OverviewComponent/index.js

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