openatc-components 0.4.39 → 0.4.41

package/build/webpack.base.conf.js

@@ -61,6 +61,11 @@ module.exports = {
           symbolId: 'icon-[name]'
         }
       },
+      // {
+      //   test: /\.svg$/,
+      //   loader: 'raw-loader',  // 让 Webpack 直接返回 SVG 文件内容
+      //   include: [resolve('src/assets/svg')] // 仅针对 `src/assets/svg` 目录
+      // },
       {
         test: /\.less$/,
         loader: ['style', 'css', 'less'],
@@ -69,6 +74,7 @@ module.exports = {
         test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
         loader: 'url-loader',
         exclude: [resolve('src/icons')],
+        // exclude: [resolve('src/icons'), resolve('src/assets/svg')],
         options: {
           limit: 10000,
           name: utils.assetsPath('img/[name].[hash:7].[ext]')

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

@@ -1,29 +1,32 @@
-/**
- * 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" />
+      @saveCallback="saveCallback" /> -->
+    <CustomDraw
+      ref="CustomDraw"
+      :AgentId="AgentId"
+      :loadedChannelizatonData="loadedChannelizatonData"
+      @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',
@@ -77,28 +80,57 @@ 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)
-          // }
-          return
-        }
-        if (data.data.data === undefined || JSON.stringify(data.data.data) === '{}') return
-        _this.pageindex = 2
-        _this.loadedChannelizatonData = JSON.parse(JSON.stringify(data.data.data))
-      })
+      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()
+        })
     },
     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 () {

package/package/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)
       }