openatc-components 0.0.96-hotfix → 0.0.97

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

@@ -541,8 +541,7 @@ export default {
         detectortype: 1, // 检测器类型： 1 车辆检测器 2 行人检测器
         detectorid: undefined,
         occupancythreshold: 80,
-        minflowsaturationthreshold: 30,
-        maxflowsaturationthreshold: 70,
+        flowsaturationthreshold: 20,
         ...defaultDetectorParam
       }
       this.curChooseIconIndex = detectoritem.index

package/package/kisscomps/components/DrawChannelization/drawsvg/laneEditPanel.vue

@@ -160,45 +160,18 @@
            <el-form-item
                 :label="$t('openatccomponents.channelizationmap.occupancythreshold') + ':'"
                 prop="intersection">
-              <!-- <el-input-number :min="0" :max="100" :precision="0" :step="1" :controls="false"
+              <el-input-number :min="0" :max="100" :precision="0" :step="1" :controls="false"
                 :value="occupancythreshold" size="mini"
                 @change="handleChangeOccuthreshold" />
-              <span class="detector-threshold-formtext">%</span> -->
-              <el-select :value="occupancythreshold" @change="handleChangeOccuthreshold">
-                <el-option
-                  v-for="item in occupResholdOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
+              <span class="detector-threshold-formtext">%</span>
             </el-form-item>
             <el-form-item
                 :label="$t('openatccomponents.channelizationmap.saturationthreshold') + ':'"
                 prop="count">
-              <!-- <el-input-number :min="0" :max="100" :precision="0" :step="1" :controls="false"
+              <el-input-number :min="0" :max="100" :precision="0" :step="1" :controls="false"
                 :value="flowsaturationthreshold" size="mini"
                 @change="handleChangeFlowthreshold" />
-              <span class="detector-threshold-formtext">%</span> -->
-              <el-select :value="minflowsaturationthreshold" @change="handleChangeMinFlowthreshold">
-                <el-option
-                  v-for="item in minflowResholdOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                  :disabled="item.disabled">
-                </el-option>
-              </el-select>
-              <span class="flow-separator">——</span>
-              <el-select :value="maxflowsaturationthreshold" @change="handleChangeMaxFlowthreshold">
-                <el-option
-                  v-for="item in maxflowResholdOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                  :disabled="item.disabled">
-                </el-option>
-              </el-select>
+              <span class="detector-threshold-formtext">%</span>
             </el-form-item>
         </el-form>
       </div>
@@ -400,12 +373,8 @@ export default {
         iconclass: 'custom-peddetector',
         name: this.$t('openatccomponents.channelizationmap.pedestriandetector')
       }],
-      occupResholdOptions: [],
-      minflowResholdOptions: [],
-      maxflowResholdOptions: [],
       occupancythreshold: 80,
