Merge branch 'master' of http://git.nzklabs.com:3000/huangyuanhao/jfcloud-coldchain

snowy-admin-web/src/views/basicset/mem/configForm.vue

@@ -172,7 +172,7 @@
 	const visible = ref(false) // 默认是关闭状态
 	const formRef = ref()
 	const formData = ref({}) // 表单数据
-	const modeOptions = tool.dictList('COIDCHAIN') // 设备型号
+
 	// 默认要校验的
 	const formRules = {
 		deviceName: [required('请输入设备名称')],

snowy-admin-web/src/views/basicset/mem/form.vue

@@ -105,9 +105,6 @@
 </script>
 
 <style lang="less" scoped>
-	.ant-tabs {
-		width: 100%;
-	}
 	:deep(.ant-form-item) {
 		width: 100%;
 		margin-bottom: 10px;

snowy-admin-web/src/views/basicset/monitor/configForm.vue

@@ -0,0 +1,83 @@
+<template>
+	<xn-form-container title="区域配置" :width="'500px'" :visible="visible" :destroy-on-close="true" @close="onClose">
+		<a-form
+			ref="formRef"
+			:model="formData"
+			:rules="formRules"
+			layout="inline"
+			:label-col="{ style: { width: '85px', justifyContent: 'end' } }"
+		>
+			<!-- <a-form-item label="目标端口" name="code">
+				<a-input v-model:value="formData.code" placeholder="请输入目标端口" allow-clear />
+			</a-form-item>
+			<a-form-item label="设备型号" name="modelName">
+				<a-select ref="select" v-model:value="formData.modelName" :options="modeOptions"> </a-select>
+			</a-form-item>
+			<a-form-item label="目标端口" name="code">
+				<a-input-number id="inputNumber" v-model:value="formData.code" style="width: 100%" />
+			</a-form-item> -->
+		</a-form>
+
+		<template #footer>
+			<a-button class="xn-mr8" @click="onClose">退出</a-button>
+			<a-button type="primary" @click="onSubmit">保存</a-button>
+		</template>
+	</xn-form-container>
+</template>
+
+<script setup>
+	import tool from '@/utils/tool'
+	import { required } from '@/utils/formRules'
+	import memApi from '@/api/basicset/memApi'
+	const emit = defineEmits({ successful: null })
+	const visible = ref(false) // 默认是关闭状态
+	const formRef = ref()
+	const formData = ref({}) // 表单数据
+	const modeOptions = tool.dictList('COIDCHAIN') // 设备型号
+	// 默认要校验的
+	const formRules = {
+		code: [required('请输入设备名称')]
+	}
+
+	// 打开抽屉
+	const onOpen = (record) => {
+		visible.value = true
+		if (record) {
+			formData.value = Object.assign({}, record)
+		} else {
+			formData.value = {}
+		}
+	}
+	// 关闭抽屉
+	const onClose = () => {
+		formRef.value.resetFields()
+		visible.value = false
+	}
+
+	// 验证并提交数据
+	const onSubmit = () => {
+		formRef.value
+			.validate()
+			.then(() => {
+				memApi.submitForm(formData.value, formData.value.id).then(() => {
+					onClose()
+					emit('successful')
+				})
+			})
+			.catch((error) => {
+				console.log(error)
+			})
+	}
+
+	// 调用这个函数将子组件的一些数据和方法暴露出去
+	defineExpose({
+		onOpen
+	})
+</script>
+
+<style lang="less" scoped>
+	:deep(.ant-form-item) {
+		width: 100%;
+		margin-bottom: 10px;
+	}
+</style>

snowy-admin-web/src/views/basicset/monitor/setup.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="table_item">
-		<s-table ref="tableRef" :columns="columns" :data="loadData" :row-key="(record) => record.code">
+		<s-table ref="tableRef" :columns="columns" :data="loadData" :row-key="(record) => record.id">
 			<template #operator>
 				<!-- 搜索区域 -->
 				<div class="table-search">
@@ -57,6 +57,7 @@
 					<a-popconfirm title="确定要删除吗？" @confirm="deleteData(record)">
 						<a-button type="link" danger size="small">删除</a-button>
 					</a-popconfirm>
+					<a-button type="link" size="small" @click="configformRef.onOpen(record)">区域配置</a-button>
 				</template>
 			</template>
 			<!-- <template #expandedRowRender="{ record }">
@@ -128,6 +129,7 @@
 			</template> -->
 		</s-table>
 		<Form ref="formRef" @successful="tableRef.refresh(true)" />
+		<configForm ref="configformRef" @successful="tableRef.refresh(true)" />
 	</div>
 </template>
 
@@ -135,7 +137,10 @@
 	import tool from '@/utils/tool'
 	import setupApi from '@/api/basicset/setupApi'
 	import Form from './form.vue'
+	import configForm from './configForm.vue'
 	const formRef = ref()
+	const configformRef = ref()
+
 	const searchFormRef = ref()
 	const searchFormState = ref({})
 	const tableRef = ref()
@@ -175,13 +180,12 @@
 			title: '操作',
 			dataIndex: 'action',
 			align: 'center',
-			width: 150
+			width: 200
 		}
 	]
 
 	const loadData = (parameter) => {
 		return setupApi.setupPage(Object.assign(parameter, searchFormState.value)).then((res) => {
-			console.log(res, 'x')
 			return res
 		})
 	}

snowy-admin-web/src/views/motoring/location/index.vue

@@ -48,6 +48,9 @@
 				</div>
 			</template>
 			<template #bodyCell="{ column, record }">
+				<template v-if="column.dataIndex === 'modelName'">
+					{{ $TOOL.dictTypeData('COIDCHAIN', record.modelName) }}
+				</template>
 				<template v-if="column.dataIndex === 'action'">
 					<a-button type="link" size="small" @click="formRef.onOpen(record)">编辑</a-button>
 					<a-popconfirm title="确定要删除吗？" @confirm="deleteData(record)">