Merge branch 'v2.0.0-fire' of http://192.168.0.115:3000/bill/fuse-code into v2.0.0-fire

package.json

@@ -12,6 +12,7 @@
   "dependencies": {
     "@ant-design/icons-vue": "^7.0.1",
     "@types/three": "^0.169.0",
+    "@vueup/vue-quill": "^1.2.0",
     "ant-design-vue": "4.1.0",
     "axios": "^0.27.2",
     "coordtransform": "^2.1.2",
@@ -20,6 +21,7 @@
     "konva": "^9.3.18",
     "less": "^4.1.3",
     "mitt": "^3.0.0",
+    "quill": "^2.0.3",
     "simaqcore": "^1.2.0",
     "swiper": "^11.1.15",
     "three": "^0.169.0",

src/api/scene.ts

@@ -21,6 +21,7 @@ export enum SceneType {
   SWYDSS = 5,
   SWYDMX = 6,
   DSFXJ = 7,
+  SWSX = 8,
 }
 export const SceneTypeDesc: Record<SceneType, string> = {
   [SceneType.SWKK]: "四维看看/Mesh",
@@ -31,6 +32,7 @@ export const SceneTypeDesc: Record<SceneType, string> = {
   [SceneType.SWYDSS]: "四维深光/点云",
   [SceneType.SWYDMX]: "四维深光/Mesh",
   [SceneType.DSFXJ]: "圆周率/Mesh",
+  [SceneType.SWSX]: "四维深巡/点云",
 };
 
 export interface Scene {
@@ -83,7 +85,7 @@ export const fetchScenesAll = async (params: {
   pageNum: number;
   pageSize: number;
 }) => {
-  const data = await axios.post<{ total: number, list: Scenes  }>(SCENE_LIST_ALL, {...params, sceneStatus: -2});
+  const data = await axios.post<{ total: number, list: Scenes  }>(SCENE_LIST_ALL, {...params, status: -2 ,sceneStatus: -2});
   data.list = data.list.map(toLocalScene);
   return data
 };