openatc-components 0.4.38 → 0.4.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openatc-components",
-  "version": "0.4.38",
+  "version": "0.4.40",
   "description": "A Vue.js project",
   "author": "openatc developer",
   "private": false,
@@ -44,15 +44,15 @@
     "autoprefixer": "^7.1.2",
     "babel-eslint": "8.0.3",
     "babel-helper-vue-jsx-merge-props": "2.0.3",
-    "babel-jest": "^21.0.2",
     "babel-loader": "7.1.2",
-    "babel-plugin-dynamic-import-node": "^1.2.0",
     "babel-plugin-syntax-jsx": "6.18.0",
-    "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
     "babel-plugin-transform-runtime": "6.23.0",
     "babel-plugin-transform-vue-jsx": "3.5.0",
     "babel-preset-env": "1.6.1",
     "babel-preset-stage-2": "6.24.1",
+    "babel-jest": "^21.0.2",
+    "babel-plugin-dynamic-import-node": "^1.2.0",
+    "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
     "babel-register": "^6.22.0",
     "babel-runtime": "^6.11.6",
     "chalk": "^2.0.1",
@@ -86,7 +86,6 @@
     "postcss-import": "^11.0.0",
     "postcss-loader": "^2.0.8",
     "postcss-url": "^7.2.1",
-    "raw-loader": "^0.5.1",
     "rimraf": "^2.6.0",
     "sass-loader": "^7.0.3",
     "sass-resources-loader": "^2.1.1",

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

@@ -1,32 +1,29 @@
-/** * Copyright (c) 2020 kedacom * OpenATC is licensed under Mulan PSL v2. * You
-can use this software according to the terms and conditions of the Mulan PSL v2.
-* You may obtain a copy of Mulan PSL v2 at: *
-http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS"
-BASIS, WITHOUT WARRANTIES OF ANY KIND, * EITHER EXPRESS OR IMPLIED, INCLUDING
-BUT NOT LIMITED TO NON-INFRINGEMENT, * MERCHANTABILITY OR FIT FOR A PARTICULAR
-PURPOSE. * See the Mulan PSL v2 for more details. **/
-<!--完整渠化编辑功能，包含导入-->
+/**
+ * Copyright (c) 2020 kedacom
+ * OpenATC is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ **/
+  <!--完整渠化编辑功能，包含导入-->
 <template>
   <div class="custom-cross-part draw-channelization">
-    <!-- <FirstImportCrossmap v-if="pageindex === 1"
+    <FirstImportCrossmap v-if="pageindex === 1"
     @loadSvgString="loadSvgString" @loadMapSize="loadMapSize" />
     <CustomDraw v-show="pageindex === 2" ref="CustomDraw"
       :AgentId="AgentId"
       :loadedChannelizatonData="loadedChannelizatonData"
-      @saveCallback="saveCallback" /> -->
-    <CustomDraw
-      ref="CustomDraw"
-      :AgentId="AgentId"
-      :loadedChannelizatonData="loadedChannelizatonData"
-      @saveCallback="saveCallback"
-    />
+      @saveCallback="saveCallback" />
   </div>
 </template>
 <script>
 import FirstImportCrossmap from './firstImportCrossmap'
 import CustomDraw from './index.draw'
 import { getChannelizatonChart } from '../../../../api/cross'
-import DefaultCrossRoadsSvg from '../../../../assets/svg/CrossRoadsSvg.svg'
 
 export default {
   name: 'custom-channelization',
@@ -80,57 +77,28 @@ export default {
     getChannelizatonChart () {
       let _this = this
       _this.pageindex = 1
-      getChannelizatonChart(this.AgentId)
-        .then((data) => {
-          if (!data.data.success) {
-            // 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)
-            //   }
-            // } else {
-            //   _this.$message.error(parrenterror)
-            // }
-            this.AutoReadSVG()
-            return
-          }
-          if (
-            data.data.data === undefined ||
-            JSON.stringify(data.data.data) === '{}'
-          ) {
-            this.AutoReadSVG()
-            return
-          }
-          _this.pageindex = 2
-          _this.loadedChannelizatonData = JSON.parse(
-            JSON.stringify(data.data.data)
-          )
-        })
-        .catch(() => {
-          this.AutoReadSVG()
-        })
+      getChannelizatonChart(this.AgentId).then(data => {
+        if (!data.data.success) {
+          // 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)
+          //   }
+          // } else {
+          //   _this.$message.error(parrenterror)
+          // }
+          return
+        }
+        if (data.data.data === undefined || JSON.stringify(data.data.data) === '{}') return
+        _this.pageindex = 2
+        _this.loadedChannelizatonData = JSON.parse(JSON.stringify(data.data.data))
+      })
     },
     saveCallback (res) {
       this.$emit('saveCallback', res)
-    },
-    AutoReadSVG () {
-      this.loadedChannelizatonData = {
-        crossMap: {
-          index: -2,
-          icontype: 'crossmap',
-          x: 435,
-          y: 325,
-          w: 870,
-          h: 650,
-          angle: 0,
-          imgfilesrc: '',
-          svgstr: DefaultCrossRoadsSvg,
-          type: 'vectorgraph'
-        }
-      }
     }
   },
   mounted () {
@@ -138,4 +106,5 @@ export default {
   }
 }
 </script>
-<style scoped></style>
+<style scoped>
+</style>

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

@@ -1170,17 +1170,17 @@ export default {
           return k.id
         })
       })
