tangning 8 月之前
父節點
當前提交
44755b0c9e

+ 1 - 1
src/hook/pagging.ts

@@ -102,9 +102,9 @@ export const usePagging = <PARAM, RAW, NRAW>(
       }, {} as any);
 
     const data = await props.get(params);
-    console.log('await', data);
     pag.total = data.total;
     tableOperate.tableState.value.rows = data.list as any;
+    console.log('await', tableOperate.tableState.value);
     await nextTick();
     loading.value = false;
   };

+ 9 - 2
src/store/case.ts

@@ -49,6 +49,9 @@ export type Case = {
 };
 
 export const treeList = ref([]);
+export const caseInfoData = ref({
+  caseTitle: '',
+});
 
 export const setCaseSharePWD = (params: { caseId: number; randCode: string }) =>
   axios.post(setCasePsw, params);
@@ -75,8 +78,11 @@ export const getSceneListData = async (params) =>
   (await axios.get<string>(getSceneList, { params })).data;
   // (await axios.get<string>(info, { params:params })).data;
 
-export const getCaseInfo = async (caseId) =>
-  (await axios.get<Case>(caseInfo, { params: { caseId } })).data;
+export const getCaseInfo = async (caseId) => {
+  caseInfoData.value =  (await axios.get<Case>(caseInfo, { params: { caseId } })).data
+  return caseInfoData.value;
+}
+  
 
 export const getCaseInquestInfo = async (caseId: number) =>
   (await axios.get(newCaseInfo, { params: { caseId } })).data;
@@ -226,3 +232,4 @@ export const getSceneListHasAi = (caseId: number) =>
 
 export const submitMergePhotos = (data) => axios.post(ffmpegMergeImage, { ...data })
 
+export const getCaseInfoData = () => caseInfoData.value

+ 3 - 2
src/view/abstract/index.vue

@@ -290,7 +290,7 @@ onMounted(async () => {
   console.log("caseInfo", caseInfo, caseData);
   if (caseInfo) {
     ruleForm.value = caseData || {};
-    bindExample.value = caseInfo;
+    bindExample.value = JSON.parse(JSON.stringify(caseInfo));
 
  }
 });
@@ -331,7 +331,8 @@ const submit = async () => {
       ElMessage.error("案件名称不能为空");
       throw "案件名称不能为空";
     }
-    setExample({...bindExample.value, caseId :caseId.value })
+    await setExample({...bindExample.value, caseId :caseId.value })
+    await getCaseInfo(caseId.value)
   }else{
     casesaveOrUpDate({...ruleForm.value, caseId :caseId.value })
   }

+ 13 - 9
src/view/layout/top/index.vue

@@ -33,7 +33,7 @@
 import { openErrorMsg } from "@/request";
 import { user, logout as logoutRaw } from "@/store/user";
 import defAvatar from "@/assets/image/top_my.png";
-import { getCaseInfo } from "@/store/case";
+import { getCaseInfo, getCaseInfoData } from "@/store/case";
 import { refreshRole, roleId } from "@/store/role";
 import { RouteName, router } from "@/router";
 import { confirm } from "@/helper/message";
@@ -48,15 +48,19 @@ const caseId = computed(() => {
     return Number(caseId);
   }
 });
-const title = ref('')
-const getInfo = async () => {
-  const res = await getCaseInfo(caseId.value);
-  console.log('getInfo', res)
-  title.value = res?.caseTitle || "";
-};
-getInfo();
+getCaseInfo(caseId.value)
+// const useCaseStore = getCaseInfoData();
+const title = computed(() => getCaseInfoData().caseTitle);
+console.log("useCaseStore", title);
+// const title = ref('')
+// const getInfo = async () => {
+//   const res = await getCaseInfo(caseId.value);
+//   console.log('getInfo', res, getCaseInfoData())
+//   title.value = getCaseInfoData() || res?.caseTitle || "";
+// };
+// getInfo();
 watch(() => caseId.value, () => {
-    getInfo();
+    // getInfo();
 })
 const loginoutRaw = async () => {
   await logoutRaw();

+ 1 - 1
src/view/vrmodel/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <com-head :options="headOptions" v-model="params.pagging.state.query.type">
+  <com-head :options="headOptions" v-model="params.pagging.state.query.isObj">
     <el-form label-width="84px" inline>
       <slot name="header" />
       <el-form-item class="searh-btns" style="grid-area: 1 / 4 / 2 / 4">

+ 1 - 2
src/view/vrmodel/pagging.ts

@@ -6,12 +6,11 @@ export const useScenePaggingParams = () => {
   const pagging = usePagging({
     get: getScenePagging,
     paramsTemlate: {
-      type: SceneType.SWKK,
+      isObj: SceneType.SWKK,
       sceneName: "",
       modelTitle: "",
       deptId: "",
       snCode: "",
-      sceneType: '1',
     },
   });
 

+ 3 - 6
src/view/vrmodel/sceneContent.vue

@@ -2,7 +2,6 @@
   <div class="body-head">
     <!-- <h3 style="visibility: hidden">场景管理</h3> -->
   </div>
-
   <el-table
     class="mybody-head"
     :data="pagging.state.table.rows"
@@ -93,12 +92,11 @@ import {
   genMeshScene,
   LocationEnum,
 } from "@/store/scene";
-import { ScenePagging } from "./pagging";
 import { QuoteSceneStatusDesc } from "@/constant/scene";
 import { OpenType, openSceneUrl } from "../case/help";
 import { confirm } from "@/helper/message";
 import { sceneDownload } from "./quisk";
-import { useScenePaggingParams } from "./pagging";
+import { useScenePaggingParams, ScenePagging } from "./pagging";
 import { QuiskExpose } from "@/helper/mount";
 import { onMounted, ref, watch, watchEffect } from "vue";
 import {
@@ -140,14 +138,13 @@ const delSceneHandler = async (scene: QuoteScene) => {
 };
 console.log('propsnumList', props.numList);
 const selectable = (row) => {
-  console.log('selectable', row.num);
   return !props.numList.includes(row.num)
 }
 // 复选框同步
 watchEffect(() => {
   if (!tableRef.value) return;
   const selectKeys = caseScenes.value.find(
-    (item) => item.type === params.pagging.state.query.type
+    (item) => item.type === params.pagging.state.query.isObj
   )!.numList;
 
   params.pagging.state.table.rows.forEach((scene) => {
@@ -157,7 +154,7 @@ watchEffect(() => {
 const changeSelection = (selectScenes) => {
   if (params.pagging.loading) return;
   const pagScenes = params.pagging.state.table.rows;
-  const type = params.pagging.state.query.sceneType;
+  const type = params.pagging.state.query.isObj;
   console.log('changeSelection', params, type);
   const typeCaseScenes = caseScenes.value.find((item) => item.type == type)!;
   const oldKeys = caseScenes.value.find((item) => item.type == type)!.numList;