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

snowy-admin-web/package.json

@@ -42,8 +42,8 @@
 		"lodash-es": "4.17.21",
 		"nprogress": "0.2.0",
 		"pinia": "2.2.2",
-		"screenfull": "6.0.2",
 		"qs": "6.13.0",
+		"screenfull": "6.0.2",
 		"sm-crypto": "0.3.13",
 		"snowflake-id": "1.1.0",
 		"sortablejs": "1.15.3",
@@ -77,7 +77,7 @@
 		"typescript": "5.6.2",
 		"unplugin-auto-import": "0.18.3",
 		"unplugin-vue-components": "0.27.4",
-		"vite": "5.4.8",
+		"vite": "^5.4.8",
 		"vite-plugin-compression": "0.5.1",
 		"vite-plugin-vue-setup-extend": "0.4.0",
 		"vue-eslint-parser": "9.3.2"

snowy-admin-web/src/views/auth/login/util.js

@@ -16,14 +16,12 @@ export const afterLogin = async (loginToken) => {
 	// 获取用户的菜单
 	const menu = await userCenterApi.userLoginMenu()
 	let indexMenu = routerUtil.getIndexMenu(menu).path
+
 	await menuStore.fetchMenu()
 	// 重置系统默认应用
 	tool.data.set('SNOWY_MENU_MODULE_ID', menu[0].id)
 	message.success('登录成功')
-	if (tool.data.get('LAST_VIEWS_PATH')) {
-		// 如果有缓存，将其登录跳转到最后访问的路由
-		indexMenu = tool.data.get('LAST_VIEWS_PATH')
-	}
+
 	// 如果存在退出后换新账号登录，进行重新匹配，匹配无果则默认首页
 	if (menu) {
 		let routerTag = 0

snowy-admin-web/src/views/biz/monitor/devicetype/form.vue

@@ -1,6 +1,6 @@
 <template>
 	<xn-form-container
-		:title="formData.id ? '编辑设备型号' : '新增设备型号'"
+		:title="formData.id ? '编辑设备型号' : '新增设备型号11111111111111111111111'"
 		:width="'800px'"
 		:visible="visible"
 		:destroy-on-close="true"
@@ -99,7 +99,7 @@
 						</a-form-item>
 					</a-col>
 				</div>
-				<div class="form_item" v-if="formData.sensorType == 'WSC'">
+				<div class="form_item" v-if="formData.sensorType == 'WSC' || formData.sensorType == 'C'">
 					<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
 						<a-form-item label="CO2上限" name="co2Up">
 							<a-input-number
@@ -149,6 +149,7 @@
 	const formRef = ref()
 	const formData = ref({ sortCode: 99 }) // 表单数据
 	const sensorOptions = tool.dictList('SENSORTYPE') // 传感器类型
+	
 
 	// 默认要校验的
 	const formRules = {

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

@@ -135,7 +135,7 @@
 						</a-form-item>
 					</a-col>
 				</div>
-				<div class="form_item" v-if="modeData.sensorType == 'WSC'">
+				<div class="form_item" v-if="modeData.sensorType == 'WSC' || modeData.sensorType == 'C'">
 					<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
 						<a-form-item label="CO2上限" name="co2Up">
 							<a-input-number

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

@@ -130,12 +130,18 @@
 									:span="2"
 									>{{ item.humidityDown }}</a-descriptions-item
 								>
-								<a-descriptions-item v-if="item.sensorType == 'WSC'" label="CO2上限" :span="2">{{
-									item.co2Up
-								}}</a-descriptions-item>
-								<a-descriptions-item v-if="item.sensorType == 'WSC'" label="CO2下限" :span="2">{{
-									item.co2Down
-								}}</a-descriptions-item>
+								<a-descriptions-item
+									v-if="item.sensorType == 'WSC' || item.sensorType == 'C'"
+									label="CO2上限"
+									:span="2"
+									>{{ item.co2Up }}</a-descriptions-item
+								>
+								<a-descriptions-item
+									v-if="item.sensorType == 'WSC' || item.sensorType == 'C'"
+									label="CO2下限"
+									:span="2"
+									>{{ item.co2Down }}</a-descriptions-item
+								>
 							</a-descriptions>
 						</div>
 					</a-tab-pane>

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

@@ -183,7 +183,7 @@
 					</a-col>
 				</div>
 
-				<div class="form_item" v-if="formData.sensorType == 'WSC'">
+				<div class="form_item" v-if="formData.sensorType == 'WSC' || formData.sensorType == 'C'">
 					<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
 						<a-form-item label="CO2上限" name="co2Up">
 							<a-input-number

snowy-admin-web/src/views/biz/monitor/trendchart/index.vue

@@ -10,10 +10,7 @@
 			<div class="head_name">{{ data.regionName }}</div>
 			<div class="head_row">
 				<div class="label">
-					<img
-						src="/src/assets/images/monitor/01.png"
-						v-if="data.sensorType == 'W' || data.sensorType == 'WS' || data.sensorType == 'WSC'"
-					/>
+					<img src="/src/assets/images/monitor/01.png" v-if="data.sensorData && data.sensorData.temperature" />
 					<img src="/src/assets/images/monitor/01-1.png" v-else />
 				</div>
 				<div class="value">
@@ -23,7 +20,7 @@
 			</div>
 			<div class="head_row">
 				<div class="label">
-					<img src="/src/assets/images/monitor/02.png" v-if="data.sensorType == 'WS' || data.sensorType == 'WSC'" />
+					<img src="/src/assets/images/monitor/02.png" v-if="data.sensorData && data.sensorData.humidity" />
 					<img src="/src/assets/images/monitor/02-2.png" v-else />
 				</div>
 				<div class="value">
@@ -33,7 +30,7 @@
 			</div>
 			<div class="head_row">
 				<div class="label">
-					<img src="/src/assets/images/monitor/03.png" v-if="data.sensorType == 'WSC'" />
+					<img src="/src/assets/images/monitor/03.png" v-if="data.sensorData && data.sensorData.co2" />
 					<img src="/src/assets/images/monitor/03-3.png" v-else />
 				</div>
 				<div class="value">
@@ -52,7 +49,7 @@
 				<span>查询范围：</span>
 				<a-range-picker
 					v-model:value="timeValue"
-					style="width: 300px"
+					style="width: 250px"
 					format="YYYY-MM-DD"
 					value-format="YYYY-MM-DD"
 					:disabled-date="disabledDate"
@@ -78,6 +75,7 @@
 					<a-radio-button value="1d">天</a-radio-button>
 					<a-radio-button value="1w">自然周</a-radio-button>
 					<a-radio-button value="1mo">月度</a-radio-button>
+					<a-radio-button value="3mo">季度</a-radio-button>
 				</a-radio-group>
 				<a-button class="xn-mg08">
 					<template #icon><download-outlined /></template>导出