openatc-components 0.3.106 → 0.3.107

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

@@ -212,8 +212,8 @@ export default {
       Detector: [], // 管理所有检测器
       DetectorChart: [], // 管理所有检测器统计图
       motorwayicon: '',
-      IconLengh: 60,
-      IconWdith: 134,
+      IconLengh: 33,
+      IconWdith: 109,
       textareaW: 200,
       textareaH: 100,
       pedW: 206,
@@ -389,8 +389,8 @@ export default {
         h: this.IconWdith,
         angle: 0
       }
-      this.IconLengh = 60
-      this.IconWdith = 134
+      this.IconLengh = 33
+      this.IconWdith = 109
       let Motorwaysitem = {
         index: this.index,
         id: this.motorid,

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

@@ -92,7 +92,7 @@ export default {
           // }
           return
         }
-        if (JSON.stringify(data.data.data) === '{}') return
+        if (data.data.data === undefined || JSON.stringify(data.data.data) === '{}') return
         _this.pageindex = 2
         _this.loadedChannelizatonData = JSON.parse(JSON.stringify(data.data.data))
       })

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

@@ -222,10 +222,6 @@ export default {
       type: Boolean,
       devault: true
     },
-    isShowMessage: {
-      type: Boolean,
-      default: true
-    },
     roadDirection: {
       type: String
     },
@@ -722,7 +718,7 @@ export default {
             }
           }
           msg = msg + ' - ' + commomMsg
-          this.isShowMessage && this.$message.error(msg)
+          this.$message.error(msg)
           return
         }
         this.isLoaded = true
@@ -1044,10 +1040,10 @@ export default {
         let res = data.data
         if (!res.success) {
           if (res.code === '4003') {
-            this.isShowMessage && this.$message.error(this.$t('openatccomponents.errorTip.devicenotonline'))
+            this.$message.error(this.$t('openatccomponents.errorTip.devicenotonline'))
             return
           }
-          this.isShowMessage && this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
+          this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
           return
         }
         let channelList = res.data.data.channelList.filter(ele => ele.type !== undefined)

package/src/kisscomps/components/IntersectionMap/intersectionmap.vue

@@ -41,7 +41,6 @@
       :clickMode="clickMode"
       :isThirdSignal="isThirdSignal"
       :channelType="channelType"
-      :isShowMessage ="isShowMessage"
       @handleClickCrossIcon="handleClickCrossIcon" />
   </div>
 </div>
@@ -85,10 +84,6 @@ export default {
       type: Boolean,
       default: true
     },
-    isShowMessage: {
-      type: Boolean,
-      default: true
-    },
     roadDirection: {
       type: String,
       default: 'right'

package/src/kisscomps/components/IntersectionWithInterface/IntersectionWithInterface.vue

@@ -23,7 +23,6 @@
         :stateName="stateName"
         :isShowMode="isShowMode"
         :isShowState="isShowState"
-        :isShowMessage ="isShowMessage"
         :isShowInterval="isShowInterval"
         @onSelectStages="onSelectStages"/>
   </div>
@@ -74,10 +73,6 @@ export default {
       type: Boolean,
       default: true
     },
-    isShowMessage: {
-      type: Boolean,
-      default: true
-    },
     isShowState: {
       type: Boolean,
       devault: false
@@ -145,7 +140,7 @@ export default {
             }
           }
           msg = msg + ' - ' + commomMsg
-          this.isShowMessage && this.$message.error(msg)
+          this.$message.error(msg)
           if (this.isResend) {
             this.reSend()
           }
@@ -197,7 +192,7 @@ export default {
             // this.devStatus = 2
             this.clearPatternInterval() // 清除其他定时器
             this.clearVolumeInterval()
-            this.isShowMessage && this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale) + ' - ' + commomMsg)
+            this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale) + ' - ' + commomMsg)
             if (this.isResend) {
               this.reSend()
             }
@@ -213,7 +208,7 @@ export default {
             }
           }
           msg = msg + ' - ' + commomMsg
-          this.isShowMessage && this.$message.error(msg)
+          this.$message.error(msg)
           this.clearPatternInterval() // 清除其他定时器
           if (this.isResend) {
             this.reSend()
@@ -227,7 +222,7 @@ export default {
         this.controlData = this.controlFormat.handleGetData(param)
         this.$emit('getTscControl', data)
       }).catch(error => {
-        this.isShowMessage && this.$message.error(error)
+        this.$message.error(error)
         console.log(error)
       })
     },
