openatc-components 0.3.33 → 0.3.35

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

@@ -21,7 +21,7 @@
           @change="handleChangePosY" @input.native="eventChange('y')" />
       </el-form-item>
       <el-form-item v-if="showAngle" :label="$t('openatccomponents.channelizationmap.angle') + ':'">
-        <el-input-number :min="0" :max="360" :precision="0" :step="1" :controls="false" ref="refNumber-angle" v-model="basicCoodInfo.angle"
+        <el-input-number :min="0" :max="360" :controls="false" ref="refNumber-angle" v-model="basicCoodInfo.angle"
           @change="handleChangeAngle" @input.native="eventChange('angle')" />
       </el-form-item>
       <el-form-item v-if="showKeyId" label="ID:">

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

@@ -26,8 +26,8 @@
               :disabled="!isSeletable"
               @click="clickOpen"
             >{{$t('openatccomponents.channelizationmap.againimport')}}</el-button>
-            <i class="lock-map el-icon-unlock" v-if="!isLockedCrossMap" @click="handleLockCrossMap()"></i>
-            <i class="lock-map el-icon-lock" v-if="isLockedCrossMap" @click="handleLockCrossMap()"></i>
+            <i class="lock-map el-icon-unlock" v-if="isLockedCrossMap" @click="handleLockCrossMap()"></i>
+            <i class="lock-map el-icon-lock" v-if="!isLockedCrossMap" @click="handleLockCrossMap()"></i>
           </div>
 
           <div class="draw-to-sketchpad">

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/patternConfig/index.vue

@@ -38,7 +38,6 @@
                 </div>
                 <div style="height: 94%;" class="table-container">
                   <PatternTable ref="patterntable"
-                                :devicesData="devicesData"
                                 :maxTableHeight="maxTableHeight"
                                 :opt="item.devs"
                                 :isAllowedExpand="isAllowedExpand"
@@ -56,7 +55,6 @@
     </el-container>
     <div v-if="isShowSingle" style="height: 94%;" class="table-container">
       <PatternTable ref="patterntable"
-                    :devicesData="devicesData"
                     :opt="opt.optPatternList[0].devs"
                     :isAllowedExpand="isAllowedExpand"
                     :maxTableHeight="maxTableHeight"
@@ -123,8 +121,6 @@ export default {
   },
   data () {
     return {
-      devicesData: [],
-      deviceIds: [],
       maxTableHeight: 200,
       chartData: {},
       months: monthsModel,
@@ -145,6 +141,36 @@ export default {
       // isOnlyOneTab: true,
       loading: false,
       keyintsidOptions: [],
+      directionOptions: [{
+        value: 'up',
+        label: this.$t('openatccomponents.greenwaveoptimize.directionOption1'),
+        id: '1'
+      }, {
+        value: 'down',
+        label: this.$t('openatccomponents.greenwaveoptimize.directionOption2'),
+        id: '2'
+      }, {
+        value: 'all',
+        label: this.$t('openatccomponents.greenwaveoptimize.directionOption3'),
+        id: '3'
+      }],
+      optstrategyOptions: [{
+        value: 'green',
+        label: this.$t('openatccomponents.greenwaveoptimize.optstrategyoption1'),
+        id: '1'
+      }, {
+        value: 'red',
+        label: this.$t('openatccomponents.greenwaveoptimize.optstrategyoption2'),
+        id: '2'
+      }, {
+        value: 'motorcade-end',
+        label: this.$t('openatccomponents.greenwaveoptimize.optstrategyoption3'),
+        id: '3'
+      }, {
+        value: 'dynamicGreen',
+        label: this.$t('openatccomponents.greenwaveoptimize.optstrategyoption4'),
+        id: '4'
+      }],
       editableTabsValue: '1',
       routePattern: {
         'id': 1,
@@ -240,7 +266,6 @@ export default {
           }
         }
         this.route = route
-        await _this.getDeviceByIds(route)
         _this.onAgentidsChange('', optPatternList, _this.agentids)
       })
     },
@@ -489,6 +514,128 @@ export default {
       }
     },
     onConditionChange () {},
