openatc-components 0.1.25 → 0.1.27

package/config/index.js

@@ -15,8 +15,8 @@ module.exports = {
         // target:  'http://192.168.13.103:8012/openatc',//'http://172.16.239.139:8080/',//设置你调用的接口域名和端口号
         // target:  'http://192.168.14.2:8012/openatc',//'http://172.16.239.139:8080/',//设置你调用的接口域名和端口号
         // target:  'https://dolphin-test.kedacom.com/openatc',
-        target:  'http://192.168.13.105:11003/openatc',
-        // target:  'http://192.168.13.103:10003/openatc',
+        // target:  'http://192.168.13.105:11003/openatc',
+        target:  'http://192.168.13.103:10003/openatc',
         // target:  'http://192.168.13.103:10003/openatc',
         // target:  'http://192.168.13.103:9999',//'http://172.16.239.139:8080/',//设置你调用的接口域名和端口号
         // target:  'http://192.168.13.103:9999/kissapi',//'http://172.16.239.139:8080/',//设置你调用的接口域名和端口号

package/package/kisscomps/components/DrawChannelization/drawsvg/basicCoordInfo.vue

@@ -27,6 +27,9 @@
       <el-form-item v-if="showKeyId" label="ID:">
         <el-input v-model="basicCoodInfo.keyid" ref="keyid" @input="handleChangeKeyID" />
       </el-form-item>
+      <el-form-item v-if="showLaneId" :label="$t('openatccomponents.channelizationmap.holographiclaneid') + ':'">
+        <el-input v-model="basicCoodInfo.laneid" ref="laneid" @input="handleChangeLaneID" />
+      </el-form-item>
     </el-form>
   </div>
 </template>
@@ -38,6 +41,7 @@ export default {
     return {
       showAngle: true,
       showKeyId: true,
+      showLaneId: true,
       basicCoodInfo: {
         x: 0,
         y: 0,
@@ -62,6 +66,9 @@ export default {
         if (obj.keyid !== undefined) {
           this.basicCoodInfo.keyid = obj.keyid
         }
+        if (obj.laneid !== undefined) {
+          this.basicCoodInfo.laneid = obj.laneid
+        }
         this.isShowAngleSetting()
         this.isShowKeyIdSetting()
       },
@@ -102,6 +109,10 @@ export default {
       this.basicCoodInfo.keyid = value
       this.$emit('handleChangeBasicCoord', this.basicCoodInfo)
     },
+    handleChangeLaneID (value) {
+      this.basicCoodInfo.laneid = value
+      this.$emit('handleChangeBasicCoord', this.basicCoodInfo)
+    },
     checkOnlyNum (numString) {
       // eslint-disable-next-line no-new-wrappers
       let num = new Number(numString)
@@ -134,8 +145,10 @@ export default {
     },
     isShowKeyIdSetting () {
       this.showKeyId = false
+      this.showLaneId = false
       if (this.drawingObjInfo.icontype === 'vehile') {
         this.showKeyId = true
+        this.showLaneId = true
       }
       if (this.drawingObjInfo.icontype === 'ped') {
         this.showKeyId = true
@@ -153,6 +166,9 @@ export default {
       if (this.drawingObjInfo.keyid !== undefined) {
         this.basicCoodInfo.keyid = this.drawingObjInfo.keyid
       }
+      if (this.drawingObjInfo.laneid !== undefined) {
+        this.basicCoodInfo.laneid = this.drawingObjInfo.laneid
+      }
       this.isShowAngleSetting()
       this.isShowKeyIdSetting()
     }

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

@@ -395,7 +395,7 @@ export default {
         index: this.index,
         id: this.motorid,
         keyid: this.motorid, // 后端需要的id，默认指取索引，可修改
-        laneid: String(this.motorid), // 全息需要车道id
+        laneid: undefined, // 全息需要车道id
         icontype: 'vehile',
         icondireid: [1], // 前端区分箭头方向的标识
         icondirename: [this.PhaseDataModel.getPhase(1).name],

package/package/kisscomps/components/DrawChannelization/drawsvg/laneEditPanel.vue

@@ -641,6 +641,10 @@ export default {
         this.iconObj.keyid = basicCoord.keyid
         this.$emit('changeIconDataByType', this.iconObj, ['keyid'])
       }
+      if (basicCoord.laneid !== undefined) {
+        this.iconObj.laneid = basicCoord.laneid
+        this.$emit('changeIconDataByType', this.iconObj, ['laneid'])
+      }
     },
     handleClone () {
       this.$emit('cloneItem', this.iconObj)

package/package/kisscomps/components/SchemeConfig/priorityControl/utils.js

@@ -9,7 +9,7 @@
  * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
  * See the Mulan PSL v2 for more details.
  **/
-import Edgebase from '@openatc/edgebase-front'
+// import Edgebase from '@openatc/edgebase-front'
 let images = [{
   id: 1,
   // name: 'East-Straight',
@@ -123,26 +123,26 @@ let images = [{
   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 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 = ''
@@ -160,4 +160,4 @@ const getDirName = (arr) => {
   return res
 }
 
-export {getImages, getDirName}
+export {getDirName}

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

@@ -383,7 +383,11 @@ export default {
           // rings = JSON.parse(JSON.stringify(rings))
           let mapAdd = rings.map(item => {
             return item.map(val => {
-              return val.value + (val.sum ? val.sum : 0)
+              if (val.mode !== 7) {
+                return val.value + (val.sum ? val.sum : 0)
+              } else {
+                return 0
+              }
             })
           })
           let maxCycle = mapAdd.length > 0 ? mapAdd.map(item => {

package/package/kisscomps/components/Stages/index.vue

@@ -40,7 +40,7 @@
                   </div>
                   <i class="iconfont icon-gongjiaoche" style="font-size:11PX;color:#606266;" v-if="item[item.length-1].controltype === 3"></i>
                   <i class="iconfont icon-youguidianche" style="font-size:11PX;color:#606266;" v-if="item[item.length-1].controltype === 5"></i>
-                  <div v-if="presetIndex === index + 1" style="color:red;width:50px;position:absolute;right:0px;bottom:5px;font-size:11px;">{{presetText}}</div>
+                  <div v-if="presetStageIndex === index + 1" style="color:red;width:50px;position:absolute;right:0px;bottom:5px;font-size:11px;">{{presetText}}</div>
                 </div>
               </div>
             </div>
@@ -80,6 +80,10 @@ export default {
       type: Number,
       default: -1
     },
+    presetPhaseId: {
+      type: Number,
+      default: -1
+    },
     zoom: {
       type: Number,
       default: 1
@@ -95,6 +99,7 @@ export default {
   },
   data () {
     return {
+      presetStageIndex: -1,
       side: {key: 'pedphase1653818707546719', phaseid: 1, id: 1, name: '东人行横道'},
       // stagesList: [],
       currentStage: -1,
@@ -124,7 +129,38 @@ export default {
       }
     }
   },
+  watch: {
+    stagesList: {
+      handler: function (val, oldVal) {
+        if (this.presetPhaseId > -1) {
+          this.presetStageIndex = this.getComputedPresetIndex()
+        } else {
+          this.presetStageIndex = this.presetIndex
+        }
+      },
+      // 深度观察监听
+      deep: true
+    }
+  },
   methods: {
+    getComputedPresetIndex() {
+      let res = -1
+      for (let i = 0; i < this.stagesList.length; i++) {
+        let stage = this.stagesList[i]
+        for (let phase of stage) {
+          let phaseId = phase.id
+          if (phaseId === this.presetPhaseId) {
+            res = i
+            break
+          }
+        }
+        if (res > -1) {
+          res = res + 1
+          break
+        }
+      }
+      return res
+    },
     selectStages (value) {
       if (this.isShowCurrentStage) {
         return false