Forráskód Böngészése

离线版本修改

tangning 5 hónapja
szülő
commit
068c4ce2a7

+ 4 - 0
src/assets/style/custom-element.scss

@@ -7,6 +7,7 @@ html.dark {
   --el-bg-color: #1B1B1C;
   --el-menu-active-color:#fff;
   --el-border-color-light: #000;
+  --el-fill-color-blank : #1B1B1C;
   --el-dialog-padding-primary: 0px;
   --el-button-border-color: #00C8AF;
   --el-font-size-large: 16px;
@@ -17,6 +18,9 @@ html.dark {
   .layer .content .view .main{
     background-color: var(--bgColor);
   }
+  .slide, .el-menu-item{
+    background-color: var(--bgColor);
+  }
 }
 
 .el-pagination.is-background .btn-next.is-active,

+ 2 - 2
src/store/case.ts

@@ -345,8 +345,8 @@ export const getUrlSrc = (item, caseId) => {
 
   param.swssUrl = `${params.swssUrl}?lang=${langKey}&serve_link=${param.laserRoot}&basePath=${param.laserRoot}&m=${item.num}`;
   param.swssmxUrl = `${params.swssUrl}?lang=${langKey}&serve_link=${param.laserRoot}&basePath=${param.laserRoot}&m=${item.num}`;
-  param.swkkUrl = `${params.swkkUrl}?lang=${langKey}&app_server=${ip}${params.swkkPort}&m=${item.num}`;
-  param.fuse = `${params.fuse}?caseId=${caseId}&single&ip=${ip}&swkkPort=${params.swkkPort}&swssUrl=${params.swssUrl}&swkkUrl=${params.swkkUrl}&laserServicePort=${params.laserServicePort}&servicePort=${params.servicePort}&lang=${langKey}&app_server=${ip}${params.swkkPort}&testMap&static=&m=${item.num}`;
+  param.swkkUrl = `${params.swkkUrl}?lang=${langKey}&app_server=${params.ip}${params.swkkPort}&m=${item.num}`;
+  param.fuse = `${params.fuse}?caseId=${caseId}&single&ip=${params.ip}&swkkPort=${params.swkkPort}&swssUrl=${params.swssUrl}&swkkUrl=${params.swkkUrl}&laserServicePort=${params.laserServicePort}&servicePort=${params.servicePort}&lang=${langKey}&app_server=${ip}${params.swkkPort}&testMap&static=&m=${item.num}`;
   let SceneType = {
     0: params.swkkUrl,//`/spg.html?m=${item.num}`,
     1: params.swkkUrl,//`/spg.html?m=${item.num}`,

+ 1 - 1
src/store/user.ts

@@ -79,7 +79,7 @@ export const urlData = ref<urlData>({
   laserServicePort: '9095',
   servicePort: '9250',
   swssUrl: '',
-  fuse: 'file%3A%2F%2F%2FD%3A%2F4DMega%2Fbin%2Fresources%2Fstatic%2Flib%2Ffuse%2Findex.html',
+  fuse: decodeURIComponent('file%3A%2F%2F%2FD%3A%2F4DMega%2Fbin%2Fresources%2Fstatic%2Flib%2Ffuse%2Findex.html'),
   swkkUrl: './index.html',
   swkkPort: '9150',
   // static: '',

+ 26 - 2
src/view/vrmodel/index.vue

@@ -52,7 +52,7 @@ import {
   getSceneListTree,
   setCaseaddOrUpdate,
 } from "@/store/case";
-import { router } from "@/router";
+// import { router } from "@/router";
 import comSelect from "@/components/company-select/index.vue";
 import List from "./list.vue";
 import SceneContent from "./sceneContent.vue";
@@ -61,6 +61,7 @@ import ModelContent from "./modelContent.vue";
 import { useScenePaggingParams } from "./pagging";
 import { computed, ref, onMounted } from "vue";
 import { tableModelScene } from "./quisk";
+import { useRouter, useRoute } from "vue-router";
 import { ui18n } from '@/i18n'
 import { windowOpen } from "@/util";
 const active = ref(true);
@@ -68,12 +69,35 @@ const locale = ui18n.locale
 const list = ref([]);
 const isEdit = ref(false);
 const showModal = ref(false);
+const router = useRouter();
+const route = useRoute();
 const params = useScenePaggingParams();
 const caseId = computed(() => router.currentRoute.value?.params?.caseId);
 onMounted(() => {
   geiList();
-  console.log("router.currentRoute.value", caseId);
 });
+const getAllParams = () => {
+  let href = window.location.href;
+  let query = href.substring(href.indexOf("?") + 1);
+  let vars = query.split("&");
+  let obj = {};
+  for (let i = 0; i < vars.length; i++) {
+    let pair = vars[i].split("=");
+    // 将参数名和参数值分别作为对象的属性名和属性值
+    obj[pair[0]] = pair[1];
+  }
+  return obj;
+};
+let querys = getAllParams()
+console.log("getAllParams", route.name, querys.ga);
+if(querys.ga === '1' && route.name != 'scene'){
+  router.replace('/home/'+caseId.value as number)
+
+}
+if(querys.ga === '0' && route.name != 'homes'){
+  router.replace('/homes/'+caseId.value as number)
+}
+// setUrlData
 async function geiList() {
   list.value = await getCaseSceneList(caseId.value);
   console.log("res", list.value);