Quellcode durchsuchen

统一名称:对象统一改为冰箱

like vor 5 Monaten
Ursprung
Commit
fd6d91ab22

+ 17 - 0
snowy-admin-web/src/router/systemRouter.js

@@ -17,6 +17,9 @@ import Login from '@/views/auth/login/login.vue'
 import Findpwd from '@/views/auth/findPwd/index.vue'
 import Callback from '@/views/auth/login/callback.vue'
 
+import Wx from '@/views/wx/index.vue'
+import Success from '@/views/success/index.vue'
+
 // 系统路由
 const routes = [
 	{
@@ -46,6 +49,20 @@ const routes = [
 		meta: {
 			title: '三方登录'
 		}
+	},
+	{
+		path: '/wx',
+		component: Wx,
+		meta: {
+			title: '授权'
+		}
+	},
+	{
+		path: '/success',
+		component: Success,
+		meta: {
+			title: '授权成功'
+		}
 	}
 ]
 

+ 3 - 35
snowy-admin-web/src/views/biz/alarmuser/index.vue

@@ -108,13 +108,7 @@
 			ellipsis: true,
 			resizable: true
 		},
-		{
-			title: 'RefreshToken',
-			dataIndex: 'refreshToken',
-			align: 'center',
-			ellipsis: true,
-			resizable: true
-		},
+
 		{
 			title: '微信昵称',
 			dataIndex: 'nickName',
@@ -132,27 +126,7 @@
 				return value == '1' ? '男' : '女'
 			}
 		},
-		{
-			title: '省份',
-			dataIndex: 'province',
-			align: 'center',
-			ellipsis: true,
-			resizable: true
-		},
-		{
-			title: '用户城市',
-			dataIndex: 'city',
-			align: 'center',
-			ellipsis: true,
-			resizable: true
-		},
-		{
-			title: '国家',
-			dataIndex: 'country',
-			align: 'center',
-			ellipsis: true,
-			resizable: true
-		},
+
 		{
 			title: '用户头像',
 			dataIndex: 'avatar',
@@ -167,13 +141,7 @@
 			ellipsis: true,
 			resizable: true
 		},
