fix: 1

src/request/config.ts

@@ -62,4 +62,7 @@ export const successCode = [0, "000000", 200];
 // baseURL
 export const baseURL = import.meta.env.DEV ? "/api" : "";
 
-export const notOpenUrls: string[] = [uploadModel];
+export const notOpenUrls: string[] = [
+  uploadModel,
+  "/fusion/scene/getSceneProgress",
+];

src/request/loading.ts

@@ -6,6 +6,7 @@ let loading: ReturnType<typeof ElLoading.service> | null;
 export const openLoading = (url?: string) => {
   if (loading || (url && ~notOpenUrls.indexOf(url))) return;
 
+  console.log(url);
   loading = ElLoading.service({
     lock: true,
     text: "加载中",

src/store/role.ts

@@ -127,7 +127,6 @@ export const refreshRole = async () => {
   roleLevel.value = user.value.info.isAdmin
     ? RoleLevel.systemAdmin
     : RoleLevel.corps;
-  // console.log(, user.value.info.permsList);
   setPermission(userPermListCover(user.value.info.permsList));
 
   // const { perm, level } = await getRole(roleId.value);

src/store/scene.ts

@@ -148,8 +148,12 @@ type ScenePaggingParams = PaggingReq<
 >;
 
 export const getSceneStep = async (scene: QuoteScene) => {
-  const data = await axios.post<{ step: number }>("xxx", { sceneId: scene.id });
-  return data.step;
+  const data = (await axios.get<{ step: number }>(
+    `/fusion/scene/getSceneProgress`,
+    { params: { num: scene.num } }
+  )) as any;
+  console.log(data.data.data.progress);
+  return data.data.data.progress;
 };
 
 export const getScenePagging = async (params: ScenePaggingParams) => {

src/view/camera/bind.vue

@@ -8,6 +8,16 @@
         @update:modelValue="(val: string) => (bindCamera.snCode = val.trim())"
       />
     </el-form-item>
+    <el-form-item label="相机类型：" class="mandatory">
+      <el-select v-model="bindCamera.cameraType" placeholder="请选择" style="width: 100%">
+        <el-option
+          v-for="item in cameraTypes"
+          :key="item"
+          :label="cameraTypeDesc[item]"
+          :value="item.toString()"
+        />
+      </el-select>
+    </el-form-item>
     <el-form-item label="所属架构：" class="mandatory">
       <com-company
         v-model="bindCamera.deptId"
@@ -32,7 +42,8 @@
 import comCompany from "@/components/company-select/index.vue";
 import { operateIsPermissionByPath } from "@/directive/permission";
 
-import { Camera, addCamera, editCamera } from "@/store/camera";
+import { Camera, CameraType, addCamera, editCamera } from "@/store/camera";
+import { cameraTypeDesc } from "@/constant/camera";
 import { UserInfo, getUsers } from "@/store/user";
 import { ref, watchEffect } from "vue";
 import { ElMessage } from "element-plus";
@@ -42,6 +53,13 @@ const props = defineProps<{ camera?: Camera }>();
 const bindCamera = ref<Camera>(
   (props.camera ? { ...props.camera } : { cameraSn: "", snCode: "" }) as Camera
 );
+
+const cameraTypes = [
+  CameraType.SWKK,
+  CameraType.SWKJ,
+  CameraType.SWSS1,
+  CameraType.SWSS2,
+];
 const users = ref<UserInfo[]>([]);
 watchEffect(async () => {
   if (bindCamera.value.deptId) {
@@ -64,6 +82,9 @@ defineExpose<QuiskExpose>({
     if (!bindCamera.value.snCode || !bindCamera.value.snCode.trim()) {
       ElMessage.error("SN码不能为空");
       throw "SN码不能为空";
+    } else if (!bindCamera.value.cameraType) {
+      ElMessage.error("请选择相机类型");
+      throw "请选择相机类型";
     } else if (!bindCamera.value.userId) {
       ElMessage.error("请选择管理员");
       throw "请选择管理员";

src/view/vrmodel/pagging.ts

@@ -4,6 +4,7 @@ import {
   QuoteSceneStatus,
   SceneType,
   getScenePagging,
+  getSceneStep,
 } from "@/store/scene";
 import { computed, reactive, watch, watchEffect } from "vue";
 
@@ -51,7 +52,7 @@ export const useScenePaggingParams = () => {
   watch(
     () => pagging.state.table.rows as QuoteScene[],
     (scenes, _, onCleanup) => {
-      const getSteps = () => {
+      const getSteps = async () => {
         const runs = scenes.filter(
           (scene) => scene.status === QuoteSceneStatus.RUN
         );
@@ -59,7 +60,7 @@ export const useScenePaggingParams = () => {
 
         for (const scene of runs) {
           // 请求进度
-          scene.step = 10;
+          scene.step = (await getSceneStep(scene)) as number;
         }
       };
       const interval = setInterval(getSteps, 1000);

vite.config.ts

@@ -44,14 +44,14 @@ export default defineConfig({
     proxy: {
       "/api": {
         target: dev
-          ? "http://192.168.0.135:14000"
+          ? "http://192.168.50.101:14000"
           : "https://mix3d.4dkankan.com",
         changeOrigin: true,
         rewrite: (path) => path.replace(new RegExp(`^/api`), ""),
       },
       "/fusion": {
         target: dev
-          ? "https://test-mix3d.4dkankan.com"
+          ? "http://192.168.50.101:14000"
           : "https://mix3d.4dkankan.com",
         changeOrigin: true,
         rewrite: (path) => path.replace(new RegExp(`^/api`), "/fusion"),
@@ -59,16 +59,17 @@ export default defineConfig({
       "/dev-code": {
         // target: "https://localhost:7173/",
         target: dev
-          ? "https://test-mix3d.4dkankan.com/code"
+          ? "http://192.168.50.101:14000/code"
           : "https://mix3d.4dkankan.com/code",
         changeOrigin: true,
         secure: false,
         rewrite: (path) => path.replace(new RegExp(`^/dev-code`), ""),
       },
       "/swkk": {
-        target: dev ? "https://test.4dkankan.com" : "https://www.4dkankan.com",
+        target: dev
+          ? "http://192.168.50.101:14000/swkk"
+          : "https://www.4dkankan.com",
         changeOrigin: true,
-        rewrite: (path) => path.replace(new RegExp(`^/swkk`), ""),
       },
       "/service": {
         target: dev ? "https://test.4dkankan.com" : "https://www.4dkankan.com",
@@ -76,10 +77,9 @@ export default defineConfig({
       },
       "/swss": {
         target: dev
-          ? "https://uat-laser.4dkankan.com/uat"
+          ? "http://192.168.50.101:14000/swss"
           : "https://laser.4dkankan.com",
         changeOrigin: true,
-        rewrite: (path) => path.replace(new RegExp(`^/swss`), ""),
       },
       "/laser": {
         target: dev
@@ -93,7 +93,7 @@ export default defineConfig({
           ? "https://uat-laser.4dkankan.com/uat"
           : "https://laser.4dkankan.com",
         changeOrigin: true,
-        rewrite: (path) => path.replace(new RegExp(`^/swss`), ""),
+        rewrite: (path) => path.replace(new RegExp(`^/swss`), "/swss"),
       },
     },
   },