对接模板详情弹窗的数据显示

src/views/iot/device/template/component/dataAreaDialog.vue

@@ -5,22 +5,22 @@
 		</div>
 		<el-table :key="tableKey" v-loading="listLoading" :data="list" border fit highlight-current-row style="width: 100%">
 			<el-table-column label="名称" prop="name" align="center">
-				<template slot-scope="{ row }">
+				<template #default="{ row }">
 					<el-input v-model="row.name" placeholder="请输入" />
 				</template>
 			</el-table-column>
 			<el-table-column label="起始地址" prop="address" align="center">
-				<template slot-scope="{ row }">
+				<template #default="{ row }">
 					<el-input-number v-model="row.address" controls-position="right" :min="0" style="width: 100%" />
 				</template>
 			</el-table-column>
 			<el-table-column label="长度" prop="length" align="center">
-				<template slot-scope="{ row }">
+				<template #default="{ row }">
 					<el-input-number v-model="row.length" controls-position="right" :min="0" style="width: 100%" />
 				</template>
 			</el-table-column>
 			<el-table-column label="寄存器区" prop="regArea" align="center">
-				<template slot-scope="{ row }">
+				<template #default="{ row }">
 					<el-select v-model="row.regArea">
 						<el-option label="HOLDING" value="holding" />
 						<el-option label="INPUT" value="input" />
@@ -30,18 +30,18 @@
 				</template>
 			</el-table-column>
 			<el-table-column label="读取属性" prop="" align="center">
-				<template slot-scope="{ row }">
+				<template #default="{ row }">
 					<span v-if="row.regArea === 'input' || row.regArea === 'discrete'">只读</span>
 					<span v-else-if="row.regArea === 'holding' || row.regArea === 'coil'">读写</span>
 				</template>
 			</el-table-column>
 			<el-table-column label="备注" prop="remarks" align="center">
-				<template slot-scope="{ row }">
+				<template #default="{ row }">
 					<el-input v-model="row.remarks" placeholder="请输入" />
 				</template>
 			</el-table-column>
 			<el-table-column label="操作" align="center" width="150px">
-				<template slot-scope="{ row, $index }">
+				<template #default="{ row, $index }">
 					<el-button type="primary" size="mini" @click="handleSubmit(row, $index)"> 保存 </el-button>
 					<el-button type="danger" size="mini" @click="handleDelete(row, $index)"> 删除 </el-button>
 				</template>
@@ -78,7 +78,7 @@ export default {
 	methods: {
 		getList() {
 			this.listLoading = true;
-			api.template
+			api.area
 				.getList({ template_number: this.templateNumber })
 				.then((res: any) => {
 					this.list = res.list || [];

src/views/iot/device/template/component/deviceTemplateDialog.vue

@@ -4,7 +4,7 @@
 			<el-button class="filter-item" type="primary" icon="el-icon-circle-plus-outline" @click="openDialog('create')"> 添加变量列表 </el-button>
 		</div>
 		<el-table :key="tableKey" v-loading="listLoading" :data="list" border fit highlight-current-row style="width: 100%">
-			<el-table-column label="序号" type="index" width="50" />
+			<el-table-column label="序号" type="index" width="60" />
 			<!-- <el-table-column label="监控设备" prop="templateNumber" align="center" /> -->
 			<el-table-column label="变量名" prop="title" align="center" />
 			<el-table-column label="变量编码" prop="dataAttribName" align="center" />
@@ -12,7 +12,7 @@
 			<el-table-column label="系数" prop="dataCoef" align="center" />
 			<el-table-column label="存盘周期" prop="saveCycle" align="center" />
 			<el-table-column label="操作" align="center" width="200">
-				<template slot-scope="{ row, $index }">
+				<template #default="{ row, $index }">
 					<el-button type="primary" size="mini" @click="handleUpdate(row)"> 修改 </el-button>
 					<el-button v-if="row.status != 'deleted'" size="mini" type="danger" @click="handleDelete(row, $index)"> 删除 </el-button>
 				</template>
@@ -117,7 +117,7 @@
 					</el-col>
 				</el-row>
 			</el-form>
-			<div slot="footer" class="dialog-footer">
+			<div slot="footer" class="dialog-footer" style="margin-top:20px">
 				<el-button @click="clsoeDialog"> 取 消 </el-button>
 				<el-button type="primary" @click="dialogStatus === 'create' ? createData() : updateData()"> 保 存 </el-button>
 			</div>
@@ -131,18 +131,19 @@ import api from '/@/api/device/modbus';
 
 export default {
 	props: {
-		templateNumber: '',
-		mode: '',
+		templateNumber: String,
+		mode: String,
 	},
 	data() {
 		return {
 			tableKey: 0,
-			list: null,
+			list: [],
 			total: 0,
 			listLoading: false,
 			listQuery: {
 				page: 1,
-				size: 20,
+        size: 20,
+        template_number: ''
 			},
 			temp: {
 				title: '',
@@ -193,25 +194,25 @@ export default {
 	methods: {
 		// 获取字典数据
 		getDict() {
-			api.getDict({ code: 'dataType' }).then((res) => {
-				this.dataTypeOptions = res.data.list || [];
+			api.getDict({ code: 'dataType' }).then((res: any) => {
+				this.dataTypeOptions = res.list || [];
 			});
 		},
 		getList() {
 			this.listLoading = true;
-			api.template.getList(this.listQuery)
-				.then((response) => {
-					this.list = response.data.list || [];
-					this.total = response.data.Total;
+			api.data.getList(this.listQuery)
+				.then((res: any) => {
+					this.list = res.list || [];
+					this.total = res.Total;
 				})
 				.finally(() => {
 					this.listLoading = false;
 				});
 		},
 		getDataAreaList() {
-			getDataAreaList({ template_number: this.templateNumber })
-				.then((response) => {
-					this.dataAreaOptions = response.data.list || [];
+			api.area.getList({ template_number: this.templateNumber })
+				.then((res: any) => {
+					this.dataAreaOptions = res.list || [];
 				})
 				.finally(() => {});
 		},
@@ -226,7 +227,7 @@ export default {
 				type: 'warning',
 			})
 				.then(function () {
-					return deleteDeviceTemplate({ dt_id: row.dtId });
+					return api.data.deleteDeviceTemplate({ dt_id: row.dtId });
 				})
 				.then(() => {
 					this.getList();

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

@@ -92,7 +92,6 @@ export default {
 			}
 		},
 		clsoeDialog() {
-			this.dialogVisible = false;
 			this.activeName = '1';
 			this.temp = {
 				title: '',
@@ -100,7 +99,8 @@ export default {
 				remarks: '',
 				number: '',
 			};
-			// this.$refs.dataForm.resetFields()
+			(this.$refs.dataForm as any).resetFields()
+			this.dialogVisible = false;
 		},
 		// 获取模板id 自动生成
 		getDataId() {