修改驾驶舱搜索条件机构树可以选择多层级机构(已修复为三层机构)

src/api/public.js

@@ -143,6 +143,14 @@ export function userAndOrgTree(removeId) {
     params: removeId
   })
 }
+//驾驶舱行社树
+export function hangsheAndOrgTree(removeId) {
+  return request({
+    url: '/system/dept/deptTree/hangshe',
+    method: 'get',
+    params: removeId
+  })
+}
 //常规业务使用的树
 export function deptTreeSelect(data) {
   if (!data) {

src/components/layouts/index.vue

@@ -98,6 +98,7 @@ export default {
       })
 
       this.$store.dispatch('getOrgTree')
+      this.$store.dispatch('getOrgTreeHangshe')
     },
     handleChange(v) {
       console.log('tab value:', v)

src/components/orgTree/index.vue

@@ -1,11 +1,12 @@
 <template>
   <div class="orgTree van-hairline--bottom">
+   
     <tree-select
       :addendToBody="true"
       @input="onInput"
       @select="onSelect"
       v-model="selected"
-      :options="orgTree"
+      :options="isHangsheTree? orgTreeHangshe:orgTree"
       :clearable="clearable"
       label='检查机构'
       :backspaceRemoves="false"
@@ -32,6 +33,12 @@ export default  {
       type:Boolean,
       default:true
     },
+    // orgTreeHangshe
+    //是否行社机构树
+    isHangsheTree:{
+      type:Boolean,
+      default:false
+    },
     value: {
       type: [String,Number],
       default: null
@@ -52,8 +59,12 @@ export default  {
       checked:false,
     }
   },
+  // mounted(){
+ 
+  //   this.treeData=isHangsheTree? this.orgTreeHangshe:this.orgTree
+  // },
   computed: {
-    ...mapGetters(['orgTree'])
+    ...mapGetters(['orgTree','orgTreeHangshe'])
   },
   watch: {
     value: {

src/router/router.config.js

@@ -84,12 +84,7 @@ export let routers = [
     component: () => import('@/views/menu/rehearsalTask/components/rehearsalTaskSign.vue'),
     meta: { title: '演练详情', keepAlive: false }
   },
-  {
-    path: '/cockpit',
-    name: 'cockpit',
-    component: () => import('@/views/menu/cockpit/index.vue'),
-    meta: { title: '驾驶舱', keepAlive: false ,hideTabBar:false}
-  },
+  
 
   {
     path: '/home',
@@ -101,6 +96,12 @@ export let routers = [
     },
     children: [
       {
+        path: '/cockpit',
+        name: 'cockpit',
+        component: () => import('@/views/menu/cockpit/index.vue'),
+        meta: { title: '驾驶舱', keepAlive: false ,hideTabBar:false}
+      },
+      {
         path: '/works',
         name: 'works',
         component: () => import('@/views/home/works'),

src/store/getters.js

@@ -6,6 +6,7 @@ const getters = {
   orgName: state => state.user.orgName,
   roleList: state => state.user.userRoleList,
   orgTree: state => state.app.orgTree,
+  orgTreeHangshe: state => state.app.orgTreeHangshe,
   depTree: state => state.app.depTree,
   commonTree: state => state.app.commonTree,
   dictionary: state => state.app.dictionary,

src/store/modules/app.js

@@ -1,4 +1,4 @@
-import {deptTreeSelect, handsheDeptTreeSelect, getDict, userAndOrgTree} from '@/api/public'
+import {deptTreeSelect, handsheDeptTreeSelect, getDict,hangsheAndOrgTree, userAndOrgTree} from '@/api/public'
 export default {
   state: {
     //用户名
@@ -11,6 +11,8 @@ export default {
     orgName: null,
     //用户机构树
     orgTree: [],
+    //行社机构树
+    orgTreeHangshe:[],
     //常规业务树
     commonTree:[],
     //行社机构树
@@ -26,6 +28,10 @@ export default {
       state.orgTree = val
       
     },
+    SET_ORGTREE_HANGSHE: (state, val) => {
+      state.orgTreeHangshe = val
+      
+    },
     SET_DEPTREE: (state, val) => {
       state.depTree = val
     },
@@ -68,7 +74,17 @@ export default {
         })
       })
     },
-
+    //获取行社机构树
+    getOrgTreeHangshe({commit, state}) {
+      return new Promise((resolve, reject) => {
+        hangsheAndOrgTree().then(res => {
+          commit('SET_ORGTREE_HANGSHE', res.data)
+          resolve(res)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     //常规业务机构树树
     getCommonTree({commit, state}) {
       return new Promise((resolve, reject) => {

src/views/login.vue

@@ -71,11 +71,12 @@ export default {
   },
   methods: {
     onSubmit() {
-      this.formData.password = SM4Encrypt(this.formData.password)
-      login(this.formData).then(res => {
+      let obj=JSON.parse(JSON.stringify(this.formData))
+      // obj.password=JSON.parse(JSON.stringify(SM4Encrypt(this.formData.password)))
+      login(obj).then(res => {
         if (this.checked) {
           localStorage.setItem('username', this.formData.username)
-          localStorage.setItem('password', SM4Encrypt(this.formData.password))
+          localStorage.setItem('password', JSON.parse(JSON.stringify(SM4Encrypt(this.formData.password))) )
           localStorage.setItem('checked', this.checked)
         } else {
           localStorage.clear()

src/views/menu/cockpit/index.vue

@@ -3,7 +3,7 @@
     <NavBar :go="{ type: 'push', path: '/menu' }" />
     <van-row>
       <van-col span="24">
-        <org-tree v-model="cascaderValue" :name="'sss'" @changeItem="getDataList"></org-tree>
+        <org-tree v-model="cascaderValue" :name="'sss'" :isHangsheTree="true" @changeItem="getDataList"></org-tree>
       </van-col>
     </van-row>
     <div>

vue.config.js

@@ -117,7 +117,8 @@ module.exports = defineConfig({
       },
       '/dev': {
         target: "http://47.92.229.224:8080",
-        // target: "http://10.87.23.48:8080",
+        // target: "http://10.87.23.50:8080",
+        // target: "http://10.87.21.103:8080",
         // ws:true,
         changOrigin:true,
         pathRewrite:{