openatc-components 0.3.61 → 0.3.62

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

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

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

@@ -14,9 +14,8 @@
       <!-- 环模式true -->
       <div v-if="this.contrloType === 'ring' || !this.contrloType">
         <div class="ring-first" v-for="(list, index1) in patternInfo" :key="index1">
-          <draggable :move="move" @end="endDrag(index1)" :disabled="isMove" :list="list">
-            <div style="position: relative;" :style="{'height': '34px','float':'left','width':((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%'}"  v-for="(item,index2) in list" :key="index2" :class="item.mode===7?'direction': ''">
-              <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.greenWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%').replace('%', ''))*100+'%','height':'34px','background':'#7ccc66'}">
+          <div style="position: relative;" :style="{'height': '34px','float':'left','width':((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%'}"  v-for="(item,index2) in list" :key="index2" :class="item.mode===7?'direction': ''">
+            <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.greenWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%').replace('%', ''))*100+'%','height':'34px','background':'#7ccc66'}">
                 <el-tooltip placement="top-start" effect="light">
                   <div slot="content">{{$t('openatccomponents.phase.phase')}}{{item.id}}:{{item.split}}</div>
                   <div style="cursor:pointer;">
@@ -26,18 +25,7 @@
                     </div>
                     <div v-if="isShowTip" class="box" style="position: absolute; left:40px; width:40px; top: -1px;">
                       <div class="ring-nums">{{$t('openatccomponents.phase.phase')}}{{item.id}}</div>
-                      <div v-if="isMove" class="ring-nums">{{item.split}}</div>
-                      <el-input-number
-                        v-if="!isMove"
-                        class="ring-nums"
-                        size="small"
-                        :controls="false"
-                        :min="0"
-                        :step="1"
-                        v-model.number="item.split"
-                        @change="handleEdit(item)"
-                        style="width: 24px"
-                      ></el-input-number>
+                      <div class="ring-nums">{{item.split}}</div>
                     </div>
                   </div>
                 </el-tooltip>
@@ -53,8 +41,7 @@
               <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.flashgreen.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100).toFixed(3) + '%').replace('%', ''))*100+'%','height':'34px','float':'left','background': 'linear-gradient(to right, #ffffff 50%, #7ccc66 0)','background-size': '4px 100%'}"></div>
               <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.yellowWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%').replace('%', ''))*100+'%','height':'34px','background':'#f9dc6a'}"></div>
               <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.redWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100).toFixed(3) + '%').replace('%', ''))*100+'%','height':'34px','background':'#f27979'}"></div>
-            </div>
-          </draggable>
+              </div>
           </div>
         <div v-if="showBarrier">
           <div v-for="(item, index) in barrierList" :key="index + '1'">
@@ -113,7 +100,6 @@
 <script>
 // import patternwalksvg from '../PatternWalkSvg/PatternWalkSvg'
 import xdrdirselector from '../XRDDirSelector/XRDDirSelector'
-import draggable from 'vuedraggable'
 // import PatternWalkSvg from '../IntersectionMap/crossDirection/baseImg/PatternWalkSvg'
 import PhaseDataModel from '../IntersectionMap/crossDirection/utils.js'
 import CrossDiagramMgr from '../../../EdgeMgr/controller/crossDiagramMgr.js'
