物联设备BUG处理

src/views/biz/nuBaseInfo/iotDevices/IotDevices.data.ts

@@ -60,16 +60,21 @@ export const columnsTy: BasicColumn[] = [
     align: "center",
     dataIndex: 'sn'
   },
-  // {
-  //   title: '设备型号',
-  //   align: "center",
-  //   dataIndex: 'deviceModel'
-  // },
   {
-    title: '设备维度',
+    title: '设备名称',
     align: "center",
-    dataIndex: 'dimension'
+    dataIndex: 'deviceName'
   },
+  {
+    title: '设备型号',
+    align: "center",
+    dataIndex: 'deviceModel'
+  },
+  // {
+  //   title: '设备维度',
+  //   align: "center",
+  //   dataIndex: 'dimension'
+  // },
   {
     title: '设备类型',
     align: "center",

src/views/biz/nuBaseInfo/iotDevices/IotDevicesTyList.vue

@@ -58,7 +58,7 @@
 
     <div style="margin-top: 10px;padding: 14px;background-color: white;">
       <span style="font-size: 16px;color:red;font-weight: 700;" v-if="nuInfo.tystatus == '5'">提示：您停用区域【{{queryParam.nuName}}】，将释放所有设备，请慎重操作！</span>
-      <span style="font-size: 16px;color:red;font-weight: 700;" v-if="nuInfo.tystatus == '4'">提示：请联系平台运维组技术人员绑定物联设备！</span>
+      <span style="font-size: 16px;color:red;font-weight: 700;" v-if="nuInfo.tystatus == '4'">提示：请【物联设备】功能中绑定设备！</span>
     </div>
     <!-- 表单区域 -->
     <IotDevicesModal ref="registerModal" @success="handleSuccess"></IotDevicesModal>

src/views/iot/manager/components/DeviceBrokenForm.vue

@@ -40,6 +40,7 @@ const formData = reactive<Record<string, any>>({
   nuId: undefined,
   nuName: undefined,
   dimension: undefined,
+  deviceName: undefined,
   deviceType: undefined,
   deviceModel: undefined,
   factory: undefined,

src/views/iot/manager/components/DeviceGhForm.vue

@@ -53,6 +53,7 @@ const formData = reactive<Record<string, any>>({
   nuId: undefined,
   nuName: undefined,
   dimension: undefined,
+  deviceName: undefined,
   deviceType: undefined,
   deviceModel: undefined,
   factory: undefined,

src/views/iot/manager/components/log/DeviceLogList.vue

@@ -1,5 +1,42 @@
 <template>
   <div>
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" :model="queryParam" :label-col="labelCol"
+              :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="6">
+            <a-form-item name="deviceName">
+              <template #label><span title="设备名称">设备名称</span></template>
+              <a-input v-model:value="queryParam.deviceName" placeholder="请输入设备名称" allow-clear />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="dimension">
+              <template #label><span title="设备维度">设备维度</span></template>
+              <a-select v-model:value="queryParam.dimension" placeholder="请选择设备维度" allow-clear>
+                <a-select-option value="机构维度">机构维度</a-select-option>
+                <a-select-option value="区域维度">区域维度</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="deviceType">
+              <template #label><span title="设备类型">设备类型</span></template>
+              <j-dict-select-tag v-model:value="queryParam.deviceType" :showLabel="false" dictCode="tplink_device_type" placeholder="请选择设备类型"  allow-clear />
+            </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-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-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
     <!--引用表格-->
     <BasicTable @register="registerTable">
       <!--插槽:table标题-->
@@ -20,6 +57,8 @@ import {onMounted, reactive, ref} from 'vue';
   import { bingLogList } from '../../manager.api';
   import { logColumns} from '../../manager.data';
   import { useDrawer } from "@/components/Drawer";
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  const formRef = ref();
   const [registerDrawer, { openDrawer }] = useDrawer();
   const queryParam = reactive<any>({});
   const selectedRows = ref<any[]>([]);
@@ -48,6 +87,32 @@ import {onMounted, reactive, ref} from 'vue';
     },
   })
   const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+  const labelCol = reactive({
+    xs:24,
+    sm:8,
+    xl:8,
+    xxl:8
+  });
+  const wrapperCol = reactive({
+    xs: 24,
+    sm: 20,
+  });
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    //刷新数据
+    reload();
+  }
 
   /**
    * 成功回调
@@ -76,11 +141,27 @@ defineExpose({
 </script>
 
 <style lang="less" scoped>
-:deep(.selected-row) {
+.jeecg-basic-table-form-container {
-  background-color: #e6f7ff !important;
+  padding: 0;
-
+  .table-page-search-submitButtons {
-  &:hover td {
+    display: block;
-    background-color: #e6f7ff !important;
+    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>

src/views/iot/manager/components/preview/DevicePreviewForm.vue

@@ -17,6 +17,13 @@
               </a-form-item>
             </a-col>
           </a-row>
+          <a-row>
+            <a-col :span="24">
+              <div style="padding: 14px;display: flex;justify-content: center;">
+                <span style="font-size: 16px;color:red;font-weight: 700;">提示：请正确填写设备标识，如标识填写错误，将无法正常集成设备！</span>
+              </div>
+            </a-col>
+          </a-row>
         </a-form>
       </template>
     </JFormContainer>

src/views/iot/manager/manager.data.ts

@@ -148,6 +148,12 @@ export const logColumns: BasicColumn[] = [
     dataIndex: 'dimension',
     width: 100
   },
+  {
+    title: '设备名称',
+    align: "center",
+    dataIndex: 'deviceName',
+    width: 100
+  },
   {
     title: '设备类型',
     align: "center",