openatc-components 0.3.105 → 0.3.107

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) {
@@ -1267,30 +1342,16 @@ export default {
           }
           obj.split = split
           obj.cycle = cycle
-          const isZero = split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen
-          const allAdd = split + currPhase.redclear + currPhase.yellow + currPhase.flashgreen
-          if (isZero <= 0) {
-            if (ring.sum) {
-              obj.sum = ring.sum
-              obj.redWidth = ((((currPhase.redclear + ring.sum) / allAdd) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
-            } else {
-              obj.redWidth = (((currPhase.redclear / allAdd) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
-            }
-            obj.greenWidth = (((split - (currPhase.redclear / allAdd) - (currPhase.yellow / allAdd) - (currPhase.flashgreen / allAdd)) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
-            obj.yellowWidth = (((currPhase.yellow / allAdd) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
-            obj.flashgreen = (((currPhase.flashgreen / allAdd) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
+          if (ring.sum) {
+            obj.sum = ring.sum
+            obj.redWidth = ((currPhase.redclear + ring.sum) / (this.max ? this.max : cycle) * 100) + '%'
           } else {
-            if (ring.sum) {
-              obj.sum = ring.sum
-              obj.redWidth = ((currPhase.redclear + ring.sum) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
-            } else {
-              obj.redWidth = (currPhase.redclear / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
-            }
-            obj.mode = ring.mode
-            obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
-            obj.flashgreen = (currPhase.flashgreen / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
-            obj.yellowWidth = (currPhase.yellow / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
+            obj.redWidth = (currPhase.redclear / (this.max ? this.max : cycle) * 100) + '%'
           }
+          obj.mode = ring.mode
+          obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / (this.max ? this.max : cycle) * 100) + '%'
+          obj.flashgreen = (currPhase.flashgreen / (this.max ? this.max : cycle) * 100) + '%'
+          obj.yellowWidth = (currPhase.yellow / (this.max ? this.max : cycle) * 100) + '%'
           // 忽略相位不显示
           // let mode = ring.mode
           // if (mode !== 7) { // 忽略相位不显示
@@ -1456,9 +1517,7 @@ export default {
         newMin.push(minNum)
         let newmaxNum = Math.max.apply(Math, newMax)// 每组最大值
         let newminNum = Math.min.apply(Math, newMin)
-        if (newArr.length > 1) {
-          this.newCycle = newmaxNum + newminNum
-        }
+        this.newCycle = newmaxNum + newminNum
         if (newmaxNum === newminNum) {
           this.max = newmaxNum + newminNum
           pattern.map(d => {

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

@@ -39,9 +39,6 @@
               :overlap="overlap"
               :patternSelect="patternSelect"
               :allPatternList="allPatternList"
-              :funcSort="funcSort"
-              :thirdPartyControlMenu="thirdPartyControlMenu"
-              :thirdPartyControl="thirdPartyControl"
               :isShowBack="isShowBack"
               :isShowRecovery="isShowRecovery"
               :isShowImplement="isShowImplement"
@@ -105,9 +102,6 @@
             :overlap="overlap"
             :patternSelect="patternSelect"
             :allPatternList="allPatternList"
-            :funcSort="funcSort"
-            :thirdPartyControlMenu="thirdPartyControlMenu"
-            :thirdPartyControl="thirdPartyControl"
             :isShowBack="isShowBack"
             :isShowRecovery="isShowRecovery"
             :isShowImplement="isShowImplement"
@@ -142,8 +136,6 @@ import CrossDiagramMgr from '../../../EdgeMgr/controller/crossDiagramMgr.js'
 import { setToken, setHost, getTheme } from '../../../utils/auth.js'
 import RingDataModel from '../../../utils/RingDataModel.js'
 import { getIntersectionInfo } from '../../../api/template'
-import { GetRoleByName } from '../../../api/permission.js'
-import { getPermissionMenu, getPermissionControl } from './utils/thirdPartypermission.js'
 
 export default {
   name: 'scheme-config',
@@ -206,6 +198,10 @@ export default {
       type: String,
       default: ''
     },
+    funcSort: {
+      type: String,
+      default: 'allFunc'
+    },
     roadDirection: {
       type: String,
       default: 'right'
@@ -467,10 +463,7 @@ export default {
       patternSelect: [], // 所有方案id
       specialPage: '', // 哪一个特殊控制页面
       nextcycleefficcontrol: [5, 6, 9, 10, 12, 19], // 下周期生效的控制方式
-      resetcomponent: false,
-      funcSort: 'allFunc',
-      thirdPartyControlMenu: [],
-      thirdPartyControl: []
+      resetcomponent: false
     }
   },
   watch: {
@@ -520,6 +513,14 @@ export default {
   async mounted () {
     this.resetcomponent = true
     this.init()
+    if (this.realtimeStatusModalvisible === false) {
+      this.changeStatus()
+    }
+    this.setPropsToken(this.Token)
+    this.hiddenPartControl()
+    // await this.getPhase()
+    this.getFault()
+    this.initData()
   },
   methods: {
     resetComponent () {
@@ -535,7 +536,6 @@ export default {
         this.changeStatus()
       }
       this.setPropsToken(this.Token)
-      this.hiddenPartControl()
       // await this.getPhase()
       this.getFault()
       this.initData()
@@ -618,24 +618,8 @@ export default {
     changeStatus () {
       this.toPage = 1
       this.isOperation = true
-      if (this.platform !== undefined && this.platform !== 'OpenATC') {
-        this.queryThirdParty()
-      }
       this.$refs.ManualControlModalNew.init()
     },
-    queryThirdParty () {
-      this.funcSort = 'allFunc'
-      GetRoleByName(`thirdparty--${this.platform}`).then(res => {
-        if (!res.data.success) {
-          let msg = getMessageByCode(res.data.code, this.$i18n.locale)
-          this.$message.error(msg)
-          return
-        }
-        this.funcSort = 'thirdPartyFunc'
-        this.thirdPartyControl = getPermissionControl(res.data.data)
-        this.thirdPartyControlMenu = getPermissionMenu(this.thirdPartyControl)
-      })
-    },
     handleGetData (data) {
       let that = this
       if (data.name === '') {

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

@@ -20,10 +20,10 @@
            :model="manualInfo"
            label-width="90px">
            <el-form-item
-                :label="$t('openatccomponents.overview.greenclear')"
-                prop="intersection">
-              <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempGreenflash" size="small"></el-input-number>
-            </el-form-item>
+               :label="$t('openatccomponents.overview.duration')"
+               prop="count">
+             <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempDuration" size="small"></el-input-number>
+           </el-form-item>
 
             <el-form-item
                 :label="$t('openatccomponents.overview.yellowflash')"
@@ -44,13 +44,11 @@
           label-position="left"
           :model="manualInfo"
           label-width="90px">
-
-           <el-form-item
-               :label="$t('openatccomponents.overview.duration')"
-               prop="count">
-             <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempDuration" size="small"></el-input-number>
-           </el-form-item>
-
+          <el-form-item
+              :label="$t('openatccomponents.overview.greenclear')"
+              prop="intersection">
+            <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempGreenflash" size="small"></el-input-number>
+          </el-form-item>
            <el-form-item
                :label="$t('openatccomponents.overview.allred')"
                prop="intersection">

package/package/kisscomps/components/SchemeConfig/manualControlModalNew/controlModelGroup.vue

@@ -18,7 +18,7 @@
           <div class="single-model-new"
             :style="{'backgroundColor': item.bgcolor}"
             @click="selectModel(item)"
-            v-if="isHasPermission(item.permission) && (funcSort === 'allFunc' || (funcSort === 'thirdPartyFunc'&& thirdPartyControl.indexOf(item.id) !== -1))">
+            v-if="isHasPermission(item.permission)">
             <div class="closephase-icon">
               <OthersIconSvg :type="item.type" />
             </div>
@@ -31,7 +31,7 @@
           :style="{'backgroundColor': item.bgcolor}"
           @click="selectModel(item)"
           :class="preselecttype == item.type? 'single-model-select' : ''"
-          v-if="isHasPermission(item.permission) && (funcSort === 'allFunc' || (funcSort === 'thirdPartyFunc'&& thirdPartyControl.indexOf(item.id) !== -1))">
+          v-if="isHasPermission(item.permission) && (funcSort === 'allFunc' || (funcSort === 'basicFunc'&& basicFuncControlId.indexOf(item.id) !== -1))">
           <!-- <svg-icon :icon-class="item.iconClass" className="model-icon"></svg-icon> -->
           <div class="model-icon">
             <IconSvg :type="item.type" />
@@ -70,16 +70,13 @@ export default {
     othersControl: {
       type: Boolean,
       default: false
-    },
-    thirdPartyControl: {
-      type: Array
     }
   },
   data () {
     return {
       preselecttype: '',
       controllist: [],
-      specialControl: [23, 24, 100]
+      specialControl: [23, 22, 100, 24, 25]
     }
   },
   computed: {

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

@@ -12,15 +12,13 @@
 <template>
   <div class="manual-control-modal-new">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane :label="$t('openatccomponents.overview.residentcontrol')" name="residentcontrol"
-        v-if="(funcSort === 'allFunc' || (funcSort === 'thirdPartyFunc'&& thirdPartyControlMenu.indexOf('驻留控制') !== -1))">
+      <el-tab-pane :label="$t('openatccomponents.overview.residentcontrol')" name="residentcontrol">
         <ControlModelGroup
           v-if="activeName === 'residentcontrol'"
           ref="ControlModelGroup"
           className="residentcontrol"
           :controlList="residentControlList"
           :funcSort="funcSort"
-          :thirdPartyControl="thirdPartyControl"
           @selectModel="selectModel"
         />
 
@@ -82,15 +80,13 @@
             <el-button v-if="!isShowImplement" type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
         </div>
       </el-tab-pane>
-      <el-tab-pane :label="$t('openatccomponents.overview.specialcontrol')" name="specialcontrol"
-        v-if="(funcSort === 'allFunc' || (funcSort === 'thirdPartyFunc'&& thirdPartyControlMenu.indexOf('特殊控制') !== -1))">
+      <el-tab-pane :label="$t('openatccomponents.overview.specialcontrol')" name="specialcontrol">
         <ControlModelGroup
           v-if="activeName === 'specialcontrol'"
           ref="ControlModelGroup"
           className="specialcontrol"
           :controlList="specialControlList"
           :funcSort="funcSort"
-          :thirdPartyControl="thirdPartyControl"
           @selectModel="selectModel"
         />
 
@@ -116,15 +112,13 @@
       </div>
 
       </el-tab-pane>
-      <el-tab-pane :label="$t('openatccomponents.overview.schemeselection')" name="schemeselection"
-        v-if="(funcSort === 'allFunc' || (funcSort === 'thirdPartyFunc'&& thirdPartyControlMenu.indexOf('方案选择') !== -1))">
+      <el-tab-pane :label="$t('openatccomponents.overview.schemeselection')" name="schemeselection">
         <ControlModelGroup
           v-if="activeName === 'schemeselection'"
           ref="ControlModelGroup"
           className="otherscontrol"
           :controlList="patternChooseControlList"
           :funcSort="funcSort"
-          :thirdPartyControl="thirdPartyControl"
           @selectModel="selectModel"
           @selectSpecialModel="selectSpecialModel" />
 
@@ -183,8 +177,7 @@
             <el-button v-if="!isShowImplement" type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
         </div>
       </el-tab-pane>
-      <el-tab-pane :label="$t('openatccomponents.overview.others')" name="others"
-        v-if="(funcSort === 'allFunc' || (funcSort === 'thirdPartyFunc'&& thirdPartyControlMenu.indexOf('其他') !== -1))">
+      <el-tab-pane :label="$t('openatccomponents.overview.others')" name="others">
         <ControlModelGroup
           v-if="activeName === 'others'"
           ref="ControlModelGroup"
@@ -192,7 +185,6 @@
           othersControl
           :controlList="othersControlList"
           :funcSort="funcSort"
-          :thirdPartyControl="thirdPartyControl"
           @selectModel="selectModel"
           @selectSpecialModel="selectSpecialModel"
         />
@@ -356,12 +348,6 @@ export default {
     isShowImplement: {
       type: Boolean,
       default: true
-    },
-    thirdPartyControlMenu: {
-      type: Array
-    },
-    thirdPartyControl: {
-      type: Array
     }
   },
   watch: {
@@ -389,6 +375,7 @@ export default {
   },
   data () {
     return {
+      basicFuncControlId: [0, 1, 4, 5], // 基础功能包含的控制方式： 自主控制（手动下）、黄闪、步进、定周期
       visible: this.Visible,
       manuals: false,
       realtimeStage: {},

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

@@ -74,6 +74,7 @@
             :agentId="agentId"
             :ip="ip"
             :platform="platform"
+            :funcSort="FuncSort"
             :roadDirection="roadDirection" />
         </div>
       </div>
@@ -139,6 +140,7 @@ export default {
       stateName: this.$t('openatccomponents.overview.offline'),
       curBodyWidth: 1920,
       graphicMode: false,
+      FuncSort: 'allFunc',
       controlData: {},
       checked: false,
       overlap: [],
@@ -182,6 +184,7 @@ export default {
     ...mapState({
       // curBodyWidth: state => state.globalParam.curBodyWidth,
       curBodyHeight: state => state.globalParam.curBodyHeight,
+      // FuncSort: state => state.globalParam.FuncSort,
       hideMenu: state => state.globalParam.hideMenu
       // graphicMode: state => state.globalParam.graphicMode
       // isShowGui: state => state.globalParam.isShowGui,
@@ -610,6 +613,12 @@ export default {
           this.agentName = res.data.data.name
         }
         this.platform = res.data.data.platform
+        if (this.platform === 'OpenATC') {
+          this.FuncSort = 'allFunc'
+        }
+        if (this.platform === 'SCATS' || this.platform === 'HUATONG') {
+          this.FuncSort = 'basicFunc'
+        }
         this.$refs.intersectionMap.resetCrossDiagram()
         this.registerMessage() // 注册消息
         this.initData()
@@ -654,6 +663,20 @@ export default {
         } else {
           this.stateName = this.$t('openatccomponents.overview.offline')
         }
+        // let func = 'allFunc'
+        // if (this.platform === 'OpenATC') {
+        //   func = 'allFunc'
+        // }
+        // if (this.platform === 'SCATS' || this.platform === 'HUATONG') {
+        //   func = 'basicFunc'
+        // }
+        // this.$store.dispatch('SaveFunctionLevel', func)
+        if (this.platform === 'OpenATC') {
+          this.FuncSort = 'allFunc'
+        }
+        if (this.platform === 'SCATS' || this.platform === 'HUATONG') {
+          this.FuncSort = 'basicFunc'
+        }
       })
     },
     isJsonString (str) {

package/package/kisscomps/components/patternConfig/index.vue

@@ -11,7 +11,7 @@
  **/
 <template>
   <div class="patternConfig">
-    <el-container v-if="!isShowSingle" style="height: 100%;" >
+    <el-container v-if="!isShowSingle" >
         <div class="main-container" style="height: 100%;width: 100%;">
           <el-tabs v-model="editableTabsValue" type="card"  @edit="handleTabsEdit" :before-leave="beforeLeave" style="height: 100%;">
             <el-tab-pane

package/package/kisscomps/components/patternConfig/pattern/patternTable.vue

@@ -12,7 +12,7 @@
 <template>
   <div class="app-container" ref="pattern-container">
     <el-table :data="newPatternList" :max-height="tableHeight" id="footerBtn" :show-header="isShowTableHeader">
-      <el-table-column :type="isAllowedExpand ? 'expand' : ''" v-if="isAllowedExpand">
+      <el-table-column type="expand" v-if="isAllowedExpand">
         <template slot-scope="scope">
           <div v-if="isAllowedExpand && isSingleCrossMode" class="optimizetype">
               <span>{{$t('openatccomponents.pattern.optimizetype')}}</span>
@@ -51,14 +51,14 @@
           <span>{{scope.row.agentid}}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" :label="$t('openatccomponents.overview.crossname')" width="120" minWidth="40" v-if="isShowColumn('name')">
+      <el-table-column align="center" :label="$t('openatccomponents.greenwaveoptimize.period')" width="100" minWidth="40" v-if="isShowColumn('period')">
         <template slot-scope="scope">
-          <span>{{getDevName(scope.row)}}</span>
+          <span>{{getPeriod(scope.row)}}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" :label="$t('openatccomponents.greenwaveoptimize.period')" width="100" minWidth="40" v-if="isShowColumn('period')">
+      <el-table-column align="center" :label="$t('openatccomponents.overview.crossname')" width="120" minWidth="40" v-if="isShowColumn('name')">
         <template slot-scope="scope">
-          <span>{{getPeriod(scope.row)}}</span>
+          <span>{{getDevName(scope.row)}}</span>
         </template>
       </el-table-column>
       <el-table-column property="isValid" :label="$t('openatccomponents.token.isValid')" align="center" width="80" prop="isused" v-if="isShowColumn('isused')">
@@ -200,9 +200,7 @@ export default {
   },
   watch: {
     maxTableHeight: function () {
-      this.$nextTick(() => {
-        this.tableHeight = this.maxTableHeight // 动态更新高度
-      })
+      this.tableHeight = this.maxTableHeight
     },
     optList: {
       handler: function (val) {
@@ -223,6 +221,11 @@ export default {
     }
   },
   mounted: function () {
+    // var _this = this
+    // _this.$nextTick(function () {
+    //   _this.tableHeight = _this.maxTableHeight
+    // })
+    // _this.tableHeight = _this.maxTableHeight
   },
   methods: {
     onOptimizeClick (row, index) {
@@ -313,7 +316,7 @@ export default {
       return res
     },
     getPeriod (row) {
-      let period = row.timeperiodrange || row.period
+      let period = row.period || row.timeperiodrange
       let res = ''
       if (period && period.length > 0) {
         res = period[0].substring(0, 5) + '-' + period[1].substring(0, 5)
@@ -342,30 +345,9 @@ export default {
       // this.phaseList = phaseList
       this.handlePatternList(routeData, patternList, phaseList)
     },
-    // 依据anengid获取设备信息,同时兼容单路口数据按序index取值
-    getDevFromDevsOrIndex (devs, agentid, index) {
-      let res
-      // check special
-      let isSingleCrossMode = false
-      if (devs && devs.length > 1 && devs[0].agentid === devs[1].agentid) {
-        isSingleCrossMode = true
-        // check errData
-        if (index === undefined || index === null) {
-          console.log('getDevFromDevsOrIndex Err: index is null')
-        }
-      }
-      if (!isSingleCrossMode) {
-        res = devs.filter(ist => ist.agentid === agentid)[0]
-      } else {
-        res = devs[index]
-        console.log('getDevByIndex:', res)
-      }
-      return res
-    },
     handlePatternList (routeData, patternList, phaseList) {
       this.newPatternList = []
       let devs = routeData.devs
-      let index = 0
       for (let pattern of patternList) {
         let obj = {}
         let id = pattern.agentid
@@ -373,9 +355,7 @@ export default {
         let count = [] // 计算相位有几个环
         if (pattern.feature !== undefined && pattern.feature.patternList.length !== 0) {
           let currPatternList = pattern.feature.patternList
-          // let dev = devs.filter(ist => ist.agentid === id)[0]
-          let dev = this.getDevFromDevsOrIndex(devs, id, index)
-          index = index + 1
+          let dev = devs.filter(ist => ist.agentid === id)[0]
           let patternId = dev.patternid
           let currPattern
           if (Array.isArray(currPatternList)) {

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

@@ -115,7 +115,7 @@ export default {
       // this.getRouteInfo()
       this.routeData = editableTab
       let patternList = this.getPatternListFromTab(editableTab, this.patternList)
-      let phaseList = this.getPhaseListFromTab(editableTab, this.phaseList)
+      let phaseList = this.getPatternListFromTab(editableTab, this.patternList)
       if (patternList && patternList.length > 0 && phaseList && phaseList.length > 0) {
         this.patternList = patternList
         this.phaseList = phaseList
@@ -153,14 +153,14 @@ export default {
           return res
         }
       }
-      let devPhaseList = devs.map(item => {
+      let devPatternList = devs.map(item => {
         let pattern = {
           agentid: item.agentid,
           feature: item.feature
         }
         return pattern
       })
-      res = devPhaseList
+      res = devPatternList
       return res
     },
     closeInterval () {