@@ -121,7 +107,6 @@ export default {
   name: 'pattern-list',
   components: {
     // patternwalksvg,
-    draggable,
     xdrdirselector
   },
   data () {
@@ -129,7 +114,6 @@ export default {
       barrierHeight: '',
       stageCycle: '',
       barrierList: [],
-      barrierArr: [],
       newCycle: this.cycles,
       patternIds: this.patternId,
       newPatterns: [],
@@ -158,10 +142,6 @@ export default {
     stagesChange: {
       type: Array
     },
-    isMove: {
-      type: Boolean,
-      default: true
-    },
     controlPhase: {
       type: Object
     },
@@ -363,11 +343,11 @@ export default {
       handler: function (val, oldVal) {
         this.handleBarrierHeight() // 计算屏障高度
         if (this.patternStatusList && this.newCycle) {
-          // setTimeout(() => {
-          this.handleCurrentChange(this.patternStatusList)
+          setTimeout(() => {
+            this.handleCurrentChange(this.patternStatusList)
+            this.handleBarrierHeight()
+          }, 10)
           this.handleBarrierHeight()
-          // }, 10)
-          // this.handleBarrierHeight()
         }
       },
       // 深度观察监听
@@ -395,60 +375,6 @@ export default {
     }
   },
   methods: {
-    move (e) {
-      // 这里的e表示即将停靠的元素。
-      let result = this.barrierArr.filter(item => item.includes(e.relatedContext.element.id))[0]
-      if (!result.includes(e.draggedContext.element.id)) {
-        return false
-      }
-    },
-    endDrag (index) {
-      // 拖动后对原数据排序
-      const idIndexMap = {}
-      this.patternInfo.forEach((subArray, subArrayIndex) => {
-        subArray.forEach((item, index) => {
-          idIndexMap[item.id] = { subArrayIndex, index }
-        })
-      })
-      this.patternStatusList.forEach((subArray, subArrayIndex) => {
-        if (subArray.length > 0) {
-          subArray.sort((aItem, bItem) => {
-            const aIndex = idIndexMap[aItem.id] ? idIndexMap[aItem.id].index : Infinity
-            const bIndex = idIndexMap[bItem.id] ? idIndexMap[bItem.id].index : Infinity
-            return aIndex - bIndex
-          })
-        }
-      })
-    },
-    handleEdit (val) {
-      this.patternStatusList.map(d => {
-        d.map(r => {
-          if (r.id === val.id) {
-            r.value = val.split
-          }
-        })
-      })
-      // this.handleCurrentChange(this.patternStatusList)
-      this.$emit('handleSplitMove', this.patternId)
-    },
-    getMaxCycle (pattern) {
-      // let rings = pattern.rings
-      let maxCycle = 0
-      for (let ring of pattern) {
-        if (ring.length === 0) continue
-        let cycle = 0
-        for (let r of ring) {
-          if (r.mode === 7) { // 忽略相位不计周期
-            continue
-          }
-          cycle = cycle + r.value
-        }
-        if (cycle > maxCycle) {
-          maxCycle = cycle
-        }
-      }
-      return maxCycle
-    },
     getPed (data) {
       let ped = []
       for (let stg of data) {
@@ -1253,7 +1179,6 @@ export default {
           }
         }
         let resArr = ringArr.map(item => item.data)
-        this.barrierArr = resArr
         let ringTeam = this.step1(this.phaseList, resArr)
         let ringTeams = ringTeam.filter(item => item.length !== 0)
         if (this.patternList) {

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

@@ -510,6 +510,7 @@ export default {
       this.changeStatus()
     }
     this.setPropsToken(this.Token)
+    this.hiddenPartControl()
     // await this.getPhase()
     this.getFault()
     this.initData()
@@ -941,6 +942,12 @@ export default {
       if (token && token !== '') {
         setToken(token)
       }
+    },
+    hiddenPartControl () {
+      // 保存的面板，不显示方位锁定的功能
+      if (this.isShowImplement === false) {
+        this.residentControlList = this.residentControlList.filter(item => item.id !== 25)
+      }
     }
   },
   destroyed () {

package/src/kisscomps/components/SchemeConfig/lockingPhaselControlModal/index.vue

@@ -20,10 +20,10 @@
            :model="manualInfo"
            label-width="90px">
            <el-form-item
-               :label="$t('openatccomponents.overview.duration')"
-               prop="count">
-             <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempDuration" size="small"></el-input-number>
-           </el-form-item>
+                :label="$t('openatccomponents.overview.greenclear')"
+                prop="intersection">
+              <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempGreenflash" size="small"></el-input-number>
+            </el-form-item>
 
             <el-form-item
                 :label="$t('openatccomponents.overview.yellowflash')"
@@ -44,11 +44,13 @@
           label-position="left"
           :model="manualInfo"
           label-width="90px">
-          <el-form-item
-              :label="$t('openatccomponents.overview.greenclear')"
-              prop="intersection">
-            <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempGreenflash" size="small"></el-input-number>
-          </el-form-item>
+
+           <el-form-item
+               :label="$t('openatccomponents.overview.duration')"
+               prop="count">
+             <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempDuration" size="small"></el-input-number>
+           </el-form-item>
+
            <el-form-item
                :label="$t('openatccomponents.overview.allred')"
                prop="intersection">

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

@@ -62,7 +62,7 @@
           @toAutoControl="toAutoControl" />
 
         <AzimuthLocking
-          v-if="preselecttype === '方向锁定'"
+          v-if="preselecttype === '方向锁定' && isShowImplement"
           :realtimeStatusModalvisible="realtimeStatusModalvisible"
           :phaseList="phaseList"
           :patternStatus="statusData"

package/src/kisscomps/components/patternList/patternList.vue

@@ -5,7 +5,6 @@
     :contrloType="contrloType"
     :stagesChange="stagesChange"
     :isShowTip="isShowTip"
-    :isMove="isMove"
     :patternStatusList="patternStatusList"
     :cycles="cycles"
     :cycle="cycle"
@@ -20,7 +19,6 @@
     :agentId="agentId"
     :controlData="controlData"
     :syncTime="syncTime"
-    @handleSplitMove="handleSplitMove"
     :isPhase="isPhase"
     >
     </BoardCard>
@@ -504,10 +502,6 @@ export default {
       type: Boolean,
       default: true
     },
-    isMove: {
-      type: Boolean,
-      default: true
-    },
     contrloType: {
       type: String
     },
@@ -587,11 +581,6 @@ export default {
     // if (this.$route.query !== undefined && Object.keys(this.$route.query).length) {
     //   this.resetCrossDiagram()
     // }
-  },
-  methods: {
-    handleSplitMove (data) {
-      this.$emit('handleSplitMove', data)
-    }
   }
 }
 </script>

package/static/styles/common.scss

@@ -11,12 +11,12 @@
 
  // 全局滚动条样式
  ::-webkit-scrollbar {
-  width: 6PX;
-  height: 6PX;
+  width: 12PX;
+  height: 12PX;
 }
 ::-webkit-scrollbar-thumb {
   // 滚动条的滑块
-  border-radius: 3PX;
+  border-radius: 4px;
   background: rgba(144, 147, 153, 0.3);
 }
 ::-webkit-scrollbar-corner{

package/static/styles/dark/theme/element-dark.scss

@@ -34,7 +34,7 @@ $--button-danger-font-color: #FFFFFF;
 $--button-success-font-color: #FFFFFF;
 $--radio-button-checked-font-color: #FFFFFF;
 $--radio-font-color: $--color-text-secondary;
-$--tag-info-color: #FFFFFF;
+$--tag-info-color: $--color-text-placeholder;
 $--tooltip-color: $--color-white;
 $--checkbox-font-color: $--color-text-secondary;
 

package/static/styles/intersection.scss

@@ -38,6 +38,9 @@
       zoom: 0.9;
       
     }
+    .centerText .text {
+      font-size: 14px;
+    }
    }
   /*当屏幕小于等于1440px的屏幕样式*/
   @media only screen and (max-width: 1440px){
@@ -46,6 +49,9 @@
       zoom: 0.8;
       
     }
+    .centerText .text {
+      font-size: 18px;
+    }
    }
    /*当屏幕小于等于1280px的屏幕样式*/
   @media only screen and (max-width: 1280px){
@@ -53,6 +59,9 @@
       // transform: scale(0.65);
       zoom: 0.65;
     }
+    .centerText .text {
+      font-size: 20px;
+    }
    }
    /*当屏幕小于等于960px的屏幕样式*/
   @media only screen and (max-width: 960px){
@@ -60,6 +69,9 @@
       // transform: scale(0.5);
       zoom: 0.5;
     }
+    .centerText .text {
+      font-size: 14px;
+    }
    }
     /*当屏幕小于等于720px的屏幕样式*/
   @media only screen and (max-width: 720px){
@@ -67,6 +79,9 @@
       // transform: scale(0.45);
       zoom: 0.45;
     }
+    .centerText .text {
+      font-size: 14px;
+    }
    }
   // 小屏幕打开首页适配样式
   .minifont {
@@ -173,9 +188,4 @@
     color: $--color-text-primary;
     font-size:30PX;
  }
- .centerText {
-  .text {
-    font-size: 18PX;
-  }
- }
 }

