openatc-components 0.1.143 → 0.1.145

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openatc-components",
-  "version": "0.1.143",
+  "version": "0.1.145",
   "description": "A Vue.js project",
   "author": "openatc developer",
   "private": false,

package/src/kisscomps/components/FaultDetailModal/FaultDetailModal.vue

@@ -14,7 +14,7 @@
     <el-dialog
       :title="$t(`openatccomponents.faultrecord.faultDetail`)"
       :visible.sync="dialogFormVisible"
-      width="60%"
+      :width="isFromAtc ? '45%' : '30%'"
       :append-to-body="true"
       :close-on-click-modal="false">
     <div class="content">
@@ -25,12 +25,14 @@
         :default-sort = "{prop: 'm_unFaultOccurTime', order: 'descending'}"
        >
         <el-table-column
+          v-if="isFromAtc"
           prop="m_unFaultOccurTime"
           :label="$t('openatccomponents.faultrecord.faultOccurtime')"
           sortable
           width="200">
         </el-table-column>
         <el-table-column
+          v-if="isFromAtc"
           prop="m_byFaultBoardType"
           :formatter="formatterBoardType"
           :label="$t('openatccomponents.faultrecord.boardCardType')"
@@ -55,6 +57,7 @@
           sortable>
         </el-table-column>
         <el-table-column
+          v-if="isFromAtc"
           prop="m_byFaultLevel"
           :formatter="m_byFaultLevel"
           :label="$t('openatccomponents.faultrecord.faultGrade')"
@@ -62,6 +65,7 @@
           width="120">
         </el-table-column>
         <el-table-column
+          v-if="isFromAtc"
           prop="enumerate"
           :label="$t('openatccomponents.faultrecord.enumerate')"
           align="center">
@@ -69,7 +73,7 @@
             <el-tag v-show="scope.row.enumerate" :type="scope.row.enumerate === '1'?'info':scope.row.enumerate === '2'?'success':scope.row.enumerate === '0'?'':''">{{formatterEnumerate(scope.row)}}</el-tag>
           </template>
           </el-table-column>
-        <el-table-column :label="$t('openatccomponents.faultrecord.operation')" align="center">
+        <el-table-column v-if="isFromAtc" :label="$t('openatccomponents.faultrecord.operation')" align="center">
         <template slot-scope="scope">
           <el-button type="text" @click="handleEnumerateCheck(scope.row, '2')">{{$t('openatccomponents.button.confirm')}}</el-button>
           <el-button type="text" @click="handleEnumerateCheck(scope.row, '1')">{{$t('openatccomponents.button.ignore')}}</el-button>
