openatc-components 0.1.139 → 0.1.142

package/src/i18n/language/zh.js

@@ -142,6 +142,14 @@ const zh = {
       'priorityPhase': '优先相位',
       'typeOption0': '常规优先',
       'typeOption1': '紧急优先',
+      'dong': '东',
+      'xi': '西',
+      'bei': '北',
+      'nan': '南',
+      'dongnan': '东南',
+      'xinan': '西南',
+      'dongbei': '东北',
+      'xibei': '西北',
       'es': '东直行',
       'el': '东左转',
       'er': '东右转',
@@ -1200,6 +1208,131 @@ const zh = {
       'detector': '检测器',
       'port': '端口'
     },
+    'greenwaveoptimize': {
+      'downSend': '下发',
+      'patternName': '方案名称',
+      'period': '时段',
+      'distancenull': '距离不能设置为0',
+      'spaceGraph': '时距图',
+      'addplan': '点击添加按钮添加绿波协调计划',
+      'createconfig': '点击编辑按钮开始生成配置',
+      'operation': '操作',
+      'isdelete': '是否删除',
+      'nochooseplan': '未选中任何方案！',
+      'namerepeat': '名称重复！',
+      'addfail': '新增失败，名称重复！',
+      'addroute': '新增路线管理',
+      'editroute': '编辑路线管理',
+      'name': '名称',
+      'routename': '路线名称',
+      'isClose': '配置未保存，是否确认关闭?',
+      'coordinateparamconfig': '路线参数',
+      'device': '路口',
+      'phase': '相位',
+      'distance': '距离',
+      'pattern': '方案',
+      'choosephase': '请选择相位！',
+      'choosepattern': '请选择方案！',
+      'configsuccess': '参数配置成功！',
+      'adddevice': '新增路口',
+      'deletedevice': '是否删除设备',
+      'deviceid': '路口ID',
+      'devicename': '路口名称',
+      'type': '类型',
+      'IP': 'IP',
+      'port': '端口',
+      'describe': '路口描述',
+      'deletedevsuccess': '删除路口成功！',
+      'distancemeter': '距离（m）',
+      'widthmeter': '宽度（m）',
+      'forward': '上行',
+      'back': '下行',
+      'generate': '生成',
+      'edit': '编辑',
+      'confirmdownloadpattern': '确认下载此方案?',
+      'offset': '相位差',
+      'cycle': '周期',
+      'timespace': '干线实时监控',
+      'coordinationstrategy': '协调策略',
+      'coordinationdirection': '协调方向',
+      'keyintersection': '关键路口',
+      'upspeed': '上行速度(km/h)',
+      'downspeed': '下行速度(km/h)',
+      'up': '上行',
+      'down': '下行',
+      'optstrategyoption1': '绿波优化',
+      'optstrategyoption2': '红波优化',
+      'optstrategyoption3': '车队尾策略',
+      'optstrategyoption4': '动态绿波',
+      'directionOption1': '上行',
+      'directionOption2': '下行',
+      'directionOption3': '双向',
+      'duration': '持续时间：',
+      'speed': '速度：',
+      'vehicle': '车辆：',
+      'es': '东直行',
+      'el': '东左转',
+      'er': '东右转',
+      'eb': '东掉头',
+      'ws': '西直行',
+      'wl': '西左转',
+      'wr': '西右转',
+      'wb': '西掉头',
+      'ns': '北直行',
+      'nl': '北左转',
+      'nr': '北右转',
+      'nb': '北掉头',
+      'ss': '南直行',
+      'sl': '南左转',
+      'sr': '南右转',
+      'sb': '南掉头',
+      'notonline': '不在线！',
+      'generatesuedsucc': '生成成功!',
+      'planissuedsucc': '方案下发成功!',
+      'chooseRoute': '请选择路线！',
+      'onlyOneTab': '只允许一个tab!',
+      'scene': '仿真实例',
+      'choosePattern': '请先点击选择方案！',
+      'routeDeviceNotOnline': '路线路口不在线！',
+      'atleastOnePattern': '最少要保留一个方案！',
+      'chooseCros': '请选择路口!',
+      'choosePhase': '请选择相位!',
+      'errDownloadParam': '下载参数异常!',
+      'pleaseChoseOptstrategy': '请选择协调策略!',
+      'pleaseInputPatternName': '请输入方案名称!',
+      'repeatPatternName': '方案名称重复!',
+      'pleaseChoseKeyintersection': '请选择关键路口!',
+      'pleaseInputUpspeed': '请输入上行速度!',
+      'pleaseInputDownspeed': '请输入下行速度!',
+      'abnormalIntersections': '路口数据异常!',
+      'routeCros': '路线路口',
+      'setDistance': '设置距离',
+      'setPhase': '设置相位',
+      'intesectionDistance': '路口名称/间隔距离(米)',
+      'intesectionWidth': '路口宽度（米）',
+      'inputRouteName': '请输入路线名称！',
+      'executePlan': '执行临时方案',
+      'backSelfControl': '恢复自主控制',
+      'downloadPlan': '下载协调方案',
+      'updated': '已更新',
+      'ignored': '忽略',
+      'failed': '失败',
+      'continueOnfailure': '遇到失败继续',
+      'executeTime': '执行时间',
+      'saveParams': '参数保存',
+      'time': '时间（s）',
+      'realtimecoordinationscheme': '实时路线协调方案',
+      'planningcoordinationscheme': '规划路线协调方案'
+    },
+    'token': {
+      'username': '用户名',
+      'tokenManage': 'Token管理',
+      'timeStart': '有效期开始',
+      'timeEnd': '有效期截止',
+      'isValid': '是否启用',
+      'yes': '是',
+      'no': '否'
+    },
     'channelizationmap': {
       'importpicture': '导入图片',
       'importtip': '图片格式为svg、png、jpg，大小不超过10Mb',

package/src/kisscomps/components/CommonKanban/CommonKanban.vue

@@ -27,8 +27,10 @@
             <el-tooltip class="item" effect="dark" placement="left">
               <div slot="content">{{element.name}}</div>
               <div class="common-phase-description">
-                <xdrdirselector Width="40px"
-                  Height="40px"
+                <xdrdirselector Width="70px"
+                  Height="70px"
+                  Widths="60px"
+                  Heights="60px"
                   :showlist="element.desc"
                   :ISActiveMask="ISActiveMask"
                   :MaskColor="MaskColor"
@@ -50,8 +52,10 @@
               <div slot="content">{{element.name}}</div>
               <div class="common-phase-description">
                 <!-- <patternwalksvg :sidewalkPhaseData="sidewalkPhaseData" :showWalk="element.peddirection" Width="38" Height="40"></patternwalksvg> -->
-                <xdrdirselector Width="40px"
-                  Height="40px"
+                <xdrdirselector Width="70px"
+                  Height="70px"
+                  Widths="60px"
+                  Heights="60px"
                   :showlist="element.desc"
                   :ISActiveMask="ISActiveMask"
                   :MaskColor="MaskColor"

package/src/kisscomps/components/DrawChannelization/drawsvg/overlapAssociatedComponent.vue

@@ -18,7 +18,7 @@
         </div>
 
         <div class="phase-icon" v-if="item.direction">
-          <xdr-dir-selector Width="44px" Height="44px" :showlist="getShowlist(item)" :roadDirection="roadDirection"></xdr-dir-selector>
+          <xdr-dir-selector Width="60px" Height="60px" Widths="50px" Heights="50px" :showlist="getShowlist(item)" :roadDirection="roadDirection"></xdr-dir-selector>
         </div>
       </div>
       <div class="single-phase-name">{{$t('openatccomponents.channelizationmap.phase') + item.id}}</div>

package/src/kisscomps/components/DrawChannelization/drawsvg/phaseAssociatedComponent.vue

@@ -18,7 +18,7 @@
         </div>
 
         <div class="phase-icon" v-if="item.direction">
-          <xdr-dir-selector Width="44px" Height="44px" :showlist="getShowlist(item)" :roadDirection="roadDirection"></xdr-dir-selector>
+          <xdr-dir-selector Width="50px" Height="50px" Widths="60px" Heights="60px" :showlist="getShowlist(item)" :roadDirection="roadDirection"></xdr-dir-selector>
         </div>
       </div>
       <div class="single-phase-name">{{$t('openatccomponents.channelizationmap.phase') + item.id}}</div>

package/src/kisscomps/components/ExpendConfig/ExpendConfig.vue

@@ -26,7 +26,7 @@
             <el-tooltip class="item" effect="dark" placement="left">
               <div slot="content">{{element.name}}</div>
               <div class="common-phase-description">
-                <xdrdirselector Width="40px" Height="40px" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
+                <xdrdirselector  Width="60px" Height="60px" Widths="50px" Heights="50px" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
               </div>
             </el-tooltip>
         </el-col>

package/src/kisscomps/components/KanBan/kanban.vue

@@ -23,7 +23,7 @@
             <el-tooltip class="item" effect="dark" placement="left">
               <div slot="content">{{element.name}}</div>
               <div class="common-phase-description">
-                <xdrdirselector Width="40px" Height="40px" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
+                <xdrdirselector  Width="60px" Height="60px" Widths="50px" Heights="50px" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
               </div>
             </el-tooltip>
         </el-col>

package/src/kisscomps/components/OverLap/OverLap.vue

@@ -14,7 +14,7 @@
                 <div style="cursor:pointer;">
                     <div class="ring-phase">
                         <!-- <patternwalksvg :showWalk="list.peddirection" :Width="'32'" :Height="'34'"></patternwalksvg> -->
-                        <xdrdirselector  Width="36px" Height="34px" :showlist="item.direction"></xdrdirselector>
+                        <xdrdirselector  Width="60px" Height="60px" Widths="50px" Heights="50px" :showlist="item.direction"></xdrdirselector>
                     </div>
                     <div class="box">
                         <div class="ring-nums">
@@ -136,7 +136,7 @@ export default {
       let overlapData = overlap.map(item => {
         let findIndexs = []
         item.includedphases.forEach(i => {
-          const findItems = stageList.filter(j => j.stages.includes(i))
+          const findItems = stageList.filter(j => j.phases.includes(i))
           if (findItems.length) findIndexs.push(...findItems.map(m => m.key))
         })
         findIndexs = Array.from(new Set(findIndexs))

package/src/kisscomps/components/PatternOptimize/PatternOptimize.vue

@@ -50,7 +50,7 @@
             <el-tooltip class="item" effect="dark" placement="left">
               <div slot="content">{{element.name}}</div>
               <div class="common-phase-description">
-                <xdrdirselector Width="40px" Height="40px" :Data="showStyle" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
+                <xdrdirselector Width="60px" Height="60px" Widths="50px" Heights="50px" :Data="showStyle" :Datas="showStyle" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
               </div>
             </el-tooltip>
         </el-col>

package/src/kisscomps/components/PatternStatus/PatternStatus.vue

@@ -15,32 +15,32 @@
       <div v-if="this.contrloType === 'ring' || !this.contrloType">
         <div class="ring-first" v-for="(list, index1) in patternInfo" :key="index1">
           <div style="position: relative;" :style="{'height': '34px','float':'left','width':((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100).toFixed(3) + '%'}"  v-for="(item,index2) in list" :key="index2" :class="item.mode===7?'direction': ''">
-            <div class="first-1" :class="item.mode===8?'mask': ''" :style="{'width':Number(item.greenWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100).toFixed(3) + '%').replace('%', ''))*100+'%','height':'34px','background':'#7ccc66'}">
+            <div class="first-1" :class="item.mode===8?'masks': ''" :style="{'width':Number(item.greenWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100).toFixed(3) + '%').replace('%', ''))*100+'%','height':'34px','background':'#7ccc66'}">
                 <el-tooltip placement="top-start" effect="light">
                   <div slot="content">P{{item.id}}:{{item.split}}</div>
                   <div style="cursor:pointer;">
                     <div class="ring-phase">
                       <!-- <patternwalksvg :showWalk="item.peddirection" :Width="'32'" :Height="'34'"></patternwalksvg> -->
-                      <xdrdirselector  Width="38px" Height="36px" :showlist="item.direction"></xdrdirselector>
+                      <xdrdirselector  Width="60px" Height="60px" Widths="50px" Heights="50px" :showlist="item.direction"></xdrdirselector>
                     </div>
-                    <div class="box" style="position: absolute; left:40px;top: 2px;">
+                    <div class="box" style="position: absolute; left:40px;top: -1px;">
                       <div class="ring-nums">P{{item.id}}</div>
                       <div class="ring-nums">{{item.split}}</div>
                     </div>
                   </div>
                 </el-tooltip>
                 <div style="width:50px;" v-for="(bus,index3) in busPhaseData" :key="index3">
-                  <i class="iconfont icon-lukouzhilu" style="position: absolute;top: 8px;left:60px;font-size:12px;color:#454545;" v-if="bus.controltype === 1 && bus.phaseid===item.id"></i>
-                  <i class="iconfont icon-BRT" style="position: absolute;top: 8px;left:60px;font-size:12px;color:#454545;" v-if="bus.controltype === 4 && bus.phaseid===item.id"></i>
-                  <i class="iconfont icon-xuxiangwei-xin" style="position: absolute;top: 8px;left:60px;font-size:12px;color:#454545;" v-if="bus.controltype === 99 && bus.phaseid===item.id"></i>
-                  <i class="iconfont icon-feijidongche" style="position: absolute;top: 8px;left:60px;font-size:12px;color:#454545;" v-if="bus.controltype === 6 && bus.phaseid===item.id"></i>
-                  <i class="iconfont icon-gongjiaoche" style="position: absolute;top: 8px;left:60px;font-size:12px;color:#454545;" v-if="bus.controltype === 3 && bus.phaseid===item.id"></i>
-                  <i class="iconfont icon-youguidianche" style="position: absolute;top: 8px;left:60px;font-size:12px;color:#454545;" v-if="bus.controltype === 5 && bus.phaseid===item.id"></i>
+                  <i class="iconfont icon-lukouzhilu" style="position: absolute;top: 8px;left:70px;font-size:12px;color:#454545;" v-if="bus.controltype === 1 && bus.phaseid===item.id"></i>
+                  <i class="iconfont icon-BRT" style="position: absolute;top: 8px;left:70px;font-size:12px;color:#454545;" v-if="bus.controltype === 4 && bus.phaseid===item.id"></i>
+                  <i class="iconfont icon-xuxiangwei-xin" style="position: absolute;top: 8px;left:70px;font-size:12px;color:#454545;" v-if="bus.controltype === 99 && bus.phaseid===item.id"></i>
+                  <i class="iconfont icon-feijidongche" style="position: absolute;top: 8px;left:70px;font-size:12px;color:#454545;" v-if="bus.controltype === 6 && bus.phaseid===item.id"></i>
+                  <i class="iconfont icon-gongjiaoche" style="position: absolute;top: 8px;left:70px;font-size:12px;color:#454545;" v-if="bus.controltype === 3 && bus.phaseid===item.id"></i>
+                  <i class="iconfont icon-youguidianche" style="position: absolute;top: 8px;left:70px;font-size:12px;color:#454545;" v-if="bus.controltype === 5 && bus.phaseid===item.id"></i>
                 </div>
               </div>
-              <div class="first-1" :class="item.mode===8?'mask': ''" :style="{'width':Number(item.flashgreen.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100).toFixed(3) + '%').replace('%', ''))*100+'%','height':'34px','float':'left','background': 'linear-gradient(to right, #ffffff 50%, #7ccc66 0)','background-size': '4px 100%'}"></div>
-              <div class="first-1" :class="item.mode===8?'mask': ''" :style="{'width':Number(item.yellowWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100).toFixed(3) + '%').replace('%', ''))*100+'%','height':'34px','background':'#f9dc6a'}"></div>
-              <div class="first-1" :class="item.mode===8?'mask': ''" :style="{'width':Number(item.redWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100).toFixed(3) + '%').replace('%', ''))*100+'%','height':'34px','background':'#f27979'}"></div>
+              <div class="first-1" :class="item.mode===8?'masks': ''" :style="{'width':Number(item.flashgreen.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100).toFixed(3) + '%').replace('%', ''))*100+'%','height':'34px','float':'left','background': 'linear-gradient(to right, #ffffff 50%, #7ccc66 0)','background-size': '4px 100%'}"></div>
+              <div class="first-1" :class="item.mode===8?'masks': ''" :style="{'width':Number(item.yellowWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100).toFixed(3) + '%').replace('%', ''))*100+'%','height':'34px','background':'#f9dc6a'}"></div>
+              <div class="first-1" :class="item.mode===8?'masks': ''" :style="{'width':Number(item.redWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100).toFixed(3) + '%').replace('%', ''))*100+'%','height':'34px','background':'#f27979'}"></div>
               </div>
           </div>
         <div v-if="showBarrier">
@@ -60,19 +60,19 @@
                 <el-tooltip placement="top-start" effect="light">
                   <div slot="content">
                     <span class="ring-nums" v-for="(pha,index) in list.phases" :key="index">
-                      P:{{pha}}
+                      P{{pha}}
                       </span>
                   </div>
                   <div style="cursor:pointer;">
                     <div class="ring-phase">
                       <!-- <patternwalksvg :showWalk="list.peddirection" :Width="'32'" :Height="'34'"></patternwalksvg> -->
-                      <xdrdirselector  Width="36px" Height="34px" :showlist="list.direction"></xdrdirselector>
+                      <xdrdirselector  Width="60px" Height="60px" Widths="50px" Heights="50px" :showlist="list.direction"></xdrdirselector>
                     </div>
-                    <div class="box" style="line-height:28px">
+                    <!-- <div class="box" style="line-height:28px">
                       <span class="ring-nums" v-for="(pha,index) in list.phases" :key="index">
                     P:{{pha}}
                       </span>
-                    </div>
+                    </div> -->
                   </div>
                 </el-tooltip>
               </div>
@@ -323,17 +323,18 @@ export default {
         if (directionList.length === 0) {
           tempList.push({
             id: '',
-            color: '#606266',
+            color: '#454545',
             peddirection: peddirections
           })
         } else {
           tempList = directionList.map(dir => ({
             id: dir,
-            color: '#606266',
+            color: '#454545',
             peddirection: peddirections
           }))
         }
-        stagesTemp.push(...tempList)
+        let newTemp = tempList.filter(item => item.id !== '')
+        stagesTemp.push(...newTemp)
       }
       return stagesTemp
     },
@@ -1355,7 +1356,7 @@ export default {
 .direction {
   filter: brightness(70%);
 }
-.mask {
+.masks {
   background: rgb(242, 121, 121) !important;
 }
 .first-1 {

package/src/kisscomps/components/PhaseMarker/phasemarker.vue

@@ -7,7 +7,7 @@
     <phaseCountCycle v-if="showLevel === 3"></phaseCountCycle>
     <div class="dirwrap">
       <xdrdirselector
-        Width="40px" Height="40px"
+        Width="60px" Height="60px" Widths="50px" Heights="50px"
         :showlist="dirshow">
       </xdrdirselector>
     </div>

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

@@ -731,7 +731,7 @@ export default {
             return
           }
         }
-        this.$alert(this.$t('openatccomponents.common.download'), { type: 'success' })
+        this.$message.success(this.$t('openatccomponents.common.download'))
       }).catch(error => {
         this.unlockScreen()
         console.log(error)

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

@@ -59,7 +59,7 @@
             <div style="margin-top:20px" class="model-label-title">{{currentName}}{{$t('openatccomponents.overview.currentphase')}}:</div>
             <div class="control-model" v-for="(item, index) in sidewalkPhaseData" :key="index">
                 <div style="position:relative;"  class="single-model">
-                <xdr-dir-selector Width="40PX" Height="40PX" :Data="showStyle" :showlist="item"></xdr-dir-selector>
+                <xdr-dir-selector Width="75PX" Height="75PX"  Widths="65PX" Heights="65PX" :Data="showStyle" :Datas="showStyles" :showlist="item"></xdr-dir-selector>
                 <div style="height:65px;display:flex;flex-direction:row;justify-content:center;align-items:end;">
                     <div class="current-stage-num" style="width:20%;">{{index + 1}}</div>
                     <div style="width:70%;">
@@ -102,7 +102,7 @@
 <script>
 import { getPhase } from './utils'
 import { getIframdevid } from '../../../../utils/auth'
-import { getlockPhase, lockPhase } from '../../../../api/control'
+import { getlockPhase, lockPhase, getAllDerection } from '../../../../api/control'
 import Stages from '../../Stages/index'
 import RingDataModel from '../../../../utils/RingDataModel.js'
 import { getMessageByCode } from '../../../../utils/responseMessage'
@@ -142,18 +142,25 @@ export default {
         obj.name = this.$t(obj.name)
         arrays.push(obj)
       })
-      return arrays
+      let arr1Ids = this.allDirection.map(item => item.id)
+      const result = arrays.filter(item => arr1Ids.includes(item.id))
+      return result
     }
   },
   data () {
     return {
       showStyle: {
+        top: '7PX',
+        left: '13px'
+      },
+      showStyles: {
         top: '5PX',
-        left: '14px'
+        left: '12px'
       },
       sidewalkPhaseData: [],
       currentName: '',
       lockList: [],
+      allDirection: [],
       patternCycleEqual: true,
       spanIndex: [],
       directions: [],
@@ -167,25 +174,59 @@ export default {
     }
   },
   created () {
+    this.getAllDerection()
   },
   methods: {
     checkId (val) {
       if (val.id === 1) {
-        return 2
-      } else if (val.id === 5) {
         return 1
+      } else if (val.id === 5) {
+        return 2
       } else if (val.id === 13) {
-        return 4
-      } else if (val.id === 9) {
         return 3
+      } else if (val.id === 9) {
+        return 4
       } else if (val.id === 17) {
-        return 8
+        return 6
       } else if (val.id === 21) {
-        return 5
-      } else if (val.id === 25) {
         return 7
+      } else if (val.id === 25) {
+        return 5
       } else if (val.id === 29) {
-        return 6
+        return 8
+      }
+    },
+    getAllDerection () {
+      let iframdevid = getIframdevid()
+      getAllDerection(iframdevid).then((res) => {
+        if (res.data.success !== true) {
+          this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
+          return
+        }
+        this.allDirection = res.data.data.map(item => {
+          return {
+            id: this.checkDirection(item.direction)
+          }
+        })
+      })
+    },
+    checkDirection (id) {
+      if (id === 1) {
+        return 1
+      } else if (id === 2) {
+        return 5
+      } else if (id === 3) {
+        return 13
+      } else if (id === 4) {
+        return 9
+      } else if (id === 5) {
+        return 25
+      } else if (id === 6) {
+        return 17
+      } else if (id === 7) {
+        return 21
+      } else if (id === 8) {
+        return 29
       }
     },
     getLockPhase (val) {
@@ -248,7 +289,7 @@ export default {
           this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
           return
         }
-        this.$alert(this.$t('openatccomponents.common.download'), { type: 'success' })
+        this.$message.success(this.$t('openatccomponents.common.download'))
         // if (res.data.success !== true) {
         //   this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
         // }

package/src/kisscomps/components/SchemeConfig/azimuthlocking/utils.js

@@ -14,56 +14,56 @@ let images = [
   {
     id: 1,
     // name: 'East-Straight',
-    name: 'openatccomponents.overview.es',
+    name: 'openatccomponents.overview.dong',
     // img: require('./images/East-Straight.svg'),
     class: 'iconfont icon-dongzhihang'
   },
   {
     id: 5,
     // name: 'West-Straight',
-    name: 'openatccomponents.overview.ws',
+    name: 'openatccomponents.overview.xi',
     // img: require('./images/West-Straight.svg'),
     class: 'iconfont icon-xizhihang'
   },
   {
     id: 13,
     // name: 'South-Straight',
-    name: 'openatccomponents.overview.ss',
+    name: 'openatccomponents.overview.nan',
     // img: require('./images/South-Straight.svg'),
     class: 'iconfont icon-nanzhihang'
   },
   {
     id: 9,
     // name: 'North-Straight',
-    name: 'openatccomponents.overview.ns',
+    name: 'openatccomponents.overview.bei',
     // img: require('./images/North-Straight.svg'),
     class: 'iconfont icon-beizhihang'
   },
   {
     id: 17,
     // name: 'South-Back',
-    name: 'openatccomponents.overview.ses',
+    name: 'openatccomponents.overview.dongnan',
     // img: require('./images/South-Back.svg'),
     class: 'iconfont icon-dongnanzhihang'
   },
   {
     id: 21,
     // name: 'South-Back',
-    name: 'openatccomponents.overview.sws',
+    name: 'openatccomponents.overview.xinan',
     // img: require('./images/South-Back.svg'),
     class: 'iconfont icon-xinanzhihang'
   },
   {
     id: 25,
     // name: 'South-Back',
-    name: 'openatccomponents.overview.nes',
+    name: 'openatccomponents.overview.dongbei',
     // img: require('./images/South-Back.svg'),
     class: 'iconfont icon-dongbeizhihang'
   },
   {
     id: 29,
     // name: 'South-Back',
-    name: 'openatccomponents.overview.nws',
+    name: 'openatccomponents.overview.xibei',
     // img: require('./images/South-Back.svg'),
     class: 'iconfont icon-xibeizhihang'
   }

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

@@ -62,6 +62,8 @@
         <div style="width: 100%; height: auto;overflow: hidden;" v-if="isHasPermission('configer:manual:dwell')">
           <Stages :crossStatusData="manuals?manualsStage:realtimeStage"
                   :phaseList="phaseList"
+                  :preselectStages="preselectStages"
+                  :preselectModel="preselectModel"
                   :isShowCurrentStage="false"
                   @onSelectStages="selectStages"></Stages>
         </div>

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

@@ -51,7 +51,7 @@
                     :label="item.label"
                     :value="item.value">
                     <div class="single-model">
-                        <xdrdirselector Width="40px" Height="40px" :showlist="item.item"></xdrdirselector>
+                        <xdrdirselector Width="60px" Height="60px" Widths="50px" Heights="50px" :showlist="item.item"></xdrdirselector>
                         <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
                     </div>
                   </el-option>

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

@@ -691,7 +691,7 @@ export default {
       let res = {
         key: i,
         split: this.narr[i], // 阶段绿性比
-        stages: stageArr,
+        phases: stageArr,
         stageKanban: stage,
         delaystart: 0,
         advanceend: 0