openatc-components 0.2.36 → 0.2.37

package/src/views/schemeconfig.vue

@@ -20,12 +20,12 @@
       :close-on-click-modal="false"
       @close="oncancle"
       append-to-body>
-      <!-- <scheme-config
-        :agentId="agentId"
-        :statusData="crossStatusData"
-        :realtimeStatusModalvisible="false"
-        @patternCommitCallback="patternCommitCallback"/> -->
       <scheme-config
+            ref="rightpanel"
+            :agentId="agentId"
+            :statusData="crossStatusData"
+            :phaseList="phaseList2"/>
+      <!-- <scheme-config
         ref="rightpanel"
         :agentId="agentId"
         :lockPhaseBtnName="lockPhaseBtnName"
@@ -33,8 +33,7 @@
         :phaseList="phaseList"
         :realtimeStatusModalvisible="true"
         roadDirection="left"
-         />
-         <!-- funcSort="basicFunc" -->
+         /> -->
     </el-dialog>
   </div>
 </template>
@@ -42,6 +41,7 @@
 import { getTscControl } from '../api/control.js'
 import { getMessageByCode } from '../utils/responseMessage.js'
 import { getIntersectionInfo } from '../api/template'
+import { getTscPhase } from '../api/cross.js'
 import {
   setToken
 } from '../utils/auth'
@@ -51,14 +51,16 @@ export default {
   },
   data () {
     return {
+      timer: 0,
+      phaseList2: [],
       phaseList: [],
       showWalk: [ 1, 2 ],
       sidewalkPhaseData: [{key: 'pedphase1653873194007699', phaseid: 1, id: 1, name: '东人行横道', isshow: false}],
       lockPhaseBtnName: this.$t('openatccomponents.overview.comfirm'),
-      agentId: '12004-950',
-      Token: 'eyJraWQiOiIxNjcwMzc0ODA4MTcyIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1Njc3NDgwOCwiaWF0IjoxNjcwMzc0ODA4fQ.xsRoye_tk_Xf60w5Mpigm8vrPgQJCLN-W_IW4U7dafA',
+      agentId: 'cslsnl',
+      Token: 'eyJraWQiOiIxNzAxODMyOTQ3MTUwIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJxeXl0aCIsImV4cCI6MTc2OTc4ODgwMCwiaWF0IjoxNzAxMzYwMDAwfQ.RIQpNEkJibL-RYllirDeNLi8G9-t8PecM_m7KlZNQXg',
       Token103: 'eyJraWQiOiIxNjcwMzc0ODA4MTcyIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1Njc3NDgwOCwiaWF0IjoxNjcwMzc0ODA4fQ.xsRoye_tk_Xf60w5Mpigm8vrPgQJCLN-W_IW4U7dafA',
-      boxVisible: false,
+      boxVisible: true,
       dialogWidth: '80%',
       crossStatusData: {} // 路口状态数据
     }
@@ -82,11 +84,10 @@ export default {
         this.dialogWidth = def + 'px'
       }
     },
