openatc-components 0.3.97 → 0.3.98

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

@@ -76,8 +76,7 @@ export default {
     return {
       preselecttype: '',
       controllist: [],
-      specialControl: [23, 22, 100, 24, 25],
-      basicFuncControlId: [0, 1, 4, 5] // 基础功能包含的控制方式： 自主控制（手动下）、黄闪、步进、定周期
+      specialControl: [23, 22, 100, 24, 25]
     }
   },
   computed: {

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

@@ -179,7 +179,7 @@
       </el-tab-pane>
       <el-tab-pane :label="$t('openatccomponents.overview.others')" name="others">
         <ControlModelGroup
-          v-if="activeName === 'others' && funcSort === 'allFunc'"
+          v-if="activeName === 'others'"
           ref="ControlModelGroup"
           className="otherscontrol"
           othersControl

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 () {

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>