diff --git a/components.d.ts b/components.d.ts index b6c6be2..1af1c7a 100644 --- a/components.d.ts +++ b/components.d.ts @@ -22,7 +22,6 @@ declare module '@vue/runtime-core' { ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem'] ElDialog: typeof import('element-plus/es')['ElDialog'] ElDivider: typeof import('element-plus/es')['ElDivider'] - ElDrawer: typeof import('element-plus/es')['ElDrawer'] ElDropdown: typeof import('element-plus/es')['ElDropdown'] ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem'] ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu'] diff --git a/index.html b/index.html index 028a323..31c02e6 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ - 电压暂降监测平台 + 无锡电能质量演示平台
diff --git a/src/views/SagTraceResult_WX/components/manage/index.vue b/src/views/SagTraceResult_WX/components/manage/index.vue index cd2f9a6..0b4a283 100644 --- a/src/views/SagTraceResult_WX/components/manage/index.vue +++ b/src/views/SagTraceResult_WX/components/manage/index.vue @@ -10,7 +10,8 @@ maxlength="32" placeholder="请输入项目名称" show-word-limit - style="width: 300px; margin-left: 10px" + clearable + style="width: 240px; margin-left: 10px" size="small" /> @@ -35,6 +36,8 @@ margin-top: 10px; height: 660px; " + v-loading="loading" + :element-loading-background="'rgba(122, 122, 122, 0.8)'" > { }; const fetachData = async () => { + loading.value = true; const res = await projectList({ pageNum: params.pageNum, pageSize: params.pageSize, @@ -307,7 +312,7 @@ const fetachData = async () => { // projectData.splice(0, projectData.length, ...res.records); projectData.value = res.data.records; params.total = res.data.total; - + loading.value = false; if (res.data.records.length > 0) { firstForm.value.id = res.data.records[0].id; firstForm.value.name = res.data.records[0].name; @@ -421,14 +426,14 @@ const onTableCurrentChange = (page: number) => { // 设计 const Aclick = (e: any) => { - // window.open("http://192.168.1.179:4001" + `/zutai/?id=${e.id}&&name=decodeURI(${e.name})&&flag=false`) + // window.open( window.location.origin + `/zutai/?id=${e.id}&&name=decodeURI(${e.name})&&flag=false`) // window.open( // window.location.origin + // `/zutai/?id=${e.id}&&name=${e.name}&&preview=false&&graphicDisplay=true` // ); // 无锡项目进去不展示数据绑定图元 window.open( - "http://192.168.1.179:4001" + + window.location.origin + `/zutai/?id=${e.id}&&name=${e.name}&&preview=false&&graphicDisplay=wx` ); }; @@ -470,7 +475,7 @@ const imgData = (e: any) => { // `/zutai/?id=${e.id}&&name=${e.name}&&preview=true#/preview` // ); window.open( - "http://192.168.1.179:4001" + + window.location.origin + `/zutai/?id=${e.id}&&name=${e.name}&&preview=true&&graphicDisplay=wx#/preview` ); }; diff --git a/src/views/SagTraceResult_WX/components/plan.vue b/src/views/SagTraceResult_WX/components/plan.vue index 33888bc..92f55f4 100644 --- a/src/views/SagTraceResult_WX/components/plan.vue +++ b/src/views/SagTraceResult_WX/components/plan.vue @@ -36,7 +36,7 @@ watch( if (newVal && newVal.id && newVal.name) { // window.location.origin iframeSrc.value = - "http://192.168.1.179:4001" + + window.location.origin + `/zutai/?id=${newVal.id}&&name=${encodeURIComponent( newVal.name )}&&preview=true&&display=true&&graphicDisplay=wx#/preview`; @@ -55,7 +55,7 @@ onMounted(() => { if (res.code == "A0000") { // window.location.origin iframeSrc.value = - "http://192.168.1.179:4001" + + window.location.origin + `/zutai/?id=${res.data.id}&&name=${encodeURIComponent( res.data.name )}&&preview=true&&display=true&&graphicDisplay=wx#/preview`; diff --git a/src/views/VoltageSag_BJ/components/bottomText.vue b/src/views/VoltageSag_BJ/components/bottomText.vue index 61ad67a..872c446 100644 --- a/src/views/VoltageSag_BJ/components/bottomText.vue +++ b/src/views/VoltageSag_BJ/components/bottomText.vue @@ -5,48 +5,38 @@
- + > --> + + + + +
- 确认 - 一键确认 + 确认 + 一键确认
-
+
- -
+ +
{{ item.timeid }}.{{ item.ms }}

{{ item.bdname }} {{ item.pointname }}发生{{ @@ -56,31 +46,19 @@ }}%,持续时间：{{ item.persisttime }}s;

- - 影响范围： {{ item.objName }} + + 影响范围： {{ + item.objName + }}

- + + - +