openatc-components 0.3.75 → 0.3.77

package/package/kisscomps/components/BoardCard/BoardCard.vue

@@ -11,6 +11,7 @@
         :showBarrier="showBarrier"
         :controlPhase="controlPhase"
         :isShowTip="isShowTip"
+        :isMove="isMove"
         :localPatternList="localPatternList"
         :showCondition="showCondition"
         :contrloType="contrloType"
@@ -24,6 +25,7 @@
         :cycle="cycle"
         :syncTime="syncTime"
         :style="{'margin-top': '25px'}"
+        @handleSplitMove="handleSplitMove"
         :patternStatusList="patternStatusList"
         :patternId="patternId"
         :cycles="cycles">
@@ -72,6 +74,10 @@ export default {
     stagesChange: {
       type: Array
     },
+    isMove: {
+      type: Boolean,
+      default: true
+    },
     isShowTip: {
       type: Boolean,
       default: true
@@ -108,6 +114,11 @@ export default {
     syncTime: {
       type: Number
     }
+  },
+  methods: {
+    handleSplitMove (data) {
+      this.$emit('handleSplitMove', data)
+    }
   }
 }
 </script>

package/package/kisscomps/components/ChannelRealtimeIntersection/ChannelRealtimeIntersection.vue

@@ -88,7 +88,7 @@ export default {
     getPlatform () {
       queryDevice(this.agentId).then(res => {
         if (!res.data.success) {
-          let commomMsg = this.$t('openatc.overview.signalID') + ': ' + this.AgentId
+          let commomMsg = this.$t('openatccomponents.overview.signalID') + ': ' + this.AgentId
           this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale) + ' - ' + commomMsg)
           return
         }

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

@@ -915,7 +915,7 @@ export default {
           }
           return
         }
-        let msg = this.$t('openatccomponents.common.savesucess')
+        let msg = this.$t('openatccomponents.common.savesuccess')
         this.$message({
           message: msg,
           type: 'success',

package/package/kisscomps/components/IntersectionDirectionSelection/IntersectionDirectionSelection.vue

@@ -119,7 +119,7 @@ export default {
     getPlatform () {
       queryDevice(this.agentId).then(res => {
         if (!res.data.success) {
-          let commomMsg = this.$t('openatc.overview.signalID') + ': ' + this.AgentId
+          let commomMsg = this.$t('openatccomponents.overview.signalID') + ': ' + this.AgentId
           this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale) + ' - ' + commomMsg)
           return
         }

package/package/kisscomps/components/IntersectionWithInterface/IntersectionWithInterface.vue

@@ -233,7 +233,7 @@ export default {
       let _this = this
       queryDevice(this.AgentId).then(res => {
         if (!res.data.success) {
-          let commomMsg = this.$t('openatc.overview.signalID') + ': ' + this.AgentId
+          let commomMsg = this.$t('openatccomponents.overview.signalID') + ': ' + this.AgentId
           let msg = getMessageByCode(res.data.code, this.$i18n.locale) + ', ' + commomMsg
           this.$message.error(msg)
           return

package/package/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="70px" Height="70px" Widths="50px" Heights="50px" :Data="styles" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
+                <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>
@@ -79,9 +79,13 @@ export default {
   },
   data () {
     return {
+      showStyle: {
+        left: '2px',
+        top: '0px'
+      },
       styles: {
         left: '1px',
-        top: '0'
+        top: '0px'
       },
       typeOptions: [{
         value: 'flow-split-opt'
@@ -97,6 +101,9 @@ export default {
       type: String,
       default: 'Header'
     },
+    id: {
+      type: Number
+    },
     rings: {
       type: Object
     },
@@ -209,6 +216,7 @@ export default {
                   }
                 }
               }
+              this.$emit('optimizesucess', this.id)
             }
           }).catch(error => {
             console.log(error)
@@ -232,6 +240,7 @@ export default {
                 }
               }
             }
+            this.$emit('optimizesucess', this.id)
           }
         }).catch(error => {
           console.log(error)

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

@@ -14,8 +14,9 @@
       <!-- 环模式true -->
       <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) + '%'}"  v-for="(item,index2) in list" :key="index2" :class="item.mode===7?'direction': ''">
-            <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.greenWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%').replace('%', ''))*100+'%','height':'34px','background':'#7ccc66'}">
+          <draggable :move="move" @end="endDrag(index1)" :disabled="isMove" :list="list">
+            <div style="position: relative;" :style="{'height': '34px','float':'left','width':((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%'}"  v-for="(item,index2) in list" :key="index2" :class="item.mode===7?'direction': ''">
+              <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.greenWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%').replace('%', ''))*100+'%','height':'34px','background':'#7ccc66'}">
                 <el-tooltip placement="top-start" effect="light">
                   <div slot="content">{{$t('openatccomponents.phase.phase')}}{{item.id}}:{{item.split}}</div>
                   <div style="cursor:pointer;">
@@ -25,7 +26,18 @@
                     </div>
                     <div v-if="isShowTip" class="box" style="position: absolute; left:40px; width:40px; top: -1px;">
                       <div class="ring-nums">{{$t('openatccomponents.phase.phase')}}{{item.id}}</div>
-                      <div class="ring-nums">{{item.split}}</div>
+                      <div v-if="isMove" class="ring-nums">{{item.split}}</div>
+                      <el-input-number
+                        v-if="!isMove"
+                        class="ring-nums"
+                        size="small"
+                        :controls="false"
+                        :min="0"
+                        :step="1"
+                        v-model.number="item.split"
+                        @change="handleEdit(item)"
+                        style="width: 24px"
+                      ></el-input-number>
                     </div>
                   </div>
                 </el-tooltip>
@@ -41,7 +53,8 @@
               <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :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' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.yellowWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%').replace('%', ''))*100+'%','height':'34px','background':'#f9dc6a'}"></div>
               <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :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>
+          </draggable>
           </div>
         <div v-if="showBarrier">
           <div v-for="(item, index) in barrierList" :key="index + '1'">
@@ -100,6 +113,7 @@
 <script>
 // import patternwalksvg from '../PatternWalkSvg/PatternWalkSvg'
 import xdrdirselector from '../XRDDirSelector/XRDDirSelector'
+import draggable from 'vuedraggable'
 // import PatternWalkSvg from '../IntersectionMap/crossDirection/baseImg/PatternWalkSvg'
 import PhaseDataModel from '../IntersectionMap/crossDirection/utils.js'
 import CrossDiagramMgr from '../../../EdgeMgr/controller/crossDiagramMgr.js'
@@ -107,6 +121,7 @@ export default {
   name: 'pattern-list',
   components: {
     // patternwalksvg,
+    draggable,
     xdrdirselector
   },
   data () {
@@ -114,6 +129,7 @@ export default {
       barrierHeight: '',
       stageCycle: '',
       barrierList: [],
+      barrierArr: [],
       newCycle: this.cycles,
       patternIds: this.patternId,
       newPatterns: [],
@@ -142,6 +158,10 @@ export default {
     stagesChange: {
       type: Array
     },
+    isMove: {
+      type: Boolean,
+      default: true
+    },
     controlPhase: {
       type: Object
     },
@@ -343,11 +363,11 @@ export default {
       handler: function (val, oldVal) {
         this.handleBarrierHeight() // 计算屏障高度
         if (this.patternStatusList && this.newCycle) {
-          setTimeout(() => {
-            this.handleCurrentChange(this.patternStatusList)
-            this.handleBarrierHeight()
-          }, 10)
+          // setTimeout(() => {
+          this.handleCurrentChange(this.patternStatusList)
           this.handleBarrierHeight()
+          // }, 10)
+          // this.handleBarrierHeight()
         }
       },
       // 深度观察监听
@@ -375,6 +395,60 @@ export default {
     }
   },
   methods: {
+    move (e) {
+      // 这里的e表示即将停靠的元素。
+      let result = this.barrierArr.filter(item => item.includes(e.relatedContext.element.id))[0]
+      if (!result.includes(e.draggedContext.element.id)) {
+        return false
+      }
+    },
+    endDrag (index) {
+      // 拖动后对原数据排序
+      const idIndexMap = {}
+      this.patternInfo.forEach((subArray, subArrayIndex) => {
+        subArray.forEach((item, index) => {
+          idIndexMap[item.id] = { subArrayIndex, index }
+        })
+      })
+      this.patternStatusList.forEach((subArray, subArrayIndex) => {
+        if (subArray.length > 0) {
+          subArray.sort((aItem, bItem) => {
+            const aIndex = idIndexMap[aItem.id] ? idIndexMap[aItem.id].index : Infinity
+            const bIndex = idIndexMap[bItem.id] ? idIndexMap[bItem.id].index : Infinity
+            return aIndex - bIndex
+          })
+        }
+      })
+    },
+    handleEdit (val) {
+      this.patternStatusList.map(d => {
+        d.map(r => {
+          if (r.id === val.id) {
+            r.value = val.split
+          }
+        })
+      })
+      // this.handleCurrentChange(this.patternStatusList)
+      this.$emit('handleSplitMove', this.patternId)
+    },
+    getMaxCycle (pattern) {
+      // let rings = pattern.rings
+      let maxCycle = 0
+      for (let ring of pattern) {
+        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
+    },
     getPed (data) {
       let ped = []
       for (let stg of data) {
@@ -1179,6 +1253,7 @@ export default {
           }
         }
         let resArr = ringArr.map(item => item.data)
+        this.barrierArr = resArr
         let ringTeam = this.step1(this.phaseList, resArr)
         let ringTeams = ringTeam.filter(item => item.length !== 0)
         if (this.patternList) {

package/package/kisscomps/components/overView/index.vue

@@ -599,7 +599,7 @@ export default {
     queryDevParams () {
       queryDevice(this.AgentId).then(res => {
         if (!res.data.success) {
-          let commomMsg = this.$t('openatc.overview.signalID') + ': ' + this.AgentId
+          let commomMsg = this.$t('openatccomponents.overview.signalID') + ': ' + this.AgentId
           let msg = getMessageByCode(res.data.code, this.$i18n.locale) + ', ' + commomMsg
           this.$message.error(msg)
           return
@@ -644,7 +644,7 @@ export default {
     getPlatform () {
       queryDevice(this.AgentId).then(res => {
         if (!res.data.success) {
-          let commomMsg = this.$t('openatc.overview.signalID') + ': ' + this.AgentId
+          let commomMsg = this.$t('openatccomponents.overview.signalID') + ': ' + this.AgentId
           this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale) + ' - ' + commomMsg)
           return
         }

package/package/kisscomps/components/patternConfig/planContent.vue

@@ -25,7 +25,7 @@
         <button slot="reference" class="btn" @click="handleEdit" ref="editbtn">{{$t('openatccomponents.greenwaveoptimize.edit')}}</button>
       </el-popover>
     </div>
-    <el-button class="btn" type="primary" @click="Download" style="margin-left:10px;">{{$t('openatc.button.download')}}</el-button>
+    <el-button class="btn" type="primary" @click="Download" style="margin-left:10px;">{{$t('openatccomponents.button.download')}}</el-button>
   </div>
   <el-tabs v-model="activeName" type="card" @tab-click="handleClick" style="border:0px solid red;height:40%;">
     <el-tab-pane :label="$t('openatccomponents.greenwaveoptimize.timespace')" name="first">
@@ -292,7 +292,7 @@ export default {
             this.$message.error(msg)
             resolve(false)
           }
-          this.$message.success(this.$t('openatc.common.deletesuccess'))
+          this.$message.success(this.$t('openatccomponents.common.deletesuccess'))
           this.$parent.getAllPlan()
           resolve(true)
         }).catch(error => {
@@ -315,7 +315,7 @@ export default {
             this.$message.error(msg)
             resolve(false)
           }
-          this.$message.success(this.$t('openatc.common.savesuccess'))
+          this.$message.success(this.$t('openatccomponents.common.savesuccess'))
           this.$parent.getAllPlan()
           resolve(true)
         }).catch(error => {
@@ -337,7 +337,7 @@ export default {
           this.$message.error(msg)
           return
         }
-        this.$message.success(this.$t('openatc.common.savesuccess'))
+        this.$message.success(this.$t('openatccomponents.common.savesuccess'))
         this.$parent.getAllPlan()
       })
     },

package/package/kisscomps/components/patternConfig/planMenu.vue

@@ -11,7 +11,7 @@
  **/
 <template>
 <div class="openatc-planmanu">
-  <div class="title" style="display:flex;">{{$t('openatc.main.routeOptimize')}}</div>
+  <div class="title" style="display:flex;">{{$t('openatccomponents.main.routeOptimize')}}</div>
   <el-menu @select="selectPlan" v-loading="loading">
     <el-menu-item :index="String(plan.id)" v-for="(plan, index) in planData" :key="index">
         <span slot="title">{{plan.name}}</span>
@@ -19,7 +19,7 @@
   </el-menu>
   <div class="btnGroup" v-show="false">
     <div class="addbtn" :style="{zIndex: zIndexObj.addZIndex}">
-      <button slot="reference" class="btn" @click="onAdd" ref="addbtn">{{$t('openatc.common.add')}}</button>
+      <button slot="reference" class="btn" @click="onAdd" ref="addbtn">{{$t('openatccomponents.common.add')}}</button>
     </div>
     <div class="operate">
       <el-dropdown trigger="click" @command="switchOperate">
@@ -27,8 +27,8 @@
           {{$t('openatccomponents.greenwaveoptimize.operation')}}<i class="el-icon-arrow-down el-icon--right"></i>
         </span>
         <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item icon="el-icon-edit" command="Edit">{{$t('openatc.common.edit')}}</el-dropdown-item>
-          <el-dropdown-item icon="el-icon-delete" command="Delete">{{$t('openatc.common.delete')}}</el-dropdown-item>
+          <el-dropdown-item icon="el-icon-edit" command="Edit">{{$t('openatccomponents.common.edit')}}</el-dropdown-item>
+          <el-dropdown-item icon="el-icon-delete" command="Delete">{{$t('openatccomponents.common.delete')}}</el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
     </div>
@@ -139,7 +139,7 @@ export default {
         this.deleteDiologVisible = false
         this.resetChooseId()
         this.$message({
-          message: this.$t('openatc.common.deletesuccess'),
+          message: this.$t('openatccomponents.common.deletesuccess'),
           type: 'success',
           duration: 1 * 1000,
           onClose: () => {
@@ -168,7 +168,7 @@ export default {
         }
         this.closeAddDialog()
         this.$message({
-          message: this.$t('openatc.common.updatesuccess'),
+          message: this.$t('openatccomponents.common.updatesuccess'),
           type: 'success',
           duration: 1 * 1000,
           onClose: () => {
@@ -189,7 +189,7 @@ export default {
         }
         this.closeAddDialog()
         this.$message({
-          message: this.$t('openatc.common.addsuccess'),
+          message: this.$t('openatccomponents.common.addsuccess'),
           type: 'success',
           duration: 1 * 1000,
           onClose: () => {

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

@@ -5,6 +5,7 @@
     :contrloType="contrloType"
     :stagesChange="stagesChange"
     :isShowTip="isShowTip"
+    :isMove="isMove"
     :patternStatusList="patternStatusList"
     :cycles="cycles"
     :cycle="cycle"
@@ -19,6 +20,7 @@
     :agentId="agentId"
     :controlData="controlData"
     :syncTime="syncTime"
+    @handleSplitMove="handleSplitMove"
     :isPhase="isPhase"
     >
     </BoardCard>
@@ -502,6 +504,10 @@ export default {
       type: Boolean,
       default: true
     },
+    isMove: {
+      type: Boolean,
+      default: true
+    },
     contrloType: {
       type: String
     },
@@ -581,6 +587,11 @@ export default {
     // if (this.$route.query !== undefined && Object.keys(this.$route.query).length) {
     //   this.resetCrossDiagram()
     // }
+  },
+  methods: {
+    handleSplitMove (data) {
+      this.$emit('handleSplitMove', data)
+    }
   }
 }
 </script>