openatc-components 0.3.117 → 0.3.119

package/package/kisscomps/components/SchemeConfig/manualControlModalNew/icon.vue

@@ -227,7 +227,7 @@ PURPOSE. * See the Mulan PSL v2 for more details. **/
       </g>
     </svg>
     <svg
-      v-if="type === '单点感应'"
+      v-if="type === '自适应'"
       version="1.1"
       id="图层_1"
       xmlns="http://www.w3.org/2000/svg"
@@ -266,7 +266,7 @@ PURPOSE. * See the Mulan PSL v2 for more details. **/
     </svg>
 
     <svg
-      v-if="type === '自适应控制'"
+      v-if="type === '方案生成'"
       xmlns="http://www.w3.org/2000/svg"
       viewBox="0 0 24.53 21.2"
       :width="iconWidth"
@@ -399,38 +399,6 @@ PURPOSE. * See the Mulan PSL v2 for more details. **/
         p-id="6532"
       ></path>
     </svg>
-
-    <svg
-      v-if="type === '感应式自适应'"
-      t="1734600340213"
-      class="icon"
-      viewBox="0 0 1252 1024"
-      version="1.1"
-      xmlns="http://www.w3.org/2000/svg"
-      p-id="12292"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      :width="iconWidth"
-      :height="iconHeight"
-    >
-      <path
-        :class="themeColor"
-        d="M48.597631 254.131387c22.423358 0 44.846715-18.686131 44.846715-44.846715V85.956204h130.80292c18.686131 0 41.109489-18.686131 41.109489-41.109489C265.356755 18.686131 242.933398 0 220.51004 0H48.597631C22.437047 0 3.750916 18.686131 3.750916 44.846715v168.175183c0 22.423358 18.686131 41.109489 44.846715 41.109489zM1203.400551 0h-168.175183c-22.423358 0-44.846715 18.686131-44.846715 44.846715 0 22.423358 18.686131 44.846715 44.846715 44.846716h123.328467v130.802919c0 22.423358 18.686131 44.846715 44.846716 44.846716 22.423358 0 44.846715-18.686131 44.846715-44.846716V44.846715C1244.51004 18.686131 1225.823908 0 1203.400551 0zM1203.400551 766.131387c-22.423358 0-44.846715 18.686131-44.846716 44.846715V934.306569h-130.802919c-22.423358 3.737226-41.109489 22.423358-41.109489 48.583942 3.737226 22.423358 18.686131 37.372263 41.109489 41.109489H1199.663325c22.423358 0 44.846715-18.686131 44.846715-44.846715v-168.175183c0-26.160584-18.686131-44.846715-41.109489-44.846715zM213.035587 930.569343H89.70712v-130.80292c0-22.423358-18.686131-44.846715-44.846715-44.846715-22.423358 0-44.846715 18.686131-44.846716 44.846715V971.678832c0 22.423358 18.686131 44.846715 44.846716 44.846715h168.175182c22.423358-3.737226 41.109489-22.423358 41.109489-48.583941-3.737226-18.686131-18.686131-33.635036-41.109489-37.372263zM556.860405 186.861314H328.889602C284.042887 186.861314 250.40785 224.233577 250.40785 269.080292v485.839416c0 44.846715 33.635036 78.481752 78.481752 78.481752h227.970803c44.846715 0 78.481752-33.635036 78.481752-78.481752v-485.839416C635.342157 224.233577 601.70712 186.861314 556.860405 186.861314z m18.686131 568.058394c0 11.211679-7.474453 18.686131-18.686131 18.686131H328.889602c-11.211679 0-18.686131-7.474453-18.686132-18.686131v-485.839416c0-11.211679 7.474453-18.686131 18.686132-18.686131h227.970803c7.474453 0 14.948905 7.474453 18.686131 18.686131v485.839416zM881.999091 235.445255l-7.474453-7.474452c-11.211679-11.211679-29.89781-11.211679-41.109489 0-11.211679 11.211679-11.211679 29.89781 0 41.109489 130.80292 130.80292 134.540146 343.824818 3.737227 474.627737l-3.737227 3.737226c-11.211679 11.211679-11.211679 29.89781 0 41.10949 7.474453 3.737226 14.948905 7.474453 22.423358 7.474452 7.474453 0 14.948905-3.737226 22.423358-7.474452 153.226277-145.751825 156.963504-396.145985 3.737226-553.10949z"
-        fill="#606266"
-        p-id="12293"
-      ></path>
-      <path
-        :class="themeColor"
-        d="M784.831208 336.350365c-7.474453-14.948905-26.160584-18.686131-41.109489-7.474453-14.948905 11.211679-14.948905 29.89781-7.474453 41.109489 0 3.737226 3.737226 3.737226 7.474453 7.474453 37.372263 33.635036 56.058394 82.218978 56.058394 130.80292s-18.686131 97.167883-56.058394 130.802919c-11.211679 11.211679-11.211679 29.89781 0 41.109489 7.474453 3.737226 14.948905 7.474453 22.423357 7.474453s14.948905-3.737226 22.423358-7.474453c44.846715-44.846715 71.007299-108.379562 71.007299-171.912408s-26.160584-123.328467-74.744525-171.912409z"
-        fill="#606266"
-        p-id="12294"
-      ></path>
-      <path
-        :class="themeColor"
-        d="M702.61223 467.153285c-18.686131 0-29.89781 11.211679-29.897811 26.160584v29.89781c0 14.948905 11.211679 26.160584 26.160584 26.160584h3.737227c14.948905 0 26.160584-11.211679 26.160584-26.160584v-33.635037c3.737226-11.211679-11.211679-22.423358-26.160584-22.423357z"
-        fill="#606266"
-        p-id="12295"
-      ></path>
-    </svg>
   </span>
 </template>
 

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

