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

src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue

@@ -6,6 +6,45 @@
         :wrapper-col="wrapperCol">
         <a-row :gutter="24">
           <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">
               <template #label><span title="物料名称">物料名称</span></template>
               <j-input placeholder="请输入物料名称" v-model:value="queryParam.materialName" allow-clear></j-input>
@@ -22,8 +61,8 @@
               <template #label><span title="拼音检索">拼音检索</span></template>
               <j-input placeholder="请输入拼音" v-model:value="queryParam.pinyin" allow-clear></j-input>
             </a-form-item>
-          </a-col>
-          <a-col :lg="5">
+          </a-col> -->
+          <a-col :lg="4">
             <a-form-item name="izEnabled">
               <template #label><span title="是否启用">是否启用</span></template>
               <j-dict-select-tag type='list' placeholder="请选择是否启用" v-model:value="queryParam.izEnabled"
@@ -62,7 +101,9 @@
           <a-menu style="width: 100%;" mode="inline">
             <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>
                   <Icon :icon="item.icon" :size="20" v-if="item.icon" />
                   <Icon icon="ant-design:appstore-add-outlined" :size="20" v-else />
@@ -74,7 +115,9 @@
                       <!-- 下拉菜单 -->
                       <a-dropdown>
                         <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>
                         <!-- 图标 -->
                         <a class="ant-dropdown-link" style="color:#1890FF;" @click.prevent>
@@ -86,7 +129,9 @@
                 </template>
                 <!-- 第二级 -->
                 <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>
                       <Icon :icon="child.icon" :size="20" v-if="child.icon" />
                       <Icon icon="ant-design:appstore-add-outlined" :size="20" v-else />
@@ -98,7 +143,9 @@
                           <!-- 下拉菜单 -->
                           <a-dropdown>
                             <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>
                             <!-- 图标 -->
                             <a class="ant-dropdown-link" style="color:#1890FF;" @click.prevent>
@@ -109,7 +156,9 @@
                       </span>
                     </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>
                         <Icon :icon="childThree.icon" :size="20" v-if="childThree.icon" />
                         <Icon icon="ant-design:appstore-add-outlined" :size="20" v-else />
@@ -119,7 +168,9 @@
                         <span v-show="childThree.showContent">
                           <a-dropdown>
                             <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>
                             <a class="ant-dropdown-link" style="color:#1890FF;" @click.prevent>
                               <Icon icon="ant-design:setting-outlined" />
@@ -129,7 +180,9 @@
                       </span>
                     </a-menu-item>
                   </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>
                       <Icon :icon="child.icon" :size="20" v-if="child.icon" />
                       <Icon icon="ant-design:appstore-add-outlined" :size="20" v-else />
@@ -140,7 +193,9 @@
                         <!-- 下拉菜单 -->
                         <a-dropdown>
                           <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>
                           <!-- 图标 -->
                           <a class="ant-dropdown-link" style="color:#1890FF;" @click.prevent>
@@ -152,7 +207,8 @@
                   </a-menu-item>
                 </template>
               </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>
                   <Icon :icon="item.icon" :size="20" v-if="item.icon" />
                   <Icon icon="ant-design:appstore-add-outlined" :size="20" v-else />
