openatc-components 0.3.93 → 0.3.94

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

@@ -222,10 +222,6 @@ export default {
       type: Boolean,
       devault: true
     },
-    isShowMessage: {
-      type: Boolean,
-      default: true
-    },
     roadDirection: {
       type: String
     },
@@ -310,20 +306,19 @@ export default {
         this.handleDefaultStatus()
       }
     },
-    // roadDirection: {
-    //   handler: function (val1, val2) {
-    //     if (val1 !== val2) {
-    //       this.init()
-    //     }
-    //   }
-    // },
+    roadDirection: {
+      handler: function (val1, val2) {
+        if (val1 !== val2) {
+          this.init()
+        }
+      }
+    },
     agentId: {
       handler: function (val1, val2) {
         if (val1 !== val2) {
           this.init()
         }
-      },
-      immediate: true
+      }
     }
   },
   data () {
@@ -707,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
@@ -722,7 +717,7 @@ export default {
             }
           }
           msg = msg + ' - ' + commomMsg
-          this.isShowMessage && this.$message.error(msg)
+          this.$message.error(msg)
           return
         }
         this.isLoaded = true
@@ -1044,10 +1039,10 @@ export default {
         let res = data.data
         if (!res.success) {
           if (res.code === '4003') {
-            this.isShowMessage && this.$message.error(this.$t('openatccomponents.errorTip.devicenotonline'))
+            this.$message.error(this.$t('openatccomponents.errorTip.devicenotonline'))
             return
           }
-          this.isShowMessage && this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
+          this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
           return
         }
         let channelList = res.data.data.channelList.filter(ele => ele.type !== undefined)
@@ -1318,7 +1313,7 @@ export default {
     }
   },
   mounted () {
-    // this.init()
+    this.init()
   }
 }
 </script>

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

@@ -41,14 +41,13 @@
       :clickMode="clickMode"
       :isThirdSignal="isThirdSignal"
       :channelType="channelType"
-      :isShowMessage ="isShowMessage"
       @handleClickCrossIcon="handleClickCrossIcon" />
   </div>
 </div>
 </template>
 
 <script>