@@ -47,7 +47,9 @@
     </div>
     <div class="cross-content" v-if="platform">
       <div style="float: left;" class="cross-name">{{$t('openatccomponents.overview.platform')}}:</div>
-      <div style="margin-left: 85px;" class="cross-value">{{platform}}</div>
+      <div style="margin-left: 85px;" class="cross-value">
+        {{firm !== undefined && firm !== '' ? firm : platform}}
+      </div>
     </div>
     <div class="cross-content" v-if="controlData.current_stagecd !== undefined">
       <div style="float: left;" class="cross-name">{{$t('openatccomponents.overview.stagecountdown')}}:</div>
@@ -223,6 +225,9 @@ export default {
     platform: {
       type: String
     },
+    firm: {
+      type: String
+    },
     curFaultList: {
       type: Array
     },

package/package/kisscomps/components/StageOptimize/StageOptimize.vue

@@ -11,7 +11,46 @@
  **/
 <template>
 <div>
-  <div v-if="this.nowNumber === 1" class="optimizetype">
+  <div class="optimizetype">
+        <span>{{$t('openatccomponents.pattern.optimizetype')}}</span>
+        <el-select v-model="value" clearable :placeholder="$t('openatccomponents.common.select')">
+            <el-option
+                v-for="item in typeOptions"
+                :key="item.value"
+                :label="$t('openatccomponents.overview.type' + item.value)"
+                :value="item.value"
+                >
+            </el-option>
+            </el-select>
+            <span class="optimiNum">{{$t('openatccomponents.pattern.optimizecycle')}}</span>
+            <el-input v-model="optimizecycle" clearable :placeholder="$t('openatccomponents.common.enter')"></el-input>
+        <!-- <el-button type="primary" @click="optimize()">{{$t('openatccomponents.pattern.inoptimize')}}</el-button> -->
+    </div>
+    <el-table class="tb-edit" ref="singleTables" row-key="id" :data="tableRing" element-loading-text="Loading" :max-height="tableHeight" fit highlight-current-row id="footerBtn">
+      <el-table-column prop="id" sortable align="center" :label="$t('openatccomponents.overview.id')">
+        <template slot-scope="scope">
+          <span>{{scope.row.id}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column class="table-column" :label="$t('openatccomponents.overview.phase')" align="center">
+        <template slot-scope="scope">
+          <xdrdirselector Width="70px" Height="70px" Widths="58px" Heights="58px" :Datas="styles" :Data="showStyle" :showlist="scope.row.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
+        </template>
+      </el-table-column>
+      <el-table-column class="table-column" :label="$t('openatccomponents.overview.flow')" align="center">
+        <template slot-scope="scope">
+          <el-input-number :controls="false" class="col-content" size="small"  :step="1" v-model.number="scope.row.flowperhour" ref="type"></el-input-number>
+          <!-- <span>{{scope.row.flowperhour}}</span> -->
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('openatccomponents.overview.saturationflow')">
+        <template slot-scope="scope">
+          <el-input-number :controls="false" class="col-content" size="small"  :step="1" v-model.number="scope.row.saturation" ref="types"></el-input-number>
+          <!-- <span>{{scope.row.saturation}}</span> -->
+        </template>
+      </el-table-column>
+    </el-table>
+  <!-- <div v-if="this.nowNumber === 1" class="optimizetype">
       <span>{{$t('openatccomponents.pattern.optimizetype')}}</span>
       <el-select v-model="value" clearable :placeholder="$t('openatccomponents.common.select')">
         <el-option
@@ -31,12 +70,14 @@
         {{headerText}}
       </div>
       <div class="common-board-table-header">
-        <el-row :gutter="13">
+        <el-row :gutter="5">
+          <el-col :span="2">{{this.$t('openatccomponents.overview.id')}}
+          </el-col>
           <el-col :span="4">{{this.$t('openatccomponents.overview.phase')}}
           </el-col>
-          <el-col :span="10">{{this.$t('openatccomponents.overview.flow')}}
+          <el-col :span="9">{{this.$t('openatccomponents.overview.flow')}}
           </el-col>
-          <el-col :span="10">{{this.$t('openatccomponents.overview.saturationflow')}}
+          <el-col :span="9">{{this.$t('openatccomponents.overview.saturationflow')}}
           </el-col>
         </el-row>
       </div>
@@ -45,7 +86,10 @@
         :list="stageData"
         :options="options">
         <div class="common-board-item" v-for="element in stageData" :key="element.id">
-          <el-row :gutter="13">
+          <el-row :gutter="5">
+            <el-col :span="2">
+              {{element.id}}
+            </el-col>
             <el-col :span="4">
               <el-tooltip class="item" effect="dark" placement="left">
                 <div slot="content">{{element.name}}</div>
@@ -54,16 +98,16 @@
                 </div>
               </el-tooltip>
           </el-col>
-          <el-col :span="10">
+          <el-col :span="9">
               <el-input-number :controls="false" class="col-content" size="small"  :step="1" v-model.number="element.flowperhour" ref="type" :disabled="element.mode === 7"></el-input-number>
           </el-col>
-          <el-col :span="10">
+          <el-col :span="9">
               <el-input-number :controls="false" class="col-content" size="small"  :step="1" v-model.number="element.saturation" ref="types" :disabled="element.mode === 7"></el-input-number>
           </el-col>
           </el-row>
         </div>
       </draggable>
-  </div>
+  </div> -->
 </div>
 </template>
 <script>
@@ -79,14 +123,15 @@ export default {
   },
   data () {
     return {
-      showStyle: {
-        left: '2px',
-        top: '0px'
-      },
-      styles: {
-        left: '1px',
-        top: '0px'
-      },
+      // showStyle: {
+      //   left: '2px',
+      //   top: '0px'
+      // },
+      // styles: {
+      //   left: '1px',
+      //   top: '0px'
+      // },
+      tableHeight: 400,
       typeOptions: [{
         value: 'flow-split-opt'
       }, {
@@ -101,6 +146,15 @@ export default {
       type: String,
       default: 'Header'
     },
+    tableRing: {
+      type: Array
+    },
+    showStyle: {
+      type: Object
+    },
+    styles: {
+      type: Object
+    },
     contrloType: {
       type: String
     },
@@ -149,12 +203,12 @@ export default {
   },
   created () {
     // this.addMinSplit()
-    this.addMin()
+    // this.addMin()
   },
   watch: {
     list: {
       handler: function () {
-        this.addMin()
+        // this.addMin()
         // let list = this.$refs.type
         // let flow = this.$refs.types
         // console.log(this.list, 'list')
@@ -174,7 +228,7 @@ export default {
     },
     stageData: {
       handler: function () {
-        this.addMins()
+        // this.addMins()
         // let list = this.$refs.type
         // let flow = this.$refs.types
         // console.log(this.list, 'list')
@@ -196,16 +250,19 @@ export default {
   methods: {
     optimize () {
       let _that = this
-      let newPha = []
-      for (let i = 0; i < _that.rings.rings.length; i++) {
-        newPha.push(..._that.rings.rings[i])
-      }
-      let phaseData = newPha.map(item => {
-        return {
-          id: item.id,
-          flowperhour: item.flowperhour,
-          saturation: item.saturation
-        }
+      // let newPha = []
+      // for (let i = 0; i < _that.rings.rings.length; i++) {
+      //   newPha.push(..._that.rings.rings[i])
+      // }
+      // let phaseData = newPha.map(item => {
+      //   return {
+      //     id: item.id,
+      //     flowperhour: item.flowperhour,
+      //     saturation: item.saturation
+      //   }
+      // })
+      this.tableRing.map(item => {
+        delete item.desc
       })
       //   let patternList = _that.$store.state.globalParam.tscParam.patternList
       //   console.log(patternList, 'patternList')
@@ -215,12 +272,12 @@ export default {
         'optcycle': _that.optimizecycle,
         'phaseList': _that.phaseList,
         'pattern': pattern,
-        'phases': phaseData
+        'phases': this.tableRing
       }
       let isValidata = []
-      for (let j = 0; j < newPha.length; j++) {
-        let comNum = (newPha[j].length / 4) * 1700 * 0.8
-        isValidata.push(newPha[j].flowperhour > comNum)
+      for (let j = 0; j < this.tableRing.length; j++) {
+        let comNum = (this.tableRing[j].length / 4) * 1700 * 0.8
+        isValidata.push(this.tableRing[j].flowperhour > comNum)
       }
       if (isValidata.includes(true)) {
         this.$confirm(this.$t('openatccomponents.overview.maxFlow'),
@@ -265,25 +322,25 @@ export default {
           console.log(error)
         })
       }
-    },
-    addMins () {
-      for (let i of this.stageData) {
-          if (!i.flowperhour || !i.saturation) {
-            i.flowperhour = 0
-            i.saturation = 1700
-            i.length = this.list.length
-          }
-      }
-    },
-    addMin () {
-      for (let i of this.list) {
-        if (!i.flowperhour || !i.saturation) {
-          i.flowperhour = 0
-          i.saturation = 1700
-          i.length = this.list.length
-        }
-      }
     }
+    // addMins () {
+    //   for (let i of this.stageData) {
+    //       if (!i.flowperhour || !i.saturation) {
+    //         i.flowperhour = 0
+    //         i.saturation = 1700
+    //         i.length = this.list.length
+    //       }
+    //   }
+    // },
+    // addMin () {
+    //   for (let i of this.list) {
+    //     if (!i.flowperhour || !i.saturation) {
+    //       i.flowperhour = 0
+    //       i.saturation = 1700
+    //       i.length = this.list.length
+    //     }
+    //   }
+    // }
   }
 }
 </script>
@@ -292,7 +349,7 @@ export default {
   width: 100%;
 }
 .optimizetype{
-  position: absolute;
+  // position: absolute;
   margin:0 0 10PX 0;
   .el-input {
     width: 80PX;

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

@@ -153,8 +153,8 @@ export default {
       volumeControlTimer: null, // 流量定时器
       ParamsMode: new Map([[0, '自主控制'], [1, '本地手动'], [2, '平台控制'], [3, '配置软件控制'], [4, '遥控器控制'], [5, '黄闪器控制'], [6, '降级控制'], [7, '脚本控制'], [8, '算法控制']]),
       ParamsModeEn: new Map([[0, 'Autonomous Control'], [1, 'Local Manual'], [2, 'Platform Control'], [3, 'Configuration Software Control'], [4, 'Remote Control'], [5, 'Yellow Flasher Control'], [6, 'Degradation Control'], [7, 'Script Control'], [8, 'Algorithm Control']]),
-      ParamsControl: new Map([[0, '多时段'], [1, '黄闪'], [2, '全红'], [3, '关灯'], [4, '步进'], [5, '定周期控制'], [6, '单点感应控制'], [7, '协调感应控制'], [8, '方案选择控制'], [9, '自适应控制'], [10, '无电缆控制'], [11, '有电缆控制'], [12, '行人过街控制'], [13, '方案恢复过渡'], [14, '相位驻留'], [15, '通道检测'], [16, '方向锁定'], [17, '韦伯斯特单点控制'], [18, '感应式自适应'], [19, '感应式行人过街'], [20, '方案干预'], [100, '方案干预'], [21, '预留21'], [22, '相位锁定'], [23, '相位放行控制'], [24, '紧急控制'], [99, '设备维护']]),
-      ParamsControlEn: new Map([[0, 'Multi Period'], [1, 'Yellow Flash Control'], [2, 'Red Control'], [3, 'Dark Control'], [4, 'Step'], [5, 'Fixed_Cycle Control'], [6, 'Free Control'], [7, 'Coordinated Induction Control'], [8, 'Pattern Selection Control'], [9, 'Adaptive Control'], [10, 'Wireless Control'], [11, 'Cable Control'], [12, 'Pedestrian Crossing Control'], [13, 'Pattern recovery'], [14, 'Phase dwell'], [15, 'Channel Detection'], [16, 'Direction lock'], [17, 'Webster Single Point Coordination'], [18, 'Inductive Adaptive'], [19, 'Inductive Pedestrian Crossing Control'], [20, 'Program Intervention'], [100, 'Program Intervention'], [21, 'Reserving21'], [22, 'Priority Control'], [23, 'Close Phase'], [24, 'Emergency Control'], [99, 'Device Mantenance']]),
+      ParamsControl: new Map([[0, '多时段'], [1, '黄闪'], [2, '全红'], [3, '关灯'], [4, '步进'], [5, '定周期控制'], [6, '自适应'], [7, '协调感应控制'], [8, '方案选择控制'], [9, '方案生成'], [10, '无电缆控制'], [11, '有电缆控制'], [12, '行人过街控制'], [13, '方案恢复过渡'], [14, '相位驻留'], [15, '通道检测'], [16, '方向锁定'], [17, '韦伯斯特单点控制'], [18, '预留18'], [19, '感应式行人过街'], [20, '方案干预'], [100, '方案干预'], [21, '预留21'], [22, '相位锁定'], [23, '相位放行控制'], [24, '紧急控制'], [99, '设备维护']]),
+      ParamsControlEn: new Map([[0, 'Multi Period'], [1, 'Yellow Flash Control'], [2, 'Red Control'], [3, 'Dark Control'], [4, 'Step'], [5, 'Fixed_Cycle Control'], [6, 'Free Control'], [7, 'Coordinated Induction Control'], [8, 'Pattern Selection Control'], [9, 'Adaptive Control'], [10, 'Wireless Control'], [11, 'Cable Control'], [12, 'Pedestrian Crossing Control'], [13, 'Pattern recovery'], [14, 'Phase dwell'], [15, 'Channel Detection'], [16, 'Direction lock'], [17, 'Webster Single Point Coordination'], [18, 'Reserving18'], [19, 'Inductive Pedestrian Crossing Control'], [20, 'Program Intervention'], [100, 'Program Intervention'], [21, 'Reserving21'], [22, 'Priority Control'], [23, 'Close Phase'], [24, 'Emergency Control'], [99, 'Device Mantenance']]),
       phaseType: new Map([[1, '红'], [2, '黄'], [3, '绿']]), // phaseType表示红，黄，绿
       phaseTypeEn: new Map([[1, 'Red'], [2, 'Yellow'], [3, 'Green']]), // phaseType表示红，黄，绿
       ip: '--',

package/package/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/package/kisscomps/index.js

@@ -12,7 +12,6 @@ import FaultDetailModal from './components/FaultDetailModal/index'
 import CommonKanban from './components/CommonKanban/index'
 import patternList from './components/patternList/index'
 import PatternStatus from './components/PatternStatus/index'
-import StageOptimize from './components/StageOptimize/index'
 import BoardCard from './components/BoardCard/index'
 import StageStatus from './components/StageStatus/index'
 import OverLap from './components/OverLap/index'
@@ -70,7 +69,6 @@ const components = {
   priorityControl,
   tentativeplancontrolmodal,
   PhaseDirectionText,
-  StageOptimize,
   patternConfig,
   XiaoKanBan,
   PhaseDirectionSelect,