heyang il y a 7 mois
Parent
commit
7f5171163a
3 fichiers modifiés avec 90 ajouts et 80 suppressions
  1. 1 1
      api/request/config.js
  2. 8 0
      pages/api/index.js
  3. 81 79
      pages/views/dataBoard/warningDispose.vue

+ 1 - 1
api/request/config.js

@@ -20,7 +20,7 @@ const config = {
 	// base_url: 'https://lab.zjznai.com/api/', //暨大化材
 	// base_url: 'https://lab.zjznai.com/kdwclabSystem/', //矿大文昌地址
 	// base_url: 'https://znyj.zjznai.suda.edu.cn/labSystem/', //苏大临时地址
-	 base_url: 'https://labcontrol.nwafu.edu.cn/api/', //西北农林
+	// base_url: 'https://labcontrol.nwafu.edu.cn/api/', //西北农林
 	// base_url: 'https://lab.zjznai.com/labapp/', //43测试
 }
 export {

+ 8 - 0
pages/api/index.js

@@ -237,6 +237,14 @@ export const securityCheckDangerNotHazardOneCollect = (data) => {
 		data: data,
 	})
 };
+//安全隐患-预警处置
+export const reportAppStatisticsWarningHandle = (data) => {
+	return apiResquest({
+    url: '/report/app/statistics/warningHandle',
+		method: 'GET',
+		data: data,
+	})
+};
 
 /************************扫码相关************************/
 

+ 81 - 79
pages/views/dataBoard/warningDispose.vue

@@ -23,18 +23,18 @@
 		<view class="statistics">
 			<view class="statistics-b">
 				<view class="statistics-b-li">
-					<view class="statistics-b-li-t">13</view>
+					<view class="statistics-b-li-t">{{yesterdayTotal}}</view>
 					<view class="statistics-b-li-b">昨日预警处置数</view>
 				</view>
 				<view class="line"></view>
 				<view class="statistics-b-li">
-					<view class="statistics-b-li-t">9</view>
+					<view class="statistics-b-li-t">{{todayTotal}}</view>
 					<view class="statistics-b-li-b">今日预警处置数</view>
 				</view>
 				<view class="line"></view>
 				<view class="statistics-b-li">
 					<view class="statistics-b-li-t-tow">
-						<text class="color-B">0.9%</text>
+						<text class="color-B">{{rate}}%</text>
 						<img src="@/pages/images/dataBoard/dataBoard-icon3.png">
 					</view>
 					<view class="statistics-b-li-b">环比增长</view>