@@ -163,7 +219,9 @@
                     <!-- 下拉菜单 -->
                     <a-dropdown>
                       <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>
                       <!-- 图标 -->
                       <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)
   var levle = parseInt(data.levle)
   if (levle == 1) {
@@ -564,8 +622,10 @@ function handleSearch(data) {
     queryParam.typeId = data.typeId
     queryParam.medicationId = data.key
   }
+  if (izReload) {
     reload();
   }
+}
 //添加本级（只添加一级分类）
 function handleAddbj(data) {
   var params = {}

src/views/invoicing/warehouseMaterialInfo/BlWarehouseMaterialInfoList.vue

@@ -2,25 +2,60 @@
   <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-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol"
+        :wrapper-col="wrapperCol">
         <a-row :gutter="24">
           <a-col :lg="6" hidden>
             <a-form-item name="nuId">
               <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-col>
-          <a-col :lg="6">
+          <a-col :lg="5">
             <a-form-item name="wlParamInfo">
               <template #label><span title="物料信息">物料信息</span></template>
               <a-input placeholder="请填写物料信息" v-model:value="queryParam.wlParamInfo" allow-clear></a-input>
             </a-form-item>
           </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">
               <a-col :lg="6">
                 <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>
             </span>
           </a-col>
@@ -31,7 +66,8 @@
     <BasicTable @register="registerTable">
       <!--插槽:table标题-->
       <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 #action="{ record }">
@@ -45,7 +81,8 @@
     <!-- 选择物料 -->
     <CheckWuliaoModal ref="registerAddModal" @success="handleSuccess"></CheckWuliaoModal>
     <!-- 出入库详情 -->
-    <NuWarehouseMaterialCrkInfoListModal ref="registerCrkModal" @success="handleSuccess"></NuWarehouseMaterialCrkInfoListModal>
+    <NuWarehouseMaterialCrkInfoListModal ref="registerCrkModal" @success="handleSuccess">
+    </NuWarehouseMaterialCrkInfoListModal>
   </div>
 </template>
 
@@ -237,6 +274,27 @@ import { defHttp } from '/@/utils/http/axios';
   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({
   init,
 });
@@ -246,24 +304,30 @@ import { defHttp } from '/@/utils/http/axios';
 <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){
+
+  :deep(.ant-picker),
+  :deep(.ant-input-number) {
     width: 100%;
   }
 }

src/views/iot/tq/ApiRequestLog/ApiRequestLogList.vue

@@ -10,6 +10,12 @@
         <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
       </template>
       <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>
     </BasicTable>
     <!-- 表单区域 -->

src/views/iot/tq/electricity/index.vue

@@ -2,30 +2,35 @@
   <div style="padding: 4px;">
     <!--查询区域-->
     <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-col :lg="6">
             <a-form-item name="address">
               <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-col>
           <a-col :lg="6">
             <a-form-item name="nuId">
               <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-col>
           <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: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-row>
       </a-form>
     </div>
     <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-card style="width: 100%;border-radius: 8px;" :headStyle="{ height: '70px', padding: '0 24px',border:'0px' }"  :bodyStyle="{ padding: '24px 24px 4px 24px' }">
+      <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-card style="width: 100%;border-radius: 8px;" :headStyle="{ height: '70px', padding: '0 24px', border: '0px' }"
+          :bodyStyle="{ padding: '24px 24px 4px 24px' }">
           <template #title>
             <a-row style="font-weight: normal;">
               <a-col :span="18" style="font-size: 14px;">
@@ -43,14 +48,16 @@
           <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="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 :span="14" style="text-align: right;font-size: 44px;font-weight: bold;margin-top:18px;">
               <span>{{ item.eleValue ? item.eleValue : '0.00' }}</span>
             </a-col>
             <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="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-row>
           <a-divider />
@@ -59,11 +66,13 @@
               <span class="tbClass"><img src="../../../../assets/iot/a1.png" style="width:20px;" /></span><br />
               <span class="antTitle">抄表</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="antTitle">拉闸</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="antTitle">合闸</span>
             </span>
@@ -243,6 +252,7 @@ const pageParams = ref({ pageNo: 1, pageSize: 8 })
   display: block;
   position: absolute;
 }
