修改bug

This commit is contained in:
yangjun 2025-08-21 13:53:28 +08:00
parent 2162ca076f
commit 83d417e1c6
12 changed files with 363 additions and 45 deletions

View File

@ -7,7 +7,7 @@
<div style="font-size: 12px;">SN<span style="font-weight: bold;">{{item.address}}</span></div>
<div style="font-size: 12px;">设备类型<a-tag color="red">电表</a-tag></div>
</a-col>
<a-col :span="6" style="text-align: center;padding-top: 4px;">
<a-col :span="6" style="display: flex; justify-content: flex-end;">
<div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.relayState=='1'?'在线':'离线'}}</div>
</a-col>
<a-col :span="24">
@ -156,18 +156,24 @@ const plainOptions = [
font-size:14px;
background: linear-gradient(to right, #1ea0fa, #017de9);
border-radius: 8px;
height: 35px;
height: 25px;
color: white;
line-height: 35px;
line-height: 25px;
text-align: center;
width:50px;
margin-top:11px;
}
.lxClass{
font-size:14px;
background: linear-gradient(to right, #cccccc, #cccccc);
border-radius: 8px;
height: 35px;
height: 25px;
color: white;
line-height: 35px;
line-height: 25px;
text-align: center;
width:50px;
margin-top:11px;
}
.tbClass{
background: #f6f6f6;

View File

@ -7,7 +7,7 @@
<div style="font-size: 12px;">SN<span style="font-weight: bold;">{{item.address}}</span></div>
<div style="font-size: 12px;">设备类型<a-tag color="blue">水表</a-tag></div>
</a-col>
<a-col :span="6" style="text-align: center;padding-top: 4px;">
<a-col :span="6" style="display: flex; justify-content: flex-end;">
<div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.relayState=='1'?'在线':'离线'}}</div>
</a-col>
<a-col :span="24">
@ -150,23 +150,28 @@ const plainOptions = [
<style lang="less" scoped>
.zxClass{
font-size:14px;
background: linear-gradient(to right, #1ea0fa, #017de9);
border-radius: 8px;
height: 35px;
height: 25px;
color: white;
line-height: 35px;
line-height: 25px;
text-align: center;
width:50px;
margin-top:11px;
}
.lxClass{
font-size:14px;
background: linear-gradient(to right, #cccccc, #cccccc);
border-radius: 8px;
height: 35px;
height: 25px;
color: white;
line-height: 35px;
line-height: 25px;
text-align: center;
width:50px;
margin-top:11px;
}
.tbClass{
background: #f6f6f6;

View File

@ -7,10 +7,10 @@
<div style="font-size: 12px;">SN<span style="font-weight: bold;">{{item.sn}}</span></div>
<div style="font-size: 12px;">设备类型<a-tag color="purple">摄像头</a-tag></div>
</a-col>
<a-col :span="6" style="text-align: center;padding-top: 4px;">
<a-col :span="6" style="display: flex; justify-content: flex-end;">
<div :class="item.deviceStatus=='1'?'zxClass':'lxClass'">{{item.deviceStatus =='1'?'在线':'离线'}}</div>
</a-col>
<a-col :span="24">
<a-col :span="24" >
<a-divider style="margin: 10px 0 0 0" />
</a-col>
</a-row>
@ -150,18 +150,24 @@ const plainOptions = [
font-size:14px;
background: linear-gradient(to right, #1ea0fa, #017de9);
border-radius: 8px;
height: 35px;
height: 25px;
color: white;
line-height: 35px;
line-height: 25px;
text-align: center;
width:50px;
margin-top:11px;
}
.lxClass{
font-size:14px;
background: linear-gradient(to right, #cccccc, #cccccc);
border-radius: 8px;
height: 35px;
height: 25px;
color: white;
line-height: 35px;
line-height: 25px;
text-align: center;
width:50px;
margin-top:11px;
}
.tbClass{
background: #f6f6f6;

View File

@ -7,8 +7,8 @@
<div style="font-size: 12px;">SN<span style="font-weight: bold;">{{item.sn}}</span></div>
<div style="font-size: 12px;">设备类型<a-tag color="green">温湿度计</a-tag></div>
</a-col>
<a-col :span="6" style="text-align: center;padding-top: 4px;">
<div :class="item.status=='1'?'zxClass':'lxClass'">{{item.status=='1'?'在线':'离线'}}</div>
<a-col :span="6" style="display: flex; justify-content: flex-end;">
<div :class="item.status=='0'?'zxClass':'lxClass'">{{item.status=='0'?'在线':'离线'}}</div>
</a-col>
<a-col :span="24">
<a-divider style="margin: 10px 0 0 0" />
@ -158,23 +158,28 @@ const plainOptions = [
<style lang="less" scoped>
.zxClass{
font-size:14px;
background: linear-gradient(to right, #1ea0fa, #017de9);
border-radius: 8px;
height: 35px;
height: 25px;
color: white;
line-height: 35px;
line-height: 25px;
text-align: center;
width:50px;
margin-top:11px;
}
.lxClass{
font-size:14px;
background: linear-gradient(to right, #cccccc, #cccccc);
border-radius: 8px;
height: 35px;
height: 25px;
color: white;
line-height: 35px;
line-height: 25px;
text-align: center;
width:50px;
margin-top:11px;
}
.tbClass{
background: #f6f6f6;

View File

@ -59,10 +59,10 @@
<span style="color: #909399;">加盟时间{{ item.franchiseTime?.substring(0, 10) }}</span>
</div>
<!-- <a-divider /> -->
<div style="text-align: center;margin-top: 12px;">
<a-button type="primary" @click="handlePrview(item)">预览</a-button>
<a-button type="primary" @click="handleOrgSelected(item)" style="margin-left:10px;">配置</a-button>
<a-button type="primary" @click="handleAddContent(item)" style="margin-left:10px;">日志</a-button>
<div style="text-align: left;margin: 12px 0;">
<a-button type="dashed" size="small" @click="handlePrview(item)">预览</a-button>
<a-button type="dashed" size="small" @click="handleOrgSelected(item)" style="margin-left:10px;">配置</a-button>
<a-button type="dashed" size="small" @click="handleAddContent(item)" style="margin-left:10px;">日志</a-button>
</div>
</a-card>
</div>
@ -111,7 +111,7 @@
<p>创建时间{{item.createTime}}</p>
<p>单元类型{{item.areaFlagText}}</p>
<div style="text-align: center;">
<a-button size="small" @click="handleSbgl(item)" >设备管理</a-button>
<a-button type="dashed" size="small" @click="handleSbgl(item)" >设备管理</a-button>
</div>
</div>

View File

@ -53,6 +53,36 @@ export const columns: BasicColumn[] = [
},
];
//列表数据
export const dbsbcolumns: BasicColumn[] = [
{
title: '设备号',
align: "center",
dataIndex: 'address'
},
{
title: '类型',
align: "center",
dataIndex: 'type_dictText'
},
{
title: '本次抄表时间',
align: "center",
dataIndex: 'requestTime'
},
{
title: '本次反馈状态',
align: "center",
dataIndex: 'resolveStatus'
},
{
title: '反馈描述',
align: "center",
dataIndex: 'resolveRemark',
defaultHidden: true
},
];
//列表数据
export const columns2: BasicColumn[] = [
{

View File

@ -0,0 +1,198 @@
<template>
<div class="p-2">
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="24">
<a-col :lg="6">
<a-form-item name="paramStatus">
<template #label><span title="反馈状态">本次反馈状态</span></template>
<a-select placeholder="请选择反馈状态" v-model:value="queryParam.paramStatus" all-clear>
<a-select-option value="">全部</a-select-option>
<a-select-option value="0">成功</a-select-option>
<a-select-option value="1">失败</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="paramsRequestTime">
<template #label><span title="抄表时间">本次抄表时间</span></template>
<a-date-picker placeholder="请选择日期" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD" v-model:value="queryParam.paramsRequestTime" style="width: 100%" />
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
<a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
</span>
</a-col>
</a-row>
</a-form>
</div>
<!--引用表格-->
<BasicTable @register="registerTable">
<!--插槽:table标题-->
<template #tableTitle>
</template>
<template v-slot:bodyCell="{ column, record, index, text }">
</template>
</BasicTable>
<!-- 表单区域 -->
<ApiRequestLogModal ref="registerModal" @success="handleSuccess"></ApiRequestLogModal>
</div>
</template>
<script lang="ts" name="ApiRequestLog-ApiRequestLog" setup>
import { ref, reactive } from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage';
import { dbsbcolumns, superQuerySchema } from './ApiRequestLog.data';
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './ApiRequestLog.api';
import { downloadFile } from '/@/utils/common/renderUtils';
import ApiRequestLogModal from './components/ApiRequestLogModal.vue'
import { useUserStore } from '/@/store/modules/user';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
const formRef = ref();
const queryParam = reactive<any>({});
const toggleSearchStatus = ref<boolean>(false);
const registerModal = ref();
const userStore = useUserStore();
//table
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: {
title: 'api请求日志',
api: list,
columns:dbsbcolumns,
canResize:false,
useSearchForm: false,
immediate: false,
showActionColumn: false,
actionColumn: {
width: 120,
fixed: 'right',
},
beforeFetch: async (params) => {
return Object.assign(params, queryParam);
},
},
});
const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
const labelCol = reactive({
xs:24,
sm:8,
xl:6,
xxl:8
});
const wrapperCol = reactive({
xs: 24,
sm: 16,
});
/**
* 新增事件
*/
function handleAdd() {
registerModal.value.disableSubmit = false;
registerModal.value.add();
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
registerModal.value.disableSubmit = false;
registerModal.value.edit(record);
}
/**
* 详情
*/
function handleDetail(record: Recordable) {
registerModal.value.disableSubmit = true;
registerModal.value.edit(record);
}
/**
* 删除事件
*/
async function handleDelete(record) {
await deleteOne({ id: record.id }, handleSuccess);
}
/**
* 批量删除事件
*/
async function batchHandleDelete() {
await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
}
/**
* 成功回调
*/
function handleSuccess() {
(selectedRowKeys.value = []) && reload();
}
/**
* 查询
*/
function searchQuery() {
console.log('searchQuery',queryParam);
reload();
}
/**
* 重置
*/
function searchReset() {
formRef.value.resetFields();
selectedRowKeys.value = [];
//
reload();
}
function init(record) {
console.log("🚀 ~ init ~ record:", record)
queryParam.cid = record.cid;
queryParam.type = record.type;
reload();
}
defineExpose({
init,
});
</script>
<style lang="less" scoped>
.jeecg-basic-table-form-container {
padding: 0;
.table-page-search-submitButtons {
display: block;
margin-bottom: 24px;
white-space: nowrap;
}
.query-group-cust{
min-width: 100px !important;
}
.query-group-split-cust{
width: 30px;
display: inline-block;
text-align: center
}
.ant-form-item:not(.ant-form-item-with-help){
margin-bottom: 16px;
height: 32px;
}
:deep(.ant-picker),:deep(.ant-input-number){
width: 100%;
}
}
</style>

View File

@ -8,10 +8,10 @@
<ApiRequestLogList ref="ApiRequestLogListModal9"></ApiRequestLogList>
</a-tab-pane>
<a-tab-pane key="10" tab="电表拉闸" force-render>
<ApiRequestLogList ref="ApiRequestLogListModal10"></ApiRequestLogList>
<ApiRequestLogList2 ref="ApiRequestLogListModal10"></ApiRequestLogList2>
</a-tab-pane>
<a-tab-pane key="11" tab="电表合闸" force-render>
<ApiRequestLogList ref="ApiRequestLogListModal11"></ApiRequestLogList>
<ApiRequestLogList2 ref="ApiRequestLogListModal11"></ApiRequestLogList2>
</a-tab-pane>
</a-tabs>
</div>
@ -21,6 +21,7 @@
import { ref, reactive } from 'vue';
import ApiRequestLogList from '/@/views/iot/tq/ApiRequestLog/ApiRequestLogList.vue';
import ApiRequestLogList2 from '/@/views/iot/tq/ApiRequestLog/ApiRequestLogList2.vue';
const activeKey= ref('3');
const dbsbInfo = ref<any>({});

View File

@ -8,10 +8,10 @@
<ApiRequestLogList ref="ApiRequestLogListModal49"></ApiRequestLogList>
</a-tab-pane>
<a-tab-pane key="43" tab="开阀" force-render>
<ApiRequestLogList ref="ApiRequestLogListModal43"></ApiRequestLogList>
<ApiRequestLogList2 ref="ApiRequestLogListModal43"></ApiRequestLogList2>
</a-tab-pane>
<a-tab-pane key="53" tab="关阀" force-render>
<ApiRequestLogList ref="ApiRequestLogListModal53"></ApiRequestLogList>
<ApiRequestLogList2 ref="ApiRequestLogListModal53"></ApiRequestLogList2>
</a-tab-pane>
</a-tabs>
</div>
@ -21,6 +21,7 @@
import { ref, reactive } from 'vue';
import ApiRequestLogList from '/@/views/iot/tq/ApiRequestLog/ApiRequestLogList.vue';
import ApiRequestLogList2 from '/@/views/iot/tq/ApiRequestLog/ApiRequestLogList2.vue';
const activeKey= ref('42');
const dbsbInfo = ref<any>({});

View File

@ -35,7 +35,7 @@
<span v-else-if="record.csq < 10" style="color:red">
</span>
<span v-else style="color:yellow">
<span v-else style="color:#1661c1">
</span>
</template>

View File

@ -46,7 +46,7 @@
<span v-else-if="record.csq < 10" style="color:red">
</span>
<span v-else style="color:yellow">
<span v-else style="color:#1661c1">
</span>
</template>

View File

@ -150,7 +150,10 @@ export const formSchema: FormSchema[] = [
field: 'deviceName',
component: 'Input',
required: true,
labelWidth: '160px'
labelWidth: '160px',
componentProps: {
maxlength: 20
}
},
{
label: '时区',
@ -181,7 +184,14 @@ export const formSchema: FormSchema[] = [
return values.isUpdate;
},
required: true,
labelWidth: '160px'
labelWidth: '160px',
componentProps: {
maxlength: 2,
min: 0, // 最小值设为1正整数
precision: 0, // 不允许小数
controls: true, // 显示增减按钮(可选)
controlsPosition: 'right' // 增减按钮位置(可选)
}
},
{
label: '上报间隔(分钟)',
@ -192,7 +202,14 @@ export const formSchema: FormSchema[] = [
return values.isUpdate;
},
required: true,
labelWidth: '160px'
labelWidth: '160px',
componentProps: {
maxlength: 2,
min: 0, // 最小值设为1正整数
precision: 0, // 不允许小数
controls: true, // 显示增减按钮(可选)
controlsPosition: 'right' // 增减按钮位置(可选)
}
},
{
label: '历史上报时刻(00:00)',
@ -218,7 +235,14 @@ export const formSchema: FormSchema[] = [
return values.isUpdate;
},
required: true,
labelWidth: '160px'
labelWidth: '160px',
componentProps: {
maxlength: 2,
min: 0, // 最小值设为1正整数
precision: 0, // 不允许小数
controls: true, // 显示增减按钮(可选)
controlsPosition: 'right' // 增减按钮位置(可选)
}
},
{
label: '温度预警-上限',
@ -229,7 +253,14 @@ export const formSchema: FormSchema[] = [
return values.isUpdate;
},
required: true,
labelWidth: '160px'
labelWidth: '160px',
componentProps: {
maxlength: 2,
min: 0, // 最小值设为1正整数
precision: 0, // 不允许小数
controls: true, // 显示增减按钮(可选)
controlsPosition: 'right' // 增减按钮位置(可选)
}
},
{
label: '温度预警-下限',
@ -240,7 +271,14 @@ export const formSchema: FormSchema[] = [
return values.isUpdate;
},
required: true,
labelWidth: '160px'
labelWidth: '160px',
componentProps: {
maxlength: 2,
min: 0, // 最小值设为1正整数
precision: 0, // 不允许小数
controls: true, // 显示增减按钮(可选)
controlsPosition: 'right' // 增减按钮位置(可选)
}
},
{
label: '温度缓冲值',
@ -251,7 +289,14 @@ export const formSchema: FormSchema[] = [
return values.isUpdate;
},
required: true,
labelWidth: '160px'
labelWidth: '160px',
componentProps: {
maxlength: 3,
min: 0, // 最小值设为1正整数
precision: 2, // 不允许小数
controls: true, // 显示增减按钮(可选)
controlsPosition: 'right' // 增减按钮位置(可选)
}
},
{
label: '湿度预警-上限',
@ -262,7 +307,14 @@ export const formSchema: FormSchema[] = [
return values.isUpdate;
},
required: true,
labelWidth: '160px'
labelWidth: '160px',
componentProps: {
maxlength: 2,
min: 0, // 最小值设为1正整数
precision: 0, // 不允许小数
controls: true, // 显示增减按钮(可选)
controlsPosition: 'right' // 增减按钮位置(可选)
}
},
{
label: '湿度预警-下限',
@ -273,7 +325,14 @@ export const formSchema: FormSchema[] = [
return values.isUpdate;
},
required: true,
labelWidth: '160px'
labelWidth: '160px',
componentProps: {
maxlength: 2,
min: 0, // 最小值设为1正整数
precision: 0, // 不允许小数
controls: true, // 显示增减按钮(可选)
controlsPosition: 'right' // 增减按钮位置(可选)
}
},
{
label: '湿度缓冲值',
@ -284,7 +343,14 @@ export const formSchema: FormSchema[] = [
return values.isUpdate;
},
required: true,
labelWidth: '160px'
labelWidth: '160px',
componentProps: {
maxlength: 3,
min: 0, // 最小值设为1正整数
precision: 2, // 不允许小数
controls: true, // 显示增减按钮(可选)
controlsPosition: 'right' // 增减按钮位置(可选)
}
},
{
label: '断电报警开关',