新增模板添加

src/api/notice/index.ts

@@ -11,7 +11,7 @@ export default {
   template: {
     getList: (params: object) => get("/notice/template/list", params),
     add: (data: object) => post("/notice/template/add", data),
-    delete: (ids: number) => del("/notice/template/del", { ids }),
+    delete: (ids: number) => del("/notice/template/delete", { ids }),
     edit: (data: object) => put("/notice/template/edit", data),
     detail: (id: number) => get("/notice/template/get", { id }),
   },

src/views/iot/noticeservices/config/component/temEdit.vue

@@ -6,15 +6,29 @@
 					<el-input v-model="ruleForm.title" placeholder="请输入名称" />
 				</el-form-item>
 
-				<el-form-item label="配置类型" prop="types">
+				<el-form-item label="通知配置" prop="configId">
+       
+						<el-select v-model="ruleForm.configId" placeholder="请选择通知配置" class="w100">
+						<el-option
+						v-for="item in configData"
+						:key="item.id"
+						:label="item.title"
+						:value="item.id"
+						/>
+					</el-select>
+					</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-item> -->
 
 			
-
+				<el-form-item label="模板内容" prop="content">
+          <el-input v-model="ruleForm.content" type="textarea" placeholder="请输入内容"></el-input>
+        </el-form-item>
 				
 
 			</el-form>
@@ -38,9 +52,11 @@ import { Delete, Plus, CircleClose, Top, Bottom, Minus, Right } from '@element-p
 
 interface RuleFormState {
 	id: number;
-	name: string;
-	type: string;
+	title: string;
+	types: string;
 	sendGateway:string;
+	content:string;
+	configId:string;
 	
 	
 }
@@ -48,6 +64,8 @@ interface DicState {
 	isShowDialog: boolean;
 	ruleForm: RuleFormState;
 	rules: {};
+	configData: {};
+	id: number;
 
 }
 
@@ -60,6 +78,7 @@ export default defineComponent({
 		const formRef = ref<HTMLElement | null>(null);
 		const state = reactive<DicState>({
 			id: 0,
+			configData:[],
 			isShowDialog: false,
 		
 			
@@ -68,11 +87,16 @@ export default defineComponent({
 				title: '',
 				types: "1",
 				sendGateway:'',
+				configId:'',
+				content:'',
+
 				
 			},
 			rules: {
 				title: [{ required: true, message: '配置名称不能为空', trigger: 'blur' }],
-				type: [{ required: true, message: '配置类型不能为空', trigger: 'blur' }],
+				configId: [{ required: true, message: '通知配置不能为空', trigger: 'blur' }],
+				types: [{ required: true, message: '配置类型不能为空', trigger: 'blur' }],
+				content: [{ required: true, message: '模板内容不能为空', trigger: 'blur' }],
 				
 			},
 		});
@@ -83,6 +107,13 @@ export default defineComponent({
 			if (row) {
 				state.ruleForm = row;
 			}
+
+			api.config.getList({ sendGateway: type }).then((res: any) => {
+			state.configData = res.Data || [];
+			});
+
+
+
 			state.ruleForm.sendGateway=type
 			state.isShowDialog = true;
 		};
@@ -96,6 +127,8 @@ export default defineComponent({
 				title: '',
 				types: "1",
 				sendGateway:'',
+				configId:'',
+				content:'',
 			
 			};
 		};

src/views/iot/noticeservices/config/setting.vue

@@ -5,7 +5,7 @@
 				<el-form :model="tableData.param" ref="queryRef" :inline="true">
 					<el-form-item label="配置名称" prop="name">
 						<el-input
-							v-model="tableData.param.name"
+							v-model="tableData.param.title"
 							placeholder="请输入配置名称"
 							clearable
 							size="default"
@@ -15,7 +15,7 @@
 					</el-form-item>
 					<el-form-item label="通知方式" prop="name">
 						<el-input
-							v-model="tableData.param.triggerType"
+							v-model="tableData.param.sendGateway"
 							placeholder="请输入通知方式"
 							clearable
 							size="default"
@@ -153,9 +153,9 @@ import { useRoute } from 'vue-router';
 // 定义接口来定义对象的类型
 interface TableDataRow {
 	id: number;
-	name: string;
-	key: string;
-	createBy: string;
+	title: string;
+	sendGateway: string;
+	type: string;
 }
 interface TableDataState {
 	ids: number[];
@@ -166,9 +166,9 @@ interface TableDataState {
 		param: {
 			pageNum: number;
 			pageSize: number;
-			name: string;
-			level: number;
-			triggerType: number;
+			title: string;
+			sendGateway: string;
+			types: string;
 		};
 	};
 }
@@ -198,7 +198,7 @@ export default defineComponent({
 					pageSize: 20,
 					title: '',
 					sendGateway: '',
-					type: '',
+					types: '',
 				},
 			},
 		});
@@ -231,7 +231,7 @@ export default defineComponent({
 			let msg = '你确定要删除所选数据？';
 			let ids: number[] = [];
 			if (row) {
-				msg = `此操作将永久删除模型：“${row.name}”，是否继续?`;
+				msg = `此操作将永久删除模型：“${row.title}”，是否继续?`;
 				ids = row.id;
 			} else {
 				ids = state.ids;

src/views/iot/noticeservices/config/template.vue

@@ -5,7 +5,7 @@
 				<el-form :model="tableData.param" ref="queryRef" :inline="true">
 					<el-form-item label="配置名称" prop="name">
 						<el-input
-							v-model="tableData.param.name"
+							v-model="tableData.param.title"
 							placeholder="请输入配置名称"
 							clearable
 							size="default"
@@ -13,16 +13,7 @@
 							@keyup.enter.native="dataList"
 						/>
 					</el-form-item>
-					<el-form-item label="通知方式" prop="name">
-						<el-input
-							v-model="tableData.param.triggerType"
-							placeholder="请输入通知方式"
-							clearable
-							size="default"
-							style="width: 240px"
-							@keyup.enter.native="dataList"
-						/>
-					</el-form-item>
+					
 
 					<el-form-item>
 						<el-button size="default" type="primary" class="ml10" @click="dataList">
@@ -103,7 +94,7 @@
 										</el-icon>
 										调试
 									</el-button>
-								</div>
+								</div>-->
 
 								<div class="card-button" @click="onOpenEdit(item)">
 									<el-button size="default" type="info" text bg>
@@ -112,7 +103,7 @@
 										</el-icon>
 										通知记录
 									</el-button>
-								</div> -->
+								</div> 
 
 								<div class="card-button" @click="onRowDel(item)">
 									<el-button size="default" type="danger" text bg>
@@ -153,9 +144,9 @@ import { useRoute } from 'vue-router';
 // 定义接口来定义对象的类型
 interface TableDataRow {
 	id: number;
-	name: string;
-	key: string;
-	createBy: string;
+	title: string;
+	types: string;
+	sendGateway: string;
 }
 interface TableDataState {
 	ids: number[];
@@ -166,9 +157,9 @@ interface TableDataState {
 		param: {
 			pageNum: number;
 			pageSize: number;
-			name: string;
-			level: number;
-			triggerType: number;
+			title: string;
+			sendGateway: string;
+			types: number;
 		};
 	};
 }
@@ -198,7 +189,7 @@ export default defineComponent({
 					pageSize: 20,
 					title: '',
 					sendGateway: '',
-					type: '',
+					types: '',
 				},
 			},
 		});