openatc-components 0.2.79 → 0.2.80

package/package/kisscomps/components/IntersectionMap/crossDirection/posJson/phasePos.left.json

@@ -24,8 +24,8 @@
       "id": 4,
       "name": "东掉头",
       "ename": "East-Back",
-      "x": "591px",
-      "y": "301px"
+      "x": "604px",
+      "y": "334px"
     },
     {
       "id": 5,
@@ -52,8 +52,8 @@
       "id": 8,
       "name": "西掉头",
       "ename": "West-Back",
-      "x": "246px",
-      "y": "325px"
+      "x": "248px",
+      "y": "301px"
     },
     {
       "id": 9,
@@ -80,8 +80,8 @@
       "id": 12,
       "name": "北掉头",
       "ename": "North-Back",
-      "x": "412px",
-      "y": "135px"
+      "x": "446px",
+      "y": "138px"
     },
     {
       "id": 13,
@@ -108,8 +108,8 @@
       "id": 16,
       "name": "南掉头",
       "ename": "South-Back",
-      "x": "436px",
-      "y": "481px"
+      "x": "412px",
+      "y": "495px"
     }
   ]
 }

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

@@ -40,7 +40,6 @@
       :isVipRoute="isVipRoute"
       :clickMode="clickMode"
       :isThirdSignal="isThirdSignal"
-      :channelType="channelType"
       @handleClickCrossIcon="handleClickCrossIcon" />
   </div>
 </div>
@@ -126,10 +125,6 @@ export default {
     isThirdSignal: {
       type: Boolean,
       default: false
-    },
-    channelType: {
-      type: Boolean,
-      default: false
     }
   },
   watch: {
@@ -148,13 +143,6 @@ export default {
           this.reset = true
         }
       }