@@ -56,8 +56,8 @@
 		config
 	} from '@/api/request/config.js'
 	import {
-
-	} from '@/pages_basics/api/index.js'
+		reportAppStatisticsWarningHandle
+	} from '@/pages/api/index.js'
 	export default {
 		name: "warningDispose",
 		components: {
@@ -65,36 +65,8 @@
 		},
 		data() {
 			return {
-				dateList: [{
-						num: '1',
-						letterNUm: 'Mon',
-					},
-					{
-						num: '2',
-						letterNUm: 'Tue',
-					},
-					{
-						num: '3',
-						letterNUm: 'Wed',
-					},
-					{
-						num: '4',
-						letterNUm: 'Thur',
-					},
-					{
-						num: '5',
-						letterNUm: 'Fri',
-					},
-					{
-						num: '6',
-						letterNUm: 'Sat',
-					},
-					{
-						num: '7',
-						letterNUm: 'Sun',
-					},
-				],
-				dateIndex: 0,
+				dateList: [],
+				dateIndex: 6,
 				deptList: [{
 						name: "农学院",
 						value: "0",
@@ -116,7 +88,7 @@
 					{
 						name: "生命科学",
 						value: "0",
-				  top: 85,
+						top: 85,
 						left: 370,
 					},
 					{
@@ -138,7 +110,7 @@
 						left: 42,
 					},
 					{
-				  name: "国重楼",
+						name: "国重楼",
 						value: "0",
 						top: 200,
 						left: 333,
@@ -157,70 +129,39 @@
 						align: 'center',
 					},
 					{
-						name: 'data1',
+						name: 'deptSortName',
 						label: '学院单位',
 						fixed: true,
 						width: 80,
 						align: 'center',
 					},
 					{
-						name: 'data2',
+						name: 'handleTotal',
 						label: '总数',
 						align: 'center',
 					},
 					{
-						name: 'data3',
+						name: 'yesterdayTotal',
 						label: '昨日',
 						align: 'center',
 					},
 					{
-						name: 'data4',
+						name: 'todayTotal',
 						label: '今日',
 						align: 'center',
 					},
 					{
-						name: 'data5',
+						name: 'rate',
 						label: '环比',
 						align: 'center',
 					},
 				],
-				dataList: [{
-						data1: '植物保护',
-						data2: '102',
-						data3: '47',
-						data4: '22',
-						data5: '13',
-					},
-					{
-						data1: '资源环境',
-						data2: '74',
-						data3: '8',
-						data4: '32',
-						data5: '18',
-					},
-					{
-						data1: '生命科学',
-						data2: '66',
-						data3: '28',
-						data4: '10',
-						data5: '8',
-					},
-					{
-						data1: '园林艺术',
-						data2: '56',
-						data3: '23',
-						data4: '17',
-						data5: '5',
-					},
-					{
-						data1: '化学与药物',
-						data2: '34',
-						data3: '12',
-						data4: '11',
-						data5: '21',
-					},
-				],
+				dataList: [],
 				total: 0,
+
+				todayTotal: 0,
+				yesterdayTotal: 0,
+				rate: 0,
 			}
 		},
 		created() {
@@ -229,10 +170,71 @@
 		beforeMount() {
 
 		},
-		mounted() {},
+		mounted() {
+			this.reportAppStatisticsWarningHandle();
+			this.getCurrentDate();
+		},
 		methods: {
 			dateClick(index) {
 				this.dateIndex = index;
+				console.log(this.dateList[index])
+			},
+
+			getCurrentDate() {
+				// 获取当前日期和星期
+				let date = new Date();
+				let weekdays = ["Sun", "Mon", "Tue", "Wed", "Thur", "Fri", "Sat"];
+				let weekdaysTow = ["7", "1", "2", "3", "4", "5", "6"];
+				// 获取星期几的索引
+				let dayOfWeekIndex = date.getDay();
+
+				// 获取当天的日期和星期
+				let dayOfMonth = date.getDate();
+				let month = date.getMonth() + 1; // 月份从0开始,需要加1
+				let year = date.getFullYear();
+
+				// 输出当前日期和星期
+				console.log("Today is " + month + "/" + dayOfMonth + "/" + year + ", " + weekdays[dayOfWeekIndex] + ".");
+
+				// 获取接下来一周的每天日期和星期
+				let nextDays = [];
+				for (let i = 0; i < 7; i++) {
+					let nextDate = new Date(date.getTime() - (i * 24 * 60 * 60 * 1000)); // 加上一天的时间差
+					nextDays.push({
+						date: nextDate.getDate(),
+						month: nextDate.getMonth() + 1,
+						year: nextDate.getFullYear(),
+						dayOfWeek: weekdays[nextDate.getDay()],
+						dayOfWeekTow: weekdaysTow[nextDate.getDay()],
+					});
+					
+				}
+				
+				// 输出接下来一周的每天日期和星期
+				for (let i = 0; i < 7; i++) {
+						this.dateList.push({
+							num:nextDays[i].dayOfWeekTow,
+							letterNUm:nextDays[i].dayOfWeek,
+							format:nextDays[i].year + "-" + nextDays[i].month + "-" + nextDays[i].date
+						})
+				}
+				this.dateList=this.dateList.reverse();
+			},
+			//预警处置
+			async reportAppStatisticsWarningHandle(planId) {
+				let self = this;
+				const {
+					data
+				} = await reportAppStatisticsWarningHandle({
+					'date': '2024-10-14'
+				});
+				if (data.code == 200) {
+					this.dataList = data.data.warningList;
+					this.$set(self, 'todayTotal', data.data.warning.todayTotal);
+					this.$set(self, 'yesterdayTotal', data.data.warning.yesterdayTotal);
+					this.$set(self, 'rate', data.data.warning.rate);
+
+				}
 			},
 		},
 	}