修改

src/request/config.js

@@ -119,7 +119,7 @@ export const deleteScene = '/web/scene/delete'
 // 获取相机列表
 export const getCameraList = '/web/camera/getUserCameraList'
 // 获取相机选项
-export const getCameraOptions = '/web/camera/getUserCameraList?pageNum=1&pageSize=100000'
+export const getCameraOptions = '/web/camera/getUserCameraList?pageNum=1&pageSize=100000&type=1'
 // 添加相机
 export const insertCamera = '/web/camera/bindNew'
 // 添加相机管理人员

src/view/camera/index.vue

@@ -117,7 +117,7 @@ export default {
       updateUrl: updateCamera,
       getUrl: getCameraList,
       delUrl: deleteCamera,
-      searchAttr: { deptId: '', snCode: '' },
+      searchAttr: { deptId: '', snCode: '',type:'2' },
       operAttr: { snCode: '', cameraSn: '',userId:'' },
       delMsg: '解绑相机，该相机拍摄的场景也将一并解绑（场景在云端存储，不会删除）确定要解绑吗？'
     });

src/view/dispatch/index.vue

@@ -110,7 +110,7 @@
         <span class="oper-span" @click="queryScene(row)" v-power="'readFile'" >场景</span>
         <span class="oper-span" v-if="row.vrLink && !isTeaching" v-power="'look'" @click="takeLook(row)">带看</span>
         <template v-if="isTeaching">
-          <span class="oper-span" @click="leaveMsgHandle(row)">留言</span>
+          <span class="oper-span" @click="leaveMsgHandle(row)" v-power="'message'">留言</span>
           <span class="oper-span" 
             @click=" user.roleKey === ADMIN_USER_ID && revokeTeaching(row)" 
             :class="{disable: user.roleKey !== ADMIN_USER_ID}"
@@ -658,7 +658,7 @@ export default {
     },
     async copyShare() {
       if (!this.share.data.randCode || this.share.data.randCode.length !== 4) {
-        return this.$message.error('请输入四位数得密码！', '提示')
+        return this.$message.error('请输入四位数的密码！', '提示')
       }
       if (this.randCode !== this.share.data.randCode) {
         await axios.post(fireSetPsw, {projectId: this.share.data.id, randCode: this.share.data.randCode})

src/view/layout/top/index.vue

@@ -67,9 +67,10 @@
 import { encryption } from '@/util'
 import comDialog from "@/components/dialog";
 import axios from 'axios';
-import { updatePsw, userLogout,getUserInfo } from '@/request/config'
+import { updatePsw,getUserInfo,userLogout } from '@/request/config'
 import { sendUserMsg } from '@/request/config'
-import { setToken, setPermission, setInfo, setRoleKey } from '@/state/user'
+import {  setInfo,setToken,setRoleKey, } from '@/state/user'
+// import { setToken, setPermission , setRoleKey } from '@/state/user'  setPermission
 import { computed, ref, reactive, watch } from 'vue'
 import user from '@/state/user'
 import {PSW} from '@/constant/REG'
@@ -121,10 +122,9 @@ export default {
     },
     async _loginout() {
       await axios.post(userLogout)
-      setToken('')
+      setToken(null)
       setRoleKey('')
-      setPermission()
-      console.log('----------')
+      // setPermission()
       setInfo({})
       this.$router.replace({name: 'login'})
     },

src/view/organization/list.vue

@@ -17,6 +17,7 @@
             :props="treeProps"
             :data="treedata"
             node-key="id"
+            :current-node-key="user.info.id"
             accordion
             default-expand-all
           >

src/view/vrmodel/index.vue

@@ -46,8 +46,9 @@
       <el-table-column label="拍摄时间" prop="createTime" v-slot:default="{ row }"> {{row.createTime.substr(0, 11)}}</el-table-column>
       <el-table-column label="操作" v-slot:default="{ row }" >
         <span class="oper-span" @click="shareHandle(row)" v-power="'view'">查看</span>
-        <span class="oper-span" @click="auth.update && user.info.id == row.creatorId && editModel(row)" :class="{disable: !(auth.update && user.info.id == row.creatorId)}" v-if="auth.update" v-power="'edit'">编辑</span>
-        <span class="oper-span" @click="auth.delete && user.info.deptId == row.deptId && dataList.delete(row)" :class="{disable: !(auth.delete && user.info.deptId == row.deptId)}" v-power="'del'" style="color: var(--primaryColor)">删除</span>
+        <span class="oper-span" v-if="(user.roleKey=='admin-ordinary' && user.info.id == row.creatorId) ||user.roleKey=='admin-dept'" @click="auth.update && user.info.id == row.creatorId && editModel(row)"   v-power="'edit'">编辑</span> 
+        <!-- v-if="auth.update || (user.roleKey=='admin-ordinary' && user.info.id == row.creatorId) " -->
+        <span class="oper-span" v-if="(user.roleKey=='admin-ordinary' && user.info.id == row.creatorId) ||user.roleKey=='admin-dept'" @click="auth.delete && user.info.deptId == row.deptId && dataList.delete(row)" v-power="'del'" style="color: var(--primaryColor)">删除</span>
       </el-table-column>
     </el-table>