openatc-components 0.3.105 → 0.3.106

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openatc-components",
-  "version": "0.3.105",
+  "version": "0.3.106",
   "description": "A Vue.js project",
   "author": "openatc developer",
   "private": false,

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

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

package/src/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,7 +184,7 @@
         </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'"
           ref="ControlModelGroup"
@@ -365,12 +365,6 @@ export default {
     }
   },
   watch: {
-    activeName: {
-      handler: function (val) {
-      },
-      // 深度观察监听
-      deep: true
-    },
     patternSelect: {
       handler: function (val) {
         this.manualInfo.tempPatternid = this.crossStatusData.patternid

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

@@ -64,19 +64,20 @@ export function getPermissionMenu (thirdPartyControl) {
   for (let i = 0; i < thirdPartyControl.length; i++) {
     let control = thirdPartyControl[i]
     if ([4, 22, 25].indexOf(control) !== -1) {
-      thirdPartyControlMenu = thirdPartyControlMenu.concat(['驻留控制'])
+      thirdPartyControlMenu = thirdPartyControlMenu.concat(['residentcontrol'])
     }
     if ([1, 2, 3].indexOf(control) !== -1) {
-      thirdPartyControlMenu = thirdPartyControlMenu.concat(['特殊控制'])
+      thirdPartyControlMenu = thirdPartyControlMenu.concat(['specialcontrol'])
     }
     if ([5, 6, 9, 10, 12, 19].indexOf(control) !== -1) {
-      thirdPartyControlMenu = thirdPartyControlMenu.concat(['方案选择'])
+      thirdPartyControlMenu = thirdPartyControlMenu.concat(['schemeselection'])
     }
     if ([23, 24, 100].indexOf(control) !== -1) {
-      thirdPartyControlMenu = thirdPartyControlMenu.concat(['其他'])
+      thirdPartyControlMenu = thirdPartyControlMenu.concat(['others'])
     }
   }
   thirdPartyControlMenu = [...new Set(thirdPartyControlMenu)]
+  // console.log(thirdPartyControlMenu)
   return thirdPartyControlMenu
 }
 
@@ -89,6 +90,6 @@ export function getPermissionControl (permissionList) {
       thirdPartyControl = thirdPartyControl.concat(permissionControlMap.get(per))
     }
   }
-  console.log(thirdPartyControl)
+  // console.log(thirdPartyControl)
   return thirdPartyControl
 }

package/src/views/intersection.vue

@@ -166,7 +166,7 @@ export default {
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzM0MDc1MTI0MjczIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczNDA3ODcyNCwiaWF0IjoxNzM0MDcxNTI0fQ.KixCOm8CIbS10UYc0djLAr-NCg24S5ftHM384yweVVU',
+      Token: 'eyJraWQiOiIxNzM0MzI2MDI5OTI2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczNDMyOTYyOSwiaWF0IjoxNzM0MzIyNDI5fQ.RG-fX6B24JHQ-pq4QgSW7aQljDYVqqrL_DVSttMkZ60',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',