-      let valSplit = val.map(item => {
-        return item.map(val => {
-          return val.value + (val.sum ? val.sum : 0)
-        })
-      })
-      let splitCycle = valSplit.length > 0 ? valSplit.map(item => {
-        return item.length > 0 ? item.reduce((a, b) => {
-          return a + b
-        }) : 0
-      }) : 0
-      let cycle = Math.max(...splitCycle)// 每个环的周期最大值
+      // let valSplit = val.map(item => {
+      //   return item.map(val => {
+      //     return val.value + (val.sum ? val.sum : 0)
+      //   })
+      // })
+      // let splitCycle = valSplit.length > 0 ? valSplit.map(item => {
+      //   return item.length > 0 ? item.reduce((a, b) => {
+      //     return a + b
+      //   }) : 0
+      // }) : 0
+      // let cycle = Math.max(...splitCycle)// 每个环的周期最大值
       let newRings = ringsequence.filter(item => item)
       let minLength = Math.min(...ringlength)
       let resultArrs = [] // 环1分组
@@ -1313,7 +1313,7 @@ export default {
         let barrier = this.step2(ringTeams, newPattern)
         let barrierLeft = barrier.map(item => item)// 屏障左移显示出人行横道
         this.barrierList = barrierLeft.map(j => {
-          return (j / (this.max ? this.max : cycle) * 100) + '%'
+          return (j / (this.max ? this.max : this.newCycle) * 100) + '%'
         })
         // this.barrierList.unshift(0)
       }
@@ -1571,7 +1571,17 @@ export default {
         let newmaxNum = Math.max.apply(Math, newMax)// 每组最大值
         let newminNum = Math.min.apply(Math, newMin)
         if (newArr.length > 1) {
-          this.newCycle = newmaxNum + newminNum
+          let mapAdd = pattern.map(item => {
+            return item.map(val => {
+              return val.value + (val.sum ? val.sum : 0)
+            })
+          })
+          let maxCycle = mapAdd.length > 0 ? mapAdd.map(item => {
+            return item.length > 0 ? item.reduce((a, b) => {
+              return a + b
+            }) : 0
+          }) : 0
+          this.newCycle = Math.max(...maxCycle)
         }
         if (newmaxNum === newminNum) {
           this.max = newmaxNum + newminNum

package/src/node_modules/.package_versions.json

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

package/src/views/customchannelization.vue

@@ -1,12 +1,12 @@
 <template>
 <!-- 渠化绘制demo -->
   <div style="height: 100%;">
-      <custom-channelization
-        :AgentId="agentId" />
-      <!-- <CustomChannelization
+      <!-- <custom-channelization
+        :AgentId="agentId" /> -->
+      <CustomChannelization
         :AgentId="agentId"
         :tscParam="tscParams"
-        @saveCallback="saveCallback" /> -->
+        @saveCallback="saveCallback" />
   </div>
 </template>
 <script>
@@ -16,7 +16,7 @@ export default {
   name: 'custom-channelization-demo',
   data () {
     return {
-      agentId: '13000000000000000003',
+      agentId: 'tjblxyl',
       tscParams: {}
     }
   },
@@ -39,7 +39,7 @@ export default {
   created () {
   },
   mounted () {
-    // this.getIntersectionInfo()
+    this.getIntersectionInfo()
   },
   destroyed () {
   }

package/src/views/intersection.vue

@@ -167,7 +167,7 @@ export default {
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzQxNjcxODYyMDI2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc0MTY3NTQ2MiwiaWF0IjoxNzQxNjY4MjYyfQ.IcB4eEk2j5WFpgIwUYhu0w5sbbR9rYZNxyS9wnmGJZI',
+      Token: 'eyJraWQiOiIxNzMwODU1NTQ1NzA3IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczMDg1OTE0NSwiaWF0IjoxNzMwODUxOTQ1fQ.CBl61S3eRifl4qEtTmgVjOZGo2hqNSGQKPxG1bN-utU',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',