package/static/styles/light/theme/element-light.scss

@@ -34,7 +34,7 @@ $--card-background-selected: #c1e0ff;
 // $--button-success-font-color: #FFFFFF;
 // $--radio-button-checked-font-color: #FFFFFF;
 // $--radio-font-color: $--color-text-secondary;
-$--tag-info-color: #303133;
+// $--tag-info-color: $--color-text-placeholder;
 // $--tooltip-color: $--color-white;
 // $--checkbox-font-color: $--color-text-secondary;
 

package/static/styles/schemeconfig.scss

@@ -226,7 +226,7 @@
       overflow-y: auto;
     }
     .manual-common-content::-webkit-scrollbar {
-      width: 6PX;
+      width: 8PX;
     }
 }
 // 手动控制弹框
@@ -498,12 +498,12 @@
     width: 85% !important;
   }
   .el-input.is-disabled .el-input__inner {
-    text-align: left;
+    text-align: center;
   }
   .el-input-number {
     width: 100%;
     .el-input__inner {
-      text-align: left;
+      text-align: center;
     }
   }
   .el-select {
@@ -540,9 +540,6 @@
   }
   .el-input-number {
     width: 100%;
-    .el-input__inner {
-      text-align: left;
-    }
   }
   .el-input-number--mini{
     width: 100%;

package/src/node_modules/.package_versions.json

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