openatc-components 0.1.114 → 0.1.116

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

@@ -136,7 +136,7 @@ export default {
   }
   .icon-fangda {
     font-size: 24px;
-    color: #409EFF;
+    color: #299BCC;
   }
   .add-disabled {
     color: #bcbec2;

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

@@ -226,11 +226,11 @@ export default {
 }
 .highlightBg {
   border-radius: 50%;
-  background-color: #409eff;
+  background-color: #299BCC;
 }
 .centerText .text {
   display: inline-block;
-  color: #409eff;
+  color: #299BCC;
   margin-top: 20px;
 }
 </style>

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

@@ -194,7 +194,7 @@ export default {
   background-color: transparent;
 }
 .highlightBg {
-  background-color: #409eff;
+  background-color: #299BCC;
 }
 .defaultVehicleBorder {
   border: 2px solid #00FF00;
@@ -204,7 +204,7 @@ export default {
 }
 .centerText .text {
   display: inline-block;
-  color: #409eff;
+  color: #299BCC;
   margin-top: 20px;
 }
 </style>

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

@@ -313,7 +313,7 @@ export default {
   data () {
     return {
       defaultColor: '#fff', // 默认状态颜色
-      highlightColor: '#409EFF', // 选中高亮状态颜色
+      highlightColor: '#299BCC', // 选中高亮状态颜色
       item: {},
       reset: true,
       iconnameArr: [],

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

@@ -54,7 +54,7 @@ export default {
   data () {
     return {
       defaultColor: '#fff', // 默认状态颜色
-      highlightColor: '#409EFF', // 选中高亮状态颜色
+      highlightColor: '#299BCC', // 选中高亮状态颜色
       item: {},
       reset: true,
       rectArr: [],

package/package/kisscomps/components/IntersectionMap/crossDirection/baseImg/refreshSvg.vue

@@ -54,7 +54,7 @@ export default {
 </script>
 <style scoped>
  .st0 {
-    fill: #409eff;
+    fill: #299BCC;
   }
 .refresh {
     cursor: pointer;

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

@@ -908,7 +908,7 @@ export default {
 }
 .centerText .text {
   display: inline-block;
-  color: #409eff;
+  color: #299BCC;
   margin-top: 20px;
 }
 

package/package/kisscomps/components/PatternStatus/PatternStatus.vue

@@ -49,7 +49,7 @@
           </div>
         </div>
         <div v-show="(syncTime && cycle && cycle>0) || (syncTime && newCycle && newCycle>0)">
-          <div class="curTimeDiv" :style="{'left':paddingLeft, 'background-color': '#409EFF'}">{{ timeNumDevide }}</div>
+          <div class="curTimeDiv" :style="{'left':paddingLeft, 'background-color': '#299BCC'}">{{ timeNumDevide }}</div>
           <div class="curTimeLine" :style="{'left':paddingLeft, 'height':barrierHeight}"></div>
         </div>
       </div>
@@ -1242,15 +1242,15 @@ export default {
 <style lang="scss">
     // el-tooltip样式
 .el-tooltip__popper.is-light {
-  background: #409EFF !important;
-  border: 1px solid #409EFF !important;
+  background: #299BCC !important;
+  border: 1px solid #299BCC !important;
   color: #FFFFFF !important;
 }
 .el-tooltip__popper.is-light[x-placement^="top"] .popper__arrow {
-  border-top-color: #409EFF !important;
+  border-top-color: #299BCC !important;
 }
 .el-tooltip__popper.is-light[x-placement^="top"] .popper__arrow::after {
-  border-top-color: #409EFF !important;
+  border-top-color: #299BCC !important;
 }
 </style>
 <style lang="scss" scoped>
@@ -1332,7 +1332,7 @@ export default {
     position: absolute;
     top: -10px;
     width: 2px;
-    background-color: #409EFF;
+    background-color: #299BCC;
   }
   .curTimeDiv {
     position: absolute;
@@ -1344,7 +1344,7 @@ export default {
     width: 60px;
     height: 19px;
     color:#FFFFFF;
-    background-color: #409EFF;
+    background-color: #299BCC;
   }
 }
 .ring-first {

package/package/kisscomps/components/PhaseDirectionSelect/PhaseDirectionSelect.vue

@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  **/
 <template>
-<div class="cross-phase-dir">
-  <el-select v-model="phaseid" style="width: 100%" clearable :placeholder="$t('openatccomponents.common.select')" :no-data-text="$t('openatccomponents.common.nodata')"
+<div class="cross-phase-dir cross-phase-dir-select">
+  <el-select v-model="phaseId" style="width: 100%" clearable :placeholder="$t('openatccomponents.common.select')" :no-data-text="$t('openatccomponents.common.nodata')"
     @change="handleSelect"
   >
     <el-option
       v-for="(option, index) in phaseOption"
       :key="index"
       :label="option.phasedesc"
-      :value="option.phaseid"
+      :value="option.phaseId"
     >
       <span>{{ option.phasedesc }}</span>
     </el-option>
@@ -36,12 +36,15 @@ export default {
   props: {
     agentid: {
       type: String
+    },
+    phaseid: {
+      type: String
     }
   },
   data () {
     return {
       phaseOption: [],
-      phaseid: ''
+      phaseId: ''
     }
   },
   mounted () {
@@ -71,11 +74,14 @@ export default {
             this.$t('openatccomponents.overview.phase') +
               ele.id + '-' +
               this.getPhaseName(ele.direction).name,
-            phaseid: ele.id
+            phaseId: ele.id
           }
         })
         console.log(options)
         this.phaseOption = options
+        if (this.phaseid !== undefined) {
+          this.phaseId = this.phaseid
+        }
       })
     },
     getName (status) {
@@ -108,7 +114,7 @@ export default {
       return this.getName(status)
     },
     handleSelect (val) {
-      let phaseinfo = this.phaseOption.filter(ele => ele.phaseid === val)[0]
+      let phaseinfo = this.phaseOption.filter(ele => ele.phaseId === val)[0]
       this.$emit('getSelectPhaseId', val)
       this.$emit('getSelectPhaseInfo', phaseinfo)
     }

package/package/kisscomps/components/PhaseDirectionText/PhaseDirectionText.vue

@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  **/
 <template>
-<div class="cross-phase-dir">
+<div class="cross-phase-dir cross-phase-dir-text">
   <div v-for="phase in phaselist" :key="phase.id">
     {{$t('openatccomponents.overview.phase')}}{{phase.id}} - {{phase.dirname}}
   </div>

package/package/kisscomps/components/SchemeConfig/azimuthlocking/index.vue

@@ -101,7 +101,7 @@
 
 <script>
 import { getPhase } from './utils'
-// import { getIframdevid } from '../../../../utils/auth'
+import { getIframdevid } from '../../../../utils/auth'
 import { getlockPhase, lockPhase } from '../../../../api/control'
 import Stages from '../../Stages/index'
 import RingDataModel from '../../../../utils/RingDataModel.js'
@@ -190,8 +190,9 @@ export default {
     },
     getLockPhase (val) {
       this.directions = [this.checkId(val)]
+      let iframdevid = getIframdevid()
       let param = {
-        'agentid': 'config_test',
+        'agentid': iframdevid,
         'direction': this.directions
       }
       getlockPhase(param).then(res => {
@@ -223,8 +224,9 @@ export default {
         this.$message.error(this.$t('openatccomponents.overview.directionnull'))
         return
       }
+      let iframdevid = getIframdevid()
       let submitdata = {
-        agentid: 'config_test',
+        agentid: iframdevid,
         direction: this.directions,
         greenflash: this.manualInfo.greenclear,
         duration: this.manualInfo.duration,
@@ -234,10 +236,22 @@ export default {
 
       }
       lockPhase(submitdata).then(res => {
-        if (res.data.success !== true) {
+        if (!res.data.success) {
+          if (res.data.code === '4002' && res.data.data.errorCode === '4209') {
+            let success = res.data.data.content.success
+            if (success !== 0) {
+              let errormsg = 'openatccomponents.overview.putTscControlError' + success
+              this.$message.error(this.$t(errormsg))
+              return
+            }
+          }
           this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
+          return
         }
         this.$alert(this.$t('openatccomponents.common.download'), { type: 'success' })
+        // if (res.data.success !== true) {
+        //   this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
+        // }
       })
     }
   }

package/package/kisscomps/components/StageBord/StageBord.vue

@@ -233,8 +233,8 @@ export default {
     box-sizing: border-box;
   }
   .el-button--primary:hover, .el-button--primary:focus{
-    background: #409EFF;
-    border-color: #409EFF;
+    background: #299BCC;
+    border-color: #299BCC;
     // color: #FFFFFF;
   }
 </style>