-import CrossDiagram from './crossDirection/crossDiagram.vue'
+import CrossDiagram from './crossDirection/crossDiagram'
 import { setToken } from '../../../utils/auth.js'
 export default {
   name: 'intersection-base-map',
@@ -75,7 +74,8 @@ export default {
     //   default: 0
     // },
     agentId: {
-      type: String
+      type: String,
+      default: '0'
     },
     graphicMode: {
       type: Boolean,
@@ -85,10 +85,6 @@ export default {
       type: Boolean,
       default: true
     },
-    isShowMessage: {
-      type: Boolean,
-      default: true
-    },
     roadDirection: {
       type: String,
       default: 'right'
@@ -139,7 +135,7 @@ export default {
   watch: {
     $route: {
       handler: function (val, oldVal) {
-        if (val.query !== undefined && val.query.agentid !== undefined) {
+        if (val.query !== undefined) {
           this.resetCrossDiagram()
         }
       },
@@ -159,23 +155,18 @@ export default {
           this.reset = true
         }
       }
-    },
-    agentId: {
-      handler: function (val1, val2) {
-        if (val1 !== val2 && val2 !== undefined) {
-          this.resetCrossDiagram()
-        }
-      }
     }
   },
   created () {
-    if (this.$route.query !== undefined && Object.keys(this.$route.query).length && this.$route.query.agentid !== undefined) {
+    if (this.$route.query !== undefined && Object.keys(this.$route.query).length) {
       this.resetCrossDiagram()
     }
   },
   mounted () {
     this.getParentSize()
-    this.reset = true
+    if (this.isVipRoute || this.channelType) {
+      this.reset = true
+    }
   },
   updated () {
   },

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

@@ -23,7 +23,6 @@
         :stateName="stateName"
         :isShowMode="isShowMode"
         :isShowState="isShowState"
-        :isShowMessage ="isShowMessage"
         :isShowInterval="isShowInterval"
         @onSelectStages="onSelectStages"/>
   </div>
@@ -60,7 +59,8 @@ export default {
       default: ''
     },
     AgentId: {
-      type: String
+      type: String,
+      default: '0'
     },
     Token: {
       type: String,
@@ -74,10 +74,6 @@ export default {
       type: Boolean,
       default: true
     },
-    isShowMessage: {
-      type: Boolean,
-      default: true
-    },
     isShowState: {
       type: Boolean,
       devault: false
@@ -97,12 +93,11 @@ export default {
   },
   watch: {
     AgentId: {
-      handler: function (val) {
+      handler: function (val, oldVal) {
         this.agentId = val
       },
       // 深度观察监听
-      deep: true,
-      immediate: true
+      deep: true
     },
     Token: {
       handler: function (val) {
@@ -145,7 +140,7 @@ export default {
             }
           }
           msg = msg + ' - ' + commomMsg
-          this.isShowMessage && this.$message.error(msg)
+          this.$message.error(msg)
           if (this.isResend) {
             this.reSend()
           }
@@ -197,7 +192,7 @@ export default {
             // this.devStatus = 2
             this.clearPatternInterval() // 清除其他定时器
             this.clearVolumeInterval()
-            this.isShowMessage && this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale) + ' - ' + commomMsg)
+            this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale) + ' - ' + commomMsg)
             if (this.isResend) {
               this.reSend()
             }
@@ -213,7 +208,7 @@ export default {
             }
           }
           msg = msg + ' - ' + commomMsg
-          this.isShowMessage && this.$message.error(msg)
+          this.$message.error(msg)
           this.clearPatternInterval() // 清除其他定时器
           if (this.isResend) {
             this.reSend()
@@ -227,7 +222,7 @@ export default {
         this.controlData = this.controlFormat.handleGetData(param)
         this.$emit('getTscControl', data)
       }).catch(error => {
-        this.isShowMessage && this.$message.error(error)
+        this.$message.error(error)
         console.log(error)
       })
     },
@@ -240,7 +235,7 @@ export default {
         if (!res.data.success) {
           let commomMsg = this.$t('openatccomponents.overview.signalID') + ': ' + this.AgentId
           let msg = getMessageByCode(res.data.code, this.$i18n.locale) + ', ' + commomMsg
-          this.isShowMessage && this.$message.error(msg)
+          this.$message.error(msg)
           return
         }
         let devParams = res.data.data.jsonparam
@@ -264,7 +259,7 @@ export default {
       })
     },
     firstInit () {
-      if (this.$route.query !== undefined && Object.keys(this.$route.query).length && this.$route.query.agentid !== undefined) {
+      if (this.$route.query !== undefined && Object.keys(this.$route.query).length) {
         this.agentId = this.$route.query.agentid
         setIframdevid(this.agentId)
         this.registerMessage() // 注册消息
@@ -300,7 +295,7 @@ export default {
             let success = data.data.data.content.success
             if (success !== 0) {
               let errormsg = 'openatccomponents.overview.putTscControlError' + success
-              this.isShowMessage && this.$message.error(this.$t(errormsg))
+              this.$message.error(this.$t(errormsg))
               return
             }
           }
@@ -335,7 +330,7 @@ export default {
         }
         if (!data.data.success) {
           if (data.data.code === '4003') {
-            this.isShowMessage && this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
+            this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
             return
           }
           let parrenterror = getMessageByCode(data.data.code, this.$i18n.locale)
@@ -344,10 +339,10 @@ export default {
             let childErrorCode = data.data.data.errorCode
             if (childErrorCode) {
               let childerror = getMessageByCode(data.data.data.errorCode, this.$i18n.locale)
-              this.isShowMessage && this.$message.error(parrenterror + ',' + childerror)
+              this.$message.error(parrenterror + ',' + childerror)
             }
           } else {
-            this.isShowMessage && this.$message.error(parrenterror)
+            this.$message.error(parrenterror)
           }
           return
         }
@@ -364,7 +359,7 @@ export default {
           controlData: controlData
         }
       }).catch(error => {
-        this.isShowMessage && this.$message.error(error)
+        this.$message.error(error)
         console.log(error)
       })
     },
@@ -373,10 +368,10 @@ export default {
         let res = data.data
         if (!res.success) {
           if (res.code === '4003') {
-            this.isShowMessage && this.$message.error(this.$t('openatccomponents.errorTip.devicenotonline'))
+            this.$message.error(this.$t('openatccomponents.errorTip.devicenotonline'))
             return
           }
-          this.isShowMessage && this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
+          this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
           return
         }
         this.phaseList = res.data.data.phaseList
@@ -490,6 +485,7 @@ export default {
     }
   },
   created () {
+    this.agentId = this.AgentId
     this.setDialogWidth()
     this.setHost(this.reqUrl)
     this.controlFormat = new ControlFormat()

package/src/kisscomps/components/PatternStatus/PatternStatus.vue

@@ -11,8 +11,33 @@
  **/
 <template>
     <div class="main-patternstatus">
+      <!-- rcp模式 -->
+      <div v-if="patternType === 'rcp'">
+        <div class="ring-first" v-for="(list, index1) in patternRcp" :key="index1">
+          <div style="position: relative" :style="{height: '34px',paddingRight: '1px',float: 'left',width:
+              ((item.split + (item.sum ? item.sum : 0)) /(item.cycle > cycles ? item.cycle : cycles)) *100 +'%',}"
+              v-for="(item, index2) in list" :key="index2">
+            <div class="first-1" :style="{ width:
+                  (Number(item.greenWidth.replace('%', '')) /
+                    Number((((item.split + (item.sum ? item.sum : 0)) /
+                  (item.cycle > cycles ? item.cycle : cycles)) * 100 + '%').replace('%', ''))) * 100 + '%', height: '34px',background: '#7ccc66'}">
+            </div>
+            <el-tooltip placement="top-start" effect="light">
+                <div v-if="item.id" slot="content">P{{ item.id }}:{{ item.split }}</div>
+                <div v-if="item.id" style="cursor: pointer">
+                  <div
+                    class="box"
+                    style="position: absolute; width:40px; left: 0; top: 5px"
+                  >
+                    <div class="ring-nums">P{{ item.id }}:{{ item.split }}</div>
+                  </div>
+                </div>
+              </el-tooltip>
+          </div>
+      </div>
+      </div>
       <!-- 环模式true -->
-      <div v-if="this.contrloType === 'ring' || !this.contrloType">
+      <div v-if="(this.contrloType === 'ring' || !this.contrloType) && patternType !== 'rcp'">
         <div class="ring-first" v-for="(list, index1) in patternInfo" :key="index1">
           <div style="position: relative;" :style="{'height': '34px','float':'left','width':((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%'}"  v-for="(item,index2) in list" :key="index2" :class="item.mode===7?'direction': ''">
             <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.greenWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%').replace('%', ''))*100+'%','height':'34px','background':'#7ccc66'}">
@@ -117,6 +142,7 @@ export default {
       newCycle: this.cycles,
       patternIds: this.patternId,
       newPatterns: [],
+      patternRcp: [],
       newList: [],
       isControl: true,
       contrloCycle: 0,
@@ -145,6 +171,9 @@ export default {
     controlPhase: {
       type: Object
     },
+    patternType: {
+      type: String
+    },
     contrloType: {
       type: String
     },
@@ -317,6 +346,9 @@ export default {
     cycles: {
       handler: function (val, oldVal) {
         this.newCycle = this.cycles
+        if (this.patternType === 'rcp') {
+          this.handleRcp(this.patternStatusList)
+        }
       },
       // 深度观察监听
       deep: true
@@ -341,6 +373,9 @@ export default {
     },
     patternStatusList: {
       handler: function (val, oldVal) {
+        if (this.patternType === 'rcp') {
+          this.handleRcp(this.patternStatusList)
+        }
         this.handleBarrierHeight() // 计算屏障高度
         if (this.patternStatusList && this.newCycle) {
           setTimeout(() => {
@@ -373,6 +408,9 @@ export default {
     if (this.contrloType === 'stage') {
       this.getStage()
     }
+    if (this.patternType === 'rcp') {
+      this.handleRcp(this.patternStatusList)
+    }
   },
   methods: {
     getPed (data) {
@@ -401,6 +439,48 @@ export default {
       }
       return ped
     },
+    handleRcp (val) {
+      this.patternRcp = []
+      let valSplit = val.map(item => {
+        return item.map(val => {
+          return val.splitchain
+        })
+      })
+      let splitCycle = valSplit.length > 0 ? valSplit.map(item => {
+        return item.length > 0 ? item.reduce((a, b) => {
+          return a + b
+        }) : 0
+      }) : 0
+      let cycle = Math.max(...splitCycle)// 每个环的周期最大值
+      for (let rings of val) {
+        if (rings.length === 0) continue
+        let list = []
+        for (let ring of rings) {
+          if (ring.splitchain === 0) continue
+          let obj = {}
+          let split = ring.splitchain
+          obj.split = split
+          obj.cycle = cycle
+          obj.id = ring.phases
+          // if (ring.sum) {
+          //   obj.sum = ring.sum
+          //   obj.redWidth = ((currPhase.redclear + ring.sum) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
+          // } else {
+          //   obj.redWidth = (currPhase.redclear / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
+          // }
+          // obj.mode = ring.mode
+          obj.greenWidth = (split / (cycle > this.cycles ? cycle : this.cycles)) * 100 + '%'
+          // obj.flashgreen = (currPhase.flashgreen / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
+          // obj.yellowWidth = (currPhase.yellow / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
+          // 忽略相位不显示
+          // let mode = ring.mode
+          // if (mode !== 7) { // 忽略相位不显示
+          list.push(obj)
+          // }
+        }
+        this.patternRcp.push(list)
+      }
+    },
     handleStageData (data) {
       if (!data) return
       let peddirections = this.getPed(data)

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"
@@ -83,7 +82,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"
@@ -464,17 +462,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
@@ -511,10 +505,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()
     }
@@ -525,23 +518,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/components/patternList/patternList.vue

@@ -3,6 +3,7 @@
     <BoardCard
     :patternId="patternId"
     :contrloType="contrloType"
+    :patternType="patternType"
     :stagesChange="stagesChange"
     :isShowTip="isShowTip"
     :patternStatusList="patternStatusList"
@@ -541,6 +542,9 @@ export default {
     patternStatusList: {
       type: Array
     },
+    patternType: {
+      type: String
+    },
     patternId: {
       type: Number
     },

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 = {