openatc-components 0.1.138 → 0.1.141

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

@@ -12,10 +12,10 @@
 <template>
   <div class="app-container" ref="pattern-container">
     <el-table :data="newPatternList" :max-height="tableHeight" id="footerBtn">
-      <el-table-column type="expand">
+      <el-table-column type="expand" v-if="isAllowedExpand">
         <template slot-scope="scope">
           <div class="components-container board">
-            <XiaoKanBan v-for="n in scope.row.ringCount" :key="n" class="kanban todo" :list="scope.row.rings[n-1]" :header-text="'环 '+n" :index="scope.$index" @fatherMethod="fatherMethod"/>
+            <XiaoKanBan v-for="n in scope.row.ringCount" :key="n" class="kanban todo" :list="scope.row.rings[n-1]" :header-text="$t('openatccomponents.pattern.ring') +' '+n" :index="scope.$index" @fatherMethod="fatherMethod"/>
           </div>
         </template>
       </el-table-column>
@@ -65,8 +65,10 @@
       </el-table-column> -->
       <el-table-column  align="center" :label="$t('openatccomponents.greenwaveoptimize.offset')" width="120" prop="offset">
         <template slot-scope="scope">
-          <!-- <el-input size="small" v-model.number="scope.row.offset"></el-input> -->
-          <el-input-number :controls="false" :min="0" :step="1" v-model.number="scope.row.offset" size="small" style="width:70%;"></el-input-number>
+          <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>
+            {{ scope.row.offset }}
+          </span>
         </template>
       </el-table-column>
       <el-table-column align="center" :label="$t('openatccomponents.greenwaveoptimize.cycle')" width="80" prop="cycle">
@@ -100,6 +102,10 @@ export default {
   props: {
     optList: {
       type: Array
+    },
+    isAllowedExpand: {
+      type: Boolean,
+      default: true
     }
   },
   data () {
@@ -287,54 +293,6 @@ export default {
       }
       return res
     },
-    // getDirectionDesc (row, bizType) {
-    //   let res = ''
-    //   let desc = ''
-    //   let phseId = -1
-    //   let directions = []
-    //   if (bizType === 'up') {
-    //     desc = row.forwardphaseDesc
-    //     phseId = row.forwardphaseid
-    //     directions = row.forwardphasedirection
-    //   } else {
-    //     desc = row.backphaseDesc
-    //     phseId = row.backphaseid
-    //     directions = row.backphasedirection
-    //   }
-    //   if (!phseId) {
-    //     return res
-    //   }
-    //   if (!directions) {
-    //     directions = []
-    //   }
-    //   let list = directions.map(id => {
-    //     return {
-    //       id: id
-    //     }
-    //   })
-    //   let dirNames = getDirName(list)
-    //   if (!dirNames) {
-    //     dirNames = []
-    //   }
-    //   let _this = this
-    //   let names = dirNames.map(item => {
-    //     let name = _this.$t(item)
-    //     return name
-    //   })
-    //   desc = names.join(',')
-    //   res = this.$t('openatccomponents.greenwaveoptimize.phase') + phseId + ' ' + desc
-    //   return res
-    // },
-    // formatterForwardphaseDesc (row, column) {
-    //   let bizType = 'up'
-    //   let res = this.getDirectionDesc(row, bizType)
-    //   return res
-    // },
-    // formatterBackphaseDesc (row, column) {
-    //   let bizType = 'down'
-    //   let res = this.getDirectionDesc(row, bizType)
-    //   return res
-    // },
     getCurPattern (agentid) {
       // 获取当前设备所有可选方案
       this.loading = true

package/src/utils/auth.js

@@ -12,7 +12,7 @@
 var localStorage = require('../lib/publicjs/localStorage')
 
 const nameSpace = 'openatc_conponents_'
-let LoginKey = 'token'
+const LoginKey = 'token'
 // eslint-disable-next-line camelcase
 let Prefix = 'Prefix'
 const LoginHost = nameSpace + 'kisshost'
@@ -27,13 +27,21 @@ const userRoles = 'kiss_userRoles'
 const isCheckPermission = 'kiss_isCheckPermission'
 
 export function getToken () {
-  let key = getPrefix() + LoginKey
+  let key = LoginKey
+  if (getPrefix()) {
+    key = getPrefix() + LoginKey
+    console.log('get tkey:', key)
+  }
   return localStorage.getStorage(key)
 }
 
-export function setToken (token, prefix = '') {
-  setPrefix(prefix)
-  let key = getPrefix() + LoginKey
+export function setToken (token, prefix) {
+  let key = LoginKey
+  if (prefix) {
+    setPrefix(prefix)
+    key = getPrefix() + LoginKey
+    console.log('set tkey:', key)
+  }
   return localStorage.setStorage(key, token)
 }
 

package/src/views/patternConfig.vue

@@ -3,7 +3,8 @@
       <button @click="getSaveParam" >获取相位参数信息</button><br/>
       <div class="layout-container2">
         <PatternConfig
-          :agentids="agentids"
+          :agentids="agentids2"
+          :isAllowedExpand="isAllowedExpand"
           :opt="opt2"
           ref="patternConfig"
         >
@@ -19,14 +20,18 @@ export default {
   name: 'PatternConfigTest',
   data () {
     return {
+      isAllowedExpand: false,
       // agentids: ['gjnlgjxl'],
-      agentids2: ['12008_835', 'gjnlgjxl'],
+      agentids2: ['gjnlahql', 'gjnlgjxl', 'gjnljml', 'jabh', 'jaja', 'jmlfqbl'],
+      // agentids2: ['15001', '15001', '15003', '15004', '15005'],
       roadDirection: 'right',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
       agentId: '12008_835',
       // agentId: '0351-01',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNjcwNTUzNTE1MDc3IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1Njk1MzUxNSwiaWF0IjoxNjcwNTUzNTE1fQ.oR9e2Fn5mVmJ4CjZV6zUOdq_23Y84RkuyhK_WppsD_o',
+      Token: 'eyJraWQiOiIxNjg4MTA1MDcxMDQwIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6NDA4Njc3NzYwMCwiaWF0IjoxNjg1NTQ4ODAwfQ.GruSjtTc2hHdGTg9vSISAhq6sDIeQ0lxRe2JBFQoETo',
+      // reqUrl: 'http://192.168.13.113:10003/openatc',
+      // Token: 'eyJraWQiOiIxNjkxMzcxMTc5ODcxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxNDE0NzIwMCwiaWF0IjoxNjkwODE5MjAwfQ.AhUj9taw4_IpP77AmP5bvCE87dDQ4-ZdsEJzrlWXKF8',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',
@@ -1433,6 +1438,8 @@ export default {
 .layout-container2 {
   /* height: 600px; */
   width: 1020px;
+  // height: 620px;
+  height: 600px;
   border: 1PX solid yellow;
   position: relative;
 }

package/static/apiconfig.json

@@ -189,6 +189,11 @@
   "url": "/devs/direction/phases",
   "method": "post"
 },
+{
+  "key": "allDerection",
+  "url": "/devs/direction/phases/all",
+  "method": "get"
+},
 {
   "key": "lockPhase",
   "url": "/devs/direction/lockPhases",