@@ -93,6 +97,10 @@ export default {
     },
     agentId: {
       type: String
+    },
+    isFromAtc: {
+      type: Boolean,
+      default: true
     }
   },
   data () {

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

@@ -948,7 +948,8 @@ export default {
           this.fillGap(ringTeams, val)
         }
         let barrier = this.step2(ringTeams, newPattern)
-        this.barrierList = barrier.map(j => {
+        let barrierLeft = barrier.map(item => item - 0.3)// 屏障左移显示出人行横道
+        this.barrierList = barrierLeft.map(j => {
           return (j / (this.max ? this.max : this.newCycle) * 100) + '%'
         })
         // this.barrierList.unshift(0)

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

@@ -11,7 +11,7 @@
  **/
 <template>
   <div class="scheme-config openatc-scheme-config" style="height: 100%;">
-    <fault-detail-modal ref="faultDetail" :agentId="agentId" @refreshFault="getFaultById"></fault-detail-modal>
+    <fault-detail-modal ref="faultDetail" :agentId="agentId" :isFromAtc="isFromAtc" @refreshFault="getFaultById"></fault-detail-modal>
         <div style="height: 100%;">
           <transition name="fade-right" mode="out-in"
           :enter-active-class="toPage === 1 ? 'animated fadeInRight' : 'animated fadeInLeft'"
@@ -205,6 +205,10 @@ export default {
     roadDirection: {
       type: String,
       default: 'right'
+    },
+    isFromAtc: {
+      type: Boolean,
+      default: true
     }
   },
   data () {

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

@@ -231,6 +231,7 @@ import dateObj from './utils.js'
 // import routeChart from './pattern/planChart/index'
 // import PlanExecute from './components/planExecute'
 import { GetDeviceByIds } from '../../../api/device.js'
+import { getAllPatternOfDevs } from '../../../api/route'
 const { monthsModel, daysModelCh, daysModelEn, datesModel, monthsModelEn, datesModelEn } = dateObj
 export default {
   name: 'PatternConfig',
@@ -385,7 +386,7 @@ export default {
     // this.getAllPlan()
   },
   methods: {
-    handeAgentidsChange () {
+    async handeAgentidsChange () {
       let devs = []
       for (let agentid of this.agentids) {
         let item = {
@@ -396,25 +397,128 @@ export default {
         devs.push(item)
       }
       let _this = this
-      this.$nextTick(() => {
+      this.$nextTick(async () => {
         let route = {
           devs: devs
         }
         let optPatternList
+        // console.log('_this.opt', _this.opt)
+        // console.log('_this.optPatternList', _this.opt.optPatternList)
+        // console.log('_this.length', _this.opt.optPatternList.length)
         if (_this.opt && _this.opt.optPatternList && _this.opt.optPatternList.length > 0) {
           route = _this.opt.optPatternList[0]
           let arr = []
           for (let dev of route.devs) {
             arr.push(dev.agentid)
           }
-          if (arr.length === this.agentids.length && arr.join('') !== this.agentids.join('')) {
+          // console.log('arr.length', arr)
+          // console.log('this.agentids', this.agentids)
+          // console.log('this.len', arr.length === this.agentids.length)
+          // console.log('this.jon', arr.join('') !== this.agentids.join(''))
+          // console.log('this.jon', arr.join(''), this.agentids.join(''))
+          // if (arr.length === this.agentids.length && arr.join('') !== this.agentids.join('')) {
+          if (arr.length === this.agentids.length) {
             optPatternList = _this.opt.optPatternList
+            // check and reset data
+            // console.log('checkAndResetListBefore', optPatternList)
+            let opt = await this.checkAndResetList(optPatternList)
+            // console.log('checkAndResetListAfter.opt', optPatternList)
+            optPatternList = opt.optPatternList
+            // console.log('checkAndResetListAfter', optPatternList)
           }
         }
         this.route = route
         _this.onAgentidsChange('', optPatternList, _this.agentids)
       })
     },
+    async checkAndResetList (optPatternList) {
+      let res = JSON.parse(JSON.stringify(optPatternList))
+      let resetFlag = false
+      for (let opt of optPatternList) {
+        if (opt.devs && opt.devs.length > 0) {
+          for (let dev of opt.devs) {
+            if (!dev.feature || dev.feature.patternList) {
+              resetFlag = true
+              break
+            }
+          }
+        }
+        if (resetFlag) {
+          break
+        }
+      }
+      if (resetFlag) {
+        res = await this.getFullOptList(optPatternList)
+      }
+      return res
+    },
+    async getAllPatternOfRoute (agentids) {
+      if (agentids.length === 0) return
+      return new Promise((resolve, reject) => {
+        getAllPatternOfDevs(agentids).then(res => {
+          if (!res.data.success) {
+            let agentid = res.data.data.agentid
+            let commomMsg = this.$t('openatccomponents.greenwaveoptimize.device') + agentid
+            let data = res
+            let parrenterror = getMessageByCode(data.data.code, this.$i18n.locale)
+            if (data.data.data) {
+              // 子类型错误
+              let childErrorCode = data.data.data.errorCode
+              if (childErrorCode) {
+                let childerror = getMessageByCode(data.data.data.errorCode, this.$i18n.locale)
+                this.$message.error(parrenterror + ',' + childerror + ',' + commomMsg)
+              }
+            } else {
+              this.$message.error(parrenterror + ',' + commomMsg)
+            }
+            console.error('ErrorOcurrred')
+            resolve([])
+          }
+          let allPatternList = res.data.data.devs
+          resolve(allPatternList)
+        })
+      })
+    },
+    async getFullOptList (optPatternList) {
+      let allPatternList = await this.getAllPatternOfRoute(this.agentids)
+      // console.log('allPatternList', allPatternList)
+      let res = {
+        'optPatternList': []
+      }
+      for (let i = 0; i < optPatternList.length; i++) {
+        let opt = optPatternList[i]
+        let opteItem = {
+          'id': i + 1,
+          'name': opt.name,
+          title: opt.name,
+          'tabName': i + 1 + '',
+          'devs': []
+        }
+        for (let j = 0; j < opt.devs.length; j++) {
+          let dev = opt.devs[j]
+          let patternList = allPatternList.filter(ap => ap.agentid === dev.agentid)[0].feature.patternList
+          let patternItem = patternList.filter(pattern => pattern.id === dev.patternid)[0]
+          let devItem = {
+            'agentid': dev.agentid,
+            'patternid': dev.patternid,
+            'isused': dev.isused,
+            'id': j + 1,
+            'offset': patternItem.offset,
+            'cycle': patternItem.cycle,
+            'patternId': patternItem.id,
+            'desc': patternItem.desc,
+            'patternDesc': patternItem.patternDesc,
+            'feature': {
+              'patternList': patternList
+            }
+          }
+          opteItem.devs.push(devItem)
+        }
+        res.optPatternList.push(opteItem)
+      }
+      // console.log('getFullOptList', res)
+      return res
+    },
     handlePlanChart (routeData, patternList, greenwave, allPatternList) {
       let chartData = {
         routeData,
@@ -902,9 +1006,12 @@ export default {
       this.resetTab()
       this.chooseId = id
       // this.agentids = agentids
+      // console.log('this.optPatternList', optPatternList)
       if (optPatternList && optPatternList.length > 0) {
         this.editableTabs = JSON.parse(JSON.stringify(optPatternList))
+        // console.log('this.editableTabs', this.editableTabs)
       } else {
+        // console.log(222)
         this.editableTabs[0].devs = this.route.devs
       }
       this.tabIndex = this.editableTabs.length

package/src/views/patternConfig.vue

@@ -3,10 +3,10 @@
       <button @click="getSaveParam" >获取相位参数信息</button><br/>
       <div class="layout-container2">
         <PatternConfig
-          :agentids="agentids2"
+          :agentids="agentids3"
+          :opt="opt3"
           :isAllowedExpand="isAllowedExpand"
           :isOnlyOneTab="isOnlyOneTab"
-          :opt="opt2"
           ref="patternConfig"
         >
         </PatternConfig>
@@ -24,7 +24,7 @@ export default {
       isOnlyOneTab: false,
       isAllowedExpand: false,
       // agentids: ['gjnlgjxl'],
-      agentids2: ['gjnlahql', 'gjnlgjxl', 'gjnljml', 'jabh', 'jaja', 'jmlfqbl'],
+      agentids3: ['gjnlahql', 'gjnlgjxl', 'gjnljml', 'jmlfqbl'],
       // agentids2: ['15001', '15001', '15003', '15004', '15005'],
       roadDirection: 'right',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
@@ -38,7 +38,35 @@ export default {
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',
       boxVisible: false,
-      opt2: {},
+      opt3: {
+        'optPatternList': [
+          {
+            'name': '杰斯安的房间里 1',
+            'devs': [
+              {
+                'agentid': 'gjnlahql',
+                'patternid': 1,
+                'isused': true
+              },
+              {
+                'agentid': 'gjnlgjxl',
+                'patternid': 2,
+                'isused': true
+              },
+              {
+                'agentid': 'gjnljml',
+                'patternid': 3,
+                'isused': false
+              },
+              {
+                'agentid': 'jmlfqbl',
+                'patternid': 1,
+                'isused': false
+              }
+            ]
+          }
+        ]
+      },
       agentids: ['gjnlgjxl'],
       opt: {
         'optPatternList': [