openatc-components 0.3.110 → 0.3.112

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

@@ -11,12 +11,36 @@
  **/
 <template>
     <div class="main-patternstatus">
+      <!-- rcp模式 -->
+      <div v-if="patternType === 'rcp'">
+        <div class="ring-first" v-for="(list, index1) in patternRcp" :key="index1">
+          <div style="position: relative" :style="{height: '34px',paddingRight: '1px',float: 'left',width:
+              ((item.split + (item.sum ? item.sum : 0)) /(item.cycle > cycles ? item.cycle : cycles)) *100 +'%',}"
+              v-for="(item, index2) in list" :key="index2">
+            <div class="first-1" :style="{ width:
+                  (Number(item.greenWidth.replace('%', '')) /
+                    Number((((item.split + (item.sum ? item.sum : 0)) /
+                  (item.cycle > cycles ? item.cycle : cycles)) * 100 + '%').replace('%', ''))) * 100 + '%', height: '34px',background: '#7ccc66'}">
+            </div>
+            <el-tooltip placement="top-start" effect="light">
+                <div v-if="item.id" slot="content">P{{ item.id }}:{{ item.split }}</div>
+                <div v-if="item.id" style="cursor: pointer">
+                  <div
+                    class="box"
+                    style="position: absolute; width:40px; left: 0; top: 5px"
+                  >
+                    <div class="ring-nums">P{{ item.id }}:{{ item.split }}</div>
+                  </div>
+                </div>
+              </el-tooltip>
+          </div>
+      </div>
+      </div>
       <!-- 环模式true -->
