openatc-components 0.0.99 → 0.0.100

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

@@ -69,12 +69,6 @@
                  @closePhaseBack="closePhaseBack"
                  @closePhaseControl="closePhaseControl"
                 />
-                <priorityControl
-                v-if="specialPage === 'prioritycontrol'"
-                :phaseList="phaseList"
-                 @closePhaseBack="closePhaseBack"
-                 @closePhaseControl="closePhaseControl"
-                />
             </div>
           </transition>
 
@@ -116,7 +110,6 @@ 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'
@@ -132,7 +125,6 @@ export default {
     ManualControlModal,
     ClosePhaseControlModal,
     LockingPhaseControlModal,
-    priorityControl,
     TentativePlanControlModal
   },
   props: {
@@ -300,9 +292,6 @@ export default {
       }, {
         id: 100,
         iconClass: 'tentativeplan'
-      }, {
-        id: 24,
-        iconClass: 'tentativeplan'
       }],
       phaseRings: [],
       curFaultList: [],
@@ -631,11 +620,6 @@ 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/StageStatus/StageStatus.vue

@@ -57,9 +57,7 @@ export default {
         if (this.contrloType === 'stage') {
           this.getStageLine()
         } else {
-          if (this.controlData) {
-            this.getPhaseId(this.controlData)
-          }
+          this.getPhaseId(this.controlData)
         }
       },
       // 深度观察监听
@@ -68,9 +66,7 @@ export default {
     patternStatusList: {
       handler: function (val, oldVal) {
         // this.handleStages() // 计算屏障高度
-        if (this.patternStatusList) {
-          this.getPhaseId(this.patternStatusList)
-        }
+        this.getPhaseId(this.patternStatusList)
       },
       // 深度观察监听
       deep: true

package/src/kisscomps/components/patternList/patternList.vue

@@ -10,7 +10,6 @@
     :patternList="patternList"
     :localPatternList="localPatternList"
     :phaseList="phaseList"
-    :showBarrier="showBarrier"
     :agentId="agentId"
     :controlData="controlData"
     :syncTime="syncTime"
@@ -508,10 +507,6 @@ export default {
     phaseList: {
       type: Array
     },
-    showBarrier: {
-      type: Boolean,
-      default: false
-    },
     controlData: {
       type: Object
     },

package/src/kisscomps/index.js

@@ -21,7 +21,6 @@ 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'
 
@@ -52,7 +51,6 @@ const components = {
   StageBord,
   ExpendConfig,
   PatternWalkSvg,
-  priorityControl,
   tentativeplancontrolmodal
 }
 

package/src/router/index.js

@@ -27,14 +27,14 @@ export default new Router({
     },
     {
       path: '/overView',
-      name: 'config',
+      name: 'overview',
       component: (resolve) => {
         require(['@/views/overView'], resolve)
       }
     },
     {
       path: '/quhua',
-      name: 'config',
+      name: 'quhua',
       component: (resolve) => {
         require(['@/views/customchannelization'], resolve)
       }

package/static/styles/channelizatioon.scss

@@ -67,6 +67,16 @@
             width: 90PX;
             height: 32PX;
           }
+          .lock-map {
+            cursor: pointer;
+            margin: 0 5PX;
+          }
+          .el-icon-lock {
+            color: $--color-text-secondary;
+          }
+          .el-icon-unlock {
+            color: rgb(242, 121, 121);
+          }
         }
         .draw-to-sketchpad {
           float: right;
@@ -105,6 +115,14 @@
         .channelization-elements-components {
           border: 1px solid $--border-color-base;
           margin: 0 auto;
+          .detector-chart-icon {
+            .detector-rect {
+              width: 20PX;
+              height: 20PX;
+              border: 2px solid #0080FF;
+              margin: 0 auto;
+            }
+          }
         }
       }
       .draw-end-function {
@@ -200,6 +218,8 @@
       }
       .lane-edit-panel {
         position: relative;
+        max-height: 87vh;
+        overflow-y: auto;
         .edit-id {
           position: absolute;
           right: 30PX;
@@ -214,9 +234,27 @@
         .delete-drawed-item {
           text-align: center;
           margin-top: 57PX;
+          margin-bottom: 39PX;
+          button {
+            width: 90PX;
+            height: 32PX;
+            padding: 0;
+          }
         }
-        .detector-threshold-formtext {
-          color: $--color-text-regular;
+        .detector-threshold {
+          margin-bottom: 55px;
+          .detector-threshold-formtext {
+            color: $--color-text-regular;
+          }
+          .flow-separator {
+            color: $--color-text-regular;
+          }
+          .el-select {
+            width: 120PX;
+          }
+        }
+        .overlap-associated {
+          margin-bottom: 30px;
         }
       }
       .phase-associated-component {

package/static/styles/schemeconfig.scss

@@ -273,58 +273,6 @@
     color: $--color-text-secondary;
   }
 } 
-.priority-control{
-  height: 100%;
-  padding: 21px 0px 21px 28px;
-  min-width: 360px;
-  overflow: auto;
-  .title {
-    margin-bottom: 24px;
-    font-size: 20px;
-    font-weight: 400;
-    line-height: 22px;
-    color: $--color-text-primary;
-    span {
-      font-size: 14px;
-      font-weight: 400;
-      color: $--color-text-secondary;
-    }
-  }
-  .footer {
-    float: right;
-    margin: 38px 24px 40px 0;
-    button {
-      width: 56px;
-      height: 32px;
-      padding: 0;
-      text-align: center;
-      line-height: 30px;
-      font-size: 12px;
-      font-weight: normal;
-      font-stretch: normal;
-    }
-  }
-  .el-input--mini{
-    width: 90%;
-  }
-  .el-form-item {
-    margin-bottom: 0px;
-  }
-  .el-form-item__label {
-    font-size: 14px;
-    font-weight: 400;
-    color: $--color-text-secondary;
-  }
-  .el-select {
-    width: 90%;
-  }
-  .el-input-number {
-    width: 100%;
-    .el-input__inner {
-      text-align: left;
-    }
-  }
-}
 .tentativeplan-control{
   height: 100%;
   padding: 21px 0px 21px 28px;

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

@@ -1,190 +0,0 @@
-<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

@@ -1,163 +0,0 @@
-/**
- * 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}