openatc-components 0.4.88 → 0.4.89

package/config/index.js

@@ -1,137 +1,137 @@
-/**
- * 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.
- **/
-'use strict'
-// Template version: 1.2.6
-// see http://vuejs-templates.github.io/webpack for documentation.
-const fs = require('fs');
-const path = require('path')
-let VUE_APP_PROXY_API_TARGET = "http://127.0.0.1:8080"
-let VUE_APP_PROXY_MAIN_TARGET = "http://127.0.0.1:8080"
-let VUE_APP_PROXY_SOCKET_TARGET = "http://127.0.0.1:8080"
-const localFile = path.resolve(__dirname, 'dev.local.js');
-if (fs.existsSync(localFile)) {
-  let local = require(localFile)
-  if (local) {
-    VUE_APP_PROXY_API_TARGET = local.VUE_APP_PROXY_API_TARGET
-    VUE_APP_PROXY_MAIN_TARGET = local.VUE_APP_PROXY_MAIN_TARGET
-    VUE_APP_PROXY_SOCKET_TARGET = local.VUE_APP_PROXY_SOCKET_TARGET
-  }
-}
-module.exports = {
-  dev: {
-    // Paths
-    assetsSubDirectory: 'static',
-    assetsPublicPath: '/',
-    proxyTable: {
-      '/api': {
-        target: VUE_APP_PROXY_API_TARGET,
-        changeOrigin: true,
-        ws: true,
-        secure: false,
-        pathRewrite: {
-          '^/api': '/api'
-        }
-      },
-      '/socket': {
-        target: VUE_APP_PROXY_SOCKET_TARGET,
-        changeOrigin: true,
-        ws: true,
-        secure: false,
-        pathRewrite: {
-          '^/socket': '/'
-        }
-			},
-      '/': {
-        target: VUE_APP_PROXY_MAIN_TARGET,
-        changeOrigin: true,     //跨域
-        pathRewrite: {
-          '^/': '/'//这里理解成用‘/api’代替target里面的地址，后面组件中我们掉接口时直接用api代替 比如我要调用'http://10.1.5.11:8080/xxx/duty?time=2017-07-07 14:57:22'，直接写‘/api/xxx/duty?time=2017-07-07 14:57:22’即可
-        }
-      }
-    },
-
-    // Various Dev Server settings
-    // host: '0.0.0.0',
-    host: 'localhost', // can be overwritten by process.env.HOST
-    port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
-    autoOpenBrowser: true,
-    errorOverlay: true,
-    notifyOnErrors: false,
-    poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
-
-    // Use Eslint Loader?
-    // If true, your code will be linted during bundling and
-    // linting errors and warnings will be shown in the console.
-    useEslint: true,
-    // If true, eslint errors and warnings will also be shown in the error overlay
-    // in the browser.
-    showEslintErrorsInOverlay: true,
-
-    /**
-     * Source Maps
-     */
-
-    // https://webpack.js.org/configuration/devtool/#development
-    devtool: 'source-map',
-
-    // If you have problems debugging vue-files in devtools,
-    // set this to false - it *may* help
-    // https://vue-loader.vuejs.org/en/options.html#cachebusting
-    cacheBusting: false,
-
-    // CSS Sourcemaps off by default because relative paths are "buggy"
-    // with this option, according to the CSS-Loader README
-    // (https://github.com/webpack/css-loader#sourcemaps)
-    // In our experience, they generally work as expected,
-    // just be aware of this issue when enabling this option.
-    cssSourceMap: false,
-  },
-
-  build: {
-    // Template for index.html
-    index: path.resolve(__dirname, '../dist/index.html'),
-   
-    // Paths
-    assetsRoot: path.resolve(__dirname, '../dist'),
-    assetsSubDirectory: './',
-
-    /**
-     * You can set by youself according to actual condition
-     * You will need to set this if you plan to deploy your site under a sub path,
-     * for example GitHub pages. If you plan to deploy your site to https://foo.github.io/bar/,
-     * then assetsPublicPath should be set to "/bar/".
-     * In most cases please use '/' !!!
-     */
-    assetsPublicPath: './', // If you are deployed on the root path, please use '/'
-
-    /**
-     * Source Maps
-     */
-
-    productionSourceMap: false,
-    // https://webpack.js.org/configuration/devtool/#production
-    devtool: '#source-map',
-
-    // Gzip off by default as many popular static hosts such as
-    // Surge or Netlify already gzip all static assets for you.
-    // Before setting to `true`, make sure to:
-    // npm install --save-dev compression-webpack-plugin
-    productionGzip: false,
-    productionGzipExtensions: ['js', 'css'],
-
-    // Run the build command with an extra argument to
-    // View the bundle analyzer report after build finishes:
-    // `npm run build --report`
-    // Set to `true` or `false` to always turn it on or off
-    bundleAnalyzerReport: process.env.npm_config_report
-  }
-}
+/**
+ * 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.
+ **/
+'use strict'
+// Template version: 1.2.6
+// see http://vuejs-templates.github.io/webpack for documentation.
+const fs = require('fs');
+const path = require('path')
+let VUE_APP_PROXY_API_TARGET = "http://127.0.0.1:8080"
+let VUE_APP_PROXY_MAIN_TARGET = "http://192.168.14.122:10003/openatc"
+let VUE_APP_PROXY_SOCKET_TARGET = "http://127.0.0.1:8080"
+const localFile = path.resolve(__dirname, 'dev.local.js');
+if (fs.existsSync(localFile)) {
+  let local = require(localFile)
+  if (local) {
+    VUE_APP_PROXY_API_TARGET = local.VUE_APP_PROXY_API_TARGET
+    VUE_APP_PROXY_MAIN_TARGET = local.VUE_APP_PROXY_MAIN_TARGET
+    VUE_APP_PROXY_SOCKET_TARGET = local.VUE_APP_PROXY_SOCKET_TARGET
+  }
+}
+module.exports = {
+  dev: {
+    // Paths
+    assetsSubDirectory: 'static',
+    assetsPublicPath: '/',
+    proxyTable: {
+      '/api': {
+        target: VUE_APP_PROXY_API_TARGET,
+        changeOrigin: true,
+        ws: true,
+        secure: false,
+        pathRewrite: {
+          '^/api': '/api'
+        }
+      },
+      '/socket': {
+        target: VUE_APP_PROXY_SOCKET_TARGET,
+        changeOrigin: true,
+        ws: true,
+        secure: false,
+        pathRewrite: {
+          '^/socket': '/'
+        }
+			},
+      '/': {
+        target: VUE_APP_PROXY_MAIN_TARGET,
+        changeOrigin: true,     //跨域
+        pathRewrite: {
+          '^/': '/'//这里理解成用‘/api’代替target里面的地址，后面组件中我们掉接口时直接用api代替 比如我要调用'http://10.1.5.11:8080/xxx/duty?time=2017-07-07 14:57:22'，直接写‘/api/xxx/duty?time=2017-07-07 14:57:22’即可
+        }
+      }
+    },
+
+    // Various Dev Server settings
+    // host: '0.0.0.0',
+    host: 'localhost', // can be overwritten by process.env.HOST
+    port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+    autoOpenBrowser: true,
+    errorOverlay: true,
+    notifyOnErrors: false,
+    poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
+
+    // Use Eslint Loader?
+    // If true, your code will be linted during bundling and
+    // linting errors and warnings will be shown in the console.
+    useEslint: true,
+    // If true, eslint errors and warnings will also be shown in the error overlay
+    // in the browser.
+    showEslintErrorsInOverlay: true,
+
+    /**
+     * Source Maps
+     */
+
+    // https://webpack.js.org/configuration/devtool/#development
+    devtool: 'source-map',
+
+    // If you have problems debugging vue-files in devtools,
+    // set this to false - it *may* help
+    // https://vue-loader.vuejs.org/en/options.html#cachebusting
+    cacheBusting: false,
+
+    // CSS Sourcemaps off by default because relative paths are "buggy"
+    // with this option, according to the CSS-Loader README
+    // (https://github.com/webpack/css-loader#sourcemaps)
+    // In our experience, they generally work as expected,
+    // just be aware of this issue when enabling this option.
+    cssSourceMap: false,
+  },
+
+  build: {
+    // Template for index.html
+    index: path.resolve(__dirname, '../dist/index.html'),
+
+    // Paths
+    assetsRoot: path.resolve(__dirname, '../dist'),
+    assetsSubDirectory: './',
+
+    /**
+     * You can set by youself according to actual condition
+     * You will need to set this if you plan to deploy your site under a sub path,
+     * for example GitHub pages. If you plan to deploy your site to https://foo.github.io/bar/,
+     * then assetsPublicPath should be set to "/bar/".
+     * In most cases please use '/' !!!
+     */
+    assetsPublicPath: './', // If you are deployed on the root path, please use '/'
+
+    /**
+     * Source Maps
+     */
+
+    productionSourceMap: false,
+    // https://webpack.js.org/configuration/devtool/#production
+    devtool: '#source-map',
+
+    // Gzip off by default as many popular static hosts such as
+    // Surge or Netlify already gzip all static assets for you.
+    // Before setting to `true`, make sure to:
+    // npm install --save-dev compression-webpack-plugin
+    productionGzip: false,
+    productionGzipExtensions: ['js', 'css'],
+
+    // Run the build command with an extra argument to
+    // View the bundle analyzer report after build finishes:
+    // `npm run build --report`
+    // Set to `true` or `false` to always turn it on or off
+    bundleAnalyzerReport: process.env.npm_config_report
+  }
+}

