修改bug

2025-08-19 13:38:10 +08:00 · 2025-08-19 13:38:10 +08:00 · 18c6048171
parent c0e0e01f7e
commit 18c6048171
9 changed files with 99 additions and 35 deletions
--- a/src/views/biz/nuBaseInfo/components/BaseWlsbListForm.vue
+++ b/src/views/biz/nuBaseInfo/components/BaseWlsbListForm.vue
@ -20,7 +20,7 @@
              <a-row style="margin-top:-20px;">
                <a-col :span="12" ><span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:5px;">NUID: {{item.nuId?item.nuId:'未配置'}}</span></a-col>
                <a-col :span="12" style="text-align: right;">
-                  {{item.nuId_dictText?item.nuId_dictText:'未配置'}}
+                  {{item.nuName?item.nuName:'未配置'}}
                </a-col>
                <a-col :span="24" style="text-align: center;font-size: 44px;font-weight: bold;margin-top:18px;">
                  <img src="../../../../assets/iot/sxt.png" style="width:80px;" />
@ -72,7 +72,7 @@
              <a-row style="margin-top:-20px;">
                <a-col :span="12" ><span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:5px;">NUID: {{item.nuId?item.nuId:'未配置'}}</span></a-col>
                <a-col :span="12" style="text-align: right;">
-                  {{item.nuId_dictText?item.nuId_dictText:'未配置'}}
+                  {{item.nuName?item.nuName:'未配置'}}
                </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>
@ -139,7 +139,7 @@
              <a-row style="margin-top:-20px;">
                <a-col :span="12" ><span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:5px;">NUID: {{item.nuId?item.nuId:'未配置'}}</span></a-col>
                <a-col :span="12" style="text-align: right;">
-                  {{item.nuId_dictText?item.nuId_dictText:'未配置'}}
+                  {{item.nuName?item.nuName:'未配置'}}
                </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>
@ -205,7 +205,7 @@
              <a-row style="margin-top:-20px;">
                <a-col :span="12" ><span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:5px;">NUID: {{item.nuId?item.nuId:'未配置'}}</span></a-col>
                <a-col :span="12" style="text-align: right;">
-                  {{item.nuId_dictText?item.nuId_dictText:'未配置'}}
+                  {{item.nuName?item.nuName:'未配置'}}
                </a-col>
                <a-col :span="24" style="padding: 12px 0 0 5px;margin-top:18px;">
                  <a-row>
--- a/src/views/invoicing/ConfigMaterial/components/WlqianyiForm.vue
+++ b/src/views/invoicing/ConfigMaterial/components/WlqianyiForm.vue
@ -16,12 +16,12 @@
 						</a-col>
 						<a-col :span="24" >
 							<a-form-item label="二级分类" v-bind="validateInfos.typeId" id="ConfigMaterialInfoForm-typeId" name="typeId">
-                <j-dict-select-tag type='radio' v-model:value="formData.typeId" :dictCode="`nu_config_material_type,type_name,id,category_id = ${formData.categoryId || -1} and iz_enabled = 0 and del_flag = 0 `" placeholder="请选择二级分类" @change="formData.medicationId = null"  allow-clear />
+                <j-dict-select-tag type='radio' v-model:value="formData.typeId" :dictCode="`nu_config_material_type,type_name,id,category_id = '${formData.categoryId || -1}' and iz_enabled = 0 and del_flag = 0 `" placeholder="请选择二级分类" @change="formData.medicationId = null"  allow-clear />
 							</a-form-item>
 						</a-col>
 						<a-col :span="24" >
 							<a-form-item label="三级分类" v-bind="validateInfos.medicationId" id="ConfigMaterialInfoForm-medicationId" name="medicationId">
-                <j-dict-select-tag type='radio' v-model:value="formData.medicationId" :dictCode="`nu_config_material_medication,medication_name,id,type_id = ${formData.typeId || -1} and iz_enabled = 0 and del_flag = 0`" placeholder="请选择三级分类"  allow-clear />
+                <j-dict-select-tag type='radio' v-model:value="formData.medicationId" :dictCode="`nu_config_material_medication,medication_name,id,type_id = '${formData.typeId || -1}' and iz_enabled = 0 and del_flag = 0`" placeholder="请选择三级分类"  allow-clear />
 							</a-form-item>
 						</a-col>
 						 
--- a/src/views/iot/tplink/camera/camera.data.ts
+++ b/src/views/iot/tplink/camera/camera.data.ts
@ -82,6 +82,12 @@ export const formSchema: FormSchema[] = [
    // }
    dynamicDisabled: true
  },