@@ -240,7 +235,7 @@ export default {
         if (!res.data.success) {
           let commomMsg = this.$t('openatccomponents.overview.signalID') + ': ' + this.AgentId
           let msg = getMessageByCode(res.data.code, this.$i18n.locale) + ', ' + commomMsg
-          this.isShowMessage && this.$message.error(msg)
+          this.$message.error(msg)
           return
         }
         let devParams = res.data.data.jsonparam
@@ -300,7 +295,7 @@ export default {
             let success = data.data.data.content.success
             if (success !== 0) {
               let errormsg = 'openatccomponents.overview.putTscControlError' + success
-              this.isShowMessage && this.$message.error(this.$t(errormsg))
+              this.$message.error(this.$t(errormsg))
               return
             }
           }
@@ -335,7 +330,7 @@ export default {
         }
         if (!data.data.success) {
           if (data.data.code === '4003') {
-            this.isShowMessage && this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
+            this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
             return
           }
           let parrenterror = getMessageByCode(data.data.code, this.$i18n.locale)
@@ -344,10 +339,10 @@ export default {
             let childErrorCode = data.data.data.errorCode
             if (childErrorCode) {
               let childerror = getMessageByCode(data.data.data.errorCode, this.$i18n.locale)
-              this.isShowMessage && this.$message.error(parrenterror + ',' + childerror)
+              this.$message.error(parrenterror + ',' + childerror)
             }
           } else {
-            this.isShowMessage && this.$message.error(parrenterror)
+            this.$message.error(parrenterror)
           }
           return
         }
@@ -364,7 +359,7 @@ export default {
           controlData: controlData
         }
       }).catch(error => {
-        this.isShowMessage && this.$message.error(error)
+        this.$message.error(error)
         console.log(error)
       })
     },