+
 .zxClass {
   font-size: 14px;
   background: linear-gradient(to right, #1ea0fa, #017de9);
@@ -266,11 +276,13 @@ const pageParams = ref({ pageNo: 1, pageSize: 8 })
   width: 50px;
   margin-top: 11px;
 }
+
 .tbClass {
   background: #f6f6f6;
   padding: 8px;
   border-radius: 5px;
 }
+
 .antTitle {
   margin-top: 10px;
   display: block;

src/views/iot/tq/water/index.vue

@@ -2,30 +2,35 @@
   <div style="padding: 4px;">
     <!--查询区域-->
     <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-col :lg="6">
             <a-form-item name="address">
               <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-col>
           <a-col :lg="6">
             <a-form-item name="nuId">
               <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-col>
           <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: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-row>
       </a-form>
     </div>
     <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-card style="width: 100%;border-radius: 8px;" :headStyle="{ height: '70px', padding: '0 24px',border:'0px' }"  :bodyStyle="{ padding: '24px 24px 4px 24px' }">
+      <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-card style="width: 100%;border-radius: 8px;" :headStyle="{ height: '70px', padding: '0 24px', border: '0px' }"
+          :bodyStyle="{ padding: '24px 24px 4px 24px' }">
           <template #title>
             <a-row style="font-weight: normal;">
               <a-col :span="18" style="font-size: 14px;">
@@ -43,14 +48,16 @@
           <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="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 :span="14" style="text-align: right;font-size: 44px;font-weight: bold;margin-top:18px;">
               <span>{{ item.waterValue ? item.waterValue : '0.00' }}</span>
             </a-col>
             <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="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-row>
           <a-divider />
@@ -59,11 +66,13 @@
               <span class="tbClass"><img src="../../../../assets/iot/a1.png" style="width:20px;" /></span><br />
               <span class="antTitle">抄表</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="antTitle">开阀</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="antTitle">关阀</span>
             </span>
@@ -243,6 +252,7 @@ const pageParams = ref({ pageNo: 1, pageSize: 8 })
   display: block;
   position: absolute;
 }
+
 .zxClass {
   font-size: 14px;
   background: linear-gradient(to right, #1ea0fa, #017de9);
@@ -266,11 +276,13 @@ const pageParams = ref({ pageNo: 1, pageSize: 8 })
   width: 50px;
   margin-top: 11px;
 }
+
 .tbClass {
   background: #f6f6f6;
   padding: 8px;
   border-radius: 5px;
 }
+
 .antTitle {
   margin-top: 10px;
   display: block;

src/views/iot/yiweilian/index.vue

@@ -2,23 +2,25 @@
   <div style="padding: 4px;">
     <!--查询区域-->
     <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-col :lg="6">
             <a-form-item name="sn">
               <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-col>
           <a-col :lg="6">
             <a-form-item name="nuId">
               <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-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <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"
                 style="margin-left: 8px">重置</a-button>
             </span>
@@ -27,8 +29,11 @@
       </a-form>
     </div>
     <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-card style="width: 100%;border-radius: 8px;" :headStyle="{ height: '70px', padding: '0 24px',border:'0px' }"  :bodyStyle="{ padding: '24px 24px 4px 24px' }">
+      <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-card style="width: 100%;border-radius: 8px;"
+          :headStyle="{ height: '70px', padding: '0 24px', border: '0px' }"
+          :bodyStyle="{ padding: '24px 24px 4px 24px' }">
           <template #title>
             <a-row style="font-weight: normal;">
               <a-col :span="18" style="font-size: 14px;">
@@ -46,7 +51,8 @@
           <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="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 :span="24" style="padding: 12px 0 0 5px;margin-top:18px;">
               <a-row>
@@ -59,8 +65,10 @@
                   <a-divider type="vertical" style="height: 40px;" />
                 </a-col>
                 <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="font-size: 30px;font-weight:700;margin-left: 6px;">{{item.humidity?item.humidity:'-'}}</span>
+                  <span style="margin-top:0px;"><img src="../../../assets/iot/a9.png"
+                      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>
                 </a-col>
               </a-row>
@@ -203,6 +211,7 @@ const pageParams = ref({ pageNo: 1, pageSize: 8 })
   display: block;
   position: absolute;
 }
+
 .zxClass {
   font-size: 14px;
   background: linear-gradient(to right, #1ea0fa, #017de9);
@@ -226,11 +235,13 @@ const pageParams = ref({ pageNo: 1, pageSize: 8 })
   width: 50px;
   margin-top: 11px;
 }
+
 .tbClass {
   background: #f6f6f6;
   padding: 8px;
   border-radius: 5px;
 }
+
 .antTitle {
   margin-top: 10px;
   display: block;