浏览代码

修改bug

tangning 5 月之前
父节点
当前提交
c372dafe1a

+ 1 - 0
program/lang/weblate/zh.json

@@ -1095,6 +1095,7 @@
         "library": "媒体库",
         "library": "媒体库",
         "caseView": "预览案件",
         "caseView": "预览案件",
         "dyrh": "多元融合",
         "dyrh": "多元融合",
+        "edit": "编辑器",
         "sceneList": "场景列表",
         "sceneList": "场景列表",
         "yc": "移除",
         "yc": "移除",
         "addScene": "添加场景",
         "addScene": "添加场景",

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

@@ -12,6 +12,7 @@ html.dark {
   --el-button-border-color: #00C8AF;
   --el-button-border-color: #00C8AF;
   --el-font-size-large: 16px;
   --el-font-size-large: 16px;
   --bgColor: #1B1B1C;
   --bgColor: #1B1B1C;
+  --topbgColor: #131313;
   .title1, .title0{
   .title1, .title0{
     color: #fff !important;
     color: #fff !important;
   }
   }
@@ -24,6 +25,9 @@ html.dark {
   .photo .left {
   .photo .left {
     background-color: var(--bgColor);
     background-color: var(--bgColor);
   }
   }
+  .header-top{
+    background-color: var(--topbgColor);
+  }
 }
 }
 
 
 .el-pagination.is-background .btn-next.is-active,
 .el-pagination.is-background .btn-next.is-active,

+ 1 - 1
src/store/case.ts

@@ -346,7 +346,7 @@ export const getUrlSrc = (item, caseId) => {
   param.swssUrl = `${params.swssUrl}?lang=${langKey}&serve_link=${param.laserRoot}&basePath=${param.laserRoot}&m=${item.num}`;
   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.swssmxUrl = `${params.swssUrl}?lang=${langKey}&serve_link=${param.laserRoot}&basePath=${param.laserRoot}&m=${item.num}`;
   param.swkkUrl = `${params.swkkUrl}?lang=${langKey}&app_server=${params.ip}${params.swkkPort}&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}`;
+  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=&`;
   let SceneType = {
   let SceneType = {
     0: params.swkkUrl,//`/spg.html?m=${item.num}`,
     0: params.swkkUrl,//`/spg.html?m=${item.num}`,
     1: params.swkkUrl,//`/spg.html?m=${item.num}`,
     1: params.swkkUrl,//`/spg.html?m=${item.num}`,

+ 1 - 1
src/util/index.ts

@@ -374,7 +374,7 @@ export const getDomMatrix = (dom: HTMLElement) => {
 export const windowOpen = (param) => {
 export const windowOpen = (param) => {
   if(param.url) {
   if(param.url) {
     // iframe发送消息到 父页面
     // iframe发送消息到 父页面
-    let data = JSON.stringify({type:"link", data:param.url, library: param.library});
+    let data = JSON.stringify({type:"link", data:param.url, library: param.library, title: param.title||''});
       window.parent.postMessage(data, '*');
       window.parent.postMessage(data, '*');
   } else if(param.type) {//按钮事件
   } else if(param.type) {//按钮事件
     // iframe发送消息到 父页面
     // iframe发送消息到 父页面

+ 2 - 1
src/view/layout/top/index.vue

@@ -41,6 +41,7 @@ import { updatePwd } from "@/view/system/quisk";
 import { computed, ref, watch } from "vue";
 import { computed, ref, watch } from "vue";
 import { addCaseScenes } from "@/view/originalPhoto/quisk";
 import { addCaseScenes } from "@/view/originalPhoto/quisk";
 import { windowOpen } from "@/util";
 import { windowOpen } from "@/util";
+import { ui18n } from '@/i18n'
 
 
 refreshRole();
 refreshRole();
 const caseId = computed(() => {
 const caseId = computed(() => {
@@ -73,7 +74,7 @@ const handlemtk = () => {
 };
 };
 const handleSee = () => {
 const handleSee = () => {
   let url = getUrlSrc({type: 99}, caseId.value)
   let url = getUrlSrc({type: 99}, caseId.value)
-  windowOpen({url,title: '预览案件'});
+  windowOpen({url,title: ui18n.t('sceneHome.caseView')});
 };
 };
 const logout = async () => {
 const logout = async () => {
   if (await confirm("确定要退出登录吗?")) {
   if (await confirm("确定要退出登录吗?")) {

+ 0 - 3
src/view/material/index.vue

@@ -5,14 +5,12 @@
         <div class="xct">
         <div class="xct">
           <el-button
           <el-button
             style="width: calc(50% - 7px)"
             style="width: calc(50% - 7px)"
-            type="primary"
             @click="gotoDraw(BoardType.scene, -1)"
             @click="gotoDraw(BoardType.scene, -1)"
           >
           >
             绘制平面图
             绘制平面图
           </el-button>
           </el-button>
           <el-button
           <el-button
             style="width: calc(50% - 6px)"
             style="width: calc(50% - 6px)"
-            type="primary"
             @click="handleAiItem"
             @click="handleAiItem"
           >
           >
             AI 平面图
             AI 平面图
@@ -20,7 +18,6 @@
           <el-button
           <el-button
             class="w-full mt-4"
             class="w-full mt-4"
             style="margin-left: 0"
             style="margin-left: 0"
-            type="primary"
             @click="gotoDraw(BoardType.map, -1)"
             @click="gotoDraw(BoardType.map, -1)"
           >
           >
             绘制方位图
             绘制方位图

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

@@ -108,12 +108,12 @@ function handlegotoEdit(record) {
     // record.type == 2 || record.type == 5
     // record.type == 2 || record.type == 5
     //   ? `/mega/index.html?m=${record.num}`
     //   ? `/mega/index.html?m=${record.num}`
     //   : `/epg.html?m=${record.num}`;
     //   : `/epg.html?m=${record.num}`;
-      windowOpen(url.replace("spg", "epg"));
+      windowOpen({url: url.replace("spg", "epg"),title: ui18n.t('sceneHome.edit')});
 }
 }
 function handleAdddyrh(record) {
 function handleAdddyrh(record) {
   
   
   let url = getUrlSrc({ type: 100 }, caseId.value)
   let url = getUrlSrc({ type: 100 }, caseId.value)
-  windowOpen(url);
+  windowOpen({url, title: ui18n.t('sceneHome.dyrh')});
 }
 }
 async function handlegotoelT(record) {
 async function handlegotoelT(record) {
   isEdit.value = true;
   isEdit.value = true;