openatc-components 0.2.20 → 0.2.21

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

@@ -76,28 +76,13 @@
       <el-table-column align="center" :label="$t('openatccomponents.pattern.plan')">
         <template slot-scope="scope">
           <div class="pattern-figure">
-            <!-- <pattern-list
+            <pattern-list
               :patternStatusList="scope.row.rings"
               :cycles="scope.row.cycle"
               :phaseList="scope.row.currPhase"
-              :contrloType="controlType"
             >
-            </pattern-list> -->
-            <pattern-list
-              :patternId="scope.row.patternid"
-              :contrloType="getControlType(scope.row)"
-              :index="scope.$index"
-              :cycleChange="true"
-              :stagesChange="getSelectedPattern(scope.row).stagesList"
-              :patternStatusList="getSelectedPattern(scope.row).rings"
-              :patternList="scope.row.allPatterns"
-              :allPatternList="scope.row.allPatterns"
-              :cycles="scope.row.cycle"
-              :phaseList="scope.row.currPhase"
-              :agentId="scope.row.agentid"
-              :showBarrier="false">
             </pattern-list>
-          </div>
+            </div>
          </template>
       </el-table-column>
     </el-table>
@@ -129,7 +114,6 @@ export default {
   },
   data () {
     return {
-      controlType: 'stage',
       loading: true,
       tableHeight: 460,
       screenHeight: window.innerHeight, // 屏幕高度
@@ -195,9 +179,6 @@ export default {
           let currPattern
           if (Array.isArray(currPatternList)) {
             currPattern = currPatternList.filter(cpl => cpl.id === patternId)[0]
-            if (!currPattern) {
-              currPattern = currPatternList[0]
-            }
           } else {
             currPattern = currPatternList
           }
@@ -311,34 +292,6 @@ export default {
       }
       return res
     },
-    getControlType (row) {
-      let contrloType = 'ring'
-      let allPatternList = row.feature && row.feature.patternList ? row.feature.patternList : row.allPatterns
-      if (
-        !allPatternList[0].contrloType &&
-        allPatternList[0].rings.length > 0
-      ) {
-        contrloType = 'ring'
-      } else if (
-        !allPatternList[0].contrloType &&
-        allPatternList[0].rings.length === 0
-      ) {
-        contrloType = 'stage'
-      } else {
-        contrloType = allPatternList[0].contrloType
-      }
-      let res = contrloType
-      return res
-    },
-    getSelectedPattern (row) {
-      let res = []
-      let patternList = row.feature && row.feature.patternList ? row.feature.patternList : row.allPatterns
-      let pattern = patternList.find(item => item.id === row.patternid)
-      if (pattern) {
-        res = pattern
-      }
-      return res
-    },
     getCurPattern (agentid) {
       // 获取当前设备所有可选方案
       this.loading = true

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

@@ -170,9 +170,6 @@ export default {
         let currPattern
         if (Array.isArray(currPatternList)) {
           currPattern = currPatternList.filter(cpl => cpl.id === patternId)[0]
-          if (!currPattern) {
-            currPattern = currPatternList[0]
-          }
         } else {
           currPattern = currPatternList
         }

package/src/node_modules/.package_versions.json

@@ -0,0 +1 @@
+{}

package/src/views/intersection.vue

@@ -9,19 +9,13 @@
 
     <!-- 显示按通道获取相位的模版路口图 -->
     <h2 class="text">显示配置的相位路口图</h2>
-    <!-- <intersection-base-map
+    <intersection-base-map
             ref="intersectionMap"
             :crossStatusData="crossStatusData"
-            agentId="tjblsxl-ticp6"
+            agentId="bclgkxl"
             isVipRoute
             :choosedDirection="[1,2,3]"
             :choosedPedDirection="[3,4]"
-            :roadDirection="roadDirection" /> -->
-      <intersection-direction-selection
-            :agentId="this.agentId"
-            :clickMode="false"
-            :choosedDirection="[14,6,13,8]"
-            :choosedPedDirection="[1]"
             :roadDirection="roadDirection" />
 
     <!-- 按通道获取相位的方向选择列表，特殊路口显示列表，普通路口显示模版路口图 -->
@@ -137,14 +131,14 @@ export default {
   name: 'demo',
   data () {
     return {
-      roadDirection: 'right',
+      roadDirection: 'left',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      agentId: 'tjblsxl-ticp6',
+      agentId: 'bclgkxl',
       // agentId: '13013',
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzE0MDk1MjUwNTU5IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxNDEzODQ1MCwiaWF0IjoxNzE0MDk1MjUwfQ.17SP6vzbImSV2jy_LC10xQaH7z4aXWvg3yc2bUFLYvE',
+      Token: 'eyJraWQiOiIxNzEwNzU4MTU3Njk0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiIxMjM0NTYiLCJleHAiOjE3MTM4ODgwMDAsImlhdCI6MTcxMDY5MTIwMH0.vicLABPjoZEWmHr12-5FXMbjYmEKv-WSTVRROR1eOME',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',