openatc-components 0.0.96-hotfix → 0.0.97

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openatc-components",
-  "version": "0.0.96-hotfix",
+  "version": "0.0.97",
   "description": "A Vue.js project",
   "author": "openatc developer",
   "private": false,
@@ -21,24 +21,25 @@
     "npm2yuanqu": "npm config set registry http://nexus.ctsp.kedacom.com/content/groups/npm-host-yuanqu/"
   },
   "dependencies": {
+    "@minogin/vue-drag-resize-rotate": "^1.0.5",
+    "@openatc/edgebase-front": "^2.4.0",
+    "animate.css": "^3.7.2",
+    "axios": "0.21.1",
+    "echarts": "^4.9.0",
+    "element-ui": "^2.7.2",
     "flatpickr": "^4.5.1",
     "jquery": "^3.3.1",
+    "js-cookie": "2.2.0",
+    "localStorage": "^1.0.4",
+    "moment": "^2.24.0",
     "pend": "^1.2.0",
+    "scss-loader": "0.0.1",
     "v-tooltip": "^2.0.0-rc.33",
     "vue": "^2.5.2",
-    "vue-router": "^3.0.1",
-    "element-ui": "^2.7.2",
-    "moment": "^2.24.0",
-    "axios": "0.21.1",
-    "js-cookie": "2.2.0",
-    "localStorage": "^1.0.4",
     "vue-i18n": "^8.7.0",
-    "vuex": "3.0.1",
-    "scss-loader": "0.0.1",
+    "vue-router": "^3.0.1",
     "vuedraggable": "^2.16.0",
-    "animate.css": "^3.7.2",
-    "echarts": "^4.9.0",
-    "@minogin/vue-drag-resize-rotate": "^1.0.5"
+    "vuex": "3.0.1"
   },
   "devDependencies": {
     "autoprefixer": "^7.1.2",

package/src/i18n/language/en.js

@@ -129,6 +129,7 @@ const en = {
       'phaseclose': 'Close Phase',
       'phaselocking': 'Priority Control',
       'tentativeplan': 'Tentative Plan',
+      'prioritycontrol': 'Priority Control',
       'implement': 'Execute',
       'comfirm': 'Comfirm',
       'ipaddress': 'IP',
@@ -206,7 +207,34 @@ const en = {
       'modelList22': 'Priority Control',
       'modelList23': 'Close Phase',
       'modelList100': 'Tentative Plan',
-      'modelList24': 'Emergency Control',
+      'modelList24': 'Priority Control',
+      'priorityType': 'Priority Type',
+      'priorityPhase': 'Priority Phase',
+      'typeOption0': 'Regular Priority',
+      'typeOption1': 'Urgent Priority',
+      'es': 'East-Straight',
+      'el': 'East-Left',
+      'er': 'East-Right',
+      'eb': 'East-Back',
+      'ws': 'West-Straight',
+      'wl': 'West-Left',
+      'wr': 'West-Right',
+      'wb': 'West-Back',
+      'ns': 'North-Straight',
+      'nl': 'North-Left',
+      'nr': 'North-Right',
+      'nb': 'North-Back',
+      'ss': 'South-Straight',
+      'sl': 'South-Left',
+      'sr': 'South-Right',
+      'sb': 'South-Back',
+      'level': 'Level',
+      'levelOption': 'LevelOption',
+      'levelOption1': '1',
+      'levelOption2': '2',
+      'levelOption3': '3',
+      'levelOption4': '4',
+      'levelOption5': '5',
       'modelList99': 'Device Mantenance',
       'tips': 'Tips',
       'exitmanul': 'It is necessary to restore self-control before exiting. Do you want to exit?',
@@ -1169,8 +1197,8 @@ const en = {
       'pedestriandetector': 'Pedestrian Detector',
       'detectorassociated': 'Detector Associated',
       'detectorthreshold': 'Detector Threshold',
-      'occupancythreshold': 'Greenlight Utilization Threshold',
-      'saturationthreshold': 'Flow Saturation Threshold',
+      'occupancythreshold': 'Occupancy threshold',
+      'saturationthreshold': 'Flow Saturation threshold',
       'checkthreshold': 'The threshold value cannot be blank. Please fill in a positive integer within the range of 0-100！',
       'pedestriancrossing': 'Pedestrian crossing',
       'pedestriansecondarycrossing': 'Pedestrian secondary crossing',

package/src/i18n/language/zh.js

@@ -129,6 +129,34 @@ const zh = {
       'phaseclose': '相位关断',
       'phaselocking': '相位锁定',
       'tentativeplan': '临时方案',
+      'prioritycontrol': '优先控制',
+      'priorityType': '优先类型',
+      'priorityPhase': '优先相位',
+      'typeOption0': '常规优先',
+      'typeOption1': '紧急优先',
+      'es': '东直行',
+      'el': '东左转',
+      'er': '东右转',
+      'eb': '东掉头',
+      'ws': '西直行',
+      'wl': '西左转',
+      'wr': '西右转',
+      'wb': '西掉头',
+      'ns': '北直行',
+      'nl': '北左转',
+      'nr': '北右转',
+      'nb': '北掉头',
+      'ss': '南直行',
+      'sl': '南左转',
+      'sr': '南右转',
+      'sb': '南掉头',
+      'level': '优先级',
+      'levelOption': 'levelOption',
+      'levelOption1': '1',
+      'levelOption2': '2',
+      'levelOption3': '3',
+      'levelOption4': '4',
+      'levelOption5': '5',
       'implement': '执行',
       'comfirm': '确定',
       'ipaddress': 'IP地址',
@@ -206,7 +234,7 @@ const zh = {
       'modelList22': '相位锁定',
       'modelList23': '相位关断',
       'modelList100': '临时方案',
-      'modelList24': '紧急控制',
+      'modelList24': '优先控制',
       'modelList99': '设备维护',
       'tips': '提示',
       'exitmanul': '退出前需要先恢复自主控制, 是否退出?',
@@ -1168,7 +1196,7 @@ const zh = {
       'pedestriandetector': '行人检测器',
       'detectorassociated': '检测器关联',
       'detectorthreshold': '检测器阈值',
-      'occupancythreshold': '绿灯利用率阈值',
+      'occupancythreshold': '占有率阈值',
       'saturationthreshold': '流量饱和度阈值',
       'checkthreshold': '阈值不可为空，请填0-100范围内的正整数！',
       'pedestriancrossing': '行人过街',

package/src/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/src/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/src/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/src/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>