-      minflowsaturationthreshold: 30,
-      maxflowsaturationthreshold: 70
+      flowsaturationthreshold: 20
     }
   },
   watch: {
@@ -425,11 +394,8 @@ export default {
         if (data.occupancythreshold !== undefined) {
           this.occupancythreshold = data.occupancythreshold
         }
-        if (data.minflowsaturationthreshold !== undefined) {
-          this.minflowsaturationthreshold = data.minflowsaturationthreshold
-        }
-        if (data.maxflowsaturationthreshold !== undefined) {
-          this.maxflowsaturationthreshold = data.maxflowsaturationthreshold
+        if (data.flowsaturationthreshold !== undefined) {
+          this.flowsaturationthreshold = data.flowsaturationthreshold
         }
         if (data.flip !== undefined) {
           this.flip = data.flip
@@ -481,9 +447,8 @@ export default {
       if (value === 2) {
         // 行人检测器没有阈值设置
         this.iconObj.occupancythreshold = undefined
-        this.iconObj.minflowsaturationthreshold = undefined
-        this.iconObj.maxflowsaturationthreshold = undefined
-        this.$emit('changeIconDataByType', this.iconObj, ['occupancythreshold', 'minflowsaturationthreshold', 'maxflowsaturationthreshold'])
+        this.iconObj.flowsaturationthreshold = undefined
+        this.$emit('changeIconDataByType', this.iconObj, ['occupancythreshold', 'flowsaturationthreshold'])
       }
     },
     selectPedPos (value) {
@@ -541,53 +506,15 @@ export default {
       this.iconObj.occupancythreshold = occupancythreshold
       this.$emit('changeIconDataByType', this.iconObj, ['occupancythreshold'])
     },
-    handleChangeMinFlowthreshold (minflowsaturationthreshold) {
-      if (minflowsaturationthreshold === undefined) {
-        this.$message.error(this.$t('openatccomponents.channelizationmap.checkthreshold'))
-        this.minflowsaturationthreshold = 30
-        return
-      }
-      this.minflowsaturationthreshold = minflowsaturationthreshold
-      this.iconObj.minflowsaturationthreshold = minflowsaturationthreshold
-      this.$emit('changeIconDataByType', this.iconObj, ['minflowsaturationthreshold'])
-      this.handleDisabledMaxflowOption()
-    },
-    handleDisabledMinflowOption () {
-      // 此处需要排他，恢复上次置灰到默认值
-      this.minflowResholdOptions = this.minflowResholdOptions.map(option => ({
-        label: option.label,
-        value: option.value
-      }))
-      // 控制流量饱和度最小阈值的禁用范围
-      for (let i = 0; i < this.minflowResholdOptions.length; i++) {
-        if (this.minflowResholdOptions[i].value >= this.maxflowsaturationthreshold) {
-          this.minflowResholdOptions[i].disabled = true
-        }
-      }
-    },
-    handleChangeMaxFlowthreshold (maxflowsaturationthreshold) {
-      if (maxflowsaturationthreshold === undefined) {
+    handleChangeFlowthreshold (flowsaturationthreshold) {
+      if (flowsaturationthreshold === undefined) {
         this.$message.error(this.$t('openatccomponents.channelizationmap.checkthreshold'))
-        this.maxflowsaturationthreshold = 70
+        this.flowsaturationthreshold = 20
         return
       }
-      this.maxflowsaturationthreshold = maxflowsaturationthreshold
-      this.iconObj.maxflowsaturationthreshold = maxflowsaturationthreshold
-      this.$emit('changeIconDataByType', this.iconObj, ['maxflowsaturationthreshold'])
-      this.handleDisabledMinflowOption()
-    },
-    handleDisabledMaxflowOption () {
-      // 此处需要排他，恢复上次置灰到默认值
-      this.maxflowResholdOptions = this.maxflowResholdOptions.map(option => ({
-        label: option.label,
-        value: option.value
-      }))
-      // 控制流量饱和度最大阈值的禁用范围
-      for (let i = 0; i < this.maxflowResholdOptions.length; i++) {
-        if (this.maxflowResholdOptions[i].value <= this.minflowsaturationthreshold) {
-          this.maxflowResholdOptions[i].disabled = true
-        }
-      }
+      this.flowsaturationthreshold = flowsaturationthreshold
+      this.iconObj.flowsaturationthreshold = flowsaturationthreshold
+      this.$emit('changeIconDataByType', this.iconObj, ['flowsaturationthreshold'])
     },
     getCurPedPosList (iconpedtypeid) {
       // 方位根据行人类型显示
@@ -605,34 +532,8 @@ export default {
     handleChangeFilp (value) {
       this.iconObj.flip = value
       this.$emit('changeIconDataByType', this.iconObj, ['flip'])
-    },
-    createResholdSelectOptions () {
-      for (let i = 5; i < 100; i = i + 5) {
-        let option = {
-          label: i + '%',
-          value: i
-        }
-        this.occupResholdOptions.push(option)
-        if (i <= this.minflowsaturationthreshold) {
-          option.disabled = true
-        }
-        this.maxflowResholdOptions.push(option)
-      }
-      for (let i = 5; i < 100; i = i + 5) {
-        let option = {
-          label: i + '%',
-          value: i
-        }
-        if (i >= this.maxflowsaturationthreshold) {
-          option.disabled = true
-        }
-        this.minflowResholdOptions.push(option)
-      }
     }
   },
-  created () {
-    this.createResholdSelectOptions()
-  },
   mounted () {
     if (JSON.stringify(this.Data) === '{}') return
     this.iconObj = JSON.parse(JSON.stringify(this.Data))
@@ -648,11 +549,8 @@ export default {
     if (this.Data.occupancythreshold !== undefined) {
       this.occupancythreshold = this.Data.occupancythreshold
     }
-    if (this.Data.minflowsaturationthreshold !== undefined) {
-      this.minflowsaturationthreshold = this.Data.minflowsaturationthreshold
-    }
-    if (this.Data.maxflowsaturationthreshold !== undefined) {
-      this.maxflowsaturationthreshold = this.Data.maxflowsaturationthreshold
+    if (this.Data.flowsaturationthreshold !== undefined) {
+      this.flowsaturationthreshold = this.Data.flowsaturationthreshold
     }
     if (this.Data.flip !== undefined) {
       this.flip = this.Data.flip

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

@@ -69,6 +69,12 @@
                  @closePhaseBack="closePhaseBack"
                  @closePhaseControl="closePhaseControl"
                 />
+                <priorityControl
+                v-if="specialPage === 'prioritycontrol'"
+                :phaseList="phaseList"
+                 @closePhaseBack="closePhaseBack"
+                 @closePhaseControl="closePhaseControl"
+                />
             </div>
           </transition>
 
@@ -110,6 +116,7 @@ import ManualControlModal from './manualControlModal'
 import ClosePhaseControlModal from './closePhaselControlModal'
 import LockingPhaseControlModal from './lockingPhaselControlModal'
 import TentativePlanControlModal from './tentativeplancontrolmodal'
+import priorityControl from './priorityControl'
 // import { getFaultMesZh, getFaultMesEn } from '../../utils/faultcode.js'
 import { getMessageByCode } from '../../../utils/responseMessage'
 import { GetAllFaultRange } from '../../../api/fault'
@@ -125,6 +132,7 @@ export default {
     ManualControlModal,
     ClosePhaseControlModal,
     LockingPhaseControlModal,
+    priorityControl,
     TentativePlanControlModal
   },
   props: {
@@ -292,6 +300,9 @@ export default {
       }, {
         id: 100,
         iconClass: 'tentativeplan'
+      }, {
+        id: 24,
+        iconClass: 'tentativeplan'
       }],
       phaseRings: [],
       curFaultList: [],
@@ -620,6 +631,11 @@ export default {
         this.isClosePhase = true
         this.phaseRings = ringDataModel.initRingPhaseData()
         this.specialPage = 'tentativeplan'
+      } else if (id === 24) {
+        this.toPage = 3
+        this.isClosePhase = true
+        this.phaseRings = ringDataModel.initRingPhaseData()
+        this.specialPage = 'prioritycontrol'
       } else {
         this.isClosePhase = false
         this.specialPage = ''

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

@@ -0,0 +1,190 @@
+<template>
+  <div class="priority-control">
+    <div class="title" style="margin-bottom: 18px;">{{$t('openatccomponents.overview.prioritycontrol')}}</div>
+    <el-row>
+      <el-col :span="12">
+         <el-form
+           ref="manual"
+           label-position="left"
+           :model="manualInfo"
+           label-width="100px">
+            <el-form-item
+                :label="$t('openatccomponents.overview.delay') + ':'"
+                prop="intersection">
+                <el-input-number :placeholder="$t('openatccomponents.common.input')" :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.delay" size="mini"></el-input-number>
+               <!-- <el-input v-model="manualInfo.tempDelay" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
+            </el-form-item>
+            <el-form-item
+                :label="$t('openatccomponents.overview.priorityType') + ':'"
+                prop="count">
+                <el-select v-model="manualInfo.type" class="col-inner"  size="small" clearable :placeholder="$t('openatccomponents.common.select')">
+                  <el-option
+                    v-for="item in typeSelect"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+               <!-- <el-input v-model="manualInfo.tempDuration" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
+            </el-form-item>
+           </el-form>
+      </el-col>
+      <el-col :span="12">
+         <el-form
+           ref="manual"
+           label-position="left"
+           :model="manualInfo"
+           label-width="100px">
+            <el-form-item
+                :label="$t('openatccomponents.overview.duration') + ':'"
+                prop="intersection">
+                <el-input-number :placeholder="$t('openatccomponents.common.input')" :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.duration" size="mini"></el-input-number>
+               <!-- <el-input v-model="manualInfo.duration" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
+            </el-form-item>
+            <el-form-item
+                :label="$t('openatccomponents.overview.priorityPhase') + ':'"
+                prop="count">
+                <el-select v-model="manualInfo.phase" class="col-inner"  size="small" clearable :placeholder="$t('openatccomponents.common.select')">
+                  <el-option
+                    v-for="(item, index) in phaseSelect"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.value">
+                    <div class="single-model">
+                        <xdrdirselector Width="40px" Height="40px" :showlist="item.item"></xdrdirselector>
+                        <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
+                    </div>
+                  </el-option>
+                </el-select>
+               <!-- <el-input v-model="manualInfo.tempDuration" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
+            </el-form-item>
+           </el-form>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+         <el-form
+           ref="manual"
+           label-position="left"
+           :model="manualInfo"
+           label-width="100px">
+            <el-form-item
+                :label="$t('openatccomponents.overview.level') + ':'"
+                prop="count">
+                <el-select v-model="manualInfo.level" class="col-inner"  size="small" clearable :placeholder="$t('openatccomponents.common.select')">
+                  <el-option
+                    v-for="item in levelOption"
+                    :key="item.value"
+                    :label="$t('openatccomponents.overview.levelOption' + item.value)"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+               <!-- <el-input v-model="manualInfo.tempDuration" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
+            </el-form-item>
+           </el-form>
+      </el-col>
+    </el-row>
+    <div class="footer">
+        <el-button @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
+        <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.implement')}}</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import xdrdirselector from '../../XRDDirSelector/XRDDirSelector'
+import { getTheme } from '../../../../utils/auth'
+import { getDirName } from './utils'
+export default {
+  name: 'prioritycontrol',
+  components: {
+    xdrdirselector
+  },
+  props: {
+    phaseList: {
+      type: Array
+    }
+  },
+  data () {
+    return {
+      levelOption: [{
+        value: 1,
+        label: 1
+      }, {
+        value: 2,
+        label: 2
+      }, {
+        value: 3,
+        label: 3
+      }, {
+        value: 4,
+        label: 4
+      }, {
+        value: 5,
+        label: 5
+      }],
+      typeSelect: [{
+        value: 0,
+        label: this.$t('openatccomponents.overview.typeOption0')
+      }, {
+        value: 1,
+        label: this.$t('openatccomponents.overview.typeOption1')
+      }],
+      phaseSelect: [],
+      manualInfo: {
+        level: 1,
+        phase: 1,
+        type: 0,
+        duration: 300,
+        delay: 0
+      }
+    }
+  },
+  created () {
+    this.getSelect(this.phaseList)
+  },
+  methods: {
+    getSelect (list) {
+      let color = getTheme() === 'light' ? '#1E1E1E' : '#F1F3F4'
+      this.phaseSelect = list.map((item, index) => {
+        let dirArr = []
+        for (let rec of item.direction) {
+          let recd = {
+            id: rec,
+            color: color
+          }
+          dirArr.push(recd)
+        }
+        let nameArr = getDirName(dirArr)
+        let name = ''
+        nameArr = nameArr.map(record => this.$t(record))
+        name = nameArr.join(',')
+        return {
+          label: name,
+          item: dirArr,
+          value: item.id
+        }
+      })
+    },
+    handleClose () {
+      this.$emit('closePhaseBack')
+    },
+    handleManualControl () {
+      let submitdata = {
+        control: 24,
+        delay: this.manualInfo.delay,
+        duration: this.manualInfo.duration,
+        type: this.manualInfo.type,
+        phase: this.manualInfo.phase,
+        level: this.manualInfo.level
+      }
+      console.log(submitdata, 'submitdata')
+      this.$emit('closePhaseControl', submitdata)
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>

package/package/kisscomps/components/SchemeConfig/priorityControl/utils.js

@@ -0,0 +1,163 @@
+/**
+ * Copyright (c) 2020 kedacom
+ * OpenATC is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ **/
+import Edgebase from '@openatc/edgebase-front'
+let images = [{
+  id: 1,
+  // name: 'East-Straight',
+  name: 'openatccomponents.overview.es',
+  // img: require('./images/East-Straight.svg'),
+  class: 'iconfont icon-icon-test2'
+},
+{
+  id: 2,
+  // name: 'East-Left',
+  name: 'openatccomponents.overview.el',
+  // img: require('./images/East-Left.svg'),
+  class: 'iconfont icon-icon-test4'
+},
+{
+  id: 3,
+  // name: 'East-Right',
+  name: 'openatccomponents.overview.er',
+  // img: require('./images/East-Right.svg'),
+  class: 'iconfont icon-icon-test3'
+},
+{
+  id: 4,
+  // name: 'East-Back',
+  name: 'openatccomponents.overview.eb',
+  // img: require('./images/East-Back.svg'),
+  class: 'iconfont icon-icon-test6'
+},
+{
+  id: 5,
+  // name: 'West-Straight',
+  name: 'openatccomponents.overview.ws',
+  // img: require('./images/West-Straight.svg'),
+  class: 'iconfont icon-icon-test5'
+},
+{
+  id: 6,
+  // name: 'West-Left',
+  name: 'openatccomponents.overview.wl',
+  // img: require('./images/West-Left.svg'),
+  class: 'iconfont icon-icon-test7'
+},
+{
+  id: 7,
+  // name: 'West-Right',
+  name: 'openatccomponents.overview.wr',
+  // img: require('./images/West-Right.svg'),
+  class: 'iconfont icon-icon-test9'
+},
+{
+  id: 8,
+  // name: 'West-Back',
+  name: 'openatccomponents.overview.wb',
+  // img: require('./images/West-Back.svg'),
+  class: 'iconfont icon-icon-test8'
+},
+{
+  id: 9,
+  // name: 'North-Straight',
+  name: 'openatccomponents.overview.ns',
+  // img: require('./images/North-Straight.svg'),
+  class: 'iconfont icon-icon-test10'
+},
+{
+  id: 10,
+  // name: 'North-Left',
+  name: 'openatccomponents.overview.nl',
+  // img: require('./images/North-Left.svg'),
+  class: 'iconfont icon-icon-test12'
+},
+{
+  id: 11,
+  // name: 'North-Right',
+  name: 'openatccomponents.overview.nr',
+  // img: require('./images/North-Right.svg'),
+  class: 'iconfont icon-icon-test13'
+},
+{
+  id: 12,
+  // name: 'North-Back',
+  name: 'openatccomponents.overview.nb',
+  // img: require('./images/North-Back.svg'),
+  class: 'iconfont icon-icon-test11'
+},
+{
+  id: 13,
+  // name: 'South-Straight',
+  name: 'openatccomponents.overview.ss',
+  // img: require('./images/South-Straight.svg'),
+  class: 'iconfont icon-icon-test15'
+},
+{
+  id: 14,
+  // name: 'South-Left',
+  name: 'openatccomponents.overview.sl',
+  // img: require('./images/South-Left.svg'),
+  class: 'iconfont icon-icon-test14'
+},
+{
+  id: 15,
+  // name: 'South-Right',
+  name: 'openatccomponents.overview.sr',
+  // img: require('./images/South-Right.svg'),
+  class: 'iconfont icon-icon-test'
+},
+{
+  id: 16,
+  // name: 'South-Back',
+  name: 'openatccomponents.overview.sb',
+  // img: require('./images/South-Back.svg'),
+  class: 'iconfont icon-icon-test1'
+}]
+
+const getImages = () => {
+  if (Edgebase.Store.getters.roadDirection === 'left') {
+    // 左行下，掉头图标替换
+    images.forEach((img) => {
+      if (img.id === 4) {
+        img.class = 'iconfont icon-dongtiaotou-yinni'
+      }
+      if (img.id === 8) {
+        img.class = 'iconfont icon-xitiaotou-yinni'
+      }
+      if (img.id === 12) {
+        img.class = 'iconfont icon-beitiaotou-yinni'
+      }
+      if (img.id === 16) {
+        img.class = 'iconfont icon-nantiaotou-yinni'
+      }
+    })
+  }
+  return images
+}
+
+const getDirName = (arr) => {
+  let res = ''
+  let nameArr = []
+  for (let item of arr) {
+    let id = item.id
+    for (let img of images) {
+      if (id === img.id) {
+        let name = img.name
+        nameArr.push(name)
+      }
+    }
+  }
+  res = nameArr
+  return res
+}
+
+export {getImages, getDirName}

package/package/kisscomps/index.js

@@ -21,6 +21,7 @@ import StageBord from './components/StageBord/index'
 import ExpendConfig from './components/ExpendConfig/index'
 import PatternWalkSvg from './components/PatternWalkSvg/index'
 import tentativeplancontrolmodal from './components/SchemeConfig/tentativeplancontrolmodal/index'
+import priorityControl from './components/SchemeConfig/priorityControl/index'
 import { setToken, setHost } from '../utils/auth.js'
 import componentsGlobalParam from '../store/modules/globalParam'
 
@@ -51,6 +52,7 @@ const components = {
   StageBord,
   ExpendConfig,
   PatternWalkSvg,
+  priorityControl,
   tentativeplancontrolmodal
 }