-    },
-    channelType: {
-      handler: function (val, oldVal) {
-        if (val) {
-          this.reset = true
-        }
-      }
     }
   },
   created () {
@@ -164,7 +152,7 @@ export default {
   },
   mounted () {
     this.getParentSize()
-    if (this.isVipRoute || this.channelType) {
+    if (this.isVipRoute) {
       this.reset = true
     }
   },

package/package/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'}">
@@ -48,7 +73,7 @@
             <div class="divider" :style="{'left':item, 'height':barrierHeight}"></div>
           </div>
         </div>
-        <div v-show="(cycle && cycle>0 && this.isControl) || (newCycle && newCycle>0 && this.isControl)">
+        <div v-show="(this.curtime>0 && cycle && cycle>0 && this.isControl) || (this.curtime>0 && newCycle && newCycle>0 && this.isControl)">
           <div class="curTimeDiv" :style="{'left':paddingLeft }">{{ timeNumDevide }}</div>
           <div class="curTimeLine" :style="{'left':paddingLeft, 'height':barrierHeight}"></div>
         </div>
@@ -107,6 +132,7 @@ export default {
       newCycle: this.cycles,
       patternIds: this.patternId,
       newPatterns: [],
+      patternRcp: [],
       newList: [],
       isControl: true,
       contrloCycle: 0,
@@ -131,6 +157,9 @@ export default {
     controlPhase: {
       type: Object
     },
+    patternType: {
+      type: String
+    },
     contrloType: {
       type: String
     },
@@ -213,7 +242,7 @@ export default {
   watch: {
     controlPhase: {
       handler: function (val, oldVal) {
-        if ((val && val.curTime) || val.curTime === 0) {
+        if (val && val.curTime) {
           this.curtime = val.curTime
           if (val.control === 4 || val.control === 16 || val.control === 22) {
             this.isControl = false
@@ -242,7 +271,7 @@ export default {
           }
           this.handleBarrierHeight()
         }
-        if ((val && val.curTime) || val.curTime === 0) {
+        if (val && val.curTime) {
           this.curtime = val.curTime
           if (val.control === 4 || val.control === 16 || val.control === 22) {
             this.isControl = false
@@ -290,6 +319,9 @@ export default {
     cycles: {
       handler: function (val, oldVal) {
         this.newCycle = this.cycles
+        if (this.patternType === 'rcp') {
+          this.handleRcp(this.patternStatusList)
+        }
       },
       // 深度观察监听
       deep: true
@@ -314,6 +346,9 @@ export default {
     },
     patternStatusList: {
       handler: function (val, oldVal) {
+        if (this.patternType === 'rcp') {
+          this.handleRcp(this.patternStatusList)
+        }
         this.handleBarrierHeight() // 计算屏障高度
         if (this.patternStatusList && this.newCycle) {
           setTimeout(() => {
@@ -346,6 +381,9 @@ export default {
     if (this.contrloType === 'stage') {
       this.getStage()
     }
+    if (this.patternType === 'rcp') {
+      this.handleRcp(this.patternStatusList)
+    }
   },
   methods: {
     getPed (data) {
@@ -374,6 +412,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)
@@ -610,7 +690,6 @@ export default {
                 // if (stg === walk.phaseid) {
                 let objs = {}
                 objs.name = walk.name
-                objs.color = 'rgba(48,49,51,0.6)'
                 objs.id = walk.id
                 if (ped === walk.id) {
                   peddirections.push(objs)
@@ -626,7 +705,7 @@ export default {
             obj.direction = ring.desc.map(item => { // 虚相位desc为空
               return {
                 id: item.id,
-                color: '#303133'
+                color: '#454545'
               }
             })
           } else {
@@ -635,14 +714,14 @@ export default {
                 return {
                   id: item,
                   peddirection: peddirections,
-                  color: '#303133'
+                  color: '#454545'
                 }
               })
             } else {
               obj.direction = [
                 {
                   id: '',
-                  color: '#303133',
+                  color: '#454545',
                   peddirection: peddirections
                 }
               ]
@@ -863,7 +942,6 @@ export default {
                 let objs = {}
                 objs.name = walk.name
                 objs.id = walk.id
-                objs.color = 'rgba(48,49,51,0.6)'
                 if (ped === walk.id) {
                   peddirections.push(objs)
                   peddirections = Array.from(new Set(peddirections))
@@ -878,7 +956,7 @@ export default {
             obj.direction = ring.desc.map(item => { // 虚相位desc为空
               return {
                 id: item.id,
-                color: '#303133'
+                color: '#454545'
               }
             })
           } else {
@@ -887,14 +965,14 @@ export default {
                 return {
                   id: item,
                   peddirection: peddirections,
-                  color: '#303133'
+                  color: '#454545'
                 }
               })
             } else {
               obj.direction = [
                 {
                   id: '',
-                  color: '#303133',
+                  color: '#454545',
                   peddirection: peddirections
                 }
               ]
@@ -1091,7 +1169,6 @@ export default {
                 let objs = {}
                 objs.name = walk.name
                 objs.id = walk.id
-                objs.color = 'rgba(48,49,51,0.6)'
                 if (ped === walk.id) {
                   peddirections.push(objs)
                   peddirections = Array.from(new Set(peddirections))
@@ -1106,7 +1183,7 @@ export default {
             obj.direction = ring.desc.map(item => { // 虚相位desc为空
               return {
                 id: item.id,
-                color: '#303133',
+                color: '#454545',
                 peddirection: peddirections
               }
             })
@@ -1115,7 +1192,7 @@ export default {
               obj.direction = currPhase.direction.map(item => {
                 return {
                   id: item,
-                  color: '#303133',
+                  color: '#454545',
                   peddirection: peddirections
                 }
               })
@@ -1123,7 +1200,7 @@ export default {
               obj.direction = [
                 {
                   id: '',
-                  color: '#303133',
+                  color: '#454545',
                   peddirection: peddirections
                 }
               ]
@@ -1372,7 +1449,7 @@ export default {
 <style lang="scss" scoped>
 .main-patternstatus {
   position: relative;
-  /* margin-bottom: 20px; */
+  margin-bottom: 20px;
 }
 .main-patternstatus {
   position: relative;

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

@@ -38,7 +38,6 @@
               :overlap="overlap"
               :patternSelect="patternSelect"
               :allPatternList="allPatternList"
-              :isShowBack="isShowBack"
               @closeManualModal="closeManualModal"
               @selectModel="selectModel"
               @selectStages="selectStages"
@@ -46,8 +45,76 @@
               @closePhaseBack="closePhaseBack"
               @closePhaseControl="closePhaseControl"
               @selectSpecialModel="selectSpecialModelNew" />
+             <!-- <ManualControlModal
+               :controlData="controlData"
+               :modelList="modelList"
+               :patternSelect="patternSelect"
+               :patternAll="patternAll"
+               :crossStatusData="crossStatusData"
+               :phaseList="phaseList"
+               :specialcontrolList="specialcontrolList"
+               :currModel="currModel"
+               :preselectModel="preselectModel"
+               :preselectStages="preselectStages"
+               :realtimeStatusModalvisible="realtimeStatusModalvisible"
+               :funcSort="funcSort"
+               :roadDirection="roadDirection"
+               @closeManualModal="closeManualModal"
+               @selectModel="selectModel"
+               @selectStages="selectStages"
+               @patternCommit="patternCommit"
+               @selectSpecialModel="selectSpecialModel" /> -->
             </div>
           </transition>
+          <!-- <transition name="fade-left" mode="out-in"
+          enter-active-class="animated fadeInRight"
+          leave-active-class="animated fadeOutRight">
+            <div style="position: absolute;width: 100%;height:100%" v-show="(isOperation && isClosePhase)">
+              <ClosePhaseControlModal
+                v-if="specialPage === 'closephase'"
+                :controlData="controlData"
+                :closePhaseRings="phaseRings"
+                :sidewalkPhaseData="sidewalkPhaseData"
+                :realtimeStatusModalvisible="realtimeStatusModalvisible"
+                :roadDirection="roadDirection"
+                @closePhaseBack="closePhaseBack"
+                @closePhaseControl="closePhaseControl" /> -->
+              <!-- <LockingPhaseControlModal
+                v-if="specialPage === 'lockingphase'"
+                :roadDirection="roadDirection"
+                :phaseList="phaseList"
+                :patternStatus="statusData"
+                :lockPhaseBtnName="lockPhaseBtnName"
+                @closePhaseBack="closePhaseBack"
+                @closePhaseControl="closePhaseControl" /> -->
+                <!-- <TentativePlanControlModal
+                 v-if="specialPage === 'tentativeplan'"
+                 :realtimeStatusModalvisible="realtimeStatusModalvisible"
+                 :controlData="controlData"
+                 :phaseList="phaseList"
+                 :overlap="overlap"
+                 :patternSelect="patternSelect"
+                 :allPatternList="allPatternList"
+                 @closePhaseBack="closePhaseBack"
+                 @closePhaseControl="closePhaseControl"
+                />
+                <priorityControl
+                v-if="specialPage === 'prioritycontrol'"
+                :realtimeStatusModalvisible="realtimeStatusModalvisible"
+                :phaseList="phaseList"
+                 @closePhaseBack="closePhaseBack"
+                 @closePhaseControl="closePhaseControl"
+                /> -->
+                <!-- <AzimuthLocking
+                v-if="specialPage === 'azimuthlocking'"
+                :realtimeStatusModalvisible="realtimeStatusModalvisible"
+                :phaseList="phaseList"
+                :patternStatus="statusData"
+                 @closePhaseBack="closePhaseBack"
+                 @closePhaseControl="closePhaseControl"
+                /> -->
+            <!-- </div>
+          </transition> -->
 
           <transition name="fade-left" mode="out-in"
           enter-active-class="animated fadeInLeft"
@@ -173,10 +240,6 @@ export default {
     isFromAtc: {
       type: Boolean,
       default: true
-    },
-    isShowBack: {
-      type: Boolean,
-      default: true
     }
   },
   data () {
@@ -410,6 +473,32 @@ export default {
       faultvisible: false,
       isClosePhase: false, // 是否在相位关断
       toPage: 1, // 与哪一个页面交互，1 代表路口信息页面，3代表 相位关断页面
+      specialcontrolList: [{ // 特殊控制
+        id: 23,
+        isShow: true,
+        permission: 'configer:manual:optimize',
+        iconClass: 'closephase'
+      }, {
+        id: 22,
+        isShow: true,
+        permission: 'configer:manual:optimize',
+        iconClass: 'lockingphase'
+      }, {
+        id: 100,
+        isShow: true,
+        permission: 'configer:manual:optimize',
+        iconClass: 'tentativeplan'
+      }, {
+        id: 24,
+        isShow: true,
+        permission: 'configer:manual:preempt',
+        iconClass: 'prioritycontrol'
+      }, {
+        id: 25,
+        permission: 'configer:manual:optimize',
+        isShow: this.realtimeStatusModalvisible,
+        iconClass: 'azimuthlocking'
+      }],
       phaseRings: [],
       curFaultList: [],
       confirmedFault: [],
@@ -773,6 +862,10 @@ export default {
       }
     },
     closePhaseBack () {
+      // if (!this.realtimeStatusModalvisible) {
+      //   this.$emit('closePhaseBack')
+      //   return
+      // }
       this.toPage = 3
       this.isClosePhase = false
     },

package/package/kisscomps/components/SchemeConfig/azimuthlocking/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="tentativeplan-control manual-common-content">
+    <div class="tentativeplan-control">
       <!-- <div class="title" style="margin-bottom: 18px;">{{$t('openatccomponents.overview.azimuthlocking')}}</div> -->
       <el-row>
         <el-col :span="12">
@@ -45,10 +45,10 @@
         </el-col>
       </el-row>
       <el-row style="margin-top: 6px;">
-        <el-col :span="24">
+        <el-col :span="5">
             <span class="model-label-title">{{$t('openatccomponents.overview.indirection')}}:</span>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="19">
             <div class="control-model" v-for="(item, index) in imgs" :key="index">
                 <div :style="{'backgroundColor': item.bgcolor}" :class="{'single-model-select':spanIndex.indexOf(index)>-1}" class="single-model"  @click="boxShow(index,item)">
                     <div v-if="item.class" :style="{color: themeColor}" :class="item.class" style="border:0px;font-size: 50px;"></div>
@@ -89,13 +89,13 @@
         </div>
       </div> -->
       <div class="footer" v-if="realtimeStatusModalvisible">
-          <el-button v-if="isShowBack" @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
-          <el-button @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
+          <el-button @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
+          <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
           <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.implement')}}</el-button>
       </div>
       <div class="footer" v-if="!realtimeStatusModalvisible">
-          <el-button v-if="isShowBack" @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
-          <el-button @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
+          <el-button @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
+          <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
           <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
       </div>
     </div>
@@ -117,10 +117,6 @@ export default {
     realtimeStatusModalvisible: {
       type: Boolean,
       default: true
-    },
-    isShowBack: {
-      type: Boolean,
-      default: true
     }
   },
   watch: {

package/package/kisscomps/components/SchemeConfig/closePhaselControlModal/index.vue

@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  **/
 <template>
-  <div class="manual-control-modal closephase-control  manual-common-content">
+  <div class="manual-control-modal closephase-control">
     <!-- <div class="title" style="margin-bottom: 18px;">{{$t('openatccomponents.overview.phaseclosecontrol')}}</div> -->
     <el-row>
       <el-col :span="24">
@@ -61,13 +61,13 @@
         </div>
     </el-row>
     <div class="footer" v-if="realtimeStatusModalvisible">
-        <el-button v-if="isShowBack" @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
-        <el-button @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
+        <el-button @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
+        <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
         <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.implement')}}</el-button>
     </div>
     <div class="footer" v-if="!realtimeStatusModalvisible">
-        <el-button v-if="isShowBack" @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
-        <el-button @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
+        <el-button @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
+        <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
         <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
     </div>
   </div>
@@ -118,10 +118,6 @@ export default {
     },
     roadDirection: {
       type: String
-    },
-    isShowBack: {
-      type: Boolean,
-      default: true
     }
   },
   data () {

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

@@ -10,11 +10,12 @@
  * See the Mulan PSL v2 for more details.
  **/
 <template>
-  <div class="lockingphase-control manual-common-content">
+  <div class="lockingphase-control manual-control-modal">
     <!-- <div class="title" style="margin-bottom: 18px;">{{$t('openatccomponents.overview.phaselocking')}}</div> -->
     <el-row>
       <el-col :span="12">
          <el-form
+          :inline="true"
            ref="manual"
            label-position="left"
            :model="manualInfo"
@@ -40,6 +41,7 @@
       </el-col>
       <el-col :span="12">
         <el-form
+         :inline="true"
           ref="manual"
           label-position="left"
           :model="manualInfo"
@@ -88,8 +90,8 @@
         </div>
     </el-row>
     <div class="footer">
-        <el-button v-if="isShowBack" @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
-        <el-button @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
+        <el-button @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
+        <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
         <el-button type="primary" @click="handleLockPhase()">{{lockPhaseBtnName}}</el-button>
     </div>
   </div>
@@ -116,10 +118,6 @@ export default {
     },
     roadDirection: {
       type: String
-    },
-    isShowBack: {
-      type: Boolean,
-      default: true
     }
   },
   data () {