修复通知日志的显示

.env

@@ -18,4 +18,4 @@ VITE_SCREEN_URL = '/plugin/screen/'
 # 组态图前端
 VITE_TOPO_URL = '/plugin/topo/'
 # modbus服务
-VITE_MODBUS_API = '/base-api/modbus/v1'
+VITE_MODBUS_API = '/base-api/modbus'

src/views/iot/device/channel/component/edit.vue

@@ -1,60 +1,55 @@
 <template>
 	<div class="system-edit-dic-container">
-		<el-dialog :title="(ruleForm.id!==0?'修改':'添加')+'设备'" v-model="isShowDialog" width="769px">
+		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '设备'" v-model="isShowDialog" width="769px">
 			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="110px">
-       <el-form-item label="设备标识" prop="key">
-          <el-input v-model="ruleForm.key" placeholder="请输入设备标识" :disabled="ruleForm.id" />
-        </el-form-item>
-        <el-form-item label="设备名称" prop="name">
-          <el-input v-model="ruleForm.name" placeholder="请输入设备名称" />
-        </el-form-item>
+				<el-form-item label="设备标识" prop="key">
+					<el-input v-model="ruleForm.key" placeholder="请输入设备标识" :disabled="ruleForm.id" />
+				</el-form-item>
+				<el-form-item label="设备名称" prop="name">
+					<el-input v-model="ruleForm.name" placeholder="请输入设备名称" />
+				</el-form-item>
+				<el-form-item label="所属产品" prop="productId">
+					<el-select v-model="ruleForm.productId" placeholder="请选择所属产品" class="w100">
+						<el-option v-for="item in productData" :key="item.id" :label="item.name" :value="item.id" />
+					</el-select>
+				</el-form-item>
 
-        
+				<el-form-item label="所属部门" prop="deptId">
+					<el-cascader
+						:options="deptData"
+						:props="{ checkStrictly: true, emitPath: false, value: 'deptId', label: 'deptName' }"
+						placeholder="请选择所属部门"
+						clearable
+						class="w100"
+						v-model="ruleForm.deptId"
+					>
+						<template #default="{ node, data }">
+							<span>{{ data.deptName }}</span>
+							<span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+						</template>
+					</el-cascader>
+				</el-form-item>
 
-           <el-form-item label="所属产品" prop="productId">
-       
-                <el-select v-model="ruleForm.productId" placeholder="请选择所属产品" class="w100">
-              <el-option
-                v-for="item in productData"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
-            </el-select>
-            </el-form-item> 
+				<el-form-item label="设备证书" prop="certificate">
+					<el-input v-model="ruleForm.certificate" placeholder="请输入设备证书" />
+				</el-form-item>
 
-         <el-form-item label="所属部门" prop="deptId">
-              <el-cascader :options="deptData" :props="{ checkStrictly: true,emitPath: false, value: 'deptId', label: 'deptName' }" placeholder="请选择所属部门" clearable class="w100" v-model="ruleForm.deptId">
-                <template #default="{ node, data }">
-                  <span>{{ data.deptName }}</span>
-                  <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
-                </template>
-              </el-cascader>
-            </el-form-item> 
+				<el-form-item label="设备秘钥" prop="secureKey">
+					<el-input v-model="ruleForm.secureKey" placeholder="请输入设备秘钥" />
+				</el-form-item>
 
-           
-        
-        <el-form-item label="设备证书" prop="certificate">
-          <el-input v-model="ruleForm.certificate" placeholder="请输入设备证书" />
-        </el-form-item>
+				<el-form-item label="固件版本号" prop="version">
+					<el-input v-model="ruleForm.version" placeholder="请输入固件版本号" />
+				</el-form-item>
 
-        <el-form-item label="设备秘钥" prop="secureKey">
-          <el-input v-model="ruleForm.secureKey" placeholder="请输入设备秘钥" />
-        </el-form-item>
-
-         <el-form-item label="固件版本号" prop="version">
-          <el-input v-model="ruleForm.version" placeholder="请输入固件版本号" />
-        </el-form-item>
-      
-  
-        <el-form-item label="备注" prop="desc">
-          <el-input v-model="ruleForm.desc" type="textarea" placeholder="请输入内容"></el-input>
-        </el-form-item>
+				<el-form-item label="备注" prop="desc">
+					<el-input v-model="ruleForm.desc" type="textarea" placeholder="请输入内容"></el-input>
+				</el-form-item>
 			</el-form>
 			<template #footer>
 				<span class="dialog-footer">
 					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="default">{{ruleForm.id!==0?'修 改':'添 加'}}</el-button>
+					<el-button type="primary" @click="onSubmit" size="default">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
 				</span>
 			</template>
 		</el-dialog>
@@ -62,87 +57,83 @@
 </template>
 
 <script lang="ts">
-import { reactive, toRefs, defineComponent,ref, unref } from 'vue';
+import { reactive, toRefs, defineComponent, ref, unref } from 'vue';
 import api from '/@/api/device';
