openatc-components 0.3.71 → 0.3.73

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/intersectionmap.vue

@@ -155,13 +155,6 @@ export default {
           this.reset = true
         }
       }
-    },
-    agentId: {
-      handler: function (val1, val2) {
-        if (val1 !== val2) {
-          this.resetCrossDiagram()
-        }
-      }
     }
   },
   created () {
@@ -171,7 +164,9 @@ export default {
   },
   mounted () {
     this.getParentSize()
-    this.reset = true
+    if (this.isVipRoute || this.channelType) {
+      this.reset = true
+    }
   },
   updated () {
   },

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,29 +503,19 @@ 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()
+    }
+    this.setPropsToken(this.Token)
+    this.hiddenPartControl()
+    // await this.getPhase()
+    this.getFault()
+    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 !== '') {
@@ -958,6 +942,12 @@ export default {
       if (token && token !== '') {
         setToken(token)
       }
+    },
+    hiddenPartControl () {
+      // 保存的面板，不显示方位锁定的功能
+      if (this.isShowImplement === false) {
+        this.residentControlList = this.residentControlList.filter(item => item.id !== 25)
+      }
     }
   },
   destroyed () {

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/manualControlModalNew/index.vue

@@ -62,7 +62,7 @@
           @toAutoControl="toAutoControl" />
 
         <AzimuthLocking
-          v-if="preselecttype === '方向锁定'"
+          v-if="preselecttype === '方向锁定' && isShowImplement"
           :realtimeStatusModalvisible="realtimeStatusModalvisible"
           :phaseList="phaseList"
           :patternStatus="statusData"

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/components/patternConfig/index.vue

@@ -228,6 +228,10 @@ export default {
     }
   },
   mounted () {
+    // let _this = this
+    // _this.$nextTick(function () {
+    //   _this.calcMaxTableHeight()
+    // })
     this.calcMaxTableHeight()
   },
   methods: {
@@ -241,6 +245,7 @@ export default {
       console.log('calcMaxTableHeight:', this.maxTableHeight)
       if (this.maxTableHeight < 150) {
         this.maxTableHeight = 200
+        console.log('set default maxHeight 200', this.maxTableHeight)
       }
     },
     async handeAgentidsChange () {
@@ -745,6 +750,11 @@ export default {
     async getDeviceByIds (routeData) {
       // 获取设备表格信息
       let realtimeRouteData = JSON.parse(JSON.stringify(routeData))
+      let findItem = realtimeRouteData.devs.find(item => !item.name)
+      if (!findItem) {
+        this.devicesData = realtimeRouteData.devs
+        return false
+      }
       this.deviceIds = realtimeRouteData.devs.map(ele => ele.agentid)
       await GetDeviceByIds(this.deviceIds).then(res => {
         if (!res.data.success) {
@@ -760,14 +770,14 @@ export default {
         // this.chartData.realPatternRouteData = realtimeRouteData
         // this.$refs.chartDialog.show(true, this.chartData, this.route.name, this.devicesData)
       })
-    },
-    getActurlPatternid (agentid) {
-      let devinfo = this.devicesData.filter(dev => dev.agentid === agentid)[0]
-      if (devinfo.patternid !== undefined) {
-        return devinfo.patternid
-      } else {
-        return 1
-      }
+    // },
+    // getActurlPatternid (agentid) {
+    //   let devinfo = this.devicesData.filter(dev => dev.agentid === agentid)[0]
+    //   if (devinfo.patternid !== undefined) {
+    //     return devinfo.patternid
+    //   } else {
+    //     return 1
+    //   }
     }
   }
 }

package/src/kisscomps/components/patternConfig/pattern/patternTable.vue

@@ -107,9 +107,9 @@
           <div class="pattern-figure">
             <pattern-list
               v-if="getControlType(scope.row) === 'ring'"
-              :patternStatusList="scope.row.rings"
+              :patternStatusList="JSON.parse(JSON.stringify(scope.row.rings))"
               :cycles="scope.row.cycle"
-              :phaseList="scope.row.currPhase"
+              :phaseList="JSON.parse(JSON.stringify(scope.row.currPhase))"
               :contrloType="getControlType(scope.row)"
             >
             </pattern-list>
@@ -121,10 +121,10 @@
               :cycleChange="false"
               :stagesChange="getSelectedPattern(scope.row).stagesList"
               :patternStatusList="getSelectedPattern(scope.row).rings"
-              :patternList="scope.row.allPatterns"
-              :allPatternList="scope.row.allPatterns"
+              :patternList="JSON.parse(JSON.stringify(scope.row.allPatterns))"
+              :allPatternList="JSON.parse(JSON.stringify(scope.row.allPatterns))"
               :cycles="scope.row.cycle"
-              :phaseList="scope.row.currPhase"
+              :phaseList="JSON.parse(JSON.stringify(scope.row.currPhase))"
               :agentId="scope.row.agentid"
               :showBarrier="false">
             </pattern-list>
@@ -199,9 +199,9 @@ export default {
   created () {
   },
   watch: {
-    // screenHeight: function () {
-    //   this.tableHeight = screen.height < 1080 ? screen.height * 0.35 : screen.height * 0.5
-    // },
+    maxTableHeight: function () {
+      this.tableHeight = this.maxTableHeight
+    },
     optList: {
       handler: function (val) {
         if (val && val.length > 0) {
@@ -214,16 +214,18 @@ export default {
     },
     newPatternList: {
       handler: function (val) {
+        console.log('onNewPatternListChange', val)
         this.$emit('onNewPatternListChange', val)
       },
       deep: true
     }
   },
   mounted: function () {
-    var _this = this
-    _this.$nextTick(function () {
-      _this.tableHeight = _this.maxTableHeight
-    })
+    // var _this = this
+    // _this.$nextTick(function () {
+    //   _this.tableHeight = _this.maxTableHeight
+    // })
+    // _this.tableHeight = _this.maxTableHeight
   },
   methods: {
     onOptimizeClick (row, index) {
@@ -301,18 +303,6 @@ export default {
               }
             }
           }
-          // row.cycle = cycle
-          // let newPattern = _this.newPatternList[index]
-          // newPattern.cycle = cycle
-          // newPattern.rings = row.rings
-          // _this.newPatternList[index] = newPattern
-          // if (row.feature && row.feature.patternList && row.feature.patternList.length > 0) {
-          //   let pattern = row.feature.patternList.find((item) => item.id === row.patternid)
-          //   if (pattern) {
-          //     pattern.cycle = cycle
-          //     pattern.rings = row.rings
-          //   }
-          // }
         }
       }).catch(error => {
         console.log(error)
@@ -326,10 +316,10 @@ export default {
       return res
     },
     getPeriod (row) {
-      let period = row.period
+      let period = row.period || row.timeperiodrange
       let res = ''
       if (period && period.length > 0) {
-        res = period[0] + '-' + period[1]
+        res = period[0].substring(0, 5) + '-' + period[1].substring(0, 5)
       }
       return res
     },
@@ -429,6 +419,7 @@ export default {
         obj.ringCount = ringCount
         this.newPatternList.push(obj)
       }
+      console.log('handlePatternList newPatternList', this.newPatternList)
     },
     sortNumbers (a, b) {
       return a - b
@@ -512,7 +503,7 @@ export default {
       let patternList = row.feature && row.feature.patternList ? row.feature.patternList : row.allPatterns
       let pattern = patternList.find(item => item.id === row.patternid)
       if (pattern) {
-        res = pattern
+        res = JSON.parse(JSON.stringify(pattern))
       }
       return res
     },

package/src/kisscomps/components/patternConfig/planContent.vue

@@ -103,7 +103,8 @@ export default {
     this.closeInterval()
   },
   methods: {
-    init (chooseId, editableTab, agentids) {
+    async init (chooseId, editableTab, agentids) {
+      console.log('init planContent edittab', editableTab)
       if (this.agentids.join('') !== agentids.join('')) {
         // reset data
         this.patternList = []
@@ -113,7 +114,16 @@ export default {
       this.chooseId = chooseId
       // this.getRouteInfo()
       this.routeData = editableTab
-      this.getAllPatternOfRoute()
+      let patternList = this.getPatternListFromTab(editableTab, this.patternList)
+      let phaseList = this.getPatternListFromTab(editableTab, this.patternList)
+      if (patternList && patternList.length > 0 && phaseList && phaseList.length > 0) {
+        this.patternList = patternList
+        this.phaseList = phaseList
+        this.handlePatternTable()
+        console.log('use params feature form editableTab', editableTab)
+      } else {
+        this.getAllPatternOfRoute()
+      }
     },
     getPatternListFromTab (tab, list) {
       let res = []
@@ -134,8 +144,23 @@ export default {
       res = devPatternList
       return res
     },
-    getPhaseListFromTab (tab) {
+    getPhaseListFromTab (tab, list) {
       let res = []
+      let devs = tab.devs
+      for (let dev of devs) {
+        if (!dev.feature || !dev.feature.phaseList || dev.feature.phaseList.length === 0) {
+          res = list
+          return res
+        }
+      }
+      let devPatternList = devs.map(item => {
+        let pattern = {
+          agentid: item.agentid,
+          feature: item.feature
+        }
+        return pattern
+      })
+      res = devPatternList
       return res
     },
     closeInterval () {
@@ -491,6 +516,7 @@ export default {
     },
     getAllPatternOfRoute () {
       if (this.agentids.length === 0) return
+      console.log('this.routeData', this.routeData)
       getAllPatternOfDevs(this.agentids).then(res => {
         if (!res.data.success) {
           let agentid = res.data.data.agentid
@@ -519,6 +545,7 @@ export default {
     },
     getAllPhaseOfRouter () {
       if (this.agentids.length === 0) return
+      console.log('this.routeData', this.routeData)
       getAllPhaseOfDevs(this.agentids).then(res => {
         if (!res.data.success) {
           let agentid = res.data.data.agentid
@@ -538,7 +565,11 @@ export default {
           this.$emit('ErrorOcurrred')
           return
         }
-        this.phaseList = res.data.data.devs
+        this.allPhaseList = res.data.data.devs
+        let editableTab = this.routeData
+        let list = this.getPhaseListFromTab(editableTab, this.allPhaseList)
+        this.phaseList = list
+        // this.phaseList = res.data.data.devs
         this.handlePatternTable()
         this.handlePlanChart()
         this.handleMaskVisible()

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/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: '12007_001',
-      agentid1: '13003',
-      agentid2: 'gjnlahql',
-      sum: 0,
-      Token: 'eyJraWQiOiIxNzI5NzQ2MDcxNzc3IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcyOTc0OTY3MSwiaWF0IjoxNzI5NzQyNDcxfQ.dK2P6NGoG0ZI-j8d2wiVqM1JzkzOjFapHf99cJd7uXw',
+      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: {
   },