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

# Conflicts: # src/views/device/manager/components/batch/DeviceBatchList.vue
2026-04-28 10:38:19 +08:00 · 2026-04-28 10:38:19 +08:00 · 77e3a8da52
parent 6320e28f20 d484dbad49
commit 77e3a8da52
10 changed files with 23 additions and 18 deletions
--- a/src/design/ant/index.less
+++ b/src/design/ant/index.less
@ -121,12 +121,12 @@
  padding: 12px 0;
  color: #000000d9;
 }
-/** anticon-down跟3.x保持一致*/ 
+/** anticon-down跟3.x保持一致*/
 .ant-dropdown-trigger>.anticon.anticon-down, .ant-dropdown-link>.anticon.anticon-down, .ant-dropdown-button>.anticon.anticon-down {
  font-size: 10px;
  vertical-align: baseline;
 }
-/** 表格排序箭头尺寸保持跟3.x一致 */ 
+/** 表格排序箭头尺寸保持跟3.x一致 */
 .ant-table-wrapper .ant-table-column-sorter-up, .ant-table-wrapper .ant-table-column-sorter-down {
  font-size: 11px;
 }
@ -199,12 +199,15 @@ html[data-theme='light'] {
  .ant-form:not(.jeecg-form-detail-effect) {
    .ant-select.ant-select-disabled {
      .ant-select-selection-item {
-        color: rgba(51, 51, 51, 0.25) !important;
+        color: #606266 !important;
        // color: rgba(51, 51, 51, 0.25);
        .ant-select-selection-item-content {
          color: rgba(51, 51, 51, 0.25);
        }
      }
+      .ant-select-arrow{
+        display: none !important;
+      }
    }
    .ant-input-number.ant-input-number-disabled {
      .ant-input-number-input {
--- a/src/views/device/config/DeviceConfigList.vue
+++ b/src/views/device/config/DeviceConfigList.vue
@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="p-2">
    <!--查询区域-->
    <div class="jeecg-basic-table-form-container">
      <a-form ref="formRef" :model="queryParam" :label-col="labelCol"
@ -20,16 +20,18 @@
              </a-select>
            </a-form-item>
          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :lg="10" style="margin-top: 5px;">
            <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:plus-outlined" @click="handleAdd" style="margin-left: 8px"> 新增设备</a-button>
              </a-col>
            </span>
          </a-col>
+          <a-col :lg="2" style="margin-top: 5px;">
+            <a-button type="primary" preIcon="ant-design:plus-outlined" @click="handleAdd"> 新增设备</a-button>
+          </a-col>
        </a-row>
      </a-form>
    </div>
--- a/src/views/device/config/components/DeviceConfigForm.vue
+++ b/src/views/device/config/components/DeviceConfigForm.vue
@ -13,7 +13,7 @@
          <a-row >
            <a-col :span="24">
              <a-form-item label="设备类型" v-bind="validateInfos.deviceType" id="DeviceConfigForm-deviceType" name="deviceType">
-                <j-dict-select-tag v-model:value="formData.deviceType" :showLabel="false" dictCode="tplink_device_type" placeholder="请选择设备类型" @change="changeType" @upDictCode="upDictCode"/>
+                <j-dict-select-tag v-model:value="formData.deviceType" :disabled="disabled" :showLabel="false" dictCode="tplink_device_type" placeholder="请选择设备类型" @change="changeType" @upDictCode="upDictCode"/>
              </a-form-item>
            </a-col>
          </a-row>
@ -34,7 +34,7 @@
          <a-row >
            <a-col :span="24">
              <a-form-item label="设备维度" v-bind="validateInfos.dimension" id="DeviceConfigForm-dimension" name="dimension">
-                <a-select v-model:value="formData.dimension" placeholder="请选择设备维度" allow-clear>
+                <a-select v-model:value="formData.dimension" :disabled="disabled" placeholder="请选择设备维度" allow-clear>
                  <a-select-option value="机构维度">机构维度</a-select-option>
                  <a-select-option value="区域维度">区域维度</a-select-option>
                </a-select>
--- a/src/views/device/manager/DeviceManagerList.vue
+++ b/src/views/device/manager/DeviceManagerList.vue
@ -96,13 +96,13 @@
  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
  const labelCol = reactive({
    xs:24,
-    sm:4,
-    xl:6,
-    xxl:4
+    sm:8,
+    xl:8,
+    xxl:8
  });
  const wrapperCol = reactive({
    xs: 24,
-    sm: 20,
+    sm: 16,
  });

  /**
--- a/src/views/device/manager/components/integration/CameraList.vue
+++ b/src/views/device/manager/components/integration/CameraList.vue
@ -11,7 +11,7 @@
      <template v-slot:bodyCell="{ column, record, index, text }">
      </template>
      <template #deviceStatus="{ record  }">
-        <span v-if="record.deviceStatus === '待集成'" style="color:red">
+        <span v-if="record.deviceStatus === '待标识' || record.deviceStatus === '待集成'" style="color:red">
          {{ record.deviceStatus }}
        </span>
      </template>
--- a/src/views/device/manager/components/integration/ElectricityList.vue
+++ b/src/views/device/manager/components/integration/ElectricityList.vue
@ -11,7 +11,7 @@
      <template v-slot:bodyCell="{ column, record, index, text }">
      </template>
      <template #deviceStatus="{ record  }">
-        <span v-if="record.deviceStatus === '待集成'" style="color:red">
+        <span v-if="record.deviceStatus === '待标识' || record.deviceStatus === '待集成'" style="color:red">
          {{ record.deviceStatus }}
        </span>
      </template>
--- a/src/views/device/manager/components/integration/HumidList.vue
+++ b/src/views/device/manager/components/integration/HumidList.vue
@ -11,7 +11,7 @@
      <template v-slot:bodyCell="{ column, record, index, text }">
      </template>
      <template #deviceStatus="{ record  }">
-        <span v-if="record.deviceStatus === '待集成'" style="color:red">
+        <span v-if="record.deviceStatus === '待标识' || record.deviceStatus === '待集成'" style="color:red">
          {{ record.deviceStatus }}
        </span>
      </template>
--- a/src/views/device/manager/components/integration/NetworkList.vue
+++ b/src/views/device/manager/components/integration/NetworkList.vue
@ -11,7 +11,7 @@
      <template v-slot:bodyCell="{ column, record, index, text }">
      </template>
      <template #deviceStatus="{ record  }">
-        <span v-if="record.deviceStatus === '待集成'" style="color:red">
+        <span v-if="record.deviceStatus === '待标识' || record.deviceStatus === '待集成'" style="color:red">
          {{ record.deviceStatus }}
        </span>
      </template>
--- a/src/views/device/manager/components/integration/WaterList.vue
+++ b/src/views/device/manager/components/integration/WaterList.vue
@ -11,7 +11,7 @@
      <template v-slot:bodyCell="{ column, record, index, text }">
      </template>
      <template #deviceStatus="{ record  }">
-        <span v-if="record.deviceStatus === '待集成'" style="color:red">
+        <span v-if="record.deviceStatus === '待标识' || record.deviceStatus === '待集成'" style="color:red">
          {{ record.deviceStatus }}
        </span>
      </template>
--- a/src/views/iot/tplink/camera/components/CameraPreviewModal.vue
+++ b/src/views/iot/tplink/camera/components/CameraPreviewModal.vue
@ -263,7 +263,7 @@ async function createPreview() {
    socket: formData.wssUrl, // websocket地址, getPreviewUrl接口获取
    pluginPath: '/static', // 当sdk资源不在根路径下时，需配置pluginPath
    talkEnable: true,
-    useMultitrans: false,
+    useMultitrans: true,
  });

  let isPlaying = player.value.isPlaying();