Jelajahi Sumber

fix: 修复bug列表中的 bug

yanglzh 1 tahun lalu
induk
melakukan
3c0e45efd8

+ 5 - 5
src/views/iot/alarm/setting/component/edit.vue

@@ -298,10 +298,10 @@ export default defineComponent({
 				],
 			},
 			rules: {
-				name: [{ required: true, message: '告警名称不能为空', trigger: 'blur' }],
-				level: [{ required: true, message: '告警级别不能为空', trigger: 'blur' }],
-				productKey: [{ required: true, message: '请选择产品', trigger: 'blur' }],
-				deviceKey: [{ required: true, message: '请选择设备', trigger: 'blur' }],
+				name: [{ required: true, message: '告警名称不能为空', trigger: 'change' }],
+				level: [{ required: true, message: '告警级别不能为空', trigger: 'change' }],
+				productKey: [{ required: true, message: '请选择产品', trigger: 'change' }],
+				deviceKey: [{ required: true, message: '请选择设备', trigger: 'change' }],
 			},
 		});
 
@@ -467,7 +467,7 @@ export default defineComponent({
 						alarm.common.edit(state.ruleForm).then(() => {
 							ElMessage.success('告警修改成功');
 							closeDialog(); // 关闭弹窗
-							emit('typeList');
+							emit('dataList');
 						});
 					} else {
 						//添加

+ 2 - 2
src/views/iot/alarm/setting/component/level.vue

@@ -4,8 +4,8 @@
 			<el-form ref="formRef" :model="ruleForm" :rules="rules" size="default" label-width="90px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-for="(item, index) in levelData" :key="index">
-						<el-form-item :label="'级别' + item.level" prop="name">
-							<el-input v-model="item.name" placeholder="请输入分类名称"></el-input>
+						<el-form-item :label="'级别' + item.level" prop="name" required>
+							<el-input v-model.trim="item.name" placeholder="请输入告警级别名称"></el-input>
 						</el-form-item>
 					</el-col>
 				</el-row>

+ 1 - 1
src/views/iot/alarm/setting/index.vue

@@ -207,7 +207,7 @@ export default defineComponent({
 			let msg = '你确定要删除所选数据?';
 			let ids: number[] = [];
 			if (row) {
-				msg = `此操作将永久删除模型:“${row.name}”,是否继续?`;
+				msg = `此操作将永久删除告警:“${row.name}”,是否继续?`;
 				ids = row.id;
 			} else {
 				ids = state.ids;

+ 2 - 2
src/views/iot/configuration/screen/edit.vue

@@ -1,8 +1,8 @@
 <template>
 	<el-dialog class="api-edit" v-model="showDialog" :title="`${formData.id ? '编辑大屏' : '新增大屏'}`" width="600px" :close-on-click-modal="false" :close-on-press-escape="false">
 		<el-form ref="formRef" :model="formData" :rules="ruleForm" label-width="80px">
-			<el-form-item label="项目名称" prop="projectName">
-				<el-input v-model="formData.projectName" placeholder="输入大屏项目名称" />
+			<el-form-item label="大屏名称" prop="projectName">
+				<el-input v-model.trim="formData.projectName" placeholder="输入大屏名称" />
 			</el-form-item>
 			<el-form-item label="说明" prop="remarks">
 				<el-input v-model="formData.remarks" type="textarea" :rows="3" />

+ 2 - 2
src/views/iot/configuration/screen/index.vue

@@ -15,7 +15,7 @@
     <el-table :data="tableData" style="width: 100%" v-loading="loading">
       <el-table-column type="index" label="序号" width="60" align="center" />
       <el-table-column prop="id" label="ID" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="projectName" label="项目名称" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="projectName" label="大屏名称" show-overflow-tooltip></el-table-column>
       <el-table-column prop="remarks" label="描述" show-overflow-tooltip></el-table-column>
       <el-table-column prop="createdAt" label="创建时间" min-width="100" align="center"></el-table-column>
       <el-table-column prop="updatedAt" label="更新时间" min-width="100" align="center"></el-table-column>
@@ -94,7 +94,7 @@ const preview = async (row: any) => {
 };
 
 const onDel = (row: any) => {
-  ElMessageBox.confirm(`此操作将删除接口:“${row.projectName}”,是否继续?`, '提示', {
+  ElMessageBox.confirm(`此操作将删除大屏:“${row.projectName}”,是否继续?`, '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
     type: 'warning',

+ 4 - 4
src/views/iot/device/channel/component/edit.vue

@@ -2,19 +2,19 @@
 	<el-dialog title="添加设备通道" v-model="dialogVisible" width="600px" :before-close="clsoeDialog" :close-on-click-modal="false">
 		<el-form ref="dataForm" :rules="rules" :model="temp" label-position="left" label-width="120px" style="width: 90%; margin: 0 auto">
 			<el-form-item label="通道名称" prop="title">
-				<el-input v-model="temp.title" placeholder="请输入通道名称" />
+				<el-input v-model.trim="temp.title" placeholder="请输入通道名称" />
 			</el-form-item>
 			<el-form-item label="注册码" prop="number">
-				<el-input v-model="temp.number" placeholder="请输入注册码" />
+				<el-input v-model.trim="temp.number" placeholder="请输入注册码" />
 			</el-form-item>
 			<el-form-item label="设备地址" prop="slaveId">
 				<el-input v-model.number="temp.slaveId" placeholder="请输入设备地址" />
 			</el-form-item>
 		</el-form>
-		<div slot="footer" class="dialog-footer">
+		<template #footer class="dialog-footer">
 			<el-button @click="clsoeDialog()"> 取 消 </el-button>
 			<el-button type="primary" @click="createData()"> 保 存 </el-button>
-		</div>
+		</template>
 	</el-dialog>
 </template>
 <script lang="ts">

+ 4 - 4
src/views/iot/device/channel/component/taskDialog.vue

@@ -1,6 +1,6 @@
 <template>
-	<el-dialog :title="textMap[dialogStatus]" v-model="dialogVisible" width="600px" :before-close="clsoeDialog" append-to-body :close-on-click-modal="false">
-		<el-form ref="dataForm" :rules="rules" :model="temp" label-position="left" label-width="120px" style="width: 400px; margin: 0 auto">
+	<el-dialog :title="textMap[dialogStatus]" v-model="dialogVisible" width="500px" :before-close="clsoeDialog" append-to-body :close-on-click-modal="false">
+		<el-form ref="dataForm" :rules="rules" :model="temp" label-position="left" label-width="120px">
 			<el-form-item label="标题" prop="title">
 				<el-input v-model="temp.title" placeholder="请输入标题" />
 			</el-form-item>
@@ -22,10 +22,10 @@
 				</el-select>
 			</el-form-item>
 		</el-form>
-		<div slot="footer" class="dialog-footer">
+		<template #footer class="dialog-footer">
 			<el-button @click="clsoeDialog"> 取 消 </el-button>
 			<el-button type="primary" @click="dialogStatus === 'create' ? createData() : updateData()"> 保 存 </el-button>
-		</div>
+		</template>
 	</el-dialog>
 </template>
 

+ 3 - 3
src/views/iot/device/channel/index.vue

@@ -12,10 +12,10 @@
 			<div class="search">
 				<el-form :model="params" :inline="true" ref="queryRef" @keyup.enter.native="getList(1)">
 					<el-form-item label="通道名称" prop="title">
-						<el-input v-model="params.title" placeholder="请输入通道名称" clearablestyle="width: 240px" />
+						<el-input v-model="params.title" placeholder="请输入通道名称" clearable style="width: 240px" />
 					</el-form-item>
 					<el-form-item label="注册码" prop="number">
-						<el-input v-model="params.number" placeholder="请输入注册码" clearablestyle="width: 240px" />
+						<el-input v-model="params.number" placeholder="请输入注册码" clearable style="width: 240px" />
 					</el-form-item>
 					<el-form-item>
 						<el-button size="default" type="primary" class="ml10" @click="getList(1)">
@@ -88,7 +88,7 @@ const resetQuery = () => {
 };
 
 const onDel = (row: any) => {
-	ElMessageBox.confirm(`此操作将删除接口:“${row.title}”,是否继续?`, '提示', {
+	ElMessageBox.confirm(`此操作将删除通道:“${row.title}”,是否继续?`, '提示', {
 		confirmButtonText: '确认',
 		cancelButtonText: '取消',
 		type: 'warning',

+ 2 - 2
src/views/iot/device/template/component/deviceTemplateDialog.vue

@@ -93,10 +93,10 @@
 					</el-col>
 				</el-row>
 			</el-form>
-			<div slot="footer" class="dialog-footer" style="margin-top: 20px">
+			<template #footer class="dialog-footer">
 				<el-button @click="clsoeDialog"> 取 消 </el-button>
 				<el-button type="primary" @click="dialogStatus === 'create' ? createData() : updateData()"> 保 存 </el-button>
-			</div>
+			</template>
 		</el-dialog>
 	</div>
 </template>

+ 2 - 2
src/views/iot/device/template/component/edit.vue

@@ -23,10 +23,10 @@
 					<DeviceTemplateDialog :templateNumber="temp.number" :mode="temp.mode" ref="deviceTemplateDialog" v-if="activeName === '2'" />
 				</el-tab-pane>
 			</el-tabs>
-			<div slot="footer" class="dialog-footer mt-4">
+			<template #footer class="dialog-footer">
 				<el-button @click="clsoeDialog"> 取 消 </el-button>
 				<el-button type="primary" @click="dialogStatus === 'create' ? createData() : updateData()"> 保 存 </el-button>
-			</div>
+			</template>
 		</div>
 	</el-dialog>
 </template>

+ 2 - 2
src/views/iot/device/template/index.vue

@@ -4,7 +4,7 @@
 			<div class="search">
 				<el-form :model="params" :inline="true" ref="queryRef">
 					<el-form-item label="模板名称" prop="title">
-						<el-input v-model="params.title" placeholder="请输入模板名称" clearablestyle="width: 240px" @keyup.enter.native="getList(1)" />
+						<el-input v-model="params.title" placeholder="请输入模板名称" clearable style="width: 240px" @keyup.enter.native="getList(1)" />
 					</el-form-item>
 					<el-form-item>
 						<el-button size="default" type="primary" class="ml10" @click="getList(1)">
@@ -90,7 +90,7 @@ const resetQuery = () => {
 };
 
 const onDel = (row: any) => {
-	ElMessageBox.confirm(`此操作将删除接口:“${row.title}”,是否继续?`, '提示', {
+	ElMessageBox.confirm(`此操作将删除模板:“${row.title}”,是否继续?`, '提示', {
 		confirmButtonText: '确认',
 		cancelButtonText: '取消',
 		type: 'warning',

+ 2 - 2
src/views/iot/ice104/device/component/deviceTaskTable.vue

@@ -2,7 +2,7 @@
     <div>
         <el-form :model="params" :inline="true" ref="queryRef">
             <el-form-item label="任务名称" prop="title">
-                <el-input v-model="params.title" placeholder="请输入任务名称" clearablestyle="width: 240px" @submit.prevent />
+                <el-input v-model="params.title" placeholder="请输入任务名称" clearable style="width: 240px" @submit.prevent />
             </el-form-item>
             <el-form-item>
                 <el-button v-auth="'query'" size="default" type="primary" class="ml10" @click="getList(1)">
@@ -78,7 +78,7 @@ const addOrEdit = async (row?: any) => {
  * 单一删除
  */
 const onDel = (row: any) => {
-    ElMessageBox.confirm(`此操作将删除接口:“${row.title}”,是否继续?`, '提示', {
+    ElMessageBox.confirm(`此操作将删除任务:“${row.title}”,是否继续?`, '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',

+ 1 - 9
src/views/iot/ice104/device/detail.vue

@@ -55,18 +55,10 @@ const handleClick = (tab: TabsPaneContext, event: Event) => {
 }
 
 /**
- * 重置表单
- */
-const resetQuery = () => {
-	queryRef.value.resetFields()
-	getList()
-}
-
-/**
  * 删除
  */
 const onDel = (row: any) => {
-	ElMessageBox.confirm(`此操作将删除接口:“${row.title}”,是否继续?`, '提示', {
+	ElMessageBox.confirm(`此操作将删除:“${row.title}”,是否继续?`, '提示', {
 		confirmButtonText: '确认',
 		cancelButtonText: '取消',
 		type: 'warning',

+ 1 - 1
src/views/iot/ice104/device/index.vue

@@ -12,7 +12,7 @@
 			<div class="search">
 				<el-form :model="params" :inline="true" ref="queryRef" @submit.prevent>
 					<el-form-item label="设备名称" prop="title">
-						<el-input v-model="params.title" placeholder="请输入设备名称" clearablestyle="width: 240px" @keyup.enter.native="getList(1)" />
+						<el-input v-model="params.title" placeholder="请输入设备名称" clearable style="width: 240px" @keyup.enter.native="getList(1)" />
 					</el-form-item>
 					<el-form-item>
 						<el-button v-auth="'query'" size="default" type="primary" class="ml10" @click="getList(1)">

+ 2 - 2
src/views/iot/ice104/template/component/templateTaskTable.vue

@@ -2,7 +2,7 @@
     <div>
         <el-form :model="params" :inline="true" ref="queryRef">
             <el-form-item label="点位名称" prop="title">
-                <el-input v-model="params.title" placeholder="请输入点位名称" clearablestyle="width: 240px" @keyup.enter.native="getList(1)" />
+                <el-input v-model="params.title" placeholder="请输入点位名称" clearable style="width: 240px" @keyup.enter.native="getList(1)" />
             </el-form-item>
             <el-form-item>
                 <el-button v-auth="'query'" size="default" type="primary" class="ml10" @click="getList(1)">
@@ -71,7 +71,7 @@ const addOrEdit = async (row?: any) => {
  * 单一删除
  */
 const onDel = (row: any) => {
-	ElMessageBox.confirm(`此操作将删除接口:“${row.title}”,是否继续?`, '提示', {
+	ElMessageBox.confirm(`此操作将删除点位:“${row.title}”,是否继续?`, '提示', {
 		confirmButtonText: '确认',
 		cancelButtonText: '取消',
 		type: 'warning',

+ 1 - 9
src/views/iot/ice104/template/detail.vue

@@ -42,18 +42,10 @@ const { params, tableData, getList, loading } = useSearch(api.device.getList, 'd
 getList();
 
 /**
- * 重置表单
- */
-const resetQuery = () => {
-	queryRef.value.resetFields();
-	getList();
-};
-
-/**
  * 删除
  */
 const onDel = (row: any) => {
-	ElMessageBox.confirm(`此操作将删除接口:“${row.title}”,是否继续?`, '提示', {
+	ElMessageBox.confirm(`此操作将删除:“${row.title}”,是否继续?`, '提示', {
 		confirmButtonText: '确认',
 		cancelButtonText: '取消',
 		type: 'warning',

+ 1 - 1
src/views/iot/ice104/template/index.vue

@@ -12,7 +12,7 @@
 			<div class="search">
 				<el-form :model="params" :inline="true" ref="queryRef">
 					<el-form-item label="模版名称" prop="title">
-						<el-input v-model="params.title" placeholder="请输入模版名称" clearablestyle="width: 240px" @keyup.enter.native="getList(1)" />
+						<el-input v-model="params.title" placeholder="请输入模版名称" clearable style="width: 240px" @keyup.enter.native="getList(1)" />
 					</el-form-item>
 					<el-form-item>
 						<el-button v-auth="'query'" size="default" type="primary" class="ml10" @click="getList(1)">

+ 2 - 10
src/views/iot/noticeservices/config/component/setEdit.vue

@@ -3,20 +3,14 @@
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '配置'" v-model="isShowDialog" width="50%">
 			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="110px">
 				<el-form-item label="名称" prop="title">
-					<el-input v-model="ruleForm.title" placeholder="请输入名称" />
+					<el-input v-model.trim="ruleForm.title" placeholder="请输入名称" />
 				</el-form-item>
-
 				<el-form-item label="通知类型" prop="types">
 					<el-radio-group v-model="ruleForm.types">
 						<el-radio label="1"  value="1">即时发送</el-radio>
 						<el-radio label="2" value="2">预约发送</el-radio>
 					</el-radio-group>
 				</el-form-item>
-
-			
-
-				
-
 			</el-form>
 			<template #footer>
 				<span class="dialog-footer">
@@ -41,8 +35,6 @@ interface RuleFormState {
 	name: string;
 	type: string;
 	sendGateway:string;
-	
-	
 }
 interface DicState {
 	isShowDialog: boolean;
@@ -121,7 +113,7 @@ export default defineComponent({
 						api.config.edit(state.ruleForm).then(() => {
 							ElMessage.success('配置修改成功');
 							closeDialog(); // 关闭弹窗
-							emit('typeList');
+							emit('dataList');
 						});
 					} else {
 						//添加

+ 2 - 5
src/views/iot/noticeservices/config/component/temEdit.vue

@@ -3,11 +3,10 @@
 		<el-dialog title="设置配置模板" v-model="isShowDialog" width="50%">
 			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="110px">
 				<el-form-item label="名称" prop="title">
-					<el-input v-model="ruleForm.title" placeholder="请输入名称" />
+					<el-input v-model.trim="ruleForm.title" placeholder="请输入名称" />
 				</el-form-item>
 
 				<!-- <el-form-item label="通知配置" prop="configId">
-       
 						<el-select v-model="ruleForm.configId" placeholder="请选择通知配置" class="w100">
 						<el-option
 						v-for="item in configData"
@@ -25,11 +24,9 @@
 					</el-radio-group>
 				</el-form-item> -->
 
-			
 				<el-form-item label="模板内容" prop="content">
-          <el-input v-model="ruleForm.content" type="textarea" placeholder="请输入内容"></el-input>
+          <el-input v-model.trim="ruleForm.content" type="textarea" placeholder="请输入内容"></el-input>
         </el-form-item>
-				
 
 			</el-form>
 			<template #footer>

+ 1 - 1
src/views/iot/noticeservices/config/index.vue

@@ -158,7 +158,7 @@ export default defineComponent({
       let msg = "你确定要删除所选数据?";
       let ids: number[] = [];
       if (row) {
-        msg = `此操作将永久删除模型:“${row.name}”,是否继续?`;
+        msg = `此操作将永久删除:“${row.name}”,是否继续?`;
         ids = row.id;
       } else {
         ids = state.ids;

+ 62 - 58
src/views/iot/noticeservices/config/setting.vue

@@ -2,16 +2,9 @@
 	<div class="system-dic-container">
 		<el-card shadow="hover">
 			<div class="system-user-search mb15">
-				<el-form :model="tableData.param" ref="queryRef" :inline="true">
-					<el-form-item label="配置名称" prop="name">
-						<el-input
-							v-model="tableData.param.title"
-							placeholder="请输入配置名称"
-							clearable
-							size="default"
-							style="width: 240px"
-							@keyup.enter.native="dataList"
-						/>
+				<el-form :model="tableData.param" ref="queryRef" :inline="true" @keyup.enter.native="dataList">
+					<el-form-item label="配置名称" prop="keyWord">
+						<el-input v-model="tableData.param.keyWord" placeholder="请输入配置名称" clearable size="default" style="width: 240px" />
 					</el-form-item>
 					<!-- <el-form-item label="通知方式" prop="name">
 						<el-input
@@ -49,18 +42,13 @@
 			<div>
 				<div style="border: 1px solid var(--next-border-color-light)"></div>
 				<el-row>
-					<el-col :span="8" v-for="(item, index) in tableData.data" :key="index"
-						><div class="grid-content card">
+					<el-col :span="8" v-for="(item, index) in tableData.data" :key="index">
+						<div class="grid-content card">
 							<div class="ant-card">
 								<div class="ant-card-body">
 									<div class="pro-table-card-item">
 										<div class="card-item-avatar">
-											<img
-												width="88"
-												height="88"
-												:src="'/imgs/notice/'+tableData.param.sendGateway+'.svg'"
-												alt=""
-											/>
+											<img width="88" height="88" :src="'/imgs/notice/' + tableData.param.sendGateway + '.svg'" alt="" />
 										</div>
 										<div class="card-item-body">
 											<div class="card-item-header">
@@ -70,18 +58,13 @@
 												</div>
 											</div>
 											<div class="card-item-content">
-												<div>
-													<label>通知方式</label>
-													<div class="">
-														<div style="width: 100%">{{item.types==1?'即时发送':'预约发送'}}</div>
-													</div>
-												</div>
-												<div>
+												通知方式:<el-tag>{{ item.types == 1 ? '即时发送' : '预约发送' }}</el-tag>
+												<!-- <div>
 													<label>说明</label>
 													<div class="ellipsis">
 														<div style="width: 100%"></div>
 													</div>
-												</div>
+												</div> -->
 											</div>
 										</div>
 									</div>
@@ -135,24 +118,18 @@
 					</el-col>
 				</el-row>
 			</div>
-			<div  style="text-align: center;padding: 28px;" v-if="(tableData.total==0)">暂无数据</div>
-			<pagination
-				v-show="tableData.total > 0"
-				:total="tableData.total"
-				v-model:page="tableData.param.pageNum"
-				v-model:limit="tableData.param.pageSize"
-				@pagination="dataList"
-			/>
+			<div style="text-align: center;padding: 28px;" v-if="(tableData.total == 0)">暂无数据</div>
+			<pagination v-show="tableData.total > 0" :total="tableData.total" v-model:page="tableData.param.pageNum" v-model:limit="tableData.param.pageSize" @pagination="dataList" />
 		</el-card>
 
 		<EditDic ref="editDicRef" @dataList="dataList" />
 		<EditTemDic ref="temeditDicRef" @dataList="dataList" />
-	<!-- 	<LevelDic ref="levelDicRef" @dataList="dataList" /> -->
+		<!-- 	<LevelDic ref="levelDicRef" @dataList="dataList" /> -->
 	</div>
 </template>
 
 <script lang="ts">
-import { toRefs, reactive, onMounted, ref,getCurrentInstance,defineComponent } from 'vue';
+import { toRefs, reactive, onMounted, ref, getCurrentInstance, defineComponent } from 'vue';
 import { ElMessageBox, ElMessage, FormInstance } from 'element-plus';
 import EditDic from './component/setEdit.vue';
 import EditTemDic from './component/temEdit.vue';
@@ -164,7 +141,7 @@ import { useRoute } from 'vue-router';
 // 定义接口来定义对象的类型
 interface TableDataRow {
 	id: number;
-	title: string;
+	keyWord: string;
 	sendGateway: string;
 	type: string;
 }
@@ -177,7 +154,7 @@ interface TableDataState {
 		param: {
 			pageNum: number;
 			pageSize: number;
-			title: string;
+			keyWord: string;
 			sendGateway: string;
 			types: string;
 		};
@@ -186,11 +163,11 @@ interface TableDataState {
 
 export default defineComponent({
 	name: 'setlist',
-	components: { EditDic,EditTemDic },
+	components: { EditDic, EditTemDic },
 
 	setup() {
-		
-   		 const { proxy } = getCurrentInstance() as any;
+
+		const { proxy } = getCurrentInstance() as any;
 		// const { notice_send_gateway } = proxy.useDict('notice_send_gateway');
 		const addDicRef = ref();
 		const editDicRef = ref();
@@ -200,7 +177,7 @@ export default defineComponent({
 		const route = useRoute();
 
 		const state = reactive<TableDataState>({
-			type:'',
+			type: '',
 			tableData: {
 				data: [],
 				total: 0,
@@ -208,7 +185,7 @@ export default defineComponent({
 				param: {
 					pageNum: 1,
 					pageSize: 20,
-					title: '',
+					keyWord: '',
 					sendGateway: '',
 					types: '',
 				},
@@ -216,7 +193,7 @@ export default defineComponent({
 		});
 		// 初始化表格数据
 		const initTableData = () => {
-			state.tableData.param.sendGateway=route.params.id;
+			state.tableData.param.sendGateway = route.params.id;
 			dataList();
 		};
 		const dataList = () => {
@@ -230,24 +207,24 @@ export default defineComponent({
 				.finally(() => (state.tableData.loading = false));
 		};
 		// 打开新增菜单弹窗
-		const onOpenAdd = (row?: TableDataRow ) => {
-			editDicRef.value.openDialog(null,state.tableData.param.sendGateway);
+		const onOpenAdd = (row?: TableDataRow) => {
+			editDicRef.value.openDialog(null, state.tableData.param.sendGateway);
 		};
-	
+
 		// 打开修改模型弹窗
-		const onOpenEdit = (row: TableDataRow ) => {
-			editDicRef.value.openDialog({ ...row },state.tableData.param.sendGateway);
+		const onOpenEdit = (row: TableDataRow) => {
+			editDicRef.value.openDialog({ ...row }, state.tableData.param.sendGateway);
 		};
 
-		const onOpenEditTem = (row: TableDataRow ) => {
-			temeditDicRef.value.opentemDialog(row.id,state.tableData.param.sendGateway);
+		const onOpenEditTem = (row: TableDataRow) => {
+			temeditDicRef.value.opentemDialog(row.id, state.tableData.param.sendGateway);
 		};
 
 		const onRowDel = (row?: TableDataRow) => {
 			let msg = '你确定要删除所选数据?';
 			let ids: number[] = [];
 			if (row) {
-				msg = `此操作将永久删除模型:“${row.title}”,是否继续?`;
+				msg = `此操作将永久删除:“${row.title}”,是否继续?`;
 				ids = row.id;
 			} else {
 				ids = state.ids;
@@ -267,7 +244,7 @@ export default defineComponent({
 						dataList();
 					});
 				})
-				.catch(() => {});
+				.catch(() => { });
 		};
 
 		// 页面加载时
@@ -299,7 +276,7 @@ export default defineComponent({
 			addDicRef,
 			editDicRef,
 			detailRef,
-			queryRef,			
+			queryRef,
 			onOpenAdd,
 			onOpenEdit,
 			onRowDel,
@@ -318,9 +295,11 @@ export default defineComponent({
 .el-button.is-text:not(.is-disabled).is-has-bg {
 	background-color: var(--next-border-color-light);
 }
+
 .card {
 	padding: 10px;
 }
+
 .ant-card {
 	box-sizing: border-box;
 	margin: 10px;
@@ -337,35 +316,43 @@ export default defineComponent({
 	transition: all 0.3s;
 	overflow: hidden;
 }
+
 .ant-card-body {
 	padding: 24px;
 	zoom: 1;
 	overflow: hidden;
 }
+
 .pro-table-card-item {
 	display: flex;
 }
+
 .pro-table-card-item .card-item-avatar {
 	margin-right: 16px;
 }
+
 .pro-table-card-item .card-item-body {
 	display: flex;
 	flex-direction: column;
 	flex-grow: 1;
 	width: 0;
 }
+
 .pro-table-card-item .card-item-body .card-item-header {
 	display: flex;
 	width: calc(100% - 86px);
 	margin-bottom: 12px;
 }
+
 .pro-table-card-item .card-item-body .card-item-content {
 	display: flex;
 	flex-wrap: wrap;
 }
-.pro-table-card-item .card-item-body .card-item-content > div {
+
+.pro-table-card-item .card-item-body .card-item-content>div {
 	width: 50%;
 }
+
 .ellipsis {
 	display: -webkit-box;
 	overflow: hidden;
@@ -373,10 +360,12 @@ export default defineComponent({
 	text-overflow: ellipsis;
 	word-break: break-all;
 }
+
 .card-item-body .card-item-header .card-item-header-name {
 	font-weight: 700;
 	font-size: 16px;
 }
+
 .card-state {
 	position: absolute;
 	top: 30px;
@@ -388,21 +377,27 @@ export default defineComponent({
 	background-color: rgba(89, 149, 245, 0.15);
 	transform: skewX(45deg);
 }
+
 .card-state.success {
 	background-color: #f6ffed;
 }
+
 .iot-card .card-warp .card-content .card-state.error {
 	background-color: rgba(229, 0, 18, 0.1);
 }
+
 .card-state .card-state-content {
 	transform: skewX(-45deg);
 }
+
 .ant-badge-status-success {
 	background-color: #52c41a;
 }
+
 .ant-badge-status-error {
 	background-color: #ff4d4f;
 }
+
 .ant-badge-status-dot {
 	position: relative;
 	top: -1px;
@@ -417,14 +412,17 @@ export default defineComponent({
 	display: flex;
 	margin-top: 2px;
 }
+
 .card-tools .card-button:not(:last-child) {
 	margin-right: 8px;
 }
+
 .card-tools .card-button {
 	display: flex;
 	flex-grow: 1;
 }
-.card-tools .card-button > span,
+
+.card-tools .card-button>span,
 .card-tools .card-button button {
 	width: 100%;
 	border-radius: 0;
@@ -435,11 +433,13 @@ export default defineComponent({
 	background: transparent;
 	box-shadow: none;
 }
+
 .ant-badge-status-text {
 	margin-left: 8px;
 	color: rgba(0, 0, 0, 0.85);
 	font-size: 14px;
 }
+
 .ant-btn {
 	line-height: 1.5715;
 	position: relative;
@@ -461,10 +461,12 @@ export default defineComponent({
 	border-radius: 2px;
 
 }
-.ant-btn > .anticon {
+
+.ant-btn>.anticon {
 	line-height: 1;
 }
-.ant-btn > span {
+
+.ant-btn>span {
 	display: inline-block;
 }
 
@@ -472,11 +474,13 @@ export default defineComponent({
 	display: flex;
 	justify-content: space-between;
 }
+
 .statusname {
 	font-size: 30px;
 	margin-top: 10px;
 	margin-bottom: 15px;
 }
+
 .comtest {
 	margin-top: 20px;
 	height: 30px;

+ 3 - 3
src/views/iot/rule-engine/edit.vue

@@ -2,14 +2,14 @@
 	<el-dialog
 		class="api-edit"
 		v-model="showDialog"
-		:title="`${formData.id ? '编辑数据转发' : '新增数据转发'}`"
+		:title="`${formData.id ? '编辑' : '新增'}`"
 		width="600px"
 		:close-on-click-modal="false"
 		:close-on-press-escape="false"
 	>
 		<el-form ref="formRef" :model="formData" :rules="ruleForm" label-width="80px">
-			<el-form-item label="规则名称" prop="name">
-				<el-input v-model="formData.name" placeholder="输入接口名称" />
+			<el-form-item label="名称" prop="name">
+				<el-input v-model.trim="formData.name" placeholder="输入名称" />
 			</el-form-item>
 			<el-form-item label="说明" prop="expound">
 				<el-input v-model="formData.expound" type="textarea" :rows="3" />

+ 3 - 3
src/views/system/api/index.vue

@@ -4,13 +4,13 @@
 			<div class="search">
 				<el-form :model="params" :inline="true" ref="queryRef">
 					<el-form-item label="接口名称" prop="name">
-						<el-input v-model="params.name" placeholder="请输入接口名称" clearablestyle="width: 240px" @keyup.enter.native="getList(1)" />
+						<el-input v-model="params.name" placeholder="请输入接口名称" clearable style="width: 240px" @keyup.enter.native="getList(1)" />
 					</el-form-item>
 					<el-form-item label="接口地址" prop="address">
-						<el-input v-model="params.address" placeholder="请输入接口地址" clearablestyle="width: 240px" @keyup.enter.native="getList(1)" />
+						<el-input v-model="params.address" placeholder="请输入接口地址" clearable style="width: 240px" @keyup.enter.native="getList(1)" />
 					</el-form-item>
 					<el-form-item label="状态" prop="status" style="width: 200px">
-						<el-select v-model="params.status" placeholder="接口状态" clearablestyle="width: 240px">
+						<el-select v-model="params.status" placeholder="接口状态" clearable style="width: 240px">
 							<el-option label="全部" :value="-1" />
 							<el-option label="启用" :value="1" />
 							<el-option label="禁用" :value="0" />

+ 2 - 2
src/views/system/config/component/editConfig.vue

@@ -93,11 +93,11 @@ export default defineComponent({
     const openDialog = (row: RuleFormState | null) => {
       resetForm();
       if (row) {
+        state.ruleForm = row;
         api.config.detail(row.configId).then((res: any) => {
-          const data: RuleFormState = res.data.data;
+          const data: RuleFormState = res.data;
           state.ruleForm = data;
         });
-        state.ruleForm = row;
       }
       state.isShowDialog = true;
     };