yukai пре 2 година
родитељ
комит
1baac29cbb

+ 1 - 0
src/api/notice/index.ts

@@ -14,5 +14,6 @@ export default {
     delete: (ids: number) => del("/notice/template/delete", { ids }),
     edit: (data: object) => put("/notice/template/edit", data),
     detail: (id: number) => get("/notice/template/get", { id }),
+    configIddetail: (configId: number) => get("/notice/template/getbyconfig", { configId }),
   },
 };

+ 18 - 4
src/views/iot/noticeservices/config/component/temEdit.vue

@@ -1,12 +1,12 @@
 <template>
 	<div class="system-edit-dic-container">
-		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '配置'" v-model="isShowDialog" width="50%">
+		<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-form-item>
 
-				<el-form-item label="通知配置" prop="configId">
+				<!-- <el-form-item label="通知配置" prop="configId">
        
 						<el-select v-model="ruleForm.configId" placeholder="请选择通知配置" class="w100">
 						<el-option
@@ -16,7 +16,7 @@
 						:value="item.id"
 						/>
 					</el-select>
-					</el-form-item> 
+				</el-form-item>  -->
 
 				<!-- <el-form-item label="配置类型" prop="types">
 					<el-radio-group v-model="ruleForm.types">
@@ -101,6 +101,19 @@ export default defineComponent({
 			},
 		});
 
+
+		const opentemDialog=(id,type)=>{
+			resetForm();
+			if(id){
+				api.template.configIddetail(id).then((res: any) => {
+					state.ruleForm = res || [];
+				});
+			}
+			state.ruleForm.configId = id;
+			state.ruleForm.sendGateway = type;
+			state.isShowDialog = true;
+		}
+
 		// 打开弹窗
 		const openDialog = (row: RuleFormState | null,type) => {
 			resetForm();
@@ -109,7 +122,7 @@ export default defineComponent({
 			}
 
 			api.config.getList({ sendGateway: type }).then((res: any) => {
-			state.configData = res.Data || [];
+				state.configData = res.Data || [];
 			});
 
 
@@ -174,6 +187,7 @@ export default defineComponent({
 		return {
 		
 			openDialog,
+			opentemDialog,
 			closeDialog,
 			onCancel,
 			onSubmit,

Разлика између датотеке није приказан због своје велике величине
+ 2 - 2
src/views/iot/noticeservices/config/index.vue


+ 23 - 6
src/views/iot/noticeservices/config/setting.vue

@@ -13,7 +13,7 @@
 							@keyup.enter.native="dataList"
 						/>
 					</el-form-item>
-					<el-form-item label="通知方式" prop="name">
+					<!-- <el-form-item label="通知方式" prop="name">
 						<el-input
 							v-model="tableData.param.sendGateway"
 							placeholder="请输入通知方式"
@@ -22,7 +22,7 @@
 							style="width: 240px"
 							@keyup.enter.native="dataList"
 						/>
-					</el-form-item>
+					</el-form-item> -->
 
 					<el-form-item>
 						<el-button size="default" type="primary" class="ml10" @click="dataList">
@@ -96,7 +96,15 @@
 										修改
 									</el-button>
 								</div>
-								<!-- <div class="card-button" @click="onOpenEdit(item)">
+								<div class="card-button" @click="onOpenEditTem(item)">
+									<el-button size="default" type="primary" text bg>
+										<el-icon>
+											<ele-Wallet />
+										</el-icon>
+										模板配置
+									</el-button>
+								</div>
+								<!--<div class="card-button" @click="onOpenEdit(item)">
 									<el-button size="default" type="primary" text bg>
 										<el-icon>
 											<ele-View />
@@ -105,7 +113,7 @@
 									</el-button>
 								</div>
 
-								<div class="card-button" @click="onOpenEdit(item)">
+							 	<div class="card-button" @click="onOpenEdit(item)">
 									<el-button size="default" type="info" text bg>
 										<el-icon>
 											<ele-Document />
@@ -137,6 +145,7 @@
 		</el-card>
 
 		<EditDic ref="editDicRef" @dataList="dataList" />
+		<EditTemDic ref="temeditDicRef" @dataList="dataList" />
 	<!-- 	<LevelDic ref="levelDicRef" @dataList="dataList" /> -->
 	</div>
 </template>
@@ -145,7 +154,8 @@
 import { toRefs, reactive, onMounted, ref,getCurrentInstance,defineComponent } from 'vue';
 import { ElMessageBox, ElMessage, FormInstance } from 'element-plus';
 import EditDic from './component/setEdit.vue';
-// import LevelDic from './component/level.vue';
+import EditTemDic from './component/temEdit.vue';
+//import LevelDic from './component/level.vue';
 
 import api from '/@/api/notice';
 import { useRoute } from 'vue-router';
@@ -175,7 +185,7 @@ interface TableDataState {
 
 export default defineComponent({
 	name: 'setlist',
-	components: { EditDic },
+	components: { EditDic,EditTemDic },
 
 	setup() {
 		
@@ -183,6 +193,7 @@ export default defineComponent({
 		// const { notice_send_gateway } = proxy.useDict('notice_send_gateway');
 		const addDicRef = ref();
 		const editDicRef = ref();
+		const temeditDicRef = ref();
 		const detailRef = ref();
 		const queryRef = ref();
 		const route = useRoute();
@@ -227,6 +238,10 @@ export default defineComponent({
 			editDicRef.value.openDialog({ ...row },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[] = [];
@@ -278,6 +293,8 @@ export default defineComponent({
 
 		return {
 			onActionStatus,
+			onOpenEditTem,
+			temeditDicRef,
 			addDicRef,
 			editDicRef,
 			detailRef,

Неке датотеке нису приказане због велике количине промена