yangjun
/
hldy_yunwei_vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2025-08-19 13:37:00 +08:00
parent 86575e6b29
commit 68de775664
3 changed files with 80 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/Modal/src/index.less
View File

@ -73,16 +73,22 @@
.ant-modal-header {
padding: 16px;
background: #f2f8ff !important;
border-bottom: 0px;
border-radius: 10px;
}
.ant-modal-content {
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
background: #f2f8ff !important;
border-radius: 10px;
}
.ant-modal-footer {
button + button {
margin-left: 10px;
}
border-top: 0px;
}
.ant-modal-close {

50
src/views/iot/tq/electricity/index.vue
View File

@ -48,6 +48,18 @@
<HldyUtilsModal ref="hldyUtilsModal" @success="handleHldyParams" ></HldyUtilsModal>
<ApiLogModal ref="apiLogModal"></ApiLogModal>
<!-- <ElectricitySyncLogListModal ref="syncLogModal"></ElectricitySyncLogListModal>-->
<a-modal v-model:visible="tipVisible" width="300px">
<template #title>
<Icon icon="ant-design:info-circle-outlined" :size="20" style="margin-right:10px;color:white;background:#1ea0fa;border-radius:10px;"/>{{tipTitle}}
</template>
<div style="text-align: center;margin: 40px 0;">
{{tipContent}}
</div>
<template #footer style="text-align: center;">
<a-button type="primary" style="margin-right: 35%" @click="handleCancel">知道了</a-button>
</template>
</a-modal>
</div>
</template>
@ -70,6 +82,9 @@ import { defHttp } from '/@/utils/http/axios';
const apiLogModal = ref();
// const syncLogModal = ref();
const hldyUtilsModal = ref();
const tipVisible = ref(false);
const tipTitle = ref('提示');
const tipContent = ref('');
//注册model
const [registerModal, {openModal}] = useModal();
//注册table数据
@ -102,6 +117,9 @@ import { defHttp } from '/@/utils/http/axios';
const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
function handleCancel() {
tipVisible.value = false;
}
/**
* 成功回调
*/
@ -174,13 +192,9 @@ import { defHttp } from '/@/utils/http/axios';
// 电表拉闸
async function handleControlLz(record: Recordable) {
if(record.relayState == '0'){
Modal.info({
title: '拉闸',
content: h('div', {}, [
h('p', '此电表已拉闸！'),
]),
onOk() {},
});
tipVisible.value=true;
tipTitle.value = "拉闸";
tipContent.value = "此电表已拉闸！";
return;
}
const params = {
@ -195,13 +209,21 @@ import { defHttp } from '/@/utils/http/axios';
// 电表合闸
async function handleControlHz(record: Recordable) {
if(record.relayState == '1'){
Modal.info({
title: '合闸',
content: h('div', {}, [
h('p', '此电表已合闸！'),
]),
onOk() {},
});
// Modal.info({
// title: '合闸',
// content: h('div', {}, [
// h('p', '此电表已合闸！'),
// ]),
// onOk() {},
// style: {
// borderRadius: '5px',
// },
// });
tipVisible.value=true;
tipTitle.value = "合闸";
tipContent.value = "此电表已合闸！";
return;
}
const params = {

52
src/views/iot/tq/water/index.vue
View File

@ -59,6 +59,18 @@
<HldyUtilsModal ref="hldyUtilsModal" @success="handleHldyParams" ></HldyUtilsModal>
<ApiLogModal ref="apiLogModal"></ApiLogModal>
<SyncLogListModal ref="syncLogModal"></SyncLogListModal>
<a-modal v-model:visible="tipVisible" width="300px">
<template #title>
<Icon icon="ant-design:info-circle-outlined" :size="20" style="margin-right:10px;color:white;background:#1ea0fa;border-radius:10px;"/>{{tipTitle}}
</template>
<div style="text-align: center;margin: 40px 0;">
{{tipContent}}
</div>
<template #footer style="text-align: center;">
<a-button type="primary" style="margin-right: 35%" @click="handleCancel">知道了</a-button>
</template>
</a-modal>
</div>
</template>
@ -80,6 +92,9 @@
const apiLogModal = ref();
const syncLogModal = ref();
const hldyUtilsModal = ref();
const tipVisible = ref(false);
const tipTitle = ref('提示');
const tipContent = ref('');
//注册model
const [registerModal, {openModal}] = useModal();
//注册table数据
@ -112,6 +127,9 @@
const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
function handleCancel() {
tipVisible.value = false;
}
/**
* 成功回调
*/
@ -168,13 +186,16 @@
// 水表关阀
async function handleWaterControlGf(record: Recordable) {
if(record.relayState == '0'){
Modal.info({
title: '关阀',
content: h('div', {}, [
h('p', '此水表已关阀！'),
]),
onOk() {},
});
tipVisible.value=true;
tipTitle.value = "关阀";
tipContent.value = "此水表已关阀！";
// Modal.info({
// title: '关阀',
// content: h('div', {}, [
// h('p', '此水表已关阀！'),
// ]),
// onOk() {},
// });
return;
}
const params = {
@ -189,13 +210,16 @@
// 水表开阀
async function handleWaterControlKf(record: Recordable) {
if(record.relayState == '1'){
Modal.info({
title: '开阀',
content: h('div', {}, [
h('p', '此水表已开阀！'),
]),
onOk() {},
});
tipVisible.value=true;
tipTitle.value = "开阀";
tipContent.value = "此水表已开阀！";
// Modal.info({
// title: '开阀',
// content: h('div', {}, [
// h('p', '此水表已开阀！'),
// ]),
// onOk() {},
// });
return;
}
const params = {