+    onOptstrategyChange (val) {
+      if (this.chartData.patternList) {
+        this.chartData.routeData.optstrategy = val
+      }
+    },
+    onDirectionChange (val) {
+      if (this.chartData.patternList) {
+        this.chartData.routeData.direction = val
+      }
+    },
+    onUpspeedChange (val) {
+      if (this.chartData.patternList) {
+        this.chartData.routeData.upspeed = val
+      }
+    },
+    onDownspeedChange (val) {
+      if (this.chartData.patternList) {
+        this.chartData.routeData.downspeed = val
+      }
+    },
+    handleMonth (val, index) {
+      let allValues = []
+      // 保留所有值
+      for (let item of this.months) {
+        allValues.push(item.value)
+      }
+      // 若是全部选择
+      if (val.includes(0)) this.editableTabs[index].month = allValues
+      // 取消全部选中，上次有，当前没有，表示取消全选
+      if (this.oldOptions.includes(0) && !val.includes(0)) this.editableTabs[index].month = []
+      // 点击非全部选中，需要排除全部选中，以及，当前点击的选项
+      // 新老数据都有全部选中
+      if (this.oldOptions.includes(0) && val.includes(0)) {
+        let tempIndex = val.indexOf(0)
+        val.splice(tempIndex, 1) // 排除全选选项
+        this.editableTabs[index].month = val
+      }
+      // 全选未选，但是其他选项全部选上，则全选选上，上次和当前，都没有全选
+      if (!this.oldOptions.includes(0) && !val.includes(0)) {
+        if (val.length === allValues.length - 1) this.editableTabs[index].month = [0].concat(val)
+      }
+      this.oldOptions = this.editableTabs[index].month
+    },
+    handleDate (val, index) {
+      let allValues = []
+      // 保留所有值
+      for (let item of this.dates) {
+        allValues.push(item)
+      }
+      // 判断中英文
+      if (this.$i18n.locale === 'en') {
+        // 若是全部选择
+        if (val.includes('All')) this.editableTabs[index].date = allValues
+        // 取消全部选中，上次有，当前没有，表示取消全选
+        if (this.oldOptions.includes('All') && !val.includes('All')) this.editableTabs[index].date = []
+        // 点击非全部选中，需要排除全部选中，以及，当前点击的选项
+        // 新老数据都有全部选中
+        if (this.oldOptions.includes('All') && val.includes('All')) {
+          let tempIndex = val.indexOf('All')
+          val.splice(tempIndex, 1) // 排除全选选项
+          this.editableTabs[index].date = val
+        }
+        // 全选未选，但是其他选项全部选上，则全选选上，上次和当前，都没有全选
+        if (!this.oldOptions.includes('All') && !val.includes('All')) {
+          if (val.length === allValues.length - 1) this.editableTabs[index].date = ['All'].concat(val)
+        }
+      } else if (this.$i18n.locale === 'zh') {
+        // 若是全部选择
+        if (val.includes('全选')) this.editableTabs[index].date = allValues
+        // 取消全部选中，上次有，当前没有，表示取消全选
+        if (this.oldOptions.includes('全选') && !val.includes('全选')) this.editableTabs[index].date = []
+        // 点击非全部选中，需要排除全部选中，以及，当前点击的选项
+        // 新老数据都有全部选中
+        if (this.oldOptions.includes('全选') && val.includes('全选')) {
+          let tempIndex = val.indexOf('全选')
+          val.splice(tempIndex, 1) // 排除全选选项
+          this.editableTabs[index].date = val
+        }
+        // 全选未选，但是其他选项全部选上，则全选选上，上次和当前，都没有全选
+        if (!this.oldOptions.includes('全选') && !val.includes('全选')) {
+          if (val.length === allValues.length - 1) this.editableTabs[index].date = ['全选'].concat(val)
+        }
+      }
+      this.oldOptions = this.editableTabs[index].date
+    },
+    handleDateInit (val, status) {
+      if (status) {
+        this.oldOptions = val
+      } else {
+        this.oldOptions = []
+      }
+    },
+    handleDay (val, index) {
+      let allValues = []
+      // 保留所有值
+      for (let item of this.days) {
+        allValues.push(item.value)
+      }
+      // 若是全部选择
+      if (val.includes(8)) this.editableTabs[index].day = allValues
+      // 取消全部选中，上次有，当前没有，表示取消全选
+      if (this.oldOptions.includes(8) && !val.includes(8)) this.editableTabs[index].day = []
+      // 点击非全部选中，需要排除全部选中，以及，当前点击的选项
+      // 新老数据都有全部选中
+      if (this.oldOptions.includes(8) && val.includes(8)) {
+        let tempIndex = val.indexOf(8)
+        val.splice(tempIndex, 1) // 排除全选选项
+        this.editableTabs[index].day = val
+      }
+      // 全选未选，但是其他选项全部选上，则全选选上，上次和当前，都没有全选
+      if (!this.oldOptions.includes(8) && !val.includes(8)) {
+        if (val.length === allValues.length - 1) this.editableTabs[index].day = [8].concat(val)
+      }
+      this.oldOptions = this.editableTabs[index].day
+    },
+    initOldOptions (val, status) {
+      if (status) {
+        this.oldOptions = val
+      } else {
+        this.oldOptions = []
+      }
+    },
     beforeLeave (currentName, oldName) {
       // var self = this // 重点，如果name是add，则什么都不触发
       if (currentName === 'add') {
@@ -688,22 +835,22 @@ export default {
       }
       patterntable.newPatternList = []
     },
-    async getDeviceByIds (routeData) {
+    getDeviceByIds (routeData) {
       // 获取设备表格信息
       let realtimeRouteData = JSON.parse(JSON.stringify(routeData))
       this.deviceIds = realtimeRouteData.devs.map(ele => ele.agentid)
-      await GetDeviceByIds(this.deviceIds).then(res => {
+      GetDeviceByIds(this.deviceIds).then(res => {
         if (!res.data.success) {
           this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
           return
         }
         this.devicesData = res.data.data
-        // // 取路口对应的实际方案id
-        // let devs = realtimeRouteData.devs
-        // for (let inter of devs) {
-        //   inter.patternid = this.getActurlPatternid(inter.agentid)
-        // }
-        // this.chartData.realPatternRouteData = realtimeRouteData
+        // 取路口对应的实际方案id
+        let devs = realtimeRouteData.devs
+        for (let inter of devs) {
+          inter.patternid = this.getActurlPatternid(inter.agentid)
+        }
+        this.chartData.realPatternRouteData = realtimeRouteData
         // this.$refs.chartDialog.show(true, this.chartData, this.route.name, this.devicesData)
       })
     },

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

@@ -29,11 +29,6 @@
           <span>{{scope.row.agentid}}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" :label="$t('openatccomponents.overview.crossname')" width="120" minWidth="40">
-        <template slot-scope="scope">
-          <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">
         <template slot-scope="scope">
           <el-switch
@@ -64,7 +59,11 @@
           <span></span>
         </template>
       </el-table-column>
-      <el-table-column  align="center" :label="$t('openatccomponents.greenwaveoptimize.offset')" width="70" prop="offset">
+      <!-- <el-table-column align="center" :label="$t('openatccomponents.greenwaveoptimize.directionOption1')" width="150" prop="forwardphaseDesc" :formatter="formatterForwardphaseDesc">
+      </el-table-column>
+      <el-table-column align="center" :label="$t('openatccomponents.greenwaveoptimize.directionOption2')" width="150" prop="backphaseDesc" :formatter="formatterBackphaseDesc">
+      </el-table-column> -->
+      <el-table-column  align="center" :label="$t('openatccomponents.greenwaveoptimize.offset')" width="120" prop="offset">
         <template slot-scope="scope">
           <el-input-number v-if="isAllowedExpand" :controls="false" :min="0" :step="1" v-model.number="scope.row.offset" size="small" style="width:70%;"></el-input-number>
           <span v-else>
@@ -72,7 +71,7 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column align="center" :label="$t('openatccomponents.greenwaveoptimize.cycle')" width="60" prop="cycle">
+      <el-table-column align="center" :label="$t('openatccomponents.greenwaveoptimize.cycle')" width="80" prop="cycle">
       </el-table-column>
       <el-table-column align="center" :label="$t('openatccomponents.pattern.plan')">
         <template slot-scope="scope">
@@ -126,10 +125,6 @@ export default {
     XiaoKanBan
   },
   props: {
-    devicesData: {
-      type: Array,
-      default: () => []
-    },
     optList: {
       type: Array
     },
@@ -181,14 +176,6 @@ export default {
     })
   },
   methods: {
-    getDevName (row) {
-      let res = row.name ? row.name : ''
-      if (this.devicesData) {
-        let dev = this.devicesData.find(item => item.agentid === row.agentid)
-        res = dev ? dev.name : res
-      }
-      return res
-    },
     onPatternTable (routeData, patternList, phaseList) {
       if (patternList.length === 0) {
         // this.$message.error('方案为空！')