openatc-components 0.5.28 → 0.5.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openatc-components",
-  "version": "0.5.28",
+  "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/kisscomps/components/SchemeConfig/SchemeConfig.vue

@@ -445,6 +445,13 @@ export default {
           permission: 'configer:manual:base',
           iconName: this.$t('openatccomponents.overview.modelList26'),
           bgcolor: getTheme() === 'light' ? '#edf6ff' : '#243d59'
+        }, {
+          type: '自适应微调',
+          id: 21,
+          iconClass: 'zidongfenjikongzhi',
+          permission: 'configer:manual:base',
+          iconName: this.$t('openatccomponents.overview.modelList21'),
+          bgcolor: getTheme() === 'light' ? '#edf6ff' : '#243d59'
         }
       ],
       othersControlList: [

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

@@ -446,6 +446,21 @@ PURPOSE. * See the Mulan PSL v2 for more details. **/
       d="M947.685353 711.851301h-34.260223v-121.814126c0-15.226766-11.420074-30.453532-30.453531-30.453532h-342.602231v-167.494424h137.040892c38.066914 0 64.713755-30.453532 64.713755-64.713754V114.200743c0-38.066914-30.453532-64.713755-64.713755-64.713754H346.228104c-38.066914-3.806691-68.520446 26.64684-68.520446 64.713754v216.981413c0 38.066914 30.453532 64.713755 64.713755 64.713755h137.040892v167.494424h-342.602231c-15.226766 0-30.453532 11.420074-30.453531 30.453531v121.814127h-26.64684c-38.066914 0-64.713755 30.453532-64.713755 64.713754v137.040892c0 38.066914 30.453532 64.713755 64.713755 64.713755h137.040892c38.066914 0 64.713755-30.453532 64.713754-64.713755v-137.040892c0-38.066914-30.453532-64.713755-64.713754-64.713754H167.313606v-91.360595h315.95539v91.360595h-41.873606c-38.066914 0-64.713755 30.453532-64.713754 64.713754v137.040892c0 38.066914 30.453532 64.713755 64.713754 64.713755h137.040893c38.066914 0 64.713755-30.453532 64.713754-64.713755v-137.040892c0-38.066914-30.453532-64.713755-64.713754-64.713754h-41.873606v-91.360595H852.518067v91.360595h-45.680297c-38.066914 0-64.713755 30.453532-64.713755 64.713754v137.040892c0 38.066914 30.453532 64.713755 64.713755 64.713755h137.040892c38.066914 0 64.713755-30.453532 64.713754-64.713755v-137.040892c3.806691-38.066914-22.840149-68.520446-60.907063-68.520446z m7.613383 205.561338c0 3.806691-3.806691 7.613383-7.613383 7.613383h-137.040892c-3.806691 0-7.613383-3.806691-7.613383-7.613383v-137.040892c0-3.806691 3.806691-7.613383 7.613383-7.613383h137.040892c3.806691 0 7.613383 3.806691 7.613383 7.613383v137.040892z" p-id="21091">
       </path>
     </svg>
+    <svg
+    v-if="type === '自适应微调'"
+    t="1754012035508" class="icon"
+    viewBox="0 0 1024 1024"
+    version="1.1"
+    xmlns="http://www.w3.org/2000/svg"
+    p-id="21090"
+    :width="iconWidth"
+    :height="iconHeight"
+    >
+      <path
+      :class="themeColor"
+      d="M947.685353 711.851301h-34.260223v-121.814126c0-15.226766-11.420074-30.453532-30.453531-30.453532h-342.602231v-167.494424h137.040892c38.066914 0 64.713755-30.453532 64.713755-64.713754V114.200743c0-38.066914-30.453532-64.713755-64.713755-64.713754H346.228104c-38.066914-3.806691-68.520446 26.64684-68.520446 64.713754v216.981413c0 38.066914 30.453532 64.713755 64.713755 64.713755h137.040892v167.494424h-342.602231c-15.226766 0-30.453532 11.420074-30.453531 30.453531v121.814127h-26.64684c-38.066914 0-64.713755 30.453532-64.713755 64.713754v137.040892c0 38.066914 30.453532 64.713755 64.713755 64.713755h137.040892c38.066914 0 64.713755-30.453532 64.713754-64.713755v-137.040892c0-38.066914-30.453532-64.713755-64.713754-64.713754H167.313606v-91.360595h315.95539v91.360595h-41.873606c-38.066914 0-64.713755 30.453532-64.713754 64.713754v137.040892c0 38.066914 30.453532 64.713755 64.713754 64.713755h137.040893c38.066914 0 64.713755-30.453532 64.713754-64.713755v-137.040892c0-38.066914-30.453532-64.713755-64.713754-64.713754h-41.873606v-91.360595H852.518067v91.360595h-45.680297c-38.066914 0-64.713755 30.453532-64.713755 64.713754v137.040892c0 38.066914 30.453532 64.713755 64.713755 64.713755h137.040892c38.066914 0 64.713755-30.453532 64.713754-64.713755v-137.040892c3.806691-38.066914-22.840149-68.520446-60.907063-68.520446z m7.613383 205.561338c0 3.806691-3.806691 7.613383-7.613383 7.613383h-137.040892c-3.806691 0-7.613383-3.806691-7.613383-7.613383v-137.040892c0-3.806691 3.806691-7.613383 7.613383-7.613383h137.040892c3.806691 0 7.613383 3.806691 7.613383 7.613383v137.040892z" p-id="21091">
+      </path>
+    </svg>
   </span>
 </template>
 

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