package/package/kisscomps/components/BoardCard/BoardCard.vue

@@ -15,6 +15,7 @@
         :isMove="isMove"
         :localPatternList="localPatternList"
         :showCondition="showCondition"
+        :patternType="patternType"
         :contrloType="contrloType"
         :allPatternList="allPatternList"
         :stagesChange="stagesChange"
@@ -103,6 +104,9 @@ export default {
     patternId: {
       type: Number
     },
+    patternType: {
+      type: String
+    },
     agentId: {
       type: String
     },

package/package/kisscomps/components/DirectionListConfiguration/DirectionListConfiguration.vue

@@ -288,7 +288,7 @@ export default {
                 key: this.CrossDiagramMgr.getUniqueKey('phase'),
                 channelid: ele.id, // 通道id
                 id: dir, // 接口返回的dir字段，对应前端定义的相位方向id，唯一标识
-                name: this.$t(phaseinfo.commonname)
+                name: this.$i18n.locale === 'en' ? phaseinfo.ename : phaseinfo.name
               })
             })
             realphasedirarr = Array.from(new Set(realphasedirarr.concat(ele.realdir)))
@@ -304,7 +304,7 @@ export default {
                   key: this.CrossDiagramMgr.getUniqueKey('pedphase'),
                   channelid: ele.id, // 通道id
                   id: dir,
-                  name: this.$t(pedinfo.commondesc)
+                  name: this.$i18n.locale === 'en' ? pedinfo.ename : pedinfo.desc
                 })
               }
             })

