修改问题

.env

@@ -1,2 +1,2 @@
-VUE_APP_DOMAIN=https://test.4dkankan.com
+VUE_APP_DOMAIN=https://www.4dkankan.com
 VUE_APP_PREFIX=

src/request/config.js

@@ -110,6 +110,8 @@ export const deleteScene = '/web/scene/delete'
 export const getCameraList = '/web/camera/getUserCameraList'
 // 获取相机选项
 export const getCameraOptions = '/web/camera/getUserCameraList?pageNum=1&pageSize=100000'
+// 获取相机选项(自己)
+export const getCameraListByUser = '/web/camera/getCameraListByUser?pageNum=1&pageSize=100000'
 // 添加相机
 export const insertCamera = '/web/camera/bindNew'
 // 修改相机

src/view/dispatch/index.vue

@@ -236,7 +236,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <p class="maker">注：请确保已在在“场景管理”制作火调场景</p>
+        <p class="maker">注：请确保已在“场景管理”制作火调场景</p>
       </el-form-item>
     </el-form>
   </com-dialog>

src/view/user/index.vue

@@ -4,7 +4,7 @@
       <el-form-item label="所属架构：">
         <com-company :checkStrictly="true" v-model="search.state.departmentId" />
       </el-form-item>
-      <el-form-item label="用户账户：">
+      <el-form-item label="用户账号：">
         <el-input v-model="search.state.userName" placeholder="请输入手机号"></el-input>
       </el-form-item>
       <el-form-item label="用户姓名：">

src/view/vrmodel/index.vue

@@ -81,12 +81,11 @@
         <span
           class="oper-span"
           @click="
-            auth.delete &&
-              user.info.departmentId == row.deptId &&
+            auth.delete &&(user.info.id === ADMIN_USER_ID || user.info.departmentId == row.deptId) &&
               dataList.delete(row)
           "
           :class="{
-            disable: !(auth.delete && user.info.departmentId == row.deptId),
+            disable: !(auth.delete && (user.info.departmentId == row.deptId || user.info.id === ADMIN_USER_ID)),
           }"
           style="color: var(--primaryColor)"
           >删除</span
@@ -127,9 +126,9 @@
           <el-select v-model="cameraCompany.data" placeholder="请选择">
             <el-option
               v-for="item in cameras"
-              :key="item.snCode"
-              :label="item.snCode"
-              :value="item.snCode"
+              :key="item.cameraSn"
+              :label="item.cameraSn"
+              :value="item.cameraSn"
             >
             </el-option>
           </el-select>
@@ -203,10 +202,12 @@ import comPagination from "@/components/pagination";
 import comCompany from "@/components/company-select";
 import { getApp } from "@/app";
 import { dateFormat } from "@/util";
+import { ADMIN_USER_ID } from '@/constant'
 import {
   getSceneList,
   deleteScene,
-  getCameraOptions,
+  // getCameraOptions,
+  getCameraListByUser,
   checkHasDownload,
   getDownloadProcess,
   downloadScene,
@@ -274,6 +275,7 @@ export default {
       cameraCompany,
       asyncSceneCompany,
       user,
+      ADMIN_USER_ID
     };
   },
   methods: {
@@ -389,8 +391,8 @@ export default {
     },
   },
   async activated() {
-    let res = await axios.get(getCameraOptions);
-    this.cameras = res.data.list;
+    let res = await axios.get(getCameraListByUser);
+    this.cameras = res.data;
   },
   components: {
     "com-head": comHead,

vue.config.js

@@ -18,8 +18,8 @@ module.exports = {
     // 设置代理proxy
     proxy: {
       '/__api': {
-        // target: 'http://192.168.0.135:8585/',
-        target: 'https://testhuodiao.4dkankan.com/',
+        target: 'http://192.168.0.135:8585/',
+        // target: 'https://testhuodiao.4dkankan.com/',
         changeOrigin: true,  
         pathRewrite: {      
           ['^/__api']: ''