openatc-components 0.5.29 → 0.5.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openatc-components",
-  "version": "0.5.29",
+  "version": "0.5.30",
   "description": "A Vue.js project",
   "author": "openatc developer",
   "private": false,

package/src/i18n/language/en.js

@@ -1603,7 +1603,7 @@ const en = {
       'importsizeerror': 'Picture size exceeds 10MB, please re import!',
       'importtypeerror': 'Picture format error, please import again!',
       'importcrosspicture': 'Intersection Map',
-      'againimport': 'Re import',
+      'againimport': 'Import Map',
       'motorway': 'Motorway',
       'bicyclelane': 'Non motorized Lane',
       'pedcrossing': 'Ped crossing',
@@ -1680,7 +1680,11 @@ const en = {
       'angle': 'Angle',
       'basicinfo': 'Basic information',
       'importfilesuccess': 'Import of JSON file succeeded!',
-      'holographiclaneid': 'Holographic Laneid'
+      'holographiclaneid': 'Holographic Laneid',
+      'defaultShowQuhua': 'Overview page displays the channelized map default',
+      'exportFile': 'Export to file',
+      'lockMap': 'Lock the base map',
+      'unlockMap': 'Unlock the base map'
     },
     'faultlevelCode': {
       '1': 'General failure',

package/src/i18n/language/ru.js

@@ -1392,7 +1392,7 @@ const ru = {
       'importsizeerror': 'Размер изображения превышает 10 Мб, повторите импорт!',
       'importtypeerror': 'Ошибка формата изображения, повторите импорт!',
       'importcrosspicture': 'Импортировать изображение перекрестка',
-      'againimport': 'Повторный импорт',
+      'againimport': 'Импорт фонового изображения',
       'motorway': 'Полоса для моторных транспортных средств',
       'bicyclelane': 'Полоса для немоторизованных транспортных средств',
       'pedcrossing': 'Пешеходный переход',
@@ -1469,7 +1469,11 @@ const ru = {
       'angle': 'Угол поворота',
       'basicinfo': 'Базовая информация',
       'importfilesuccess': 'Импорт файла параметров успешен!',
-      'holographiclaneid': 'ID голографической полосы'
+      'holographiclaneid': 'ID голографической полосы',
+      'defaultShowQuhua': 'Обзор по умолчанию отображает канализационную карту',
+      'exportFile': 'экспортировать в файл',
+      'lockMap': 'зафиксировать фоновое изображение',
+      'unlockMap': 'разблокировать базовую карту'
     },
     'faultlevelCode': {
       '1': 'Общая неисправность',

package/src/i18n/language/zh.js

@@ -1600,7 +1600,7 @@ const zh = {
       'importsizeerror': '图片大小超过10Mb，请重新导入!',
       'importtypeerror': '图片格式错误，请重新导入!',
       'importcrosspicture': '路口底图',
-      'againimport': '重新导入',
+      'againimport': '导入底图',
       'motorway': '机动车道',
       'bicyclelane': '非机动车道',
       'pedcrossing': '人行横道',
@@ -1677,7 +1677,11 @@ const zh = {
       'angle': '旋转角度',
       'basicinfo': '基础信息',
       'importfilesuccess': '导入参数文件成功！',
-      'holographiclaneid': '全息车道id'
+      'holographiclaneid': '全息车道id',
+      'defaultShowQuhua': '总览默认显示渠化图',
+      'exportFile': '导出为文件',
+      'lockMap': '锁定底图',
+      'unlockMap': '解锁底图'
     },
     'faultlevelCode': {
       '1': '一般故障',

package/src/kisscomps/components/DirectionListConfiguration/DirectionListConfiguration.vue

@@ -51,7 +51,7 @@ import { getMessageByCode } from '../../../utils/responseMessage.js'
 import CrossDiagramMgr from '../../../EdgeMgr/controller/crossDiagramMgr.js'
 import PhaseDataModel from '../IntersectionMap/crossDirection/utils.js'
 // import { getTheme } from '../../../utils/auth'
-import { images } from '../../../utils/phasedesc.js'
+import { getPhaseImages } from '../../../utils/phasedesc.js'
 import PedSvg from './svg/pedSvg'
 
 import CrossDirectionConflictList from '../../../utils/conflictList.js'
@@ -394,6 +394,7 @@ export default {
     getPhaseDirIcon (list) {
       let idarr = []
       let dirlist = []
+      const images = getPhaseImages(this.$i18n)
       for (let i = 0; i < list.length; i++) {
         if (list[i].id <= 16 && idarr.indexOf(list[i].id) === -1) {
           idarr.push(list[i].id)

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

@@ -36,8 +36,14 @@
               :disabled="!isSeletable"
               @click="clickOpen"
             >{{$t('openatccomponents.channelizationmap.againimport')}}</el-button>
-            <i class="lock-map el-icon-unlock" v-if="!isLockedCrossMap" @click="handleLockCrossMap()"></i>
-            <i class="lock-map el-icon-lock" v-if="isLockedCrossMap" @click="handleLockCrossMap()"></i>
+             <el-tooltip
+              :content="!isLockedCrossMap ? $t('openatccomponents.channelizationmap.lockMap') : $t('openatccomponents.channelizationmap.unlockMap')"
+              placement="bottom"
+              effect="dark"
+            >
+              <i class="lock-map el-icon-unlock" v-if="!isLockedCrossMap" @click="handleLockCrossMap()"></i>
+              <i class="lock-map el-icon-lock" v-if="isLockedCrossMap" @click="handleLockCrossMap()"></i>
+            </el-tooltip>
           </div>
 
           <div class="draw-to-sketchpad">
@@ -95,10 +101,10 @@
           <!-- <el-button type="primary" @click="cancledraw()">{{$t('openatccomponents.button.Cancel')}}</el-button> -->
           <el-button type="primary" @click="savedraw()">{{$t('openatccomponents.button.save')}}</el-button>
           <el-button type="primary" @click="importFromFile()">{{$t('openatccomponents.main.import')}}</el-button>
-          <el-button type="primary" @click="exportToFile()">{{$t('openatccomponents.main.export')}}</el-button>
+          <el-button type="primary" @click="exportToFile()">{{$t('openatccomponents.channelizationmap.exportFile')}}</el-button>
           <el-switch
             v-model="isDefaultShowQuhua"
-            active-text="渠化默认显示">
+            :active-text="$t('openatccomponents.channelizationmap.defaultShowQuhua')">
           </el-switch>
         </div>
       </div>

package/src/utils/phasedesc.js

@@ -160,3 +160,138 @@ export function getPhaseDesc (list, i18n) {
   }
   return str
 }
+
+export function getPhaseImages (i18n) {
+  const images = [{
+    id: 1,
+    name: i18n.t('openatccomponents.overview.es')
+  },
+  {
+    id: 2,
+    name: i18n.t('openatccomponents.overview.el')
+  },
+  {
+    id: 3,
+    name: i18n.t('openatccomponents.overview.er')
+  },
+  {
+    id: 4,
+    name: i18n.t('openatccomponents.overview.eb')
+  },
+  {
+    id: 5,
+    name: i18n.t('openatccomponents.overview.ws')
+  },
+  {
+    id: 6,
+    name: i18n.t('openatccomponents.overview.wl')
+  },
+  {
+    id: 7,
+    name: i18n.t('openatccomponents.overview.wr')
+  },
+  {
+    id: 8,
+    name: i18n.t('openatccomponents.overview.wb')
+  },
+  {
+    id: 9,
+    name: i18n.t('openatccomponents.overview.ns')
+  },
+  {
+    id: 10,
+    name: i18n.t('openatccomponents.overview.nl')
+  },
+  {
+    id: 11,
+    name: i18n.t('openatccomponents.overview.nr')
+  },
+  {
+    id: 12,
+    name: i18n.t('openatccomponents.overview.nb')
+  },
+  {
+    id: 13,
+    name: i18n.t('openatccomponents.overview.ss')
+  },
+  {
+    id: 14,
+    name: i18n.t('openatccomponents.overview.sl')
+  },
+  {
+    id: 15,
+    zname: '南右转',
+    name: i18n.t('openatccomponents.overview.sr')
+  },
+  {
+    id: 16,
+    zname: '南掉头',
+    name: i18n.t('openatccomponents.overview.sb')
+  },
+  {
+    id: 17,
+    name: i18n.t('openatccomponents.overview.ses')
+  },
+  {
+    id: 18,
+    name: i18n.t('openatccomponents.overview.sel')
+  },
+  {
+    id: 19,
+    name: i18n.t('openatccomponents.overview.ser')
+  },
+  {
+    id: 20,
+    name: i18n.t('openatccomponents.overview.seb')
+  },
+  {
+    id: 21,
+    name: i18n.t('openatccomponents.overview.sws')
+  },
+  {
+    id: 22,
+    name: i18n.t('openatccomponents.overview.swl')
+  },
+  {
+    id: 23,
+    name: i18n.t('openatccomponents.overview.swr')
+  },
+  {
+    id: 24,
+    name: i18n.t('openatccomponents.overview.swb')
+  },
+  {
+    id: 25,
+    name: i18n.t('openatccomponents.overview.nes')
+  },
+  {
+    id: 26,
+    name: i18n.t('openatccomponents.overview.nel')
+  },
+  {
+    id: 27,
+    name: i18n.t('openatccomponents.overview.ner')
+  },
+  {
+    id: 28,
+    name: i18n.t('openatccomponents.overview.neb')
+  },
+  {
+    id: 29,
+    name: i18n.t('openatccomponents.overview.nws')
+  },
+  {
+    id: 30,
+    name: i18n.t('openatccomponents.overview.nwl')
+  },
+  {
+    id: 31,
+    name: i18n.t('openatccomponents.overview.nwr')
+  },
+  {
+    id: 32,
+    name: i18n.t('openatccomponents.overview.nwb')
+  }
+  ]
+  return images
+}

package/src/views/intersection.vue

@@ -182,7 +182,7 @@ export default {
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzYwNjkyMjE3ODM1IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc2MDY5NTgxNywiaWF0IjoxNzYwNjg4NjE3fQ.ZOhFCKr7YjVJ-b7mD2G9EE34Pi3XBkdk73rMT0QdP8E',
+      Token: 'eyJraWQiOiIxNzY4ODk2MzEzMDM5IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc2ODg5OTkxMywiaWF0IjoxNzY4ODkyNzEzfQ.lZCLSqkVFSEHD8zJf5Fzs-LH1BpMs50Q22idq47sG5Y',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',

package/package/kisscomps/components/OptimizeKanban/index.js

@@ -1,2 +0,0 @@
-import OptimizeKanban from './OptimizeKanban.vue'
-export default OptimizeKanban

package/package/kisscomps/components/OptimizeKanban/index.vue

@@ -1,369 +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.
- **/
-<template>
-<div class="kanbanOptimize">
-    <div v-if="this.nowNumber === 1" class="optimizetype">
-        <span>{{$t('openatccomponents.pattern.optimizetype')}}</span>
-        <el-select v-model="value" clearable :placeholder="$t('openatccomponents.common.select')">
-            <el-option
-                v-for="item in typeOptions"
-                :key="item.value"
-                :label="$t('openatccomponents.overview.type' + item.value)"
-                :value="item.value"
-                >
-            </el-option>
-            </el-select>
-            <span class="optimiNum">{{$t('openatccomponents.pattern.optimizecycle')}}</span>
-            <el-input v-model="optimizecycle" clearable :placeholder="$t('openatccomponents.common.enter')"></el-input>
-        <!-- <el-button type="primary" @click="onOptimizeClick()">{{$t('openatccomponents.pattern.inoptimize')}}</el-button> -->
-    </div>
-  <div class="common-board-column" :style="{marginTop:this.nowNumber === 1 ? 0 : '50px',marginLeft:this.nowNumber === 1 ? 0 : 0}">
-    <div class="common-board-column-header">
-      {{headerText}}
-    </div>
-    <div class="openatccomponents-board-table-header">
-      <el-row :gutter="13">
-        <el-col :span="4">{{this.$t('openatccomponents.overview.phase')}}
-        </el-col>
-        <el-col :span="10">{{this.$t('openatccomponents.overview.flow')}}
-        </el-col>
-        <el-col :span="10">{{this.$t('openatccomponents.overview.saturationflow')}}
-        </el-col>
-      </el-row>
-    </div>
-    <draggable
-      class="common-board-column-content"
-      :list="list"
-      :options="options">
-      <div class="common-board-item" v-for="element in list" :key="element.id">
-        <el-row :gutter="13">
-          <el-col :span="4">
-            <el-tooltip class="item" effect="dark" placement="left">
-              <div slot="content">{{element.name}}</div>
-              <div class="common-phase-description">
-                <xdrdirselector Width="70px" Height="70px" Widths="58px" Heights="58px" :Datas="styles" :Data="showStyle" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
-              </div>
-            </el-tooltip>
-        </el-col>
-        <el-col :span="10">
-            <el-input-number :controls="false" class="col-content" size="small"  :step="1" v-model.number="element.flowperhour" ref="type" :disabled="element.mode === 7"></el-input-number>
-        </el-col>
-        <el-col :span="10">
-            <el-input-number :controls="false" class="col-content" size="small"  :step="1" v-model.number="element.saturation" ref="types" :disabled="element.mode === 7"></el-input-number>
-        </el-col>
-        </el-row>
-      </div>
-    </draggable>
-  </div>
-</div>
-</template>
-<script>
-import draggable from 'vuedraggable'
-import { getDuration } from '@/api/cross'
-import xdrdirselector from '@/components/XRDDirSelector'
-
-export default {
-  name: 'patternOptimize',
-  components: {
-    draggable,
-    xdrdirselector
-  },
-  data () {
-    return {
-      showStyle: {
-        left: '7px',
-        top: '0px'
-      },
-      styles: {
-        left: '7px',
-        top: '0px'
-      },
-      typeOptions: [{
-        value: 'flow-split-opt'
-      }, {
-        value: 'cycle-opt'
-      }],
-      value: 'flow-split-opt',
-      optimizecycle: 0
-    }
-  },
-  props: {
-    headerText: {
-      type: String,
-      default: 'Header'
-    },
-    id: {
-      type: Number
-    },
-    rings: {
-      type: Array
-    },
-    nowNumber: {
-      type: Number
-    },
-    phaseList: {
-      type: Array
-    },
-    options: {
-      type: Object,
-      default () {
-        return {}
-      }
-    },
-    list: {
-      type: Array,
-      default () {
-        return []
-      }
-    },
-    // index: {
-    //   type: Number
-    // },
-    ISActiveMask: {
-      type: Boolean,
-      default: true
-    },
-    // 当phase的描述为空时，显示的图形颜色。
-    MaskColor: {
-      type: String,
-      default: '#000000'
-    }
-  },
-  created () {
-    // this.addMinSplit()
-    this.addMin()
-  },
-  computed () {
-
-  },
-  watch: {
-    list: {
-      handler: function () {
-        // let list = this.$refs.type
-        // let flow = this.$refs.types
-        // console.log(this.list, 'list')
-        // let cycle = 0
-        // let n = this.index
-        // for (let i = 0; i < list.length; i++) {
-        //   cycle = cycle + Number(list[i].currentValue)
-        // }
-        // const globalParamModel = this.$store.getters.globalParamModel
-        // // let MaxCycle = globalParamModel.getParamsByType('patternList')[n].cycle
-        // let pattern = globalParamModel.getParamsByType('patternList')[n]
-        // globalParamModel.getParamsByType('patternList')[n].cycle = this.getMaxCycle(pattern)
-        // this.addMinSplit()
-        // this.$emit('handleSplit', n)
-      },
-      deep: true
-    }
-  },
-  methods: {
-    onOptimizeClick () {
-      let msg = this.$t('openatccomponents.pattern.algorithmEngineOptimization')
-      const loading = this.$loading({
-        lock: true,
-        text: msg,
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
-      setTimeout(() => {
-        loading.close()
-        this.handeleOptimizeClick()
-      }, 1000)
-    },
-    handeleOptimizeClick () {
-      let newPha = []
-      for (let i = 0; i < this.rings.length; i++) {
-        newPha.push(...this.rings[i])
-      }
-      let phaseData = newPha.map(item => {
-        return {
-          id: item.id,
-          flowperhour: item.flowperhour,
-          saturation: item.saturation
-        }
-      })
-      let patternList = this.$store.state.globalParam.tscParam.patternList
-      let pattern = patternList.filter((item) => item.id === this.id)[0]
-      let reqData = {
-        'type': this.value,
-        'optcycle': this.optimizecycle ? this.optimizecycle : 0,
-        'phaseList': this.phaseList,
-        'pattern': pattern,
-        'phases': phaseData
-      }
-      let isValidata = []
-      for (let j = 0; j < newPha.length; j++) {
-        let comNum = (newPha[j].length / 4) * 1700 * 0.8
-        isValidata.push(newPha[j].flowperhour > comNum)
-      }
-      if (isValidata.includes(true)) {
-        this.$confirm(this.$t('openatccomponents.overview.maxFlow'),
-          this.$t('openatccomponents.common.alarm'), {
-            confirmButtonText: this.$t('eopenatccomponentsdge.common.confirm'),
-            cancelButtonText: this.$t('openatccomponents.common.cancel'),
-            type: 'warning'
-          }).then(() => {
-          getDuration(reqData).then(data => {
-            if (data.data.success) {
-              this.$message({
-                type: 'success',
-                message: this.$t('openatccomponents.pattern.success')
-              })
-              for (let i = 0; i < this.rings.length; i++) {
-                for (let j = 0; j < this.rings[i].length; j++) {
-                  for (let h = 0; h < data.data.data.phase.length; h++) {
-                    if (this.rings[i][j].id === data.data.data.phase[h].id) {
-                      this.rings[i][j].value = data.data.data.phase[h].duration
-                      // this.rings[i][j].cycle = data.data.data.phase[h].cycle
-                    }
-                  }
-                }
-              }
-            }
-          }).catch(error => {
-            console.log(error)
-          })
-        }).catch(() => {
-        })
-      } else {
-        getDuration(reqData).then(data => {
-          if (data.data.success) {
-            this.$message({
-              type: 'success',
-              message: this.$t('openatccomponents.pattern.success')
-            })
-            for (let i = 0; i < this.rings.length; i++) {
-              for (let j = 0; j < this.rings[i].length; j++) {
-                for (let h = 0; h < data.data.data.phase.length; h++) {
-                  if (this.rings[i][j].id === data.data.data.phase[h].id) {
-                    this.rings[i][j].value = data.data.data.phase[h].duration
-                    // this.rings[i][j].cycle = data.data.data.phase[h].cycle
-                  }
-                }
-              }
-            }
-          }
-        }).catch(error => {
-          console.log(error)
-        })
-      }
-    },
-    addMin () {
-      for (let i of this.list) {
-        if (!i.flowperhour || !i.saturation) {
-          i.length = this.list.length
-          i.flowperhour = 0
-          i.saturation = 1700
-        }
-      }
-    }
-    // addMinSplit () {
-    //   const globalParamModel = this.$store.getters.globalParamModel
-    //   let phaseList = globalParamModel.getParamsByType('phaseList')
-    //   for (let ls of this.list) {
-    //     let phase = phaseList.filter((item) => {
-    //       return item.id === ls.id
-    //     })[0]
-    //     if (!phase.redyellow) {
-    //       phase.redyellow = 0
-    //     }
-    //     if (!phase.yellow) {
-    //       phase.yellow = 0
-    //     }
-    //     if (!phase.redclear) {
-    //       phase.redclear = 0
-    //     }
-    //     if (!phase.flashgreen) {
-    //       phase.flashgreen = 0
-    //     }
-    //     if (!phase.phasewalk) {
-    //       phase.phasewalk = 0
-    //     }
-    //     if (!phase.pedclear) {
-    //       phase.pedclear = 0
-    //     }
-    //     // let temp1 = phase.redyellow + phase.yellow + phase.redclear + phase.flashgreen // 绿信比的最小值要大于最小绿+黄灯+全红+绿闪
-    //     // let temp2 = phase.phasewalk + phase.pedclear
-    //     // if (temp1 > temp2) {
-    //     //   ls.minSplit = temp1
-    //     // } else {
-    //     //   ls.minSplit = temp2
-    //     // }
-    //     // if (ls.mode !== 7 && ls.value < ls.minSplit) {
-    //     //   ls.value = ls.minSplit
-    //     // }
-    //     // let temp1 = phase.yellow + phase.redclear + phase.flashgreen // 绿信比的最小值要大于最小绿+黄灯+全红+绿闪
-    //     let temp1 = phase.yellow + phase.redclear + phase.mingreen
-    //     let temp2 = phase.yellow + phase.redclear + phase.phasewalk + phase.pedclear
-    //     ls.minSplit = temp1 > temp2 ? temp1 : temp2
-    //     if (ls.mode !== 7 && ls.value < ls.minSplit) {
-    //       ls.value = ls.minSplit
-    //       this.$message.error(this.$t('openatccomponents.pattern.splitCheckMsg'))
-    //     }
-    //   }
-    // },
-    // getMaxCycle (pattern) {
-    //   let rings = pattern.rings
-    //   let maxCycle = 0
-    //   for (let ring of rings) {
-    //     if (ring.length === 0) continue
-    //     let cycle = 0
-    //     for (let r of ring) {
-    //       if (r.mode === 7) { // 忽略相位不计周期
-    //         continue
-    //       }
-    //       cycle = cycle + r.value
-    //     }
-    //     if (cycle > maxCycle) {
-    //       maxCycle = cycle
-    //     }
-    //   }
-    //   return maxCycle
-    // },
-    // doChange (val) {
-    //   // if (val.mode === 7) {
-    //   //   val.value = 0
-    //   // } else {
-    //   //   val.value = 30
-    //   // }
-    // }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.col-content {
-  width: 100%;
-}
-.kanbanOptimize {
-  .common-board-column {
-    max-width: unset !important;
-  }
-}
-.optimizetype{
-  // float: left;
-  font-size: 14PX;
-  margin:0 0 10PX 0;
-  .el-input {
-    width: 80PX;
-  }
-  .el-select{
-    width: 145PX;
-  }
-  .el-button {
-    margin-left: 10PX;
-  }
-  .optimiNum {
-    padding-left: 10PX;
-  }
-}
-</style>