openatc-components 0.0.113 → 0.1.2

package/package/kisscomps/components/DrawChannelization/drawsvg/iconSvg/countdownSvg.vue

@@ -24,7 +24,7 @@
       :rotatable="false"
       @select="handleSelectIcon(item)"
       @dragstop="boxDragStop(item, ...arguments)"
-      @resizestop="boxResizeStop(item, ...arguments)"
+      @resize="boxResizeStop"
       @rotatestop="boxRotateStop(item, ...arguments)"
     >
       <div v-if="UsageMode === 'draw'" class="centerText" :class="{'defaultBg': chooseIndex !== CountdownData.index, 'highlightBg': chooseIndex === CountdownData.index }" :style="{'width': item.w + 'px', 'height': item.h + 'px'}">
@@ -60,7 +60,8 @@ export default {
       reset: true,
       phaseCountdownList: [],
       phaseCountdownIcon: 999,
-      Fontsize: 20 // 倒计时默认字号
+      Fontsize: 20, // 倒计时默认字号
+      minCountdownSize: 30 // 限制最小倒计时区域大小
     }
   },
   watch: {
@@ -133,17 +134,20 @@ export default {
   },
   methods: {
     boxDragStop (origin, final) {
-      this.item = JSON.parse(JSON.stringify(final))
+      let info = this.handleMinCountdownSize(final)
+      this.item = JSON.parse(JSON.stringify(info))
       this.$emit('handleSelectIcon', this.CountdownData)
       this.handleChangeData()
     },
-    boxResizeStop (origin, final) {
-      this.resetSvg()
-      this.item = JSON.parse(JSON.stringify(final))
+    boxResizeStop (final) {
+      let info = this.handleMinCountdownSize(final)
+      // this.resetSvg()
+      this.item = JSON.parse(JSON.stringify(info))
       this.handleChangeData()
     },
     boxRotateStop (origin, final) {
-      this.item = JSON.parse(JSON.stringify(final))
+      let info = this.handleMinCountdownSize(final)
+      this.item = JSON.parse(JSON.stringify(info))
       this.handleChangeData()
     },
     resetSvg () {
@@ -171,6 +175,14 @@ export default {
       let fields = Object.keys(this.item)
       this.$emit('changeTimeItem', data, fields)
       this.handleSelectIcon()
+    },
+    handleMinCountdownSize (final) {
+      let info = JSON.parse(JSON.stringify(final))
+      if (info.w < 30 || info.h < 30) {
+        info.w = 30
+        info.h = 30
+      }
+      return info
     }
   },
   created () {

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

@@ -553,18 +553,19 @@ export default {
       getIntersectionInfo(agentid).then(res => {
         if (!res.data.success) {
           this.isLoaded = false
+          let commomMsg = this.$t('openatccomponents.overview.signalID') + ' : ' + agentid
           this.stateName = this.$t('openatccomponents.overview.offline')
-          let parrenterror = getMessageByCode(res.data.code, this.$i18n.locale)
+          let msg = getMessageByCode(res.data.code, this.$i18n.locale)
           if (res.data.data) {
             // 子类型错误
             let childErrorCode = res.data.data.errorCode
             if (childErrorCode) {
               let childerror = getMessageByCode(res.data.data.errorCode, this.$i18n.locale)
-              this.$message.error(parrenterror + ',' + childerror)
+              msg = msg + ' - ' + childerror
             }
-          } else {
-            this.$message.error(parrenterror)
           }
+          msg = msg + ' - ' + commomMsg
+          this.$message.error(msg)
           return
         }
         this.stateName = this.$t('openatccomponents.overview.online')

package/package/kisscomps/components/overView/index.vue

@@ -313,17 +313,16 @@ export default {
       registerMessage(this.AgentId).then(data => {
         if (!data.data.success) {
           this.devStatus = 2
-          let parrenterror = getMessageByCode(data.data.code, this.$i18n.locale)
+          let commomMsg = this.$t('openatccomponents.overview.signalID') + ' : ' + this.AgentId
+          let msg = 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)
+            let errorCode = data.data.data.errorCode
+            if (errorCode) {
+              msg = msg + ' - ' + getMessageByCode(errorCode, this.$i18n.locale)
             }
-          } else {
-            this.$message.error(parrenterror)
           }
+          msg = msg + ' - ' + commomMsg
+          this.$message.error(msg)
           if (this.isResend) {
             this.reSend()
           }
@@ -378,27 +377,28 @@ export default {
         this.responseTime = diffTime
         this.intervalFlag = true
         if (!data.data.success) {
+          let commomMsg = this.$t('openatccomponents.overview.signalID') + ' : ' + this.AgentId
           if (data.data.code === '4003') {
             this.devStatus = 2
             this.clearPatternInterval() // 清除其他定时器
             this.clearVolumeInterval()
-            this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
+            this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale) + ' - ' + commomMsg)
             if (this.isResend) {
               this.reSend()
             }
             return
           }
-          let parrenterror = getMessageByCode(data.data.code, this.$i18n.locale)
+          let msg = 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)
+              msg = msg + ' - ' + childerror
             }
-          } else {
-            this.$message.error(parrenterror)
           }
+          msg = msg + ' - ' + commomMsg
+          this.$message.error(msg)
           this.clearPatternInterval() // 清除其他定时器
           this.clearVolumeInterval()
           if (this.isResend) {
@@ -587,7 +587,9 @@ export default {
     queryDevParams () {
       queryDevice(this.AgentId).then(res => {
         if (!res.data.success) {
-          this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
+          let commomMsg = this.$t('openatc.overview.signalID') + ': ' + this.AgentId
+          let msg = getMessageByCode(res.data.code, this.$i18n.locale) + ', ' + commomMsg
+          this.$message.error(msg)
           return
         }
         let devParams = res.data.data.jsonparam
@@ -628,7 +630,8 @@ export default {
     getPlatform () {
       queryDevice(this.AgentId).then(res => {
         if (!res.data.success) {
-          this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
+          let commomMsg = this.$t('openatc.overview.signalID') + ': ' + this.AgentId
+          this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale) + ' - ' + commomMsg)
           return
         }
         let devParams = res.data.data.jsonparam