@@ -373,10 +368,10 @@ export default {
         let res = data.data
         if (!res.success) {
           if (res.code === '4003') {
-            this.isShowMessage && this.$message.error(this.$t('openatccomponents.errorTip.devicenotonline'))
+            this.$message.error(this.$t('openatccomponents.errorTip.devicenotonline'))
             return
           }
-          this.isShowMessage && this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
+          this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
           return
         }
         this.phaseList = res.data.data.phaseList

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

@@ -11,17 +11,15 @@
  **/
 <template>
   <div class="container-main">
-    <div :style="{'transform': `scale(${shrink})`, 'transform-origin': 'left top', 'height': '100%'}">
+    <div class="overview-component-content" :style="{'transform': `scale(${shrink})`, 'transform-origin': 'left top', 'height': '100%'}">
       <div class="tuxingjiemian" v-show="curHomePage === 'Graphical' || curHomePage === 'Channelization'" :class="{'minifont': curBodyWidth <= 650}">
-        <div class="tuxing-left" :class="{'changeWidth': graphicMode}" ref="tuxingLeft">
+        <div :class="{'changeWidth': graphicMode, 'tuxing-left': !onlyShowIntersectionMap}" ref="tuxingLeft">
           <intersection-base-map
             v-if="curHomePage === 'Graphical'"
             ref="intersectionMap"
             :stateName="stateName"
             :crossStatusData="crossStatusData"
             :agentId="agentId"
-            :isShowMessage ="isShowMessage"
-            :isShowInterval="isShowInterval"
             :roadDirection="roadDirection" />
           <channelization
             v-if="curHomePage === 'Channelization'"
@@ -29,7 +27,7 @@
             :AgentId="agentId"
             :crossStatusData="crossStatusData"
             :detectorStatusData="detectorStatusData" />
-          <div class="pattern-status" v-if="!graphicMode && crossStatusData.control !== 1 && crossStatusData.control !== 2 && crossStatusData.control !== 3">
+          <div class="pattern-status" v-if="!graphicMode && !onlyShowIntersectionMap && crossStatusData.control !== 1 && crossStatusData.control !== 2 && crossStatusData.control !== 3">
             <div class="pattern-name cross-mess">{{$t('openatccomponents.overviewcomponent.patternstate')}}</div>
             <div class="pattern-message">({{$t('openatccomponents.overviewcomponent.cycle')}}: {{controlData.cycle}}  {{$t('openatccomponents.overviewcomponent.patternoffset')}}: {{controlData.patternoffset}} {{$t('openatccomponents.overviewcomponent.coordinationtime')}}: {{controlData.offset}})</div>
               <span class="pattern-explain"><el-checkbox v-model="checked">{{$t('openatccomponents.overviewcomponent.overLap')}}</el-checkbox></span>
@@ -93,7 +91,7 @@
           </div>
         </div>
 
-        <div ref="tuxingRight" class="tuxing-right" >
+        <div ref="tuxingRight" class="tuxing-right" v-if="!onlyShowIntersectionMap">
           <scheme-config
             ref="rightpanel"
             :statusData="crossStatusData"
@@ -103,6 +101,7 @@
             :agentId="agentId"
             :ip="ip"
             :platform="platform"
+            :funcSort="FuncSort"
             :roadDirection="roadDirection"
             :isFromAtc="isfromatc" />
         </div>
@@ -133,23 +132,18 @@ export default {
       type: String,
       default: 'right'
     },
-    isShowInterval: {
-      type: Boolean,
-      default: true
-    },
-    isShowMessage: {
+    isfromatc: {
       type: Boolean,
       default: true
     },
-    isfromatc: {
+    onlyShowIntersectionMap: {
       type: Boolean,
-      default: true
+      default: false
     }
   },
   data () {
     return {
       stateName: this.$t('openatccomponents.overview.offline'),
-      curBodyWidth: 1920,
       controlData: {},
       checked: false,
       overlap: [],
@@ -192,7 +186,8 @@ export default {
       commonHeight: undefined, // 左右侧面板的高度值
       graphicMode: false,
       resetcomponent: true,
-      curHomePage: 'Graphical'
+      curHomePage: 'Graphical',
+      FuncSort: 'allFunc'
     }
   },
   computed: {
@@ -326,16 +321,16 @@ export default {
           //   let childErrorCode = data.data.data.errorCode
           //   if (childErrorCode) {
           //     let childerror = getMessageByCode(data.data.data.errorCode, _this.$i18n.locale)
-          //     _this.isShowMessage && _this.$message.error(parrenterror + ',' + childerror)
+          //     _this.$message.error(parrenterror + ',' + childerror)
           //   }
           // } else {
-          //   _this.isShowMessage && _this.$message.error(parrenterror)
+          //   _this.$message.error(parrenterror)
           // }
           _this.curHomePage = 'Graphical'
           return
         }
         // 路口已设置渠化，则总览默认显示渠化路口，未设置显示模版路口
-        if (_this.isfromatc === true && data.data.success === true && JSON.stringify(data.data.data) !== '{}') {
+        if (_this.isfromatc === true && data.data.success === true && data.data.data !== undefined && JSON.stringify(data.data.data) !== '{}') {
           _this.curHomePage = 'Channelization'
         } else {
           _this.curHomePage = 'Graphical'
@@ -369,7 +364,7 @@ export default {
             let success = data.data.data.content.success
             if (success !== 0) {
               let errormsg = 'openatccomponents.overview.putTscControlError' + success
-              this.isShowMessage && this.$message.error(this.$t(errormsg))
+              this.$message.error(this.$t(errormsg))
               return
             }
           }
@@ -379,10 +374,10 @@ export default {
             let childErrorCode = data.data.data.errorCode
             if (childErrorCode) {
               let childerror = getMessageByCode(data.data.data.errorCode, this.$i18n.locale)
-              this.isShowMessage && this.$message.error(parrenterror + ',' + childerror)
+              this.$message.error(parrenterror + ',' + childerror)
             }
           } else {
-            this.isShowMessage && this.$message.error(parrenterror)
+            this.$message.error(parrenterror)
           }
           if (this.isResend) {
             this.reSend()
@@ -444,7 +439,7 @@ export default {
             let success = data.data.data.content.success
             if (success !== 0) {
               let errormsg = 'openatccomponents.overview.putTscControlError' + success
-              this.isShowMessage && this.$message.error(this.$t(errormsg))
+              this.$message.error(this.$t(errormsg))
               return
             }
           }
@@ -452,7 +447,7 @@ export default {
             // this.devStatus = 2
             this.clearPatternInterval() // 清除其他定时器
             this.clearVolumeInterval()
-            this.isShowMessage && this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
+            this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
             if (this.isResend) {
               this.reSend()
             }
@@ -464,10 +459,10 @@ export default {
             let childErrorCode = data.data.data.errorCode
             if (childErrorCode) {
               let childerror = getMessageByCode(data.data.data.errorCode, this.$i18n.locale)
-              this.isShowMessage && this.$message.error(parrenterror + ',' + childerror)
+              this.$message.error(parrenterror + ',' + childerror)
             }
           } else {
-            this.isShowMessage && this.$message.error(parrenterror)
+            this.$message.error(parrenterror)
           }
           this.clearPatternInterval() // 清除其他定时器
           this.clearVolumeInterval()
@@ -487,7 +482,7 @@ export default {
         console.log('this.controlData', this.controlData)
         this.checkStage(this.controlData)
       }).catch(error => {
-        // this.isShowMessage && this.$message.error(error)
+        // this.$message.error(error)
         console.log(error)
       })
     },
@@ -710,7 +705,7 @@ export default {
     queryDevParams () {
       queryDevice(this.AgentId).then(res => {
         if (!res.data.success) {
-          this.isShowMessage && this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
+          this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
           return
         }
         let devParams = res.data.data.jsonparam
@@ -742,7 +737,7 @@ export default {
             let success = data.data.data.content.success
             if (success !== 0) {
               let errormsg = 'openatccomponents.overview.putTscControlError' + success
-              this.isShowMessage && this.$message.error(this.$t(errormsg))
+              this.$message.error(this.$t(errormsg))
               return
             }
           }
@@ -752,10 +747,10 @@ export default {
             let childErrorCode = data.data.data.errorCode
             if (childErrorCode) {
               let childerror = getMessageByCode(data.data.data.errorCode, this.$i18n.locale)
-              this.isShowMessage && this.$message.error(parrenterror + ',' + childerror)
+              this.$message.error(parrenterror + ',' + childerror)
             }
           } else {
-            this.isShowMessage && this.$message.error(parrenterror)
+            this.$message.error(parrenterror)
           }
           return
         }
@@ -767,7 +762,7 @@ export default {
     getPlatform () {
       queryDevice(this.AgentId).then(res => {
         if (!res.data.success) {
-          this.isShowMessage && this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
+          this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
           return
         }
         let devParams = res.data.data.jsonparam
@@ -779,6 +774,14 @@ export default {
           this.agentName = res.data.data.name
         }
         this.platform = res.data.data.platform
+        let func = 'allFunc'
+        if (this.platform === 'OpenATC') {
+          func = 'allFunc'
+        }
+        if (this.platform === 'SCATS' || this.platform === 'HUATONG') {
+          func = 'basicFunc'
+        }
+        this.FuncSort = func
       })
     }
   },

package/src/kisscomps/components/PatternOptimize/PatternOptimize.vue

@@ -50,7 +50,7 @@
             <el-tooltip class="item" effect="dark" placement="left">
               <div slot="content">{{element.name}}</div>
               <div class="common-phase-description">
-                <xdrdirselector Width="70px" Height="70px" Widths="50px" Heights="50px" :Data="styles" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
+                <xdrdirselector Width="70px" Height="70px" Widths="58px" Heights="58px" :Datas="styles" :Data="showStyle" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
               </div>
             </el-tooltip>
         </el-col>
@@ -79,9 +79,13 @@ export default {
   },
   data () {
     return {
+      showStyle: {
+        left: '2px',
+        top: '0px'
+      },
       styles: {
         left: '1px',
-        top: '0'
+        top: '0px'
       },
       typeOptions: [{
         value: 'flow-split-opt'
@@ -97,6 +101,9 @@ export default {
       type: String,
       default: 'Header'
     },
+    id: {
+      type: Number
+    },
     rings: {
       type: Object
     },
@@ -209,6 +216,7 @@ export default {
                   }
                 }
               }
+              this.$emit('optimizesucess', this.id)
             }
           }).catch(error => {
             console.log(error)
@@ -232,6 +240,7 @@ export default {
                 }
               }
             }
+            this.$emit('optimizesucess', this.id)
           }
         }).catch(error => {
           console.log(error)