-    initData () {
-      // let iframdevid = getIframdevid()
-      this.getIntersectionInfo(this.agentId, '')
-      getTscControl(this.agentId).then((data) => {
-        if (!data.data.success) {
+    getPhase () {
+      getTscPhase(this.agentId).then(data => {
+        let res = data.data
+        if (!res.success) {
           if (data.data.code === '4002' && data.data.data.errorCode === '4209') {
             let success = data.data.data.content.success
             if (success !== 0) {
@@ -95,10 +96,31 @@ export default {
               return
             }
           }
-          if (data.data.code === '4003') {
-            this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
-            return
+          let parrenterror = 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)
+            }
+          } else {
+            this.$message.error(parrenterror)
           }
+          return
+        }
+        if (res.data.data && res.data.data.phaseList) {
+          this.phaseList2 = res.data.data.phaseList
+        }
+      })
+    },
+    initData () {
+      // let iframdevid = getIframdevid()
+      this.getIntersectionInfo(this.agentId, '')
+      this.getPhase()
+      getTscControl(this.agentId).then((data) => {
+        // debugger
+        if (!data.data.success) {
           let parrenterror = getMessageByCode(data.data.code, this.$i18n.locale)
           if (data.data.data) {
             // 子类型错误
@@ -112,7 +134,11 @@ export default {
           }
           return
         }
+        console.log(data.data.data)
         this.crossStatusData = JSON.parse(JSON.stringify(data.data.data.data))
+        // debugger
+        console.log(this.crossStatusData)
+        // debugger
       }).catch(error => {
         console.log(error)
       })
@@ -136,9 +162,14 @@ export default {
   created () {
     this.setDialogWidth()
   },
+  beforeDestroy () {
+    clearInterval(this.timer)
+  },
   mounted () {
     this.setPropsToken(this.Token)
-    this.initData()
+    this.timer = setInterval(() => {
+      this.initData()
+    }, 1000 * 2)
     window.onresize = () => {
       return (() => {
         this.setDialogWidth()

package/static/styles/schemeconfig.scss

@@ -57,14 +57,14 @@
   .model-label, .stage-label {
     width: 100PX;
     font-size: 14PX;
-    font-weight: 700;
-    color: $--color-text-secondary;;
+    font-weight: 400;
+    color: #606266;
     line-height: 28PX;
     padding-right: 12PX;
   }
   .model-label-title {
     font-size: 14PX;
-    font-weight: 700;
+    font-weight: 400;
     line-height: 28PX;
     color: $--color-text-secondary;
     padding-right: 12PX;
@@ -74,8 +74,8 @@
     text-align: center;
     cursor:pointer;
     width: 70PX;
-    height: 80PX;
-    // background-color: #edf6ff;
+    height: 65PX;
+    background-color: #edf6ff;
     border-radius: 6PX;
     line-height: 1.15;
     .patternWalk{
@@ -88,28 +88,22 @@
     height: 24PX;
   }
   .single-model .model-icon {
-    margin: 0 auto;
+    margin-top: 10PX;
     width: 24PX;
     height: 24PX;
-    color: $--color-text-regular;
   }
   .single-model-select {
-    // background-color: #299BCC !important;
-    // border: solid 1PX #409eff;
-  }
-  .single-model-new {
     margin-right: 10PX;
-    padding-top: 13PX;
     text-align: center;
     cursor:pointer;
     width: 70PX;
-    height: 80PX;
-    background-color: #edf6ff;
+    height: 65PX;
+    background-color: #a2cfff;
     border-radius: 6PX;
-    line-height: 1.15;
+    // border: solid 1PX #409eff;
   }
   .single-model-name {
-    margin-top: 13PX;
+    margin-top: 3PX;
     font-size: 12PX;
     font-weight: normal;
     font-stretch: normal;
@@ -117,15 +111,6 @@
     letter-spacing: 0PX;
     color: #606266;
   }
-  .single-model-name-theme {
-    margin-top: 13PX;
-    font-size: 12PX;
-    font-weight: normal;
-    font-stretch: normal;
-    // line-height: 22PX;
-    letter-spacing: 0PX;
-    color: $--color-text-regular;
-  }
   .current-stage-num {
     margin-top: 3PX;
     font-size: 12PX;
@@ -222,7 +207,7 @@
 }
 // 手动控制弹框
 .manual-control-modal{
-  // padding: 21PX 0PX 21PX 28PX;
+  padding: 21PX 0PX 21PX 28PX;
   min-width: 360PX;
   overflow: auto;
   .title {
@@ -255,6 +240,7 @@
   }
   .el-form-item__label {
     font-size: 14PX;
+    font-weight: 400;
     color: $--color-text-secondary;
   }
   .el-dialog__footer {
@@ -278,52 +264,25 @@
       text-align: left;
     }
   }
+  .footer {
+    button {
+      width: 56PX;
+      height: 32PX;
+      padding: 0;
+      text-align: center;
+      line-height: 30PX;
+      font-size: 12PX;
+      font-weight: normal;
+      font-stretch: normal;
+    }
+  }
   .model-label, .stage-label {
     color: $--color-text-secondary;
   }
 } 
-.manual-control-modal-new {
-  padding: 20PX;
-  .el-tabs__nav.is-top {
-    width: 100%;
-  }
-  .el-tabs--card>.el-tabs__header .el-tabs__item {
-    background-color: $--background-color-base;
-    width: 25%;
-    text-align: center;
-    border-left: none;
-    border-bottom-color: $--border-color-light;
-  }
-  .el-tabs--card>.el-tabs__header .el-tabs__item.is-active {
-    background-color: $--color-white;
-    border-bottom: none;
-  }
-  .group-control {
-    margin-bottom: 20PX;
-    overflow: hidden;
-  }
-
-  .common-config {
-    .el-form-item__label {
-      color: $--color-text-secondary;
-    }
-    .el-form-item {
-      margin-bottom: 0PX;
-    }
-    .el-input-number {
-      .el-input__inner {
-        text-align: left;
-      }
-    }
-  }
-
-  .footer {
-    float: right;
-    margin: 28PX 0PX 40PX 0;
-  }
-}
 .priority-control{
   height: 100%;
+  padding: 21PX 0PX 21PX 28PX;
   min-width: 360PX;
   overflow: auto;
   .title {
@@ -340,19 +299,32 @@
   }
   .footer {
     float: right;
+    margin: 38PX 24PX 40PX 0;
+    button {
+      width: 56PX;
+      height: 32PX;
+      padding: 0;
+      text-align: center;
+      line-height: 30PX;
+      font-size: 12PX;
+      font-weight: normal;
+      font-stretch: normal;
+    }
   }
   .el-input--mini{
     width: 90%;
   }
   .el-form-item {
     margin-bottom: 10PX;
-    margin-right: 10PX;
   }
   .el-form-item__label {
     font-size: 14PX;
-    font-weight: 700;
+    font-weight: 400;
     color: $--color-text-secondary;
   }
+  .el-select {
+    width: 90%;
+  }
   .el-input-number {
     width: 100%;
     .el-input__inner {
@@ -362,7 +334,7 @@
 }
 .tentativeplan-control{
   // height: 100%;
-  // padding: 21PX 0PX 21PX 28PX;
+  padding: 21PX 0PX 21PX 28PX;
   min-width: 360PX;
   overflow: hidden !important;
   .forbiddenstage{
@@ -417,13 +389,14 @@
   }
   .footer {
     float: right;
+    margin: 38PX 24PX 40PX 0;
   }
   .el-form-item {
     margin-bottom: 0PX;
-    margin-right: 10PX;
   }
   .el-form-item__label {
     font-size: 14PX;
+    font-weight: 400;
     color: $--color-text-secondary;
   }
   .el-dialog__footer {
@@ -432,12 +405,27 @@
   .el-dialog__header {
     padding: 19PX 30PX;
   }
+  .el-select {
+    width: 90%;
+  }
   .el-input-number {
     width: 100%;
     .el-input__inner {
       text-align: left;
     }
   }
+  .footer {
+    button {
+      width: 56PX;
+      height: 32PX;
+      padding: 0;
+      text-align: center;
+      line-height: 30PX;
+      font-size: 12PX;
+      font-weight: normal;
+      font-stretch: normal;
+    }
+  }
   .model-label, .stage-label {
     color: $--color-text-secondary;
   }

package/static/styles/stages.scss

@@ -35,7 +35,14 @@
     }
   }
   .single-model-select {
-    // background-color: #a2cfff;
+    margin-right: 10px;
+    text-align: center;
+    cursor:pointer;
+    width: 70px;
+    height: 65px;
+    background-color: #a2cfff;
+    border-radius: 6px;
+    // border: solid 1PX #409eff;
   }
   .single-model-name {
     margin-top: 3px;

package/src/icons/svg/fangxiangsuoding.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1714021963787" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12286" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M1023.606154 512l-267.815385-154.781538v111.852307h-200.467692v-200.861538h111.458461L512.393846 0.393846l-154.781538 267.815385h111.458461v200.861538H268.603077V357.218462L0.787692 512l267.815385 154.781538V555.323077h200.467692v200.467692H357.612308l154.781538 267.815385 154.387692-267.815385h-111.458461V555.323077h200.467692v111.458461z" p-id="12287"></path></svg>

package/src/icons/svg/jieduansuoding.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1714021956193" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12129" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M54.218328 0.002671h184.821636a52.882491 52.882491 0 0 1 53.416657 53.416658v916.09568a52.882491 52.882491 0 0 1-53.416657 53.416658H54.218328a53.416658 53.416658 0 0 1-53.416658-53.416658V53.419329a53.416658 53.416658 0 0 1 53.416658-53.416658z m438.016593 0h112.174982a53.416658 53.416658 0 0 1 53.416658 53.416658v916.09568a53.416658 53.416658 0 0 1-53.416658 53.416658H492.234921a52.882491 52.882491 0 0 1-53.416657-53.416658V53.419329a52.882491 52.882491 0 0 1 53.416657-53.416658z m364.835773 0h112.174981a53.416658 53.416658 0 0 1 53.416658 53.416658v916.09568a53.416658 53.416658 0 0 1-53.416658 53.416658h-112.174981a53.416658 53.416658 0 0 1-53.416658-53.416658V53.419329a53.416658 53.416658 0 0 1 53.416658-53.416658z" p-id="12130"></path></svg>

package/src/icons/svg/xiangweisuoding.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1714026084421" class="icon" viewBox="0 0 1180 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="11864" xmlns:xlink="http://www.w3.org/1999/xlink" width="230.46875" height="200"><path d="M0.040891 1024V477.751546a302.998089 302.998089 0 0 1 298.163013-307.948286h397.166948V0L1179.454044 288.37774l-484.083192 288.377741V406.95222h-397.166948a71.777853 71.777853 0 0 0-70.223721 72.526139v544.521641H0.040891z" fill="#606266" p-id="11865"></path></svg>

package/src/kisscomps/components/SchemeConfig/manualControlModalNew/controlModelGroup.vue

@@ -1,128 +0,0 @@
-/**
- * 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.
- **/
-<template>
-  <div class="control-model-group">
-    <div :class="className" class="group-control">
-      <div class="control-model" v-for="(item, index) in controllist" :key="index">
-
-        <template v-if="othersControl && specialControl.indexOf(item.id) !== -1">
-          <div class="single-model-new"
-            :style="{'backgroundColor': item.bgcolor}"
-            @click="selectModel(item)"
-            v-if="isHasPermission(item.permission)">
-            <div class="closephase-icon">
-              <OthersIconSvg :type="item.type" />
-            </div>
-            <div class="single-model-name-theme">{{item.iconName}}</div>
-          </div>
-        </template>
-
-        <template v-else>
-          <div class="single-model-new"
-          :style="{'backgroundColor': item.bgcolor}"
-          @click="selectModel(item)"
-          :class="preselecttype == item.type? 'single-model-select' : ''"
-          v-if="isHasPermission(item.permission) && (funcSort === 'allFunc' || (funcSort === 'basicFunc'&& basicFuncControlId.indexOf(item.id) !== -1))">
-          <!-- <svg-icon :icon-class="item.iconClass" className="model-icon"></svg-icon> -->
-          <div class="model-icon">
-            <IconSvg :type="item.type" />
-          </div>
-          <div class="single-model-name-theme">{{item.iconName}}</div>
-        </div>
-        </template>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { hasPermission, getTheme } from '../../../../utils/auth'
-
-import IconSvg from './icon.vue'
-import OthersIconSvg from './othersIcon.vue'
-
-export default {
-  name: 'ControlModelGroup',
-  components: {
-    IconSvg,
-    OthersIconSvg
-  },
-  props: {
-    className: {
-      type: String
-    },
-    controlList: {
-      type: Array
-    },
-    funcSort: {
-      type: String,
-      default: 'allFunc'
-    },
-    othersControl: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data () {
-    return {
-      preselecttype: '',
-      controllist: [],
-      specialControl: [23, 22, 100, 24, 25]
-    }
-  },
-  computed: {
-  },
-  watch: {
-    controlList: {
-      handler (newVal, oldVal) {
-        this.controllist = JSON.parse(JSON.stringify(newVal))
-      },
-      deep: true
-    }
-  },
-  methods: {
-    isHasPermission (path) {
-      let res = hasPermission(path)
-      return res
-    },
-    selectModel (item) {
-      this.preselecttype = item.type
-      this.clickType(item)
-      if (this.specialControl.indexOf(item.id) !== -1) {
-        this.$emit('selectSpecialModel')
-      }
-      this.$emit('selectModel', item)
-    },
-    init () {
-      this.selectModel(this.controllist[0])
-    },
-    clickType (item) {
-      this.curTypeItem = item
-      for (let i = 0; i < this.controllist.length; i++) {
-        if (this.controllist[i].clicked) {
-          delete this.controllist[i].clicked
-          this.controllist[i].bgcolor = getTheme() === 'light' ? '#edf6ff' : '#243d59'
-        }
-      }
-      for (let i = 0; i < this.controllist.length; i++) {
-        if (this.controllist[i].type === item.type) {
-          this.controllist[i].clicked = true
-          this.controllist[i].bgcolor = getTheme() === 'light' ? '#c1e0ff' : '#0082ac'
-        }
-      }
-    }
-  },
-  mounted () {
-    this.controllist = JSON.parse(JSON.stringify(this.controlList))
-  }
-}
-</script>