openatc-components 0.3.104 → 0.3.106

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

@@ -632,8 +632,9 @@ export default {
           return
         }
         this.funcSort = 'thirdPartyFunc'
-        this.thirdPartyControlMenu = getPermissionMenu(res.data.data)
         this.thirdPartyControl = getPermissionControl(res.data.data)
+        this.thirdPartyControlMenu = getPermissionMenu(this.thirdPartyControl)
+        this.$refs.ManualControlModalNew.activeName = this.thirdPartyControlMenu[0]
       })
     },
     handleGetData (data) {

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)">
+            v-if="isHasPermission(item.permission) && (funcSort === 'allFunc' || (funcSort === 'thirdPartyFunc'&& thirdPartyControl.indexOf(item.id) !== -1))">
             <div class="closephase-icon">
               <OthersIconSvg :type="item.type" />
             </div>
@@ -79,8 +79,7 @@ export default {
     return {
       preselecttype: '',
       controllist: [],
-      specialControl: [23, 22, 100, 24, 25],
-      basicFuncControlId: [0, 1, 4, 5] // 基础功能包含的控制方式： 自主控制（手动下）、黄闪、步进、定周期
+      specialControl: [23, 24, 100]
     }
   },
   computed: {

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

@@ -13,7 +13,7 @@
   <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('驻留控制') !== -1))">
+        v-if="(funcSort === 'allFunc' || (funcSort === 'thirdPartyFunc'&& thirdPartyControlMenu.indexOf('residentcontrol') !== -1))">
         <ControlModelGroup
           v-if="activeName === 'residentcontrol'"
           ref="ControlModelGroup"
@@ -83,7 +83,7 @@
         </div>
       </el-tab-pane>
       <el-tab-pane :label="$t('openatccomponents.overview.specialcontrol')" name="specialcontrol"
-        v-if="(funcSort === 'allFunc' || (funcSort === 'thirdPartyFunc'&& thirdPartyControlMenu.indexOf('特殊控制') !== -1))">
+        v-if="(funcSort === 'allFunc' || (funcSort === 'thirdPartyFunc'&& thirdPartyControlMenu.indexOf('specialcontrol') !== -1))">
         <ControlModelGroup
           v-if="activeName === 'specialcontrol'"
           ref="ControlModelGroup"
@@ -117,7 +117,7 @@
 
       </el-tab-pane>
       <el-tab-pane :label="$t('openatccomponents.overview.schemeselection')" name="schemeselection"
-        v-if="(funcSort === 'allFunc' || (funcSort === 'thirdPartyFunc'&& thirdPartyControlMenu.indexOf('方案选择') !== -1))">
+        v-if="(funcSort === 'allFunc' || (funcSort === 'thirdPartyFunc'&& thirdPartyControlMenu.indexOf('schemeselection') !== -1))">
         <ControlModelGroup
           v-if="activeName === 'schemeselection'"
           ref="ControlModelGroup"
@@ -184,9 +184,9 @@
         </div>
       </el-tab-pane>
       <el-tab-pane :label="$t('openatccomponents.overview.others')" name="others"
-        v-if="(funcSort === 'allFunc' || (funcSort === 'thirdPartyFunc'&& thirdPartyControlMenu.indexOf('其他') !== -1))">
+        v-if="(funcSort === 'allFunc' || (funcSort === 'thirdPartyFunc'&& thirdPartyControlMenu.indexOf('others') !== -1))">
         <ControlModelGroup
-          v-if="activeName === 'others' && funcSort === 'allFunc'"
+          v-if="activeName === 'others'"
           ref="ControlModelGroup"
           className="otherscontrol"
           othersControl
@@ -365,12 +365,6 @@ export default {
     }
   },
   watch: {
-    activeName: {
-      handler: function (val) {
-      },
-      // 深度观察监听
-      deep: true
-    },
     patternSelect: {
       handler: function (val) {
         this.manualInfo.tempPatternid = this.crossStatusData.patternid

package/package/kisscomps/components/SchemeConfig/utils/thirdPartypermission.js

@@ -1,13 +1,21 @@
-const permissionMenuMap = new Map([[
-  'configer:manual:dwell', ['驻留控制']
+// const permissionMenuMap = new Map([[
+//   'configer:manual:dwell', ['驻留控制']
+// ], [
+//   'configer:manual:senior', ['特殊控制']
+// ], [
+//   'configer:manual:base', ['方案选择']
+// ], [
+//   'configer:manual:optimize', ['其他']
+// ]])
+const permissionControlMap = new Map([[
+  'configer:manual:dwell', [4, 22, 25]
 ], [
-  'configer:manual:senior', ['特殊控制']
+  'configer:manual:senior', [1, 2, 3]
 ], [
-  'configer:manual:base', ['方案选择']
+  'configer:manual:base', [5, 6, 9, 10, 12, 19]
+], [
+  'configer:manual:optimize', [23, 100, 24]
 ], [
-  'configer:manual:optimize', ['其他']
-]])
-const permissionControlMap = new Map([[
   'configer:manual:dwell:step', [4]
 ], [
   'configer:manual:dwell:stage', [4]
@@ -41,17 +49,35 @@ const permissionControlMap = new Map([[
   'configer:manual:optimize:preempt', [24]
 ]])
 
-export function getPermissionMenu (permissionList) {
+export function getPermissionMenu (thirdPartyControl) {
   // 按第三方平台角色的权限处理可显示的手动控制菜单
+  // let thirdPartyControlMenu = []
+  // for (let i = 0; i < permissionList.length; i++) {
+  //   let per = permissionList[i].permission_code
+  //   if (permissionMenuMap.get(per)) {
+  //     thirdPartyControlMenu = thirdPartyControlMenu.concat(permissionMenuMap.get(per))
+  //   }
+  // }
+  // console.log(thirdPartyControlMenu)
+  // return thirdPartyControlMenu
   let thirdPartyControlMenu = []
-  for (let i = 0; i < permissionList.length; i++) {
-    let per = permissionList[i].permission_code
-    if (permissionMenuMap.get(per)) {
-      thirdPartyControlMenu = thirdPartyControlMenu.concat(permissionMenuMap.get(per))
+  for (let i = 0; i < thirdPartyControl.length; i++) {
+    let control = thirdPartyControl[i]
+    if ([4, 22, 25].indexOf(control) !== -1) {
+      thirdPartyControlMenu = thirdPartyControlMenu.concat(['residentcontrol'])
+    }
+    if ([1, 2, 3].indexOf(control) !== -1) {
+      thirdPartyControlMenu = thirdPartyControlMenu.concat(['specialcontrol'])
+    }
+    if ([5, 6, 9, 10, 12, 19].indexOf(control) !== -1) {
+      thirdPartyControlMenu = thirdPartyControlMenu.concat(['schemeselection'])
+    }
+    if ([23, 24, 100].indexOf(control) !== -1) {
+      thirdPartyControlMenu = thirdPartyControlMenu.concat(['others'])
     }
   }
-  console.log(thirdPartyControlMenu)
-  debugger
+  thirdPartyControlMenu = [...new Set(thirdPartyControlMenu)]
+  // console.log(thirdPartyControlMenu)
   return thirdPartyControlMenu
 }
 
@@ -64,6 +90,6 @@ export function getPermissionControl (permissionList) {
       thirdPartyControl = thirdPartyControl.concat(permissionControlMap.get(per))
     }
   }
-  console.log(thirdPartyControl)
+  // console.log(thirdPartyControl)
   return thirdPartyControl
 }