openatc-components 0.5.13 → 0.5.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openatc-components",
-  "version": "0.5.13",
+  "version": "0.5.15",
   "description": "A Vue.js project",
   "author": "openatc developer",
   "private": false,

package/src/api/param.js

@@ -14,7 +14,7 @@ import {
   getIframdevid
 } from '../utils/auth'
 
-export function registerMessage (agentid) {
+export function registerMessage (agentid, protocol) {
   // var iframdevid = getIframdevid()
   if (agentid === '' || agentid === undefined) {
     agentid = 0
@@ -24,6 +24,9 @@ export function registerMessage (agentid) {
   data.agentid = agentid
   data.operation = 'get-request'
   data.infotype = 'login'
+  if (protocol === 'rcp') {
+    data.model = 'rcp'
+  }
   // let paramList = [iframdevid, 'param', 'upload']
   return api.Send({}, data)
 }

package/src/i18n/language/en.js

@@ -1094,6 +1094,21 @@ const en = {
       'download': 'Download'
     },
     'common': {
+      'datatype': 'Data Type',
+      'objectid': 'Object ID',
+      'propertyid': 'Property ID',
+      'elementid': 'Element ID',
+      'returncode': 'Return Code',
+      'statusbadvalue': 'Status Bad Value',
+      'statuswronglength': 'Status Wrong Length',
+      'statusvverflow': 'Status Overflow',
+      'statusreadonly': 'Status Read Only',
+      'statusnullvalue': 'Status Null Value',
+      'statuserror': 'Status Error',
+      'statuscontrolfail': 'Status Control Fail',
+      'statusaccessdenied': 'Status Access Denied',
+      'statusinvalidkey': 'Status Invalid Key',
+      'statuschecksumerror': 'Status Checksum Error',
       'implement': 'Implement',
       'confirm': 'Confirm',
       'query': 'Query',

package/src/i18n/language/zh.js

@@ -1090,6 +1090,21 @@ const zh = {
       'download': '下载'
     },
     'common': {
+      'datatype': '数据类',
+      'objectid': '对象',
+      'propertyid': '属性',
+      'elementid': '元素',
+      'returncode': '数据值',
+      'statusbadvalue': '值错误',
+      'statuswronglength': '值长度错误',
+      'statusvverflow': '值越界',
+      'statusreadonly': '值只读',
+      'statusnullvalue': '值不存在',
+      'statuserror': '值一般错误',
+      'statuscontrolfail': '控制失败',
+      'statusaccessdenied': '无访问权限',
+      'statusinvalidkey': '密钥错误',
+      'statuschecksumerror': '校验错误',
       'implement': '执行',
       'confirm': '确认',
       'query': '查询',

package/src/kisscomps/components/IntersectionMap/crossDirection/baseImg/SidewalkClickSvg.vue

@@ -19,15 +19,25 @@
       :style="{position: 'absolute', left: '310px', top: '198px', zIndex: '10'}"
     >
       <defs>
-          <filter id="shadow-effect" x="-50%" y="-50%" width="200%" height="200%">
-            <!-- 对应 box-shadow: 0 0 6px 6px #10B800 -->
-            <feDropShadow
-              dx="0"
-              dy="0"
-              stdDeviation="4"
-              flood-color="#10B800"
-              flood-opacity="1"/>
-          </filter>
+        <filter id="shadow-effect-side"
+          x="-10%"
+          y="-10%"
+          width="200%"
+          height="200%">
+          <feFlood flood-color="#10B800" flood-opacity="1" result="glowColor" />
+          <feComposite in="glowColor"
+                in2="SourceGraphic"
+                operator="in"
+                result="glowMask" />
+          <feGaussianBlur in="glowMask" stdDeviation="2" result="blurredGlow" />
+          <feComponentTransfer in="blurredGlow" result="brightGlow">
+            <feFuncA type="linear" slope="2" />
+          </feComponentTransfer>
+          <feMerge>
+            <feMergeNode in="brightGlow" />
+            <feMergeNode in="SourceGraphic" />
+          </feMerge>
+        </filter>
         </defs>
       <g
         id="西行人"
@@ -1224,7 +1234,7 @@ export default {
             }
           }
           clickedPath.setAttribute('fill', this.clickedColor)
-          clickedPath.setAttribute('filter', 'url(#shadow-effect)')
+          clickedPath.setAttribute('filter', 'url(#shadow-effect-side)')
         }
         this.$emit('handleClickSidewalkIcon', this.sidewalkData, curChoosePed)
       }
@@ -1239,7 +1249,7 @@ export default {
             let data = this.sidewalkData.filter(ele => ele.id === side.id)[0]
             if (data && data.clicked === true) {
               dom.setAttribute('fill', this.clickedColor)
-              dom.setAttribute('filter', 'url(#shadow-effect)')
+              dom.setAttribute('filter', 'url(#shadow-effect-side)')
             }
             if (this.clickMode && data && data.disabled === true) {
               dom.setAttribute('fill', this.disabledColor)

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

@@ -1411,8 +1411,8 @@ export default {
       } else {
         nextSelected = this.inneChoosedDirection.filter(d => d !== id)
       }
-      // 第三方信号机检查是否冲突，冲突提示是否确定；非第三方不进冲突检查
-      if (this.isThirdSignal && this.checkConflict(nextSelected)) {
+      // 检查是否冲突，冲突提示是否确定
+      if (this.checkConflict(nextSelected)) {
         try {
           await this.$confirm(this.$t('openatccomponents.overview.conflictdirectionstips'), this.$t('openatccomponents.common.tipsmodaltitle'), {
             confirmButtonText: this.$t('openatccomponents.button.OK'),

package/src/kisscomps/components/IntersectionMap/crossDirection/phaseIcon/phaseIconSvg.vue

@@ -18,14 +18,24 @@
       </svg> -->
       <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 36 26" :width="IconLengh" :height="IconWdith">
         <defs>
-          <filter id="shadow-effect" x="-50%" y="-50%" width="200%" height="200%">
-            <!-- 对应 box-shadow: 0 0 6px 6px #10B800 -->
-            <feDropShadow
-              dx="0"
-              dy="0"
-              stdDeviation="4"
-              flood-color="#10B800"
-              flood-opacity="1"/>
+          <filter id="shadow-effect"
+                x="-10%"
+                y="-10%"
+                width="200%"
+                height="200%">
+            <feFlood flood-color="#10B800" flood-opacity="1" result="glowColor" />
+            <feComposite in="glowColor"
+                  in2="SourceGraphic"
+                  operator="in"
+                  result="glowMask" />
+            <feGaussianBlur in="glowMask" stdDeviation="2" result="blurredGlow" />
+            <feComponentTransfer in="blurredGlow" result="brightGlow">
+              <feFuncA type="linear" slope="2" />
+            </feComponentTransfer>
+            <feMerge>
+              <feMergeNode in="brightGlow" />
+              <feMergeNode in="SourceGraphic" />
+            </feMerge>
           </filter>
         </defs>
           <!-- 东相位 -->
@@ -148,8 +158,7 @@ export default {
       default: false
     },
     beforeSelect: {
-      type: Function,
-      required: true
+      type: Function
     }
   },
   methods: {

package/src/kisscomps/components/OverviewComponent/index.vue

@@ -222,7 +222,7 @@ export default {
         this.agentId = val
         this.resetcomponent = false
         setIframdevid(val)
-        this.registerMessage() // 注册消息
+        // this.registerMessage() // 注册消息
         await this.getIntersectionInfo(val)
         this.$nextTick(() => {
           this.resetcomponent = true
@@ -249,7 +249,7 @@ export default {
     this.CrossDiagramMgr = new CrossDiagramMgr()
     this.agentId = this.AgentId
     setIframdevid(this.agentId)
-    this.registerMessage() // 注册消息
+    // this.registerMessage() // 注册消息
     this.getIntersectionInfo(this.agentId)
   },
   mounted () {
@@ -380,8 +380,8 @@ export default {
       })
     },
     registerMessage () {
-      registerMessage(this.agentId).then(data => {
-        if (!data.data.success) {
+      registerMessage(this.agentId, this.protocol).then(data => {
+        if (!data.data.success && this.protocol !== 'rcp') {
           // this.devStatus = 2
           if (data.data.code === '4002' && data.data.data.errorCode === '4209') {
             let success = data.data.data.content.success
@@ -406,6 +406,20 @@ export default {
             this.reSend()
           }
           return
+        } else {
+          if (data.data.code === '4002' && data.data.data.errorCode === '4210') {
+            let successArray = data.data.data.content
+            successArray.forEach(success => {
+              let dataType = this.$t('edge.common.datatype') + ':' + success.DataClass // 数据类
+              let objectID = this.$t('edge.common.objectid') + ':' + success.ObjectID // 对象
+              let propertyID = this.$t('edge.common.propertyid') + ':' + success.PropertyID // 属性
+              let elementID = this.$t('edge.common.elementid') + ':' + success.ElementID // 元素
+              let returnCode = this.$t('edge.common.returncode') + ':' + this.getError(success.ReturnCode) // 数据值
+              let errormsg = `${dataType} ${objectID} ${propertyID} ${elementID} ${returnCode}`
+              this.$message.error(this.$t(errormsg))
+            })
+            return
+          }
         }
         // this.devStatus = 3
         this.clearPatternInterval() // 清除其他定时器
@@ -418,6 +432,31 @@ export default {
         this.getPhase()
       })
     },
+    getError (val) {
+      if (val === 'Status_BadValue') {
+        return this.$t('edge.common.statusbadvalue')
+      } else if (val === 'Status_WrongLength') {
+        return this.$t('edge.common.statuswronglength')
+      } else if (val === 'Status_Overflow') {
+        return this.$t('edge.common.statusvverflow')
+      } else if (val === 'Status_ReadOnly') {
+        return this.$t('edge.common.statusreadonly')
+      } else if (val === 'Status_NullValue') {
+        return this.$t('edge.common.statusnullvalue')
+      } else if (val === 'Status_Error') {
+        return this.$t('edge.common.statuserror')
+      } else if (val === 'Status_ControlFail') {
+        return this.$t('edge.common.statuscontrolfail')
+      } else if (val === 'Status_AccessDenied') {
+        return this.$t('edge.common.statusaccessdenied')
+      } else if (val === 'Status_InvalidKey') {
+        return this.$t('edge.common.statusinvalidkey')
+      } else if (val === 'Status_ChecksumError') {
+        return this.$t('edge.common.statuschecksumerror')
+      } else {
+        return ''
+      }
+    },
     reSend () { // 设备掉线重连机制
       // this.devStatus = 1
       this.clearRegisterMessageTimer()
@@ -725,36 +764,36 @@ export default {
     reconnectionDev () {
       this.registerMessage()
     },
-    queryDevParams () {
-      queryDevice(this.AgentId).then(res => {
-        if (!res.data.success) {
-          this.isShowMessage && this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
-          return
-        }
-        let devParams = res.data.data.jsonparam
-        this.ip = devParams.ip
-        this.port = String(devParams.port)
-        this.protocol = res.data.data.protocol
-        this.agentId = res.data.data.agentid
-        if (res.data.data.name) {
-          this.agentName = res.data.data.name
-        }
-        this.platform = res.data.data.platform
-        let state = res.data.data.state
-        if (state === 'UP') {
-          this.stateName = this.$t('openatccomponents.overview.online')
-        } else {
-          this.stateName = this.$t('openatccomponents.overview.offline')
-        }
-        this.registerMessage() // 注册消息
-        this.initData()
-        // 配置工具没参数的时候
-        this.getIntersectionInfo(this.agentId)
-        if (this.curHomePage === 'Channelization') {
-          this.getDetectorStatus()
-        }
-      })
-    },
+    // queryDevParams () {
+    //   queryDevice(this.AgentId).then(res => {
+    //     if (!res.data.success) {
+    //       this.isShowMessage && this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
+    //       return
+    //     }
+    //     let devParams = res.data.data.jsonparam
+    //     this.ip = devParams.ip
+    //     this.port = String(devParams.port)
+    //     this.protocol = res.data.data.protocol
+    //     this.agentId = res.data.data.agentid
+    //     if (res.data.data.name) {
+    //       this.agentName = res.data.data.name
+    //     }
+    //     this.platform = res.data.data.platform
+    //     let state = res.data.data.state
+    //     if (state === 'UP') {
+    //       this.stateName = this.$t('openatccomponents.overview.online')
+    //     } else {
+    //       this.stateName = this.$t('openatccomponents.overview.offline')
+    //     }
+    //     this.registerMessage() // 注册消息
+    //     this.initData()
+    //     // 配置工具没参数的时候
+    //     this.getIntersectionInfo(this.agentId)
+    //     if (this.curHomePage === 'Channelization') {
+    //       this.getDetectorStatus()
+    //     }
+    //   })
+    // },
     getPhase () {
       uploadSingleTscParam('phase', this.agentId).then(data => {
         let res = data.data
@@ -800,6 +839,7 @@ export default {
           this.agentName = res.data.data.name
         }
         this.platform = res.data.data.platform
+        this.registerMessage() // 注册消息
       })
     },
     getDetectorStatus () {

package/src/node_modules/.package_versions.json

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