package/package/kisscomps/components/IntersectionDirectionSelection/IntersectionDirectionSelection.vue

@@ -8,6 +8,7 @@
             isVipRoute
             :clickMode="clickMode"
             :isThirdSignal="isThirdSignal"
+            :isRcp="isRcp"
             :choosedDirection="choosedDirection"
             :choosedPedDirection="choosedPedDirection"
             :roadDirection="roadDirection"
@@ -36,7 +37,8 @@ export default {
     return {
       crossStatusData: {},
       isSpecialIntersection: undefined,
-      isThirdSignal: false,
+      isThirdSignal: false, // 是否是第三方平台（可以直接传，也可以内部接口判断）,特勤、分组管控下，非第三方设备，按通道显示相位方向；第三方设备还是按路口相位配置显示相位方向
+      isRcp: false, // 特勤模式下兼容20999 rcp协议，能显示路口图及相位
       reset: true
     }
   },
@@ -104,6 +106,7 @@ export default {
         }
         this.tempType = res.data.data.type
         this.mainType = this.tempType.split('-')[0]
+        this.isSpecialIntersection = false
         if (this.mainType === '999') {
           this.isSpecialIntersection = true
           if (this.clickMode) {
@@ -111,8 +114,6 @@ export default {
               this.$refs.listConfiguration.init(res)
             })
           }
-        } else {
-          this.isSpecialIntersection = false
         }
       })
     },
@@ -124,15 +125,17 @@ export default {
           return
         }
         this.platform = res.data.data.platform
-        console.log(this.platform)
+        this.isThirdSignal = false
+        this.isRcp = false
         if (this.platform !== '' && this.platform !== 'OpenATC') {
           this.isThirdSignal = true
-        } else {
-          this.isThirdSignal = false
         }
         if (this.thirdSignal) {
           this.isThirdSignal = this.thirdSignal
         }
