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

Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue

This commit is contained in:
wangweidong 2025-10-27 15:17:09 +08:00
parent 2b08a1853a 7ac2f76ae8
commit 581c080f11
6 changed files with 912 additions and 747 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue
View File

@ -6,6 +6,45 @@
:wrapper-col="wrapperCol"> :wrapper-col="wrapperCol">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :lg="5"> <a-col :lg="5">
<a-form-item name="keyWord">
<template #label><span title="物料信息">物料信息</span></template>
<j-input placeholder="请输入物料名称/拼音/编码" v-model:value="queryParam.keyWord" allow-clear
:type="'default'"></j-input>
</a-form-item>
</a-col>
<a-col :lg="5">
<a-form-item name="categoryId">
<template #label><span title="一级分类">一级分类</span></template>
<j-dict-select-tag v-model:value="queryParam.categoryId"
:dictCode="`nu_config_material_category,category_name,id,del_flag = 0 and iz_enabled = 0 order by sort asc`"
placeholder="请选择一级分类" allowClear :ignoreDisabled="true"
@select="handleSearch({ 'levle': 1, 'key': queryParam.categoryId }, false)" />
<!-- <span v-else>请选择源平台</span> -->
</a-form-item>
</a-col>
<a-col :lg="5">
<a-form-item name="typeId">
<template #label><span title="二级分类">二级分类</span></template>
<j-dict-select-tag type="list" v-model:value="queryParam.typeId"
:dictCode="`nu_config_material_type,type_name,id,del_flag = 0 and iz_enabled = 0 and category_id = '${queryParam.categoryId || ''}' `"
placeholder="请选择二级分类" allowClear :ignoreDisabled="true"
@select="handleSearch({ 'levle': 2, 'categoryId': queryParam.categoryId, 'key': queryParam.typeId }, false)" />
</a-form-item>
</a-col>
<a-col :lg="5">
<a-form-item name="medicationId">
<template #label><span title="三级分类">三级分类</span></template>
<j-dict-select-tag type="list" v-model:value="queryParam.medicationId"
:dictCode="`nu_config_material_medication,medication_name,id,del_flag = 0 and iz_enabled = 0 and category_id = '${queryParam.categoryId || ''}' and type_id = '${queryParam.typeId || ''}' `"
placeholder="请选择三级分类" allowClear :ignoreDisabled="true"
@select="handleSearch({ 'levle': 3, 'categoryId': queryParam.categoryId, 'typeId': queryParam.typeId, 'key': queryParam.medicationId }, false)" />
</a-form-item>
</a-col>
<!-- <a-col :lg="5">
<a-form-item name="materialName"> <a-form-item name="materialName">
<template #label><span title="物料名称">物料名称</span></template> <template #label><span title="物料名称">物料名称</span></template>
<j-input placeholder="请输入物料名称" v-model:value="queryParam.materialName" allow-clear></j-input> <j-input placeholder="请输入物料名称" v-model:value="queryParam.materialName" allow-clear></j-input>
@ -22,8 +61,8 @@
<template #label><span title="拼音检索">拼音检索</span></template> <template #label><span title="拼音检索">拼音检索</span></template>
<j-input placeholder="请输入拼音" v-model:value="queryParam.pinyin" allow-clear></j-input> <j-input placeholder="请输入拼音" v-model:value="queryParam.pinyin" allow-clear></j-input>
</a-form-item> </a-form-item>
</a-col> </a-col> -->
<a-col :lg="5"> <a-col :lg="4">
<a-form-item name="izEnabled"> <a-form-item name="izEnabled">
<template #label><span title="是否启用">是否启用</span></template> <template #label><span title="是否启用">是否启用</span></template>
<j-dict-select-tag type='list' placeholder="请选择是否启用" v-model:value="queryParam.izEnabled" <j-dict-select-tag type='list' placeholder="请选择是否启用" v-model:value="queryParam.izEnabled"
@ -62,7 +101,9 @@
<a-menu style="width: 100%;" mode="inline"> <a-menu style="width: 100%;" mode="inline">
<template v-for="item in treeData"> <template v-for="item in treeData">
<!-- 第一层判断是否有下级 --> <!-- 第一层判断是否有下级 -->
<a-sub-menu v-if="item.children && item.children.length > 0" :key="item.key" @titleClick="handleSearch(item)" @mouseenter="item.showContent = true" @mouseleave="item.showContent = false"> <a-sub-menu v-if="item.children && item.children.length > 0" :key="item.key"
@titleClick="handleSearch(item)" @mouseenter="item.showContent = true"
@mouseleave="item.showContent = false">
<template #icon> <template #icon>
<Icon :icon="item.icon" :size="20" v-if="item.icon" /> <Icon :icon="item.icon" :size="20" v-if="item.icon" />
<Icon icon="ant-design:appstore-add-outlined" :size="20" v-else /> <Icon icon="ant-design:appstore-add-outlined" :size="20" v-else />
@ -74,7 +115,9 @@
<!-- 下拉菜单 --> <!-- 下拉菜单 -->
<a-dropdown> <a-dropdown>
<template #overlay> <template #overlay>
<ConfigMaterialInfoListMenu :data="item" @handleAddbj="handleAddbj" @handleAddxj="handleAddxj" @handleAdd="handleAdd" @handleFenleiEdit="handleFenleiEdit" @handleQyty="handleQyty" @handleQianyi="handleQianyi" /> <ConfigMaterialInfoListMenu :data="item" @handleAddbj="handleAddbj" @handleAddxj="handleAddxj"
@handleAdd="handleAdd" @handleFenleiEdit="handleFenleiEdit" @handleQyty="handleQyty"
@handleQianyi="handleQianyi" />
</template> </template>
<!-- 图标 --> <!-- 图标 -->
<a class="ant-dropdown-link" style="color:#1890FF;" @click.prevent> <a class="ant-dropdown-link" style="color:#1890FF;" @click.prevent>
@ -86,7 +129,9 @@
</template> </template>
<!-- 第二级 --> <!-- 第二级 -->
<template v-for="child in item.children"> <template v-for="child in item.children">
<a-sub-menu :key="child.key" v-if="child.children && child.children.length > 0" @titleClick="handleSearch(child)" @mouseenter="child.showContent = true" @mouseleave="child.showContent = false" > <a-sub-menu :key="child.key" v-if="child.children && child.children.length > 0"
@titleClick="handleSearch(child)" @mouseenter="child.showContent = true"
@mouseleave="child.showContent = false">
<template #icon> <template #icon>
<Icon :icon="child.icon" :size="20" v-if="child.icon" /> <Icon :icon="child.icon" :size="20" v-if="child.icon" />
<Icon icon="ant-design:appstore-add-outlined" :size="20" v-else /> <Icon icon="ant-design:appstore-add-outlined" :size="20" v-else />
@ -98,7 +143,9 @@
<!-- 下拉菜单 --> <!-- 下拉菜单 -->
<a-dropdown> <a-dropdown>
<template #overlay> <template #overlay>
<ConfigMaterialInfoListMenu :data="child" @handleAddbj="handleAddbj" @handleAddxj="handleAddxj" @handleAdd="handleAdd" @handleFenleiEdit="handleFenleiEdit" @handleQyty="handleQyty" @handleQianyi="handleQianyi" /> <ConfigMaterialInfoListMenu :data="child" @handleAddbj="handleAddbj"
@handleAddxj="handleAddxj" @handleAdd="handleAdd" @handleFenleiEdit="handleFenleiEdit"
@handleQyty="handleQyty" @handleQianyi="handleQianyi" />
</template> </template>
<!-- 图标 --> <!-- 图标 -->
<a class="ant-dropdown-link" style="color:#1890FF;" @click.prevent> <a class="ant-dropdown-link" style="color:#1890FF;" @click.prevent>
@ -109,7 +156,9 @@
</span> </span>
</template> </template>
<!-- 第三层 --> <!-- 第三层 -->
<a-menu-item :key="childThree.key" v-for="childThree in child.children" @click="handleSearch(childThree)" @mouseenter="childThree.showContent = true" @mouseleave="childThree.showContent = false"> <a-menu-item :key="childThree.key" v-for="childThree in child.children"
@click="handleSearch(childThree)" @mouseenter="childThree.showContent = true"
@mouseleave="childThree.showContent = false">
<template #icon> <template #icon>
<Icon :icon="childThree.icon" :size="20" v-if="childThree.icon" /> <Icon :icon="childThree.icon" :size="20" v-if="childThree.icon" />
<Icon icon="ant-design:appstore-add-outlined" :size="20" v-else /> <Icon icon="ant-design:appstore-add-outlined" :size="20" v-else />
@ -119,7 +168,9 @@
<span v-show="childThree.showContent"> <span v-show="childThree.showContent">
<a-dropdown> <a-dropdown>
<template #overlay> <template #overlay>
<ConfigMaterialInfoListMenu :data="childThree" @handleAddbj="handleAddbj" @handleAddxj="handleAddxj" @handleAdd="handleAdd" @handleFenleiEdit="handleFenleiEdit" @handleQyty="handleQyty" @handleQianyi="handleQianyi" /> <ConfigMaterialInfoListMenu :data="childThree" @handleAddbj="handleAddbj"
@handleAddxj="handleAddxj" @handleAdd="handleAdd" @handleFenleiEdit="handleFenleiEdit"
@handleQyty="handleQyty" @handleQianyi="handleQianyi" />
</template> </template>
<a class="ant-dropdown-link" style="color:#1890FF;" @click.prevent> <a class="ant-dropdown-link" style="color:#1890FF;" @click.prevent>
<Icon icon="ant-design:setting-outlined" /> <Icon icon="ant-design:setting-outlined" />
@ -129,7 +180,9 @@
</span> </span>
</a-menu-item> </a-menu-item>
</a-sub-menu> </a-sub-menu>
<a-menu-item :key="child.key" v-if="!child.children || child.children.length < 1" @click="handleSearch(child)" @mouseenter="child.showContent = true" @mouseleave="child.showContent = false"> <a-menu-item :key="child.key" v-if="!child.children || child.children.length < 1"
@click="handleSearch(child)" @mouseenter="child.showContent = true"
@mouseleave="child.showContent = false">
<template #icon> <template #icon>
<Icon :icon="child.icon" :size="20" v-if="child.icon" /> <Icon :icon="child.icon" :size="20" v-if="child.icon" />
<Icon icon="ant-design:appstore-add-outlined" :size="20" v-else /> <Icon icon="ant-design:appstore-add-outlined" :size="20" v-else />
@ -140,7 +193,9 @@
<!-- 下拉菜单 --> <!-- 下拉菜单 -->
<a-dropdown> <a-dropdown>
<template #overlay> <template #overlay>
<ConfigMaterialInfoListMenu :data="child" @handleAddbj="handleAddbj" @handleAddxj="handleAddxj" @handleAdd="handleAdd" @handleFenleiEdit="handleFenleiEdit" @handleQyty="handleQyty" @handleQianyi="handleQianyi" /> <ConfigMaterialInfoListMenu :data="child" @handleAddbj="handleAddbj"
@handleAddxj="handleAddxj" @handleAdd="handleAdd" @handleFenleiEdit="handleFenleiEdit"
@handleQyty="handleQyty" @handleQianyi="handleQianyi" />
</template> </template>
<!-- 图标 --> <!-- 图标 -->
<a class="ant-dropdown-link" style="color:#1890FF;" @click.prevent> <a class="ant-dropdown-link" style="color:#1890FF;" @click.prevent>
@ -152,7 +207,8 @@
</a-menu-item> </a-menu-item>
</template> </template>
</a-sub-menu> </a-sub-menu>
<a-menu-item :key="item.key" v-if="!item.children || item.children.length < 1" @click="handleSearch(item)" @mouseenter="item.showContent = true" @mouseleave="item.showContent = false"> <a-menu-item :key="item.key" v-if="!item.children || item.children.length < 1" @click="handleSearch(item)"
@mouseenter="item.showContent = true" @mouseleave="item.showContent = false">
<template #icon> <template #icon>
<Icon :icon="item.icon" :size="20" v-if="item.icon" /> <Icon :icon="item.icon" :size="20" v-if="item.icon" />
<Icon icon="ant-design:appstore-add-outlined" :size="20" v-else /> <Icon icon="ant-design:appstore-add-outlined" :size="20" v-else />
@ -163,7 +219,9 @@
<!-- 下拉菜单 --> <!-- 下拉菜单 -->
<a-dropdown> <a-dropdown>
<template #overlay> <template #overlay>
<ConfigMaterialInfoListMenu :data="item" @handleAddbj="handleAddbj" @handleAddxj="handleAddxj" @handleAdd="handleAdd" @handleFenleiEdit="handleFenleiEdit" @handleQyty="handleQyty" @handleQianyi="handleQianyi" /> <ConfigMaterialInfoListMenu :data="item" @handleAddbj="handleAddbj" @handleAddxj="handleAddxj"
@handleAdd="handleAdd" @handleFenleiEdit="handleFenleiEdit" @handleQyty="handleQyty"
@handleQianyi="handleQianyi" />
</template> </template>
<!-- 图标 --> <!-- 图标 -->
<a class="ant-dropdown-link" style="color:#1890FF;" @click.prevent> <a class="ant-dropdown-link" style="color:#1890FF;" @click.prevent>
@ -548,7 +606,7 @@ function handleWlQyty(record) {
} }
//点击树节点查询右侧列表数据 //点击树节点查询右侧列表数据
function handleSearch(data) { function handleSearch(data, izReload = true) {
console.log("🚀 ~ handleSearch ~ data:", data) console.log("🚀 ~ handleSearch ~ data:", data)
var levle = parseInt(data.levle) var levle = parseInt(data.levle)
if (levle == 1) { if (levle == 1) {
@ -564,8 +622,10 @@ function handleSearch(data) {
queryParam.typeId = data.typeId queryParam.typeId = data.typeId
queryParam.medicationId = data.key queryParam.medicationId = data.key
} }
if (izReload) {
reload(); reload();
} }
}
//添加本级（只添加一级分类） //添加本级（只添加一级分类）
function handleAddbj(data) { function handleAddbj(data) {
var params = {} var params = {}

80
src/views/invoicing/warehouseMaterialInfo/BlWarehouseMaterialInfoList.vue
View File

@ -2,25 +2,60 @@
<div class="p-2"> <div class="p-2">
<!--查询区域--> <!--查询区域-->
<div class="jeecg-basic-table-form-container"> <div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol"> <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol"
:wrapper-col="wrapperCol">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :lg="6" hidden> <a-col :lg="6" hidden>
<a-form-item name="nuId"> <a-form-item name="nuId">
<template #label><span title="库房">库房</span></template> <template #label><span title="库房">库房</span></template>
<j-dict-select-tag type='list' placeholder="请选择库房" v-model:value="queryParam.nuId" dictCode="nu_base_info,nu_name,nu_id,area_flag = '3'" allow-clear /> <j-dict-select-tag type='list' placeholder="请选择库房" v-model:value="queryParam.nuId"
dictCode="nu_base_info,nu_name,nu_id,area_flag = '3'" allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="6"> <a-col :lg="5">
<a-form-item name="wlParamInfo"> <a-form-item name="wlParamInfo">
<template #label><span title="物料信息">物料信息</span></template> <template #label><span title="物料信息">物料信息</span></template>
<a-input placeholder="请填写物料信息" v-model:value="queryParam.wlParamInfo" allow-clear></a-input> <a-input placeholder="请填写物料信息" v-model:value="queryParam.wlParamInfo" allow-clear></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-col :lg="5">
<a-form-item name="categoryId">
<template #label><span title="一级分类">一级分类</span></template>
<j-dict-select-tag v-model:value="queryParam.categoryId"
:dictCode="`nu_config_material_category,category_name,id,del_flag = 0 and iz_enabled = 0 order by sort asc`"
placeholder="请选择一级分类" allowClear :ignoreDisabled="true"
@select="handleSearch({ 'levle': 1, 'key': queryParam.categoryId }, false)" />
<!-- <span v-else>请选择源平台</span> -->
</a-form-item>
</a-col>
<a-col :lg="5">
<a-form-item name="typeId">
<template #label><span title="二级分类">二级分类</span></template>
<j-dict-select-tag type="list" v-model:value="queryParam.typeId"
:dictCode="`nu_config_material_type,type_name,id,del_flag = 0 and iz_enabled = 0 and category_id = '${queryParam.categoryId || ''}' `"
placeholder="请选择二级分类" allowClear :ignoreDisabled="true"
@select="handleSearch({ 'levle': 2, 'categoryId': queryParam.categoryId, 'key': queryParam.typeId }, false)" />
</a-form-item>
</a-col>
<a-col :lg="5">
<a-form-item name="medicationId">
<template #label><span title="三级分类">三级分类</span></template>
<j-dict-select-tag type="list" v-model:value="queryParam.medicationId"
:dictCode="`nu_config_material_medication,medication_name,id,del_flag = 0 and iz_enabled = 0 and category_id = '${queryParam.categoryId || ''}' and type_id = '${queryParam.typeId || ''}' `"
placeholder="请选择三级分类" allowClear :ignoreDisabled="true"
@select="handleSearch({ 'levle': 3, 'categoryId': queryParam.categoryId, 'typeId': queryParam.typeId, 'key': queryParam.medicationId }, false)" />
</a-form-item>
</a-col>
<a-col :xl="2" :lg="7" :md="8" :sm="24">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons"> <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="6"> <a-col :lg="6">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button> <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> <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset"
style="margin-left: 8px">重置</a-button>
</a-col> </a-col>
</span> </span>
</a-col> </a-col>
@ -31,7 +66,8 @@
<BasicTable @register="registerTable"> <BasicTable @register="registerTable">
<!--插槽:table标题--> <!--插槽:table标题-->
<template #tableTitle> <template #tableTitle>
<a-button type="primary" v-auth="'warehouseMaterialInfo:bl_warehouse_material_info:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 选择物料</a-button> <a-button type="primary" v-auth="'warehouseMaterialInfo:bl_warehouse_material_info:add'" @click="handleAdd"
preIcon="ant-design:plus-outlined"> 选择物料</a-button>
</template> </template>
<!--操作栏--> <!--操作栏-->
<template #action="{ record }"> <template #action="{ record }">
@ -45,7 +81,8 @@
<!-- 选择物料 --> <!-- 选择物料 -->
<CheckWuliaoModal ref="registerAddModal" @success="handleSuccess"></CheckWuliaoModal> <CheckWuliaoModal ref="registerAddModal" @success="handleSuccess"></CheckWuliaoModal>
<!-- 出入库详情 --> <!-- 出入库详情 -->
<NuWarehouseMaterialCrkInfoListModal ref="registerCrkModal" @success="handleSuccess"></NuWarehouseMaterialCrkInfoListModal> <NuWarehouseMaterialCrkInfoListModal ref="registerCrkModal" @success="handleSuccess">
</NuWarehouseMaterialCrkInfoListModal>
</div> </div>
</template> </template>
@ -237,6 +274,27 @@ import { defHttp } from '/@/utils/http/axios';
reload(); reload();
} }
function handleSearch(data, izReload = true) {
console.log("🚀 ~ handleSearch ~ data:", data)
var levle = parseInt(data.levle)
if (levle == 1) {
queryParam.categoryId = data.key
queryParam.typeId = ''
queryParam.medicationId = ''
} else if (levle == 2) {
queryParam.categoryId = data.categoryId
queryParam.typeId = data.key
queryParam.medicationId = ''
} else if (levle == 3) {
queryParam.categoryId = data.categoryId
queryParam.typeId = data.typeId
queryParam.medicationId = data.key
}
if (izReload) {
reload();
}
}
defineExpose({ defineExpose({
init, init,
}); });
@ -246,24 +304,30 @@ import { defHttp } from '/@/utils/http/axios';
<style lang="less" scoped> <style lang="less" scoped>
.jeecg-basic-table-form-container { .jeecg-basic-table-form-container {
padding: 0; padding: 0;
.table-page-search-submitButtons { .table-page-search-submitButtons {
display: block; display: block;
margin-bottom: 24px; margin-bottom: 24px;
white-space: nowrap; white-space: nowrap;
} }
.query-group-cust { .query-group-cust {
min-width: 100px !important; min-width: 100px !important;
} }
.query-group-split-cust { .query-group-split-cust {
width: 30px; width: 30px;
display: inline-block; display: inline-block;
text-align: center text-align: center
} }
.ant-form-item:not(.ant-form-item-with-help) { .ant-form-item:not(.ant-form-item-with-help) {
margin-bottom: 16px; margin-bottom: 16px;
height: 32px; height: 32px;
} }
:deep(.ant-picker),:deep(.ant-input-number){
:deep(.ant-picker),
:deep(.ant-input-number) {
width: 100%; width: 100%;
} }
} }

6
src/views/iot/tq/ApiRequestLog/ApiRequestLogList.vue
View File

@ -10,6 +10,12 @@
<TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/> <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
</template> </template>
<template v-slot:bodyCell="{ column, record, index, text }"> <template v-slot:bodyCell="{ column, record, index, text }">
<template v-if="column.dataIndex === 'requestValue'">
<span >{{ (text == null || text == undefined) ? '-' : ((text == '0' || text == '0.00') ? 0 : text ) }}</span>
</template>
<template v-if="column.dataIndex === 'resolveValue'">
<span >{{ (text == null || text == undefined) ? '-' : ((text == '0' || text == '0.00') ? 0 : text ) }}</span>
</template>
</template> </template>
</BasicTable> </BasicTable>
<!-- 表单区域 --> <!-- 表单区域 -->

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

@ -2,30 +2,35 @@
<div style="padding: 4px;"> <div style="padding: 4px;">
<!--查询区域--> <!--查询区域-->
<div class="jeecg-basic-table-form-container"> <div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol"> <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol"
:wrapper-col="wrapperCol">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="address"> <a-form-item name="address">
<template #label><span title="SN">SN</span></template> <template #label><span title="SN">SN</span></template>
<j-input placeholder="请输入SN" v-model:value="queryParam.address" allow-clear ></j-input> <j-input placeholder="请输入SN" v-model:value="queryParam.address" allow-clear :type="'default'"></j-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="nuId"> <a-form-item name="nuId">
<template #label><span title="区域">区域</span></template> <template #label><span title="区域">区域</span></template>
<j-dict-select-tag type='list' v-model:value="queryParam.nuId" :dictCode="`nu_base_info,nu_name,nu_id`" placeholder="请选区域" allow-clear /> <j-dict-select-tag type='list' v-model:value="queryParam.nuId" :dictCode="`nu_base_info,nu_name,nu_id`"
placeholder="请选区域" allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="reload">查询</a-button> <a-button type="primary" preIcon="ant-design:search-outlined" @click="reload">查询</a-button>
<a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button> <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset"
style="margin-left: 8px">重置</a-button>
</a-col> </a-col>
</a-row> </a-row>
</a-form> </a-form>
</div> </div>
<a-row style="margin-top: -18px;"> <a-row style="margin-top: -18px;">
<a-col v-for="(item,index) in tableData.records" :key="index" :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :xxl="6" style="padding: 8px 6px 6px 8px;"> <a-col v-for="(item, index) in tableData.records" :key="index" :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :xxl="6"
<a-card style="width: 100%;border-radius: 8px;" :headStyle="{ height: '70px', padding: '0 24px',border:'0px' }" :bodyStyle="{ padding: '24px 24px 4px 24px' }"> style="padding: 8px 6px 6px 8px;">
<a-card style="width: 100%;border-radius: 8px;" :headStyle="{ height: '70px', padding: '0 24px', border: '0px' }"
:bodyStyle="{ padding: '24px 24px 4px 24px' }">
<template #title> <template #title>
<a-row style="font-weight: normal;"> <a-row style="font-weight: normal;">
<a-col :span="18" style="font-size: 14px;"> <a-col :span="18" style="font-size: 14px;">
@ -43,14 +48,16 @@
<a-row style="margin-top:-10px;"> <a-row style="margin-top:-10px;">
<a-col :span="12" style="margin-top: -10px;">{{ item.nuId_dictText ? item.nuId_dictText : '未配置' }}</a-col> <a-col :span="12" style="margin-top: -10px;">{{ item.nuId_dictText ? item.nuId_dictText : '未配置' }}</a-col>
<a-col :span="12" style="text-align: right;margin-top: -10px;"> <a-col :span="12" style="text-align: right;margin-top: -10px;">
<span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:5px;">NUID: {{item.nuId?item.nuId:'未配置'}}</span> <span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:5px;">NUID:
{{ item.nuId ? item.nuId : '未配置' }}</span>
</a-col> </a-col>
<a-col :span="14" style="text-align: right;font-size: 44px;font-weight: bold;margin-top:18px;"> <a-col :span="14" style="text-align: right;font-size: 44px;font-weight: bold;margin-top:18px;">
<span>{{ item.eleValue ? item.eleValue : '0.00' }}</span> <span>{{ item.eleValue ? item.eleValue : '0.00' }}</span>
</a-col> </a-col>
<a-col :span="8" style="padding: 12px 0 0 5px;margin-top:18px;"> <a-col :span="8" style="padding: 12px 0 0 5px;margin-top:18px;">
<div style="font-size: 12px;margin: 5px 0 -5px 2px;padding:2px;">KWH</div> <div style="font-size: 12px;margin: 5px 0 -5px 2px;padding:2px;">KWH</div>
<div style="margin-top:-3px;"><span style="background:#eeeeee;padding: 2px;border-radius:5px;font-size:11px;">用电量</span></div> <div style="margin-top:-3px;"><span
style="background:#eeeeee;padding: 2px;border-radius:5px;font-size:11px;">用电量</span></div>
</a-col> </a-col>
</a-row> </a-row>
<a-divider /> <a-divider />
@ -59,11 +66,13 @@
<span class="tbClass"><img src="../../../../assets/iot/a1.png" style="width:20px;" /></span><br /> <span class="tbClass"><img src="../../../../assets/iot/a1.png" style="width:20px;" /></span><br />
<span class="antTitle">抄表</span> <span class="antTitle">抄表</span>
</span> </span>
<span style="display:inline-block;margin-left:10%;cursor: pointer;" @click="handleControlLz(item)" v-if="item.relayState=='1'"> <span style="display:inline-block;margin-left:10%;cursor: pointer;" @click="handleControlLz(item)"
v-if="item.relayState == '1'">
<span class="tbClass"><img src="../../../../assets/iot/a5.png" style="width:20px;" /></span><br /> <span class="tbClass"><img src="../../../../assets/iot/a5.png" style="width:20px;" /></span><br />
<span class="antTitle">拉闸</span> <span class="antTitle">拉闸</span>
</span> </span>
<span style="display:inline-block;margin-left:10%;cursor: pointer;" @click="handleControlHz(item)" v-if="item.relayState=='0'"> <span style="display:inline-block;margin-left:10%;cursor: pointer;" @click="handleControlHz(item)"
v-if="item.relayState == '0'">
<span class="tbClass"><img src="../../../../assets/iot/a2.png" style="width:20px;" /></span><br /> <span class="tbClass"><img src="../../../../assets/iot/a2.png" style="width:20px;" /></span><br />
<span class="antTitle">合闸</span> <span class="antTitle">合闸</span>
</span> </span>
@ -243,6 +252,7 @@ const pageParams = ref({ pageNo: 1, pageSize: 8 })
display: block; display: block;
position: absolute; position: absolute;
} }
.zxClass { .zxClass {
font-size: 14px; font-size: 14px;
background: linear-gradient(to right, #1ea0fa, #017de9); background: linear-gradient(to right, #1ea0fa, #017de9);
@ -266,11 +276,13 @@ const pageParams = ref({ pageNo: 1, pageSize: 8 })
width: 50px; width: 50px;
margin-top: 11px; margin-top: 11px;
} }
.tbClass { .tbClass {
background: #f6f6f6; background: #f6f6f6;
padding: 8px; padding: 8px;
border-radius: 5px; border-radius: 5px;
} }
.antTitle { .antTitle {
margin-top: 10px; margin-top: 10px;
display: block; display: block;

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

@ -2,30 +2,35 @@
<div style="padding: 4px;"> <div style="padding: 4px;">
<!--查询区域--> <!--查询区域-->
<div class="jeecg-basic-table-form-container"> <div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol"> <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol"
:wrapper-col="wrapperCol">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="address"> <a-form-item name="address">
<template #label><span title="SN">SN</span></template> <template #label><span title="SN">SN</span></template>
<j-input placeholder="请输入SN" v-model:value="queryParam.address" allow-clear ></j-input> <j-input placeholder="请输入SN" v-model:value="queryParam.address" :type="'default'" allow-clear></j-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="nuId"> <a-form-item name="nuId">
<template #label><span title="区域">区域</span></template> <template #label><span title="区域">区域</span></template>
<j-dict-select-tag type='list' v-model:value="queryParam.nuId" :dictCode="`nu_base_info,nu_name,nu_id`" placeholder="请选区域" allow-clear /> <j-dict-select-tag type='list' v-model:value="queryParam.nuId" :dictCode="`nu_base_info,nu_name,nu_id`"
placeholder="请选区域" allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="reload">查询</a-button> <a-button type="primary" preIcon="ant-design:search-outlined" @click="reload">查询</a-button>
<a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button> <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset"
style="margin-left: 8px">重置</a-button>
</a-col> </a-col>
</a-row> </a-row>
</a-form> </a-form>
</div> </div>
<a-row style="margin-top: -18px;"> <a-row style="margin-top: -18px;">
<a-col v-for="(item,index) in tableData.records" :key="index" :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :xxl="6" style="padding: 8px 6px 6px 8px;"> <a-col v-for="(item, index) in tableData.records" :key="index" :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :xxl="6"
<a-card style="width: 100%;border-radius: 8px;" :headStyle="{ height: '70px', padding: '0 24px',border:'0px' }" :bodyStyle="{ padding: '24px 24px 4px 24px' }"> style="padding: 8px 6px 6px 8px;">
<a-card style="width: 100%;border-radius: 8px;" :headStyle="{ height: '70px', padding: '0 24px', border: '0px' }"
:bodyStyle="{ padding: '24px 24px 4px 24px' }">
<template #title> <template #title>
<a-row style="font-weight: normal;"> <a-row style="font-weight: normal;">
<a-col :span="18" style="font-size: 14px;"> <a-col :span="18" style="font-size: 14px;">
@ -43,14 +48,16 @@
<a-row style="margin-top:-10px;"> <a-row style="margin-top:-10px;">
<a-col :span="12" style="margin-top: -10px;">{{ item.nuId_dictText ? item.nuId_dictText : '未配置' }}</a-col> <a-col :span="12" style="margin-top: -10px;">{{ item.nuId_dictText ? item.nuId_dictText : '未配置' }}</a-col>
<a-col :span="12" style="text-align: right;margin-top: -10px;"> <a-col :span="12" style="text-align: right;margin-top: -10px;">
<span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:5px;">NUID: {{item.nuId?item.nuId:'未配置'}}</span> <span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:5px;">NUID:
{{ item.nuId ? item.nuId : '未配置' }}</span>
</a-col> </a-col>
<a-col :span="14" style="text-align: right;font-size: 44px;font-weight: bold;margin-top:18px;"> <a-col :span="14" style="text-align: right;font-size: 44px;font-weight: bold;margin-top:18px;">
<span>{{ item.waterValue ? item.waterValue : '0.00' }}</span> <span>{{ item.waterValue ? item.waterValue : '0.00' }}</span>
</a-col> </a-col>
<a-col :span="8" style="padding: 12px 0 0 5px;margin-top:18px;"> <a-col :span="8" style="padding: 12px 0 0 5px;margin-top:18px;">
<div style="font-size: 12px;margin: 8px 0 -5px 2px;">m³</div> <div style="font-size: 12px;margin: 8px 0 -5px 2px;">m³</div>
<div style="margin-top:-3px;"><span style="background:#eeeeee;padding: 2px;border-radius:5px;font-size:11px;">用水量</span></div> <div style="margin-top:-3px;"><span
style="background:#eeeeee;padding: 2px;border-radius:5px;font-size:11px;">用水量</span></div>
</a-col> </a-col>
</a-row> </a-row>
<a-divider /> <a-divider />
@ -59,11 +66,13 @@
<span class="tbClass"><img src="../../../../assets/iot/a1.png" style="width:20px;" /></span><br /> <span class="tbClass"><img src="../../../../assets/iot/a1.png" style="width:20px;" /></span><br />
<span class="antTitle">抄表</span> <span class="antTitle">抄表</span>
</span> </span>
<span style="display:inline-block;margin-left:10%;cursor: pointer;" @click="handleControlLz(item)" v-if="item.relayState=='0'"> <span style="display:inline-block;margin-left:10%;cursor: pointer;" @click="handleControlLz(item)"
v-if="item.relayState == '0'">
<span class="tbClass"><img src="../../../../assets/iot/a10.png" style="width:20px;" /></span><br /> <span class="tbClass"><img src="../../../../assets/iot/a10.png" style="width:20px;" /></span><br />
<span class="antTitle">开阀</span> <span class="antTitle">开阀</span>
</span> </span>
<span style="display:inline-block;margin-left:10%;cursor: pointer;" @click="handleControlHz(item)" v-if="item.relayState=='1'"> <span style="display:inline-block;margin-left:10%;cursor: pointer;" @click="handleControlHz(item)"
v-if="item.relayState == '1'">
<span class="tbClass"><img src="../../../../assets/iot/a11.png" style="width:20px;" /></span><br /> <span class="tbClass"><img src="../../../../assets/iot/a11.png" style="width:20px;" /></span><br />
<span class="antTitle">关阀</span> <span class="antTitle">关阀</span>
</span> </span>
@ -243,6 +252,7 @@ const pageParams = ref({ pageNo: 1, pageSize: 8 })
display: block; display: block;
position: absolute; position: absolute;
} }
.zxClass { .zxClass {
font-size: 14px; font-size: 14px;
background: linear-gradient(to right, #1ea0fa, #017de9); background: linear-gradient(to right, #1ea0fa, #017de9);
@ -266,11 +276,13 @@ const pageParams = ref({ pageNo: 1, pageSize: 8 })
width: 50px; width: 50px;
margin-top: 11px; margin-top: 11px;
} }
.tbClass { .tbClass {
background: #f6f6f6; background: #f6f6f6;
padding: 8px; padding: 8px;
border-radius: 5px; border-radius: 5px;
} }
.antTitle { .antTitle {
margin-top: 10px; margin-top: 10px;
display: block; display: block;

29
src/views/iot/yiweilian/index.vue
View File

@ -2,23 +2,25 @@
<div style="padding: 4px;"> <div style="padding: 4px;">
<!--查询区域--> <!--查询区域-->
<div class="jeecg-basic-table-form-container"> <div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol"> <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol"
:wrapper-col="wrapperCol">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="sn"> <a-form-item name="sn">
<template #label><span title="SN">SN</span></template> <template #label><span title="SN">SN</span></template>
<j-input placeholder="请输入SN" v-model:value="queryParam.sn" allow-clear ></j-input> <JInput placeholder="请输入SN" v-model:value="queryParam.sn" allow-clear :type="'default'"></JInput>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="nuId"> <a-form-item name="nuId">
<template #label><span title="区域">区域</span></template> <template #label><span title="区域">区域</span></template>
<j-dict-select-tag type='list' v-model:value="queryParam.nuId" :dictCode="`nu_base_info,nu_name,nu_id`" placeholder="请选区域" allow-clear /> <j-dict-select-tag type='list' v-model:value="queryParam.nuId" :dictCode="`nu_base_info,nu_name,nu_id`"
placeholder="请选区域" allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<span class="table-page-search-submitButtons"> <span 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:search-outlined" @click="reload">查询</a-button>
<a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset"
style="margin-left: 8px">重置</a-button> style="margin-left: 8px">重置</a-button>
</span> </span>
@ -27,8 +29,11 @@
</a-form> </a-form>
</div> </div>
<a-row style="margin-top: -18px;"> <a-row style="margin-top: -18px;">
<a-col v-for="(item,index) in tableData.records" :key="index" :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :xxl="6" style="padding: 8px 6px 6px 8px;"> <a-col v-for="(item, index) in tableData.records" :key="index" :xs="24" :sm="24" :md="12" :lg="12" :xl="8"
<a-card style="width: 100%;border-radius: 8px;" :headStyle="{ height: '70px', padding: '0 24px',border:'0px' }" :bodyStyle="{ padding: '24px 24px 4px 24px' }"> :xxl="6" style="padding: 8px 6px 6px 8px;">
<a-card style="width: 100%;border-radius: 8px;"
:headStyle="{ height: '70px', padding: '0 24px', border: '0px' }"
:bodyStyle="{ padding: '24px 24px 4px 24px' }">
<template #title> <template #title>
<a-row style="font-weight: normal;"> <a-row style="font-weight: normal;">
<a-col :span="18" style="font-size: 14px;"> <a-col :span="18" style="font-size: 14px;">
@ -46,7 +51,8 @@
<a-row style="margin-top:-10px;"> <a-row style="margin-top:-10px;">
<a-col :span="12" style="margin-top: -10px;">{{ item.nuId_dictText ? item.nuId_dictText : '未配置' }}</a-col> <a-col :span="12" style="margin-top: -10px;">{{ item.nuId_dictText ? item.nuId_dictText : '未配置' }}</a-col>
<a-col :span="12" style="text-align: right;margin-top: -10px;"> <a-col :span="12" style="text-align: right;margin-top: -10px;">
<span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:5px;">NUID: {{item.nuId?item.nuId:'未配置'}}</span> <span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:5px;">NUID:
{{ item.nuId ? item.nuId : '未配置' }}</span>
</a-col> </a-col>
<a-col :span="24" style="padding: 12px 0 0 5px;margin-top:18px;"> <a-col :span="24" style="padding: 12px 0 0 5px;margin-top:18px;">
<a-row> <a-row>
@ -59,8 +65,10 @@
<a-divider type="vertical" style="height: 40px;" /> <a-divider type="vertical" style="height: 40px;" />
</a-col> </a-col>
<a-col :span="11" style="text-align: center;"> <a-col :span="11" style="text-align: center;">
<span style="margin-top:0px;"><img src="../../../assets/iot/a9.png" style="width:25px;margin-top: -15px;" /></span> <span style="margin-top:0px;"><img src="../../../assets/iot/a9.png"
<span style="font-size: 30px;font-weight:700;margin-left: 6px;">{{item.humidity?item.humidity:'-'}}</span> style="width:25px;margin-top: -15px;" /></span>
<span style="font-size: 30px;font-weight:700;margin-left: 6px;">{{ item.humidity ? item.humidity : '-'
}}</span>
<span style="font-size: 16px;">%</span> <span style="font-size: 16px;">%</span>
</a-col> </a-col>
</a-row> </a-row>
@ -203,6 +211,7 @@ const pageParams = ref({ pageNo: 1, pageSize: 8 })
display: block; display: block;
position: absolute; position: absolute;
} }
.zxClass { .zxClass {
font-size: 14px; font-size: 14px;
background: linear-gradient(to right, #1ea0fa, #017de9); background: linear-gradient(to right, #1ea0fa, #017de9);
@ -226,11 +235,13 @@ const pageParams = ref({ pageNo: 1, pageSize: 8 })
width: 50px; width: 50px;
margin-top: 11px; margin-top: 11px;
} }
.tbClass { .tbClass {
background: #f6f6f6; background: #f6f6f6;
padding: 8px; padding: 8px;
border-radius: 5px; border-radius: 5px;
} }
.antTitle { .antTitle {
margin-top: 10px; margin-top: 10px;
display: block; display: block;