-		{
-			title: 'unionid',
-			dataIndex: 'unionid',
-			align: 'center',
-			ellipsis: true,
-			resizable: true
-		},
+
 		{
 			title: '扩展信息',
 			dataIndex: 'extJson',

+ 1 - 1
snowy-admin-web/src/views/biz/monitor/mem/form.vue

@@ -1,6 +1,6 @@
 <template>
 	<xn-form-container
-		:title="formData.id ? '编辑监测器' : '新增监测器'"
+		:title="formData.id ? '编辑冷链设备' : '新增冷链设备'"
 		:width="'800px'"
 		:visible="visible"
 		:destroy-on-close="true"

+ 8 - 8
snowy-admin-web/src/views/biz/monitor/object/form.vue

@@ -13,11 +13,11 @@
 			layout="inline"
 			:label-col="{ style: { width: '100px', justifyContent: 'end' } }"
 		>
-			<a-form-item label="对象名称" name="name">
-				<a-input v-model:value="formData.name" placeholder="请输入对象名称" allow-clear />
+			<a-form-item label="冰箱名称" name="name">
+				<a-input v-model:value="formData.name" placeholder="请输入冰箱名称" allow-clear />
 			</a-form-item>
-			<a-form-item label="对象状态" name="status">
-				<a-select ref="select" v-model:value="formData.status" placeholder="请选择对象状态">
+			<a-form-item label="冰箱状态" name="status">
+				<a-select ref="select" v-model:value="formData.status" placeholder="请选择冰箱状态">
 					<a-select-option value="1">正常</a-select-option>
 					<a-select-option value="2">停用</a-select-option>
 				</a-select>
@@ -32,8 +32,8 @@
 					:field-names="{ label: 'nickName', value: 'openId' }"
 				></a-select>
 			</a-form-item>
-			<a-form-item label="监测位置区域">
-				<a-input v-model:value="formData.monitorPoint" placeholder="请输入监测位置区域" allow-clear />
+			<a-form-item label="冰箱位置区域">
+				<a-input v-model:value="formData.monitorPoint" placeholder="请输入冰箱位置区域" allow-clear />
 			</a-form-item>
 		</a-form>
 
@@ -57,8 +57,8 @@
 
 	// 默认要校验的
 	const formRules = {
-		name: [required('请输入对象名称')],
-		status: [required('请选择对象状态')],
+		name: [required('请输入冰箱名称')],
+		status: [required('请选择冰箱状态')],
 		alarmUsers: [required('请选择报警接收人')]
 	}
 

+ 5 - 5
snowy-admin-web/src/views/biz/monitor/object/index.vue

@@ -21,8 +21,8 @@
 								class="ant-advanced-search-form"
 							>
 								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8"
-									><a-form-item label="对象名称" name="name">
-										<a-input v-model:value="searchFormState.name" placeholder="请输入对象名称" /> </a-form-item
+									><a-form-item label="冰箱名称" name="name">
+										<a-input v-model:value="searchFormState.name" placeholder="请输入冰箱名称" /> </a-form-item
 								></a-col>
 							</a-form>
 						</a-row>
@@ -176,14 +176,14 @@
 			width: 50
 		},
 		{
-			title: '对象名称',
+			title: '冰箱名称',
 			dataIndex: 'name',
 			align: 'center',
 			ellipsis: true,
 			resizable: true
 		},
 		{
-			title: '对象状态',
+			title: '冰箱状态',
 			dataIndex: 'status',
 			align: 'center',
 			ellipsis: true,
@@ -198,7 +198,7 @@
 		},
 
 		{
-			title: '监控位置区域',
+			title: '冰箱位置区域',
 			dataIndex: 'monitorPoint',
 			align: 'center',
 			ellipsis: true,

+ 21 - 21
snowy-admin-web/src/views/biz/monitor/point/form.vue

@@ -27,12 +27,12 @@
 				</div>
 
 				<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-					<a-form-item label="监测对象" name="monitorTargetId">
+					<a-form-item label="监测冰箱" name="monitorTargetId">
 						<a-select
 							ref="select"
 							v-model:value="formData.monitorTargetId"
 							:options="monitorTargetOptions"
-							placeholder="请选择监测对象"
+							placeholder="请选择监测冰箱"
 							:field-names="{ label: 'name', value: 'id' }"
 							disabled
 						/>
@@ -56,12 +56,12 @@
 				</a-col>
 
 				<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-					<a-form-item label="监测设备" name="monitorDeviceId">
+					<a-form-item label="冷链设备" name="monitorDeviceId">
 						<a-select
 							ref="select"
 							v-model:value="formData.monitorDeviceId"
 							:options="memListOptions"
-							placeholder="请选择监测设备"
+							placeholder="请选择冷链设备"
 							:field-names="{ label: 'deviceName', value: 'id' }"
 							@change="monitorDeviceIdChange"
 						/>
@@ -244,21 +244,21 @@
 	const formData = ref({ alarmUsers: [], time: [] }) // 表单数据
 	const pointOptions = tool.dictList('MONITORPOINT') // 点位名称
 	const pointName = ref('上层')
-	const currentMonitorObj = ref({}) //当前的监测对象
+	const currentMonitorObj = ref({}) //当前的监测冰箱
 	const sensorOptions = tool.dictList('SENSORTYPE') // 传感器类型
 	const alarmUsersOptions = ref([]) // 报警接收人数据
 	const fridgeOptions = tool.dictList('REFRIGERATORSMODEL') // 冰箱型号
-	const monitorTargetOptions = ref([]) // 监测对象
-	const memListOptions = ref([]) // 监测设备
-	const currentMonitorDevice = ref({}) //当前的监测设备
+	const monitorTargetOptions = ref([]) // 所有的冰箱数据
+	const memListOptions = ref([]) // 所有的冷链设备数据
+	const currentMonitorDevice = ref({}) //当前的冷链设备
 
 	const sensorRouteMax = ref(1) //传感器最大值默认1
 
 	// 默认要校验的
 	const formRules = {
 		name: [required('请输入点位名称')],
-		monitorTargetId: [required('请选择监测对象')],
-		monitorDeviceId: [required('请选择监测设备')],
+		monitorTargetId: [required('请选择监测冰箱')],
+		monitorDeviceId: [required('请选择冷链设备')],
 		sensorType: [required('请选择传感器类型')],
 		sensorRoute: [required('请输入传感器路数')],
 		alarmUsers: [required('请选择报警接收人')],
@@ -353,13 +353,13 @@
 		})
 	}
 