+  {
+    label: 'SN',
+    field: 'sn',
+    component: 'Input',
+    dynamicDisabled: true
+  },
  {
    label: '设备名称',
    field: 'deviceName',
@ -119,12 +125,14 @@ export const formSchema: FormSchema[] = [
    label: '区域名称',
    field: 'regionName',
    component: 'Input',
+    ifShow: false,
    dynamicDisabled: true
  },
  {
    label: '父设备名称',
    field: 'parentDeviceName',
    component: 'Input',
+    ifShow: false,
    dynamicDisabled: true
  },
  {
@ -137,23 +145,26 @@ export const formSchema: FormSchema[] = [
    label: '项目名称',
    field: 'projectName',
    component: 'Input',
+    ifShow: false,
    dynamicDisabled: true
  },
  {
    label: '位置名称',
    field: 'locationName',
    component: 'Input',
+    ifShow: false,
    dynamicDisabled: true
  },
  {
    label: '区域',
    field: 'nuId',
-    component: 'JSelectNu',
-    componentProps: {
-      rowKey: 'nuId',
-      labelKey: 'nuName',
-      selectType: true,
-    },
+    component: 'Input',
+    dynamicDisabled: true,
+    // componentProps: {
+    //   rowKey: 'nuId',
+    //   labelKey: 'nuName',
+    //   selectType: true,
+    // },
  },
  {
    label: '设备重启',
--- a/src/views/iot/tplink/camera/components/CameraInfoList.vue
+++ b/src/views/iot/tplink/camera/components/CameraInfoList.vue
@ -28,9 +28,9 @@
        <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;">
-                      <div style="font-size: 12px;">设备名称：<span style="font-weight: bold;">{{item.deviceName}}</span></div>
-                      <div style="font-size: 12px;">区域名称：{{item.regionName?item.regionName:'未配置'}}</div>
+                <a-col :span="18" >
+                      <div style="font-size: 14px;">SN：<span style="font-weight: bold;">{{item.sn?item.sn:'未配置'}}</span></div>
+                      <div style="font-size: 12px;">设备名称：{{item.deviceName}}</div>
                </a-col>
                <a-col :span="6" style="text-align: center;padding-top: 4px;">
                  <div :class="item.deviceStatus=='1'?'zxClass':'lxClass'">{{item.deviceStatus =='1'?'在线':'离线'}}</div>
--- a/src/views/iot/tq/electricity/apilog/ApiLogModal.vue
+++ b/src/views/iot/tq/electricity/apilog/ApiLogModal.vue
@ -1,7 +1,15 @@
 <template>
-  <j-modal :title="title" width="70%" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+  <!-- <j-modal :title="title" width="70%" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭"> -->
+    
+  <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="true"
+    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
    <DepartUtilsList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></DepartUtilsList>
-  </j-modal>
+    <template #footer>
+      <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
+      <!-- <a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button> -->
+    </template>
+  </a-drawer>
+  <!-- </j-modal> -->
 </template>

 <script lang="ts" setup>
@ -10,7 +18,7 @@
  import JModal from '/@/components/Modal/src/JModal/JModal.vue';
  
  const title = ref<string>('');
-  const width = ref<number>(800);
+  const width = ref<string>('70%');
  const visible = ref<boolean>(false);
  const disableSubmit = ref<boolean>(false);
  const registerForm = ref();
--- a/src/views/iot/tq/electricity/apilog/WaterApiLogModal.vue
+++ b/src/views/iot/tq/electricity/apilog/WaterApiLogModal.vue
@ -1,7 +1,14 @@
 <template>
-  <j-modal :title="title" width="70%" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+  <!-- <j-modal :title="title" width="70%" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭"> -->
+    <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="true"
+    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
    <WaterApiLogList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></WaterApiLogList>
-  </j-modal>
+    <template #footer>
+      <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
+      <!-- <a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button> -->
+    </template>
+  </a-drawer>
+  <!-- </j-modal> -->
 </template>

 <script lang="ts" setup>
@ -10,7 +17,7 @@
  import JModal from '/@/components/Modal/src/JModal/JModal.vue';
  
  const title = ref<string>('');
-  const width = ref<number>(800);
+  const width = ref<string>('70%');
  const visible = ref<boolean>(false);
  const disableSubmit = ref<boolean>(false);
  const registerForm = ref();
--- a/src/views/iot/yiweilian/components/ApiLogAlarmModal.vue
+++ b/src/views/iot/yiweilian/components/ApiLogAlarmModal.vue
@ -1,7 +1,15 @@
 <template>
-  <j-modal :title="title" width="70%" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+  <!-- <j-modal :title="title" width="70%" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭"> -->
+    
+  <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="true"
+    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
    <ApiLogAlarmList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ApiLogAlarmList>
-  </j-modal>
+    <template #footer>
+      <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
+      <!-- <a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button> -->
+    </template>
+  </a-drawer>
+  <!-- </j-modal> -->
 </template>

 <script lang="ts" setup>
@ -10,7 +18,7 @@
  import JModal from '/@/components/Modal/src/JModal/JModal.vue';

  const title = ref<string>('');
-  const width = ref<number>(800);
+  const width = ref<string>('70%');
  const visible = ref<boolean>(false);
  const disableSubmit = ref<boolean>(false);
  const registerForm = ref();
--- a/src/views/iot/yiweilian/components/ApiLogList.vue
+++ b/src/views/iot/yiweilian/components/ApiLogList.vue
@ -18,7 +18,7 @@
  import { useUserStore } from '/@/store/modules/user';

  const formRef = ref();
-  const queryParam = reactive<any>({});
+  const queryParam = reactive<any>({optType:'read'});
  const toggleSearchStatus = ref<boolean>(false);
  const registerModal = ref();
  const userStore = useUserStore();
--- a/src/views/iot/yiweilian/humid.data.ts
+++ b/src/views/iot/yiweilian/humid.data.ts
@ -141,7 +141,10 @@ export const formSchema: FormSchema[] = [
    field: 'deviceName',
    component: 'Input',
    required: true,
-    labelWidth: '160px'
+    labelWidth: '160px',
+    componentProps: {
+      maxlength: 10  // 直接限制输入长度
+    }
  },
  {
    label: '时区',
@ -172,7 +175,10 @@ export const formSchema: FormSchema[] = [
      return values.isUpdate;
    },
    required: true,
-    labelWidth: '160px'
+    labelWidth: '160px',
+    componentProps: {
+      maxlength: 2  // 直接限制输入长度
+    }
  },
  {
    label: '上报间隔(分钟)',
@ -183,7 +189,10 @@ export const formSchema: FormSchema[] = [
      return values.isUpdate;
    },
    required: true,
-    labelWidth: '160px'
+    labelWidth: '160px',
+    componentProps: {
+      maxlength: 2  // 直接限制输入长度
+    }
  },
  {
    label: '历史上报时刻(00:00)',
@ -209,7 +218,10 @@ export const formSchema: FormSchema[] = [
      return values.isUpdate;
    },
    required: true,
-    labelWidth: '160px'
+    labelWidth: '160px',
+    componentProps: {
+      maxlength: 2  // 直接限制输入长度
+    }
  },
  {
    label: '温度预警-上限',
@ -220,7 +232,10 @@ export const formSchema: FormSchema[] = [
      return values.isUpdate;
    },
    required: true,
-    labelWidth: '160px'
+    labelWidth: '160px',
+    componentProps: {
+      maxlength: 2  // 直接限制输入长度
+    }
  },
  {
    label: '温度预警-下限',
@ -231,7 +246,10 @@ export const formSchema: FormSchema[] = [
      return values.isUpdate;
    },
    required: true,
-    labelWidth: '160px'
+    labelWidth: '160px',
+    componentProps: {
+      maxlength: 2  // 直接限制输入长度
+    }
  },
  {
    label: '温度缓冲值',
@ -242,7 +260,10 @@ export const formSchema: FormSchema[] = [
      return values.isUpdate;
    },
    required: true,
-    labelWidth: '160px'
+    labelWidth: '160px',
+    componentProps: {
+      maxlength: 4  // 直接限制输入长度
+    }
  },
  {
    label: '湿度预警-上限',
@ -253,7 +274,10 @@ export const formSchema: FormSchema[] = [
      return values.isUpdate;
    },
    required: true,
-    labelWidth: '160px'
+    labelWidth: '160px',
+    componentProps: {
+      maxlength: 2  // 直接限制输入长度
+    }
  },
  {
    label: '湿度预警-下限',
@ -264,7 +288,10 @@ export const formSchema: FormSchema[] = [
      return values.isUpdate;
    },
    required: true,
-    labelWidth: '160px'
+    labelWidth: '160px',
+    componentProps: {
+      maxlength: 2  // 直接限制输入长度
+    }
  },
  {
    label: '湿度缓冲值',
@ -275,7 +302,10 @@ export const formSchema: FormSchema[] = [
      return values.isUpdate;
    },
    required: true,
-    labelWidth: '160px'
+    labelWidth: '160px',
+    componentProps: {
+      maxlength: 4  // 直接限制输入长度
+    }
  },
  {
    label: '断电报警开关',