+        if (res.data.data.protocol === 'rcp') {
+          this.isRcp = true
+        }
       })
     },
     handleClickCrossIcon (allChoosedDir, curClickedPhase) {

package/package/kisscomps/components/IntersectionMap/crossDirection/crossDiagram.vue

@@ -31,7 +31,7 @@
     <!-- 右行道路 B-->
     <div class="right-dir-road" v-if="roadDir === 'right'">
       <div class="centerText" v-if="crossType !== 'Customroads' && isHasPhase">
-        <div v-if="isVipRoute" class="merge-direction-icon">
+        <div class="merge-direction-icon">
           <xdr-dir-selector
           :Data="xdrMData"
           Width="80px"
@@ -307,6 +307,10 @@ export default {
     channelType: {
       type: Boolean,
       default: false
+    },
+    isRcp: {
+      type: Boolean,
+      default: false
     }
   },
   // computed: {
@@ -883,8 +887,8 @@ export default {
           this.getValidDirections()
           this.getMergeDirections()
         }
-        if (this.isVipRoute && !this.isThirdSignal) {
-          // 特勤、分组管控下，非第三方设备，按通道显示相位方向；第三方设备还是按路口相位配置显示相位方向
+        if (this.isVipRoute && !this.isThirdSignal && !this.isRcp) {
+          // 特勤、分组管控下，非第三方设备且不是rcp协议，按通道显示相位方向；第三方设备和rcp协议还是按路口相位配置显示相位方向
           this.getChannelInfo()
           return
         }
@@ -892,15 +896,22 @@ export default {
           this.getChannelInfo()
           return
         }
-        this.getTempCrossInfo(res)
-        // 显示阶段的判断条件
-        this.allPatternList = res.data.data.param.patternList
-        if (this.allPatternList[0].rings === undefined || this.allPatternList[0].rings.length === 0) {
-          this.contrloType = 'stage'
-        } else if (this.allPatternList[0].contrloType === 'stage') {
-          this.contrloType = 'stage'
-        } else {
-          this.contrloType = 'ring'
+        let CrossInfo = res
+        if (this.isRcp) {
+          // rcp协议数据格式不一样，需要转换成原路口信息数据结构
+          CrossInfo = this.transRcpPhaseData(res)
+        }
+        this.getTempCrossInfo(CrossInfo)
+        if (!this.isRcp) {
+          // 显示阶段的判断条件
+          this.allPatternList = res.data.data.param.patternList
+          if (this.allPatternList[0].rings === undefined || this.allPatternList[0].rings.length === 0) {
+            this.contrloType = 'stage'
+          } else if (this.allPatternList[0].contrloType === 'stage') {
+            this.contrloType = 'stage'
+          } else {
+            this.contrloType = 'ring'
+          }
         }
       })
     },
