xiu该问题

src/view/camera/index.vue

@@ -165,7 +165,7 @@ export default {
     },
     submit() {
       if (!this.oper.state.snCode.trim()) {
-        return this.$message.error('S/N码不能为空！', '提示')
+        return this.$message.error('SN码不能为空！', '提示')
       }
       if (!this.oper.state.userId) {
         return this.$message.error('请选择管理员', '提示')

src/view/dispatch/index.vue

@@ -110,8 +110,8 @@
       <el-table-column label="操作" v-slot:default="{ row }" :width="isTeaching ? 280 : 320">
         <span class="oper-span" @click="queryDetail(row)" :class="{disable: (user.info.id == row.creatorId || user.roleKey == 'admin-dept')}" v-power="'view'">详情</span>
         <span class="oper-span" @click="archivesHandle(row)" v-power="'doc:look'" >档案</span>
-        <!-- <span class="oper-span" @click="queryScene(row)" v-power="'readFile'" >场景</span> -->
-        <span class="oper-span" v-power="'look'" :class="{disable: !row.sceneNum}" v-if="!isTeaching" @click="takeLook(row)">带看</span>
+        <!-- <span class="oper-span" @click="queryScene(row)" v-power="'readFile'" >场景</span> :class="{disable: !row.sceneNum}"-->
+        <span class="oper-span" v-power="'vrmodel:look'"  v-if="!isTeaching" @click="takeLook(row)">带看</span>
         <template v-if="isTeaching">
           <span class="oper-span" v-power="'message:look'" @click="leaveMsgHandle(row)">留言</span>
           <span class="oper-span" v-power="'cancel'" @click="revokeTeaching(row)" style="color: var(--primaryColor)">撤销</span>
@@ -527,7 +527,10 @@ export default {
       
     },
     takeLook(row) {
-        let routeData = this.$router.push({name: 'sceneInitiator', query: {sceneNum:row.sceneNum,id: row.id}})
+      if(!row.sceneNum){
+        return this.$message.error('暂未生成场景', '提示')
+      }
+        let routeData = this.$router.resolve({name: 'sceneInitiator', query: {sceneNum:row.sceneNum,id: row.id}})
         window.open(routeData.href, '_blank');
     },
     editInfo(row) {

src/view/layout/top/index.vue

@@ -69,8 +69,7 @@ import comDialog from "@/components/dialog";
 import axios from 'axios';
 import { updatePsw,getUserInfo,userLogout } from '@/request/config'
 import { sendUserMsg } from '@/request/config'
-import {  setInfo,setInfoPermission,setToken,setRoleKey, } from '@/state/user'
-// import { setToken, setPermission , setRoleKey } from '@/state/user'  setPermission
+import {  setInfo,setInfoPermission,setToken,setRoleKey } from '@/state/user'
 import { computed, ref, reactive, watch } from 'vue'
 import user from '@/state/user'
 import {PSW} from '@/constant/REG'
@@ -94,6 +93,8 @@ export default {
     async getInfo(){
       let res =  await axios.get(getUserInfo)
       setInfo(res.data.user)
+      setRoleKey(res.data.roles[0].roleKey)
+      sessionStorage.setItem('roleLevel',res.data.roleLevel)
       setInfoPermission(res.data.permissionsList || [])
       console.log('res',res)
     },

src/view/organization/list.vue

@@ -26,7 +26,7 @@
                 <span>{{ data.name }}</span>
                 <div class="butList"  v-if="data.id != '1'">
                   <a @click="seeDetail(data, node)" v-power="'view'"> 查看 </a>
-                  <a @click="insertProject(data)" v-power="'edit'"> 编辑 </a>
+                  <a @click="insertProject(data)"  v-power="'edit'"> 编辑 </a>
                   <a
                     style="color: var(--primaryColor)"
                     @click="remove(data.id)"
@@ -68,24 +68,23 @@
         </el-form-item>
         <el-form-item label="上级组织" class="mandatory">
           <el-cascader
-            v-if="detailType == '新增'"
             style="width: 100%"
             v-model="superiorValue"
             :options="treedatas"
             :props="{ checkStrictly: true, label: 'name', value: 'id' }"
             @change="handleChange"
           ></el-cascader>
-          <el-input
+          <!-- <el-input
             v-else
             v-model="detail.parentName"
             :disabled="true"
             placeholder="请输入组织名称"
-          ></el-input>
+          ></el-input> -->
         </el-form-item>
         <el-form-item label="负责人">
           <el-input
             v-model="detail.leader"
-            maxlength="50"
+            maxlength="30"
             placeholder="请输入"
           ></el-input>
         </el-form-item>
@@ -209,6 +208,7 @@ export default {
       let apidata = {
         superior: "sheq",
         ...data.detail,
+        deptIdList:data.superiorValue.join(',')
       };
       let requestApi = addTreeitem;
       if (detailType == "编辑") {
@@ -235,9 +235,9 @@ export default {
       data.superiorValue = [];
     };
     const insertProject = (val) => {
-      console.log("insertProject", val.id);
       if (val.id) {
         data.detailType = "编辑";
+        data.superiorValue = val.deptIdList? val.deptIdList.split(','):''
         data.detail = {
           ...val,
         };
@@ -245,11 +245,12 @@ export default {
         data.detailType = "新增";
         data.detail = {};
       }
+      console.log("insertProject", val,data.superiorValue);
       data.show = true;
     };
     const handleChange = (val) => {
       data.detail.parentId = val && val[val.length - 1];
-      console.log("点击handleChange", val.length, data);
+      console.log("点击handleChange",val, val.length, data);
     };
     const loadNode = (node, resolve) => {
       if (node.level === 0) {
@@ -313,8 +314,8 @@ export default {
       searchOptions: [],
     };
   },
-  methods: {},
-
+  methods: {
+  },
   components: {
     "com-dialog": comDialog,
     "see-info": seeInfo,

src/view/user/index.vue

@@ -72,12 +72,13 @@
               class="oper-span"
               v-power="'disabled'"
               @click="changeUserStatus(row)"
+              :class="{disable:user.info.id == row.id}"
               style="color: var(--primaryColor)"
             >
               {{ row.status ? "禁用" : "启用" }}
             </span>
             
-            <span class="oper-span" style="color: var(--primaryColor)" @click="delInfo(row)"  v-power="'del'">删除</span
+            <span  :class="user.info.id == row.id?'disable oper-span':'oper-span'"  style="color: var(--primaryColor)" @click="delInfo(row)"  v-power="'del'">删除</span
             >
           </template>
         </el-table-column>
@@ -106,7 +107,7 @@
             maxlength="30"
           ></el-input>
         </el-form-item>
-        <el-form-item label="所属架构：" class="mandatory" v-if="user.roleKey !== 'admin-ordinary'">
+        <el-form-item label="所属架构" class="mandatory" v-if="user.roleKey !== 'admin-ordinary'">
           <el-cascader
             style="width: 100%"
             v-model="editData.deptIdList"
@@ -136,11 +137,11 @@
             placeholder="请输入"
           ></el-input>
         </el-form-item>
-        <el-form-item label="所属架构：" class="mandatory" v-if="user.roleKey !== 'admin-ordinary'">
+        <el-form-item label="所属架构" class="mandatory" v-if="user.roleKey !== 'admin-ordinary'">
           <el-cascader
             style="width: 100%"
             v-model="newData.deptIdList"
-            @change="editChange"
+            @change="addChange"
             :options="treedata"
             :props="{ checkStrictly: true, label: 'name', value: 'id' }"
           ></el-cascader>
@@ -207,7 +208,7 @@ export default {
         roleId: "",
         maxlevel: 1,
       },
-      searchAttr: { nickName: "", status: "", deptId: "" },
+      searchAttr: { nickName: "", status: "", deptId: "",userName:"" },
     });
     const headList = ref([{ name: "用户管理", value: 2 }]);
     const roleKey = ref({ 'admin': "admin-dept", 'admin-dept': 'admin-ordinary' });
@@ -217,10 +218,11 @@ export default {
         return getApp().$message.error("请先启用用户", "提示");
       }
       console.log('updateInfo',row)
+      let deplist = '1,DEP000011455793031868370944,DEP000011456084219309625344'
       data.editData = {
         editName:row.nickName,
         roleId:row.roleId,
-        deptIdList:row.deptIdList.split(','),
+        deptIdList:deplist.split(','),
       }
       operRoleId.value = row.roleId;
       state.oper.value.readyUpdate(row);
@@ -373,6 +375,9 @@ export default {
     editChange(val){
       console.log('relationDeptId',val);
       this.relationDeptId = val&&val[val.length - 1] || '';
+    },
+    addChange(val){
+      this.relationDeptId = val&&val[val.length - 1] || '';
     }
   },
   components: {

src/view/vrmodel/index.vue

@@ -52,9 +52,9 @@
       >
       <el-table-column label="操作" v-slot:default="{ row }">
         <span class="oper-span" v-power="'view'" @click="shareHandle(row)">查看</span>
-        <span class="oper-span" v-power="'edit'" @click="editModel(row)">编辑</span>
+        <span class="oper-span" :class="{disable:butisShow}" v-power="'edit'" @click="editModel(row)">编辑</span>
         <span class="oper-span" @click="download(row)" v-if="row.num" >下载</span>
-        <span class="oper-span" v-power="'del'" @click="dataList.delete(row)" style="color: var(--primaryColor)"  >删除</span
+        <span :class="butisShow?'disable oper-span':'oper-span'" v-power="'del'" @click="dataList.delete(row)" style="color: var(--primaryColor)"  >删除</span
         >
       </el-table-column>
     </el-table>
@@ -74,7 +74,7 @@
       @submit="updateItemCompany"
     >
       <el-form ref="form" :model="form" label-width="84px" class="vrmodel-from">
-        <el-form-item label="所属架构：" class="mandatory">
+        <el-form-item label="所属架构" class="mandatory">
           <com-company v-model="editCompany.data.deptId" hideAll />
         </el-form-item>
       </el-form>
@@ -198,7 +198,7 @@ export default {
     const currModel = ref(1)
     const time = ref(null)
     const cameraDownload = ref({ data: { type: 0, value: 0 }, show: false });
-
+    const butisShow =ref({show:false})  
     watch(time, () => {
       if (time.value) {
         console.log(time.value[0], time.value[1])
@@ -227,7 +227,19 @@ export default {
       asyncSceneCompany.value || state.dataList.value.refer()
     })
 
-    return { ...state, headList, currModel, time, auth, editCompany, cameras, cameraCompany, asyncSceneCompany, user,cameraDownload,ADMIN_USER_ID };
+    return { ...state,butisShow, headList, currModel, time, auth, editCompany, cameras, cameraCompany, asyncSceneCompany, user,cameraDownload,ADMIN_USER_ID };
+  },
+  created(){
+      let list = {
+        1:false,//'超级管理员',
+        2:false,//'平台管理员',
+        3:true,//'总队',
+        4:true,//'支队',
+        5:true,//'大队',
+      }
+      let roleLevel =  sessionStorage.getItem('roleLevel')
+      this.butisShow = list[roleLevel] || false
+
   },
   methods: {
     download(item) {
@@ -340,7 +352,7 @@ export default {
     asynccj(){
     this.activated()
     this.cameraCompany.show = true
-  },
+    },
   },
   components: {
     "com-head": comHead,