-import {ElMessage} from "element-plus";
+import { ElMessage } from 'element-plus';
 interface RuleFormState {
-  id:number;
-  name:string;
-  certificate:string;
-  secureKey:string;
-  version:string;
-  productId:number;
-  deptId:number;
-  desc:string;
+	id: number;
+	name: string;
+	certificate: string;
+	secureKey: string;
+	version: string;
+	productId: string;
+	deptId: number;
+	desc: string;
 }
 interface DicState {
 	isShowDialog: boolean;
 	ruleForm: RuleFormState;
-  rules:{}
+	productData: any;
+	deptData: any;
+	rules: {};
 }
 
 export default defineComponent({
 	name: 'deviceEditPro',
-	setup(prop,{emit}) {
-    const formRef = ref<HTMLElement | null>(null);
+	setup(prop, { emit }) {
+		const formRef = ref<HTMLElement | null>(null);
 		const state = reactive<DicState>({
 			isShowDialog: false,
-      productData: [], // 分类数据
-      deptData: [], // 
+			productData: [], // 分类数据
+			deptData: [], //
 			ruleForm: {
-        id:0,
-        name:'',
-        productId:'',
-        deptId:0,
-        certificate:'',
-        secureKey:'',
-        version:'',
-        desc:''
+				id: 0,
+				name: '',
+				productId: '',
+				deptId: 0,
+				certificate: '',
+				secureKey: '',
+				version: '',
+				desc: '',
+			},
+			rules: {
+				name: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
+				key: [{ required: true, message: '设备标识不能为空', trigger: 'blur' }],
+				productId: [{ required: true, message: '所属产品不能为空', trigger: 'blur' }],
+				deptId: [{ required: true, message: '所属部门不能为空', trigger: 'blur' }],
 			},
-      rules: {
-        name: [
-          { required: true, message: "设备名称不能为空", trigger: "blur" }
-        ],
-        key: [
-          { required: true, message: "设备标识不能为空", trigger: "blur" }
-        ],
-        productId: [{ required: true, message: '所属产品不能为空', trigger: 'blur' }],
-        deptId: [{ required: true, message: '所属部门不能为空', trigger: 'blur' }],
-       
-      }
 		});
 		// 打开弹窗
-		const openDialog = (row: RuleFormState|null) => {
-      resetForm();
-
-        api.product.getLists({ status: 1 }).then((res: any) => {
-          state.productData = res.product || [];
-        });
-        api.dept.getList({ status: -1 }).then((res: any) => {
-          state.deptData = res || [];
-        });
+		const openDialog = (row: RuleFormState | null) => {
+			resetForm();
 
+			api.product.getLists({ status: 1 }).then((res: any) => {
+				state.productData = res.product || [];
+			});
+			api.dept.getList({ status: -1 }).then((res: any) => {
+				state.deptData = res || [];
+			});
 
-      if (row){
-        // api.dict.getType(row.id).then((res:any)=>{
-        //   state.ruleForm = res.data.dictType
-        // })
-        state.ruleForm = row;
-      }
+			if (row) {
+				// api.dict.getType(row.id).then((res:any)=>{
+				//   state.ruleForm = res.data.dictType
+				// })
+				state.ruleForm = row;
+			}
 			state.isShowDialog = true;
 		};
-    const resetForm = ()=>{
-      state.ruleForm = {
-        id:0,
-        name:'',
-        productId:'',
-        deptId:0,
-        certificate:'',
-        secureKey:'',
-        version:'',
-        desc:''
-      }
-    };
+		const resetForm = () => {
+			state.ruleForm = {
+				id: 0,
+				name: '',
+				productId: '',
+				deptId: 0,
+				certificate: '',
+				secureKey: '',
+				version: '',
+				desc: '',
+			};
+		};
 		// 关闭弹窗
 		const closeDialog = () => {
 			state.isShowDialog = false;
@@ -153,36 +144,35 @@ export default defineComponent({
 		};
 		// 新增
 		const onSubmit = () => {
-      const formWrap = unref(formRef) as any;
-      if (!formWrap) return;
-      formWrap.validate((valid: boolean) => {
-        if (valid) {
-          if(state.ruleForm.id!==0){
-            //修改
-            api.instance.edit(state.ruleForm).then(()=>{
-              ElMessage.success('设备类型修改成功');
-              closeDialog(); // 关闭弹窗
-              emit('typeList')
-            })
-          }else{
-            //添加
-            api.instance.add(state.ruleForm).then(()=>{
-              ElMessage.success('设备类型添加成功');
-              closeDialog(); // 关闭弹窗
-              emit('typeList')
-            })
-          }
-        }
-      });
+			const formWrap = unref(formRef) as any;
+			if (!formWrap) return;
+			formWrap.validate((valid: boolean) => {
+				if (valid) {
+					if (state.ruleForm.id !== 0) {
+						//修改
+						api.instance.edit(state.ruleForm).then(() => {
+							ElMessage.success('设备类型修改成功');
+							closeDialog(); // 关闭弹窗
+							emit('typeList');
+						});
+					} else {
+						//添加
+						api.instance.add(state.ruleForm).then(() => {
+							ElMessage.success('设备类型添加成功');
+							closeDialog(); // 关闭弹窗
+							emit('typeList');
+						});
+					}
+				}
+			});
 		};
 
-
 		return {
 			openDialog,
 			closeDialog,
 			onCancel,
 			onSubmit,
-      formRef,
+			formRef,
 			...toRefs(state),
 		};
 	},

src/views/iot/noticeservices/log/index.vue

@@ -95,7 +95,7 @@ interface TableDataState {
 		param: {
 			pageNum: number;
 			pageSize: number;
-
+			status: number;
 			dateRange: string[];
 		};
 	};
@@ -119,7 +119,7 @@ export default defineComponent({
 				param: {
 					pageNum: 1,
 					pageSize: 10,
-					status: '',
+					status: -1,
 					dateRange: [],
 				},
 			},