@@ -924,7 +935,7 @@ export default {
       if (!this.isVipRoute) {
         this.drawDefaultPhaseIcon()
       }
-      if (this.isVipRoute && this.isThirdSignal) {
+      if ((this.isVipRoute && this.isThirdSignal) || (this.isVipRoute && this.isRcp)) {
         this.LanePhaseData = this.CrossDiagramMgr.compare(this.LanePhaseData, this.overlapLanePhaseData, 'type', 'nostatus')
         // console.log(this.LanePhaseData)
         this.sidewalkPhaseData = this.CrossDiagramMgr.compare(this.sidewalkPhaseData, this.overlapsidewalkPhaseData, 'pedtype', 'nostatus')
@@ -935,6 +946,28 @@ export default {
         this.drawPhaseIcon()
       }
     },
+    transRcpPhaseData (rcpCrossInfo) {
+      const phaseConfigs = rcpCrossInfo.data.data.param.Phase.PhaseConfig
+      const phaseList = phaseConfigs.map(phase => {
+          return {
+              id: phase.Index,
+              direction: phase.direction || [],
+              peddirection: phase.peddirection || []
+          }
+      })
+      // 返回转换后的数据结构
+      const CrossInfo = {
+        data: {
+          data: {
+            type: rcpCrossInfo.data.data.type,
+            param: {
+                phaseList: phaseList
+            }
+          }
+        }
+      }
+      return CrossInfo
+    },
     getBusPos () {
       // 公交相位信息
       this.busPhaseData = []
@@ -1333,14 +1366,14 @@ export default {
     async drawPhaseIcon () {
       const targetIds = [4, 8, 12, 16] // 掉头相位后画
       this.LanePhaseData = this.LanePhaseData.filter(item => !targetIds.includes(item.id)).concat(this.LanePhaseData.filter(item => targetIds.includes(item.id)))
-      if (!this.isThirdSignal && this.isVipRoute) {
+      if (!this.isThirdSignal && this.isVipRoute && !this.isRcp) {
         await this.getConflictList()
         this.handleClickedPhase()
         this.compLanePhaseData = JSON.parse(JSON.stringify(this.LanePhaseData))
         this.handleClickedPedPhase()
         this.compSidewalkPhaseData = JSON.parse(JSON.stringify(this.sidewalkPhaseData))
       } else {
-        // 第三方信号机不需要处理冲突关系
+        // 第三方信号机不需要处理冲突关系/特勤下rcp协议不需要处理冲突
         this.handleClickedPhase()
         this.compLanePhaseData = JSON.parse(JSON.stringify(this.LanePhaseData))
         this.handleClickedPedPhase()
@@ -1348,7 +1381,7 @@ export default {
       }
     },
     handleClickedPhase () {
-      if (!this.isThirdSignal) {
+      if (!this.isThirdSignal && !this.isRcp) {
         this.inneChoosedDirection = this.inneChoosedDirection.filter(dir => this.phaseConflictList.indexOf(dir) === -1)
       }
       for (let index = 0; index < this.LanePhaseData.length; index++) {

package/package/kisscomps/components/IntersectionMap/crossDirection/posJson/phasePos.json

@@ -3,7 +3,6 @@
       "id": 1,
       "name": "东直行",
       "ename": "East-Straight",
-      "commonname": "openatccomponents.overview.es",
       "x": "588px",
       "y": "267px"
     },
@@ -11,7 +10,6 @@
       "id": 2,
       "name": "东左转",
       "ename": "East-Left",
-      "commonname": "openatccomponents.overview.el",
       "x": "588px",
       "y": "297px"
     },
@@ -19,7 +17,6 @@
       "id": 3,
       "name": "东右转",
       "ename": "East-Right",
-      "commonname": "openatccomponents.overview.er",
       "x": "588px",
       "y": "238px"
     },
@@ -27,7 +24,6 @@
       "id": 4,
       "name": "东掉头",
       "ename": "East-Back",
-      "commonname": "openatccomponents.overview.eb",
       "x": "588px",
       "y": "325px"
     },
@@ -35,7 +31,6 @@
       "id": 5,
       "name": "西直行",
       "ename": "West-Straight",
-      "commonname": "openatccomponents.overview.ws",
       "x": "244px",
       "y": "359px"
     },
@@ -43,7 +38,6 @@
       "id": 6,
       "name": "西左转",
       "ename": "West-Left",
-      "commonname": "openatccomponents.overview.wl",
       "x": "244px",
       "y": "329px"
     },
@@ -51,7 +45,6 @@
       "id": 7,
       "name": "西右转",
       "ename": "West-Right",
-      "commonname": "openatccomponents.overview.wr",
       "x": "244px",
       "y": "388px"
     },
@@ -59,7 +52,6 @@
       "id": 8,
       "name": "西掉头",
       "ename": "West-Back",
-      "commonname": "openatccomponents.overview.wb",
       "x": "244px",
       "y": "300px"
     },
@@ -67,7 +59,6 @@
       "id": 9,
       "name": "北直行",
       "ename": "North-Straight",
-      "commonname": "openatccomponents.overview.ns",
       "x": "379px",
       "y": "134px"
     },
@@ -75,7 +66,6 @@
       "id": 10,
       "name": "北左转",
       "ename": "North-Left",
-      "commonname": "openatccomponents.overview.nl",
       "x": "408px",
       "y": "134px"
     },
@@ -83,7 +73,6 @@
       "id": 11,
       "name": "北右转",
       "ename": "North-Right",
-      "commonname": "openatccomponents.overview.nr",
       "x": "348px",
       "y": "134px"
     },
@@ -91,7 +80,6 @@
       "id": 12,
       "name": "北掉头",
       "ename": "North-Back",
-      "commonname": "openatccomponents.overview.nb",
       "x": "436px",
       "y": "134px"
     },
@@ -99,7 +87,6 @@
       "id": 13,
       "name": "南直行",
       "ename": "South-Straight",
-      "commonname": "openatccomponents.overview.ss",
       "x": "470px",
       "y": "476px"
     },
@@ -107,7 +94,6 @@
       "id": 14,
       "name": "南左转",
       "ename": "South-Left",
-      "commonname": "openatccomponents.overview.sl",
       "x": "440px",
       "y": "476px"
     },
@@ -115,7 +101,6 @@
       "id": 15,
       "name": "南右转",
       "ename": "South-Right",
-      "commonname": "openatccomponents.overview.sr",
       "x": "500px",
       "y": "476px"
     },
@@ -123,7 +108,6 @@
       "id": 16,
       "name": "南掉头",
       "ename": "South-Back",
-      "commonname": "openatccomponents.overview.sb",
       "x": "412px",
       "y": "476px"
     }