-      <div v-if="this.contrloType === 'ring' || !this.contrloType">
+      <div v-if="(this.contrloType === 'ring' || !this.contrloType) && patternType !== 'rcp'">
         <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 +50,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 +66,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 +125,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 +132,6 @@ export default {
   name: 'pattern-list',
   components: {
     // patternwalksvg,
-    draggable,
     xdrdirselector
   },
   data () {
@@ -129,10 +139,10 @@ export default {
       barrierHeight: '',
       stageCycle: '',
       barrierList: [],
-      barrierArr: [],
       newCycle: this.cycles,
       patternIds: this.patternId,
       newPatterns: [],
+      patternRcp: [],
       newList: [],
       isControl: true,
       contrloCycle: 0,
@@ -158,13 +168,12 @@ export default {
     stagesChange: {
       type: Array
     },
-    isMove: {
-      type: Boolean,
-      default: true
-    },
     controlPhase: {
       type: Object
     },
+    patternType: {
+      type: String
+    },
     contrloType: {
       type: String
     },
@@ -337,6 +346,9 @@ export default {
     cycles: {
       handler: function (val, oldVal) {
         this.newCycle = this.cycles
+        if (this.patternType === 'rcp') {
+          this.handleRcp(this.patternStatusList)
+        }
       },
       // 深度观察监听
       deep: true
@@ -361,13 +373,16 @@ export default {
     },
     patternStatusList: {
       handler: function (val, oldVal) {
+        if (this.patternType === 'rcp') {
+          this.handleRcp(this.patternStatusList)
+        }
         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()
         }
       },
       // 深度观察监听
@@ -393,62 +408,11 @@ export default {
     if (this.contrloType === 'stage') {
       this.getStage()
     }
+    if (this.patternType === 'rcp') {
+      this.handleRcp(this.patternStatusList)
+    }
   },
   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) {
@@ -475,6 +439,48 @@ export default {
       }
       return ped
     },
+    handleRcp (val) {
+      this.patternRcp = []
+      let valSplit = val.map(item => {
+        return item.map(val => {
+          return val.splitchain
+        })
+      })
+      let splitCycle = valSplit.length > 0 ? valSplit.map(item => {
+        return item.length > 0 ? item.reduce((a, b) => {
+          return a + b
+        }) : 0
+      }) : 0
+      let cycle = Math.max(...splitCycle)// 每个环的周期最大值
+      for (let rings of val) {
+        if (rings.length === 0) continue
+        let list = []
+        for (let ring of rings) {
+          if (ring.splitchain === 0) continue
+          let obj = {}
+          let split = ring.splitchain
+          obj.split = split
+          obj.cycle = cycle
+          obj.id = ring.phases
+          // if (ring.sum) {
+          //   obj.sum = ring.sum
+          //   obj.redWidth = ((currPhase.redclear + ring.sum) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
+          // } else {
+          //   obj.redWidth = (currPhase.redclear / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
+          // }
+          // obj.mode = ring.mode
+          obj.greenWidth = (split / (cycle > this.cycles ? cycle : this.cycles)) * 100 + '%'
+          // obj.flashgreen = (currPhase.flashgreen / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
+          // obj.yellowWidth = (currPhase.yellow / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
+          // 忽略相位不显示
+          // let mode = ring.mode
+          // if (mode !== 7) { // 忽略相位不显示
+          list.push(obj)
+          // }
+        }
+        this.patternRcp.push(list)
+      }
+    },
     handleStageData (data) {
       if (!data) return
       let peddirections = this.getPed(data)
@@ -1253,7 +1259,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/package/kisscomps/components/SchemeConfig/SchemeConfig.vue

@@ -40,8 +40,6 @@
               :patternSelect="patternSelect"
               :allPatternList="allPatternList"
               :funcSort="funcSort"
-              :thirdPartyControlMenu="thirdPartyControlMenu"
-              :thirdPartyControl="thirdPartyControl"
               :isShowBack="isShowBack"
               :isShowRecovery="isShowRecovery"
               :isShowImplement="isShowImplement"
@@ -106,8 +104,6 @@
             :patternSelect="patternSelect"
             :allPatternList="allPatternList"
             :funcSort="funcSort"
-            :thirdPartyControlMenu="thirdPartyControlMenu"
-            :thirdPartyControl="thirdPartyControl"
             :isShowBack="isShowBack"
             :isShowRecovery="isShowRecovery"
             :isShowImplement="isShowImplement"
@@ -142,8 +138,6 @@ import CrossDiagramMgr from '../../../EdgeMgr/controller/crossDiagramMgr.js'
 import { setToken, setHost, getTheme } from '../../../utils/auth.js'
 import RingDataModel from '../../../utils/RingDataModel.js'
 import { getIntersectionInfo } from '../../../api/template'
-import { GetRoleByName } from '../../../api/permission.js'
-import { getPermissionMenu, getPermissionControl } from './utils/thirdPartypermission.js'
 
 export default {
   name: 'scheme-config',
@@ -206,6 +200,10 @@ export default {
       type: String,
       default: ''
     },
+    funcSort: {
+      type: String,
+      default: 'allFunc'
+    },
     roadDirection: {
       type: String,
       default: 'right'
@@ -421,13 +419,6 @@ export default {
           permission: 'configer:manual:base',
           iconName: this.$t('openatccomponents.overview.modelList19'),
           bgcolor: getTheme() === 'light' ? '#edf6ff' : '#243d59'
-        }, {
-          type: '感应式自适应',
-          id: 18,
-          iconClass: 'ganyingshizishiying',
-          permission: 'configer:manual:base',
-          iconName: this.$t('openatccomponents.overview.modelList18'),
-          bgcolor: getTheme() === 'light' ? '#edf6ff' : '#243d59'
         }
       ],
       othersControlList: [
@@ -474,10 +465,7 @@ export default {
       patternSelect: [], // 所有方案id
       specialPage: '', // 哪一个特殊控制页面
       nextcycleefficcontrol: [5, 6, 9, 10, 12, 19], // 下周期生效的控制方式
-      resetcomponent: false,
-      funcSort: 'allFunc',
-      thirdPartyControlMenu: [],
-      thirdPartyControl: []
+      resetcomponent: false
     }
   },
   watch: {
@@ -625,25 +613,8 @@ export default {
     changeStatus () {
       this.toPage = 1
       this.isOperation = true
-      if (this.platform !== undefined && this.platform !== 'OpenATC') {
-        this.queryThirdParty()
-      }
       this.$refs.ManualControlModalNew.init()
     },
-    queryThirdParty () {
-      this.funcSort = 'allFunc'
-      GetRoleByName(`thirdparty--${this.platform}`).then(res => {
-        if (!res.data.success) {
-          let msg = getMessageByCode(res.data.code, this.$i18n.locale)
-          this.$message.error(msg)
-          return
-        }
-        this.funcSort = 'thirdPartyFunc'
-        this.thirdPartyControl = getPermissionControl(res.data.data)
-        this.thirdPartyControlMenu = getPermissionMenu(this.thirdPartyControl)
-        this.$refs.ManualControlModalNew.activeName = this.thirdPartyControlMenu[0]
-      })
-    },
     handleGetData (data) {
       let that = this
       if (data.name === '') {

package/package/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/package/kisscomps/components/SchemeConfig/manualControlModalNew/controlModelGroup.vue

@@ -18,7 +18,7 @@
           <div class="single-model-new"
             :style="{'backgroundColor': item.bgcolor}"
             @click="selectModel(item)"
-            v-if="isHasPermission(item.permission) && (funcSort === 'allFunc' || (funcSort === 'thirdPartyFunc'&& thirdPartyControl.indexOf(item.id) !== -1))">
+            v-if="isHasPermission(item.permission)">
             <div class="closephase-icon">
               <OthersIconSvg :type="item.type" />
             </div>
@@ -31,7 +31,7 @@
           :style="{'backgroundColor': item.bgcolor}"
           @click="selectModel(item)"
           :class="preselecttype == item.type? 'single-model-select' : ''"
-          v-if="isHasPermission(item.permission) && (funcSort === 'allFunc' || (funcSort === 'thirdPartyFunc'&& thirdPartyControl.indexOf(item.id) !== -1))">
+          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" />
@@ -70,16 +70,14 @@ export default {
     othersControl: {
       type: Boolean,
       default: false
-    },
-    thirdPartyControl: {
-      type: Array
     }
   },
   data () {
     return {
       preselecttype: '',
       controllist: [],
-      specialControl: [23, 24, 100]
+      specialControl: [23, 22, 100, 24, 25],
+      basicFuncControlId: [0, 1, 4, 5] // 基础功能包含的控制方式： 自主控制（手动下）、黄闪、步进、定周期
     }
   },
   computed: {

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

@@ -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/manualControlModalNew/index.vue

@@ -12,15 +12,13 @@
 <template>
   <div class="manual-control-modal-new">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane :label="$t('openatccomponents.overview.residentcontrol')" name="residentcontrol"
-        v-if="(funcSort === 'allFunc' || (funcSort === 'thirdPartyFunc'&& thirdPartyControlMenu.indexOf('residentcontrol') !== -1))">
+      <el-tab-pane :label="$t('openatccomponents.overview.residentcontrol')" name="residentcontrol">
         <ControlModelGroup
           v-if="activeName === 'residentcontrol'"
           ref="ControlModelGroup"
           className="residentcontrol"
           :controlList="residentControlList"
           :funcSort="funcSort"
-          :thirdPartyControl="thirdPartyControl"
           @selectModel="selectModel"
         />
 
@@ -82,15 +80,13 @@
             <el-button v-if="!isShowImplement" type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
         </div>
       </el-tab-pane>
-      <el-tab-pane :label="$t('openatccomponents.overview.specialcontrol')" name="specialcontrol"
-        v-if="(funcSort === 'allFunc' || (funcSort === 'thirdPartyFunc'&& thirdPartyControlMenu.indexOf('specialcontrol') !== -1))">
+      <el-tab-pane :label="$t('openatccomponents.overview.specialcontrol')" name="specialcontrol">
         <ControlModelGroup
           v-if="activeName === 'specialcontrol'"
           ref="ControlModelGroup"
           className="specialcontrol"
           :controlList="specialControlList"
           :funcSort="funcSort"
-          :thirdPartyControl="thirdPartyControl"
           @selectModel="selectModel"
         />
 
@@ -116,15 +112,13 @@
       </div>
 
       </el-tab-pane>
-      <el-tab-pane :label="$t('openatccomponents.overview.schemeselection')" name="schemeselection"
-        v-if="(funcSort === 'allFunc' || (funcSort === 'thirdPartyFunc'&& thirdPartyControlMenu.indexOf('schemeselection') !== -1))">
+      <el-tab-pane :label="$t('openatccomponents.overview.schemeselection')" name="schemeselection">
         <ControlModelGroup
           v-if="activeName === 'schemeselection'"
           ref="ControlModelGroup"
           className="otherscontrol"
           :controlList="patternChooseControlList"
           :funcSort="funcSort"
-          :thirdPartyControl="thirdPartyControl"
           @selectModel="selectModel"
           @selectSpecialModel="selectSpecialModel" />
 
@@ -183,16 +177,14 @@
             <el-button v-if="!isShowImplement" type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
         </div>
       </el-tab-pane>
-      <el-tab-pane :label="$t('openatccomponents.overview.others')" name="others"
-        v-if="(funcSort === 'allFunc' || (funcSort === 'thirdPartyFunc'&& thirdPartyControlMenu.indexOf('others') !== -1))">
+      <el-tab-pane :label="$t('openatccomponents.overview.others')" name="others">
         <ControlModelGroup
-          v-if="activeName === 'others'"
+          v-if="activeName === 'others' && funcSort === 'allFunc'"
           ref="ControlModelGroup"
           className="otherscontrol"
           othersControl
           :controlList="othersControlList"
           :funcSort="funcSort"
-          :thirdPartyControl="thirdPartyControl"
           @selectModel="selectModel"
           @selectSpecialModel="selectSpecialModel"
         />
@@ -356,15 +348,15 @@ export default {
     isShowImplement: {
       type: Boolean,
       default: true
-    },
-    thirdPartyControlMenu: {
-      type: Array
-    },
-    thirdPartyControl: {
-      type: Array
     }
   },
   watch: {
+    activeName: {
+      handler: function (val) {
+      },
+      // 深度观察监听
+      deep: true
+    },
     patternSelect: {
       handler: function (val) {
         this.manualInfo.tempPatternid = this.crossStatusData.patternid
@@ -383,6 +375,7 @@ export default {
   },
   data () {
     return {
+      basicFuncControlId: [0, 1, 4, 5], // 基础功能包含的控制方式： 自主控制（手动下）、黄闪、步进、定周期
       visible: this.Visible,
       manuals: false,
       realtimeStage: {},

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

@@ -74,6 +74,7 @@
             :agentId="agentId"
             :ip="ip"
             :platform="platform"
+            :funcSort="FuncSort"
             :roadDirection="roadDirection" />
         </div>
       </div>
@@ -139,6 +140,7 @@ export default {
       stateName: this.$t('openatccomponents.overview.offline'),
       curBodyWidth: 1920,
       graphicMode: false,
+      FuncSort: 'allFunc',
       controlData: {},
       checked: false,
       overlap: [],
@@ -153,7 +155,7 @@ 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, '设备维护']]),
+      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表示红，黄，绿
@@ -182,6 +184,7 @@ export default {
     ...mapState({
       // curBodyWidth: state => state.globalParam.curBodyWidth,
       curBodyHeight: state => state.globalParam.curBodyHeight,
+      // FuncSort: state => state.globalParam.FuncSort,
       hideMenu: state => state.globalParam.hideMenu
       // graphicMode: state => state.globalParam.graphicMode
       // isShowGui: state => state.globalParam.isShowGui,
@@ -610,6 +613,12 @@ export default {
           this.agentName = res.data.data.name
         }
         this.platform = res.data.data.platform
+        if (this.platform === 'OpenATC') {
+          this.FuncSort = 'allFunc'
+        }
+        if (this.platform === 'SCATS' || this.platform === 'HUATONG') {
+          this.FuncSort = 'basicFunc'
+        }
         this.$refs.intersectionMap.resetCrossDiagram()
         this.registerMessage() // 注册消息
         this.initData()
@@ -654,6 +663,20 @@ export default {
         } else {
           this.stateName = this.$t('openatccomponents.overview.offline')
         }
+        // let func = 'allFunc'
+        // if (this.platform === 'OpenATC') {
+        //   func = 'allFunc'
+        // }
+        // if (this.platform === 'SCATS' || this.platform === 'HUATONG') {
+        //   func = 'basicFunc'
+        // }
+        // this.$store.dispatch('SaveFunctionLevel', func)
+        if (this.platform === 'OpenATC') {
+          this.FuncSort = 'allFunc'
+        }
+        if (this.platform === 'SCATS' || this.platform === 'HUATONG') {
+          this.FuncSort = 'basicFunc'
+        }
       })
     },
     isJsonString (str) {