-	// 获取监测对象
+	// 获取监测冰箱
 	const setupListData = (type, record) => {
 		setupApi
 			.setupList({ isAll: false })
 			.then((res) => {
 				monitorTargetOptions.value = res || []
-				currentMonitorObj.value = monitorTargetOptions.value.find((item) => item.id === record.monitorTargetId) //当前的监测对象
+				currentMonitorObj.value = monitorTargetOptions.value.find((item) => item.id === record.monitorTargetId) //当前的监测冰箱
 				alarmUsersOptions.value = currentMonitorObj.value.alarmUsers || [] //报警接收人
 			})
 			.finally(() => {
@@ -388,7 +388,7 @@
 		if (!val.startsWith(formData.value.name)) {
 			formData.value.name = formData.value._name
 			message.warning({
-				content: '名称必须以 "监测对象名称" + ' + pointName.value + ' 开头',
+				content: '名称必须以 "监测冰箱名称" + ' + pointName.value + ' 开头',
 				key: 'name'
 			})
 		} else {
@@ -404,7 +404,7 @@
 		}
 	}
 
-	// 监测设备通过传感器类型来获取, sensorType可为空
+	// 冷链设备通过传感器类型来获取, sensorType可为空
 	const memListData = (value) => {
 		memApi.memList({ isAll: false, sensorType: value }).then((res) => {
 			memListOptions.value = res || []
@@ -414,17 +414,17 @@
 		})
 	}
 
-	// 选中监测设备
+	// 选中冷链设备
 	const monitorDeviceIdChange = (value) => {
 		fridgeName.value = null
 		if (value) {
 			askRegionByDeviceIdData(value)
 			const data = memListOptions.value.find((item) => item.id === value)
-			currentMonitorDevice.value = data //选中的监测设备
+			currentMonitorDevice.value = data //选中的冷链设备
 			formData.value = {
 				...formData.value,
 				sensorCode: data.deviceCode, //传感器编号
-				modelName: data.modelName, //监测设备型号
+				modelName: data.modelName, //冷链设备型号
 				deviceCode: data.deviceCode, //冷链编号
 				temperatureUp: data.temperatureUp, //温度上限
 				temperatureDown: data.temperatureDown, //温度下限
@@ -437,15 +437,15 @@
 			sensorRouteMax.value = data.sensorCount //传感器路数的最大值
 			isFridgeDisabled()
 		} else {
-			// 清理掉监测设备的一些信息
+			// 清理掉冷链设备的一些信息
 			currentMonitorDevice.value = {}
 			sensorRouteMax.value = 1
 			formData.value = {
 				...formData.value,
-				monitorDeviceId: null, //监测设备
+				monitorDeviceId: null, //冷链设备
 				sensorRoute: null, //传感器路数
 				sensorCode: null, //传感器编号
-				modelName: null, //监测设备型号
+				modelName: null, //冷链设备型号
 				deviceCode: null, //冷链编号
 				temperatureUp: null, //温度上限
 				temperatureDown: null, //温度下限
@@ -482,7 +482,7 @@
 		'-196': { up: -186, down: -196 }
 	})
 	const filteredFridges = ref([])
-	// 判断 当前的监测设备 的温度范围是否在该冰箱的温度范围内
+	// 判断 当前的冷链设备 的温度范围是否在该冰箱的温度范围内
 	const isFridgeDisabled = () => {
 		filteredFridges.value = fridgeOptions.map((fridge) => {
 			const { up, down } = fridgeRanges.value[fridge.value]

+ 3 - 3
snowy-admin-web/src/views/biz/monitor/point/index.vue

@@ -98,14 +98,14 @@
 		},
 
 		{
-			title: '监控对象',
+			title: '监测冰箱',
 			dataIndex: 'targetName',
 			align: 'center',
 			ellipsis: true,
 			resizable: true
 		},
 		{
-			title: '监测设备',
+			title: '冷链设备',
 			dataIndex: 'deviceName',
 			align: 'center',
 			ellipsis: true,
@@ -152,7 +152,7 @@
 		col.width = w
 	}
 
-	const queryId = ref() //监控对象的id
+	const queryId = ref() //监控对象冰箱的id
 	onBeforeMount(() => {
 		if (Route.query.id) {
 			queryId.value = Route.query.id