diff --git a/src/api/cost/allCost.js b/src/api/cost/allCost.js
index 81500a8d..6e29a9d0 100644
--- a/src/api/cost/allCost.js
+++ b/src/api/cost/allCost.js
@@ -52,3 +52,12 @@ export function exportRawCostStatisticsHisExcel(query) {
     responseType: 'blob'
   })
 }
+
+// 获得成本首页 -获取首页数据
+export function getData(query) {
+  return request({
+    url: '/monitoring/cost-homepage/getData',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/environmental/environmentalLog.js b/src/api/environmental/environmentalLog.js
new file mode 100644
index 00000000..0709f7bc
--- /dev/null
+++ b/src/api/environmental/environmentalLog.js
@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 获得环保数据历史分页
+export function getCostEnviHisPage(query) {
+  return request({
+    url: '/monitoring/cost-envi-his/page',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/assets/img/home-bg.png b/src/assets/img/home-bg.png
new file mode 100644
index 00000000..5ef3977f
Binary files /dev/null and b/src/assets/img/home-bg.png differ
diff --git a/src/assets/img/home-progress-bg.png b/src/assets/img/home-progress-bg.png
new file mode 100644
index 00000000..39ddb5ef
Binary files /dev/null and b/src/assets/img/home-progress-bg.png differ
diff --git a/src/router/index.js b/src/router/index.js
index 509a429c..b53354c1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -76,7 +76,7 @@ export const constantRoutes = [
     children: [
       {
         path: "index",
-        component: (resolve) => require(["@/views/cost/raw/costMaterial/index"], resolve),
+        component: (resolve) => require(["@/views/cost/index"], resolve),
         name: "首页",
         meta: { title: "首页", icon: "dashboard", affix: true },
         hidden: true
diff --git a/src/views/Environmental/Environmental-log.vue b/src/views/Environmental/Environmental-log.vue
new file mode 100644
index 00000000..26a12f5d
--- /dev/null
+++ b/src/views/Environmental/Environmental-log.vue
@@ -0,0 +1,125 @@
+<!--
+ * @Author: zwq
+ * @Date: 2024-11-13 14:01:16
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-11-13 15:36:35
+ * @Description:
+-->
+<template>
+	<div>
+		<div class="app-container">
+			<!-- 搜索工作栏 -->
+			<search-bar
+				:formConfigs="formConfig"
+				ref="searchBarForm"
+				@headBtnClick="buttonClick" />
+			<!-- 列表 -->
+			<base-table
+				:page="listQuery.pageNo"
+				:limit="listQuery.pageSize"
+				:table-props="tableProps"
+				:table-data="tableData"
+				:max-height="tableH" />
+			<pagination
+				:page.sync="listQuery.pageNo"
+				:limit.sync="listQuery.pageSize"
+				:total="listQuery.total"
+				@pagination="getDataList" />
+		</div>
+	</div>
+</template>
+
+<script>
+import basicPage from '@/mixins/basic-page';
+import { getCostEnviHisPage } from '@/api/environmental/environmentalLog';
+import { parseTime } from '@/filter/code-filter';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+
+const tableProps = [
+	{
+		prop: 'recTime',
+		label: '记录时间',
+		filter: parseTime,
+		minWidth: 150,
+	},
+	{
+		prop: 'remark',
+		label: '备注',
+	},
+	{
+		prop: 'envi1',
+		label: '二氧化硫mg/Nm3',
+	},
+	{
+		prop: 'envi2',
+		label: '氮氧化物mg/Nm3',
+	},
+	{
+		prop: 'envi3',
+		label: '粉尘mg/Nm3',
+	},
+];
+export default {
+	name: '',
+	mixins: [basicPage, tableHeightMixin],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getCostEnviHisPage,
+			},
+			formConfig: [
+				{
+					type: 'datePicker',
+					label: '时间',
+					dateType: 'datetimerange',
+					format: 'yyyy-MM-dd HH:mm:ss',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					rangeSeparator: '-',
+					startPlaceholder: '开始时间',
+					endPlaceholder: '结束时间',
+					width: 350,
+					param: 'searchTime',
+					clearable: false,
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+			],
+			listQuery: {
+				statisticType: 1,
+			},
+			tableProps,
+			tableData: [],
+		};
+	},
+	components: {},
+	created() {
+		const end = new Date();
+		const start = new Date();
+		this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 00:00:00';
+		this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 23:59:59';
+		this.formConfig[0].startPlaceholder = parseTime(start).substr(0, 10);
+		this.formConfig[0].endPlaceholder = parseTime(end).substr(0, 10);
+	},
+	methods: {
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.statisticType = 1;
+					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
+					this.listQuery.endTime = val.searchTime ? val.searchTime[1] : null;
+					this.getDataList();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>
+<style lang="scss"></style>
diff --git a/src/views/base/materialPricing/index.vue b/src/views/base/materialPricing/index.vue
index 006fc943..8ded58c4 100644
--- a/src/views/base/materialPricing/index.vue
+++ b/src/views/base/materialPricing/index.vue
@@ -65,7 +65,7 @@ const tableProps = [
 	},
 	{
 		prop: 'price',
-		label: '单价(元/吨)',
+		label: '单价(元/千克)',
 		align: 'right',
 	},
 	{
diff --git a/src/views/cost/costStatistics/index.vue b/src/views/cost/costStatistics/index.vue
index a984c3e5..5c8be7a6 100644
--- a/src/views/cost/costStatistics/index.vue
+++ b/src/views/cost/costStatistics/index.vue
@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getDataList" />
+				@pagination="getNavDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -334,6 +334,13 @@ export default {
 				this.otherMethods(val);
 			}
 		},
+    getNavDataList(){
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+    },
 		/** 导出按钮操作 */
 		handleExport() {
 			let exportURL, title;
diff --git a/src/views/cost/deep/costDeepEnergy/index.vue b/src/views/cost/deep/costDeepEnergy/index.vue
index 50bed04b..0fbacef4 100644
--- a/src/views/cost/deep/costDeepEnergy/index.vue
+++ b/src/views/cost/deep/costDeepEnergy/index.vue
@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getDataList" />
+				@pagination="getNavDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -90,6 +90,10 @@ const tableProps = [
 		label: '日期',
 		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
 	},
+	{
+		prop: 'remark',
+		label: '备注',
+	},
 	{
 		prop: 'energyTypeName',
 		label: '能源类型',
@@ -115,6 +119,10 @@ const tableProps = [
 	},
 ];
 const tableProps2 = [
+	{
+		prop: 'remark',
+		label: '备注',
+	},
 	{
 		prop: 'energyTypeName',
 		label: '能源类型',
@@ -329,6 +337,13 @@ export default {
 				this.getDataList2();
 			}
 		},
+    getNavDataList(){
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+    },
 		// 获取数据2列表
 		getDataList2() {
 			if (this.listQuery.startTime) {
diff --git a/src/views/cost/deep/costDeepOthercostHis/index.vue b/src/views/cost/deep/costDeepOthercostHis/index.vue
index 74f25aa6..0acc63b1 100644
--- a/src/views/cost/deep/costDeepOthercostHis/index.vue
+++ b/src/views/cost/deep/costDeepOthercostHis/index.vue
@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getDataList" />
+				@pagination="getNavDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -91,6 +91,10 @@ const tableProps = [
 		label: '日期',
 		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
 	},
+	{
+		prop: 'remark',
+		label: '备注',
+	},
 	{
 		prop: 'otherCostName',
 		label: '成本名称',
@@ -102,6 +106,10 @@ const tableProps = [
 	},
 ];
 const tableProps2 = [
+	{
+		prop: 'remark',
+		label: '备注',
+	},
 	{
 		prop: 'otherCostName',
 		label: '成本名称',
@@ -304,6 +312,13 @@ export default {
 				this.getDataList2();
 			}
 		},
+    getNavDataList(){
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+    },
 		// 获取数据2列表
 		getDataList2() {
 			getRawOthercostSunPage(this.listQuery).then((response) => {
diff --git a/src/views/cost/deep/costDeepRatioHis/index.vue b/src/views/cost/deep/costDeepRatioHis/index.vue
index 3dd40db1..5f14d01a 100644
--- a/src/views/cost/deep/costDeepRatioHis/index.vue
+++ b/src/views/cost/deep/costDeepRatioHis/index.vue
@@ -52,7 +52,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getDataList" />
+				@pagination="getNavDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -89,6 +89,10 @@ const tableProps = [
 		label: '日期',
 		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
 	},
+	{
+		prop: 'remark',
+		label: '备注',
+	},
 	{
 		prop: 'productionLineName',
 		label: '产线',
@@ -117,6 +121,10 @@ const tableProps2 = [
 		label: '日期',
 		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
 	},
+	{
+		prop: 'remark',
+		label: '备注',
+	},
 	{
 		prop: 'productionLineName',
 		label: '产线',
@@ -309,6 +317,13 @@ export default {
 				this.otherMethods(val);
 			}
 		},
+    getNavDataList(){
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+    },
 		successSubmit() {
 			this.handleCancel();
 			const val = this.activeName === 'his' ? '产线良品率' : 'now';
diff --git a/src/views/cost/deep/costStatistics/index.vue b/src/views/cost/deep/costStatistics/index.vue
index 319db503..f23e7090 100644
--- a/src/views/cost/deep/costStatistics/index.vue
+++ b/src/views/cost/deep/costStatistics/index.vue
@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getDataList" />
+				@pagination="getNavDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -91,6 +91,10 @@ const tableProps = [
 		label: '时间',
 		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
 	},
+	{
+		prop: 'remark',
+		label: '备注',
+	},
 	{
 		prop: 'bindObjectName',
 		label: '产线',
@@ -129,6 +133,10 @@ const tableProps = [
 	},
 ];
 const tableProps2 = [
+	{
+		prop: 'remark',
+		label: '备注',
+	},
 	{
 		prop: 'bindObjectName',
 		label: '产线',
@@ -355,6 +363,13 @@ export default {
 				this.getDataList2();
 			}
 		},
+    getNavDataList(){
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+    },
 		// 获取数据2列表
 		getDataList2() {
 			if (this.listQuery.startTime) {
diff --git a/src/views/cost/index.vue b/src/views/cost/index.vue
new file mode 100644
index 00000000..2414ce2d
--- /dev/null
+++ b/src/views/cost/index.vue
@@ -0,0 +1,410 @@
+<template>
+	<div class="home-page">
+		<div class="date-tabs">
+			<el-tabs v-model="activeName" @tab-click="handleClick" :stretch="true">
+				<el-tab-pane
+					:label="'\u2002\u2002日\u2002\u2002'"
+					name="日"></el-tab-pane>
+				<el-tab-pane
+					:label="'\u2002\u2002周\u2002\u2002'"
+					name="周"></el-tab-pane>
+				<el-tab-pane
+					:label="'\u2002\u2002月\u2002\u2002'"
+					name="月"></el-tab-pane>
+				<el-tab-pane
+					:label="'\u2002\u2002年\u2002\u2002'"
+					name="年"></el-tab-pane>
+			</el-tabs>
+			<div class="current-date">( {{ showTime }} )</div>
+			<div class="current-time">
+				<span style="display: inline-block; margin-right: 16px">
+					{{ topTime + timeZone }}
+				</span>
+				<span>{{ topDate }}</span>
+			</div>
+		</div>
+		<el-row class="main-top" :gutter="16">
+			<el-col :span="24" style="position: relative">
+				<div class="title">
+					<svg-icon icon-class="home-produce" />
+					<span class="title-inner">生产总成本</span>
+				</div>
+				<el-row class="box">
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.priceS }}万元</div>
+						<div class="unit-style">总计成本</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.matPriceS }}万元</div>
+						<div class="unit-style">原料成本</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.energyPriceS }}万元</div>
+						<div class="unit-style">能源成本</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.otherPriceS }}万元</div>
+						<div class="unit-style">其他成本</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.ratioS }}</div>
+						<div class="unit-style">综合良品率/%</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.areaPriceS }}元</div>
+						<div class="unit-style">综合每平米成本</div>
+					</el-col>
+				</el-row>
+			</el-col>
+			<el-col :span="24" style="position: relative">
+				<div class="title">
+					<svg-icon icon-class="home-produce" />
+					<span class="title-inner">原片成本</span>
+				</div>
+				<el-row class="box">
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.priceO }}万元</div>
+						<div class="unit-style">原片总成本</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.matPriceO }}万元</div>
+						<div class="unit-style">原料成本</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.energyPriceO }}万元</div>
+						<div class="unit-style">能源成本</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.otherPriceO }}万元</div>
+						<div class="unit-style">其他成本</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.ratioO }}</div>
+						<div class="unit-style">原片良品率/%</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.areaPriceO }}元</div>
+						<div class="unit-style">原片每平米成本</div>
+					</el-col>
+				</el-row>
+			</el-col>
+			<el-col :span="24" style="position: relative">
+				<div class="title">
+					<svg-icon icon-class="home-produce" />
+					<span class="title-inner">深加工成本</span>
+				</div>
+				<el-row class="box">
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.priceD }}万元</div>
+						<div class="unit-style">深加工总成本</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.energyPriceD }}万元</div>
+						<div class="unit-style">能源成本</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.otherPriceD }}万元</div>
+						<div class="unit-style">其他成本</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.ratioD }}</div>
+						<div class="unit-style">深加工良品率/%</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.areaPriceD }}元</div>
+						<div class="unit-style">深加工每平米成本</div>
+					</el-col>
+				</el-row>
+			</el-col>
+		</el-row>
+		<el-row class="main-bottom" :gutter="16" v-if="false">
+			<el-col :span="9">
+				<div class="chart-wrapper">
+					<line-chart :chart-data="lineChartData" />
+				</div>
+			</el-col>
+			<el-col :span="7">
+				<div class="chart-wrapper">
+					<pie-chart />
+				</div>
+			</el-col>
+			<el-col :span="8">
+				<div class="chart-wrapper">
+					<bar-chart />
+				</div>
+			</el-col>
+		</el-row>
+		<div
+			class="main-footer"
+			style="
+				color: #c7c7c7;
+				user-select: none;
+				font-size: 14px;
+				letter-spacing: 1px;
+				height: 30px;
+				display: grid;
+				place-content: center;
+			">
+			&copy; 中建材智能自动化研究院有限公司
+		</div>
+	</div>
+</template>
+
+<script>
+import moment from 'moment';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+import LineChart from '../dashboard/LineChart';
+import PieChart from '../dashboard/PieChart';
+import BarChart from '../dashboard/BarChart';
+import PanelGroup from '../dashboard/PanelGroup';
+import { getData } from '@/api/cost/allCost';
+
+const lineChartData = {
+	newVisitis: {
+		expectedData: [100, 120, 161, 134, 105, 160, 165],
+		actualData: [120, 82, 91, 154, 162, 140, 145],
+	},
+	messages: {
+		expectedData: [200, 192, 120, 144, 160, 130, 140],
+		actualData: [180, 160, 151, 106, 145, 150, 130],
+	},
+	purchases: {
+		expectedData: [80, 100, 121, 104, 105, 90, 100],
+		actualData: [120, 90, 100, 138, 142, 130, 130],
+	},
+	shoppings: {
+		expectedData: [130, 140, 141, 142, 145, 150, 160],
+		actualData: [120, 82, 91, 154, 162, 140, 130],
+	},
+};
+
+export default {
+	name: 'Home',
+	mixins: [tableHeightMixin],
+	components: {
+		LineChart,
+		PieChart,
+		PanelGroup,
+		BarChart,
+	},
+	computed: {
+		gradientBackground() {
+			return {
+				'background-image':
+					'linear-gradient(90deg, #f0f0f0 25%, rgba(255, 255, 255, 0) 25%, rgba(255, 255, 255, 0) 50%, #f0f0f0 50%, #f0f0f0 75%, rgba(255, 255, 255, 0) 75%, rgba(255, 255, 255, 0))',
+				'background-size': '100px 100px', // 调整条纹的大小
+			};
+		},
+	},
+	data() {
+		return {
+			activeName: '日',
+			topDate: '',
+			topTime: '',
+			timeZone: '',
+			lineChartData: lineChartData.newVisitis,
+			homeData: {},
+			startTime:
+				moment(new Date()).subtract(0, 'days').format('YYYY-MM-DD') +
+				' 00:00:00',
+			endTime:
+				moment(new Date()).subtract(-1, 'days').format('YYYY-MM-DD') +
+				' 00:00:00',
+		};
+	},
+	created() {
+		this.getTime();
+		this.handleClick();
+		this.showTime = moment(new Date()).subtract(0, 'days').format('YYYY-MM-DD');
+		this.getData();
+	},
+	beforeDestroy() {
+		clearInterval(this.timer);
+	},
+	methods: {
+		getData() {
+			let listQuery = {
+				//分页
+				pageSize: 10,
+				pageNo: 1,
+				statisticType: ['', '日', '周', '月', '年'].indexOf(this.activeName),
+				startTime: this.startTime,
+				endTime: this.endTime,
+			};
+			getData(listQuery).then((response) => {
+				this.homeData = response.data;
+				for (let i in this.homeData) {
+					this.homeData[i] = Number(this.homeData[i]).toFixed(2);
+				}
+			});
+		},
+		handleClick() {
+			let start = Date.parse(new Date());
+			let end = Date.parse(new Date());
+			switch (this.activeName) {
+				case '日':
+					this.showTime = moment(new Date())
+						.subtract(0, 'days')
+						.format('YYYY-MM-DD');
+					this.lineChartData = lineChartData.newVisitis;
+					break;
+				case '周':
+					start = moment(new Date()).subtract(6, 'days').format('x');
+					this.showTime =
+						moment(new Date()).subtract(6, 'days').format('MM-DD') +
+						' ~ ' +
+						moment(new Date()).subtract(0, 'days').format('MM-DD');
+					this.lineChartData = lineChartData.messages;
+					break;
+				case '月':
+					start = moment(new Date()).subtract(1, 'month').format('x');
+					this.showTime =
+						moment(new Date()).subtract(1, 'month').format('MM-DD') +
+						' ~ ' +
+						moment(new Date()).subtract(0, 'days').format('MM-DD');
+					this.lineChartData = lineChartData.purchases;
+					break;
+				case '年':
+					start = moment(new Date()).subtract(1, 'year').format('x');
+					this.showTime =
+						moment(new Date()).subtract(1, 'year').format('YYYY') +
+						' ~ ' +
+						moment(new Date()).subtract(0, 'days').format('YYYY');
+					this.lineChartData = lineChartData.shoppings;
+					break;
+				default:
+					console.log(val);
+			}
+      this.getData()
+		},
+		getTime() {
+			let _this = this;
+			this.timer = setInterval(function () {
+				_this.topDate = moment().format('YYYY.MM.DD');
+				let temp = moment().format('A-hh:mm').split('-');
+				_this.timeZone = temp[0];
+				_this.topTime = temp[1];
+			}, 1000);
+		},
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+.home-page::before {
+	background-image: url('~@/assets/img/home-bg.png');
+	background-size: cover;
+	background-repeat: no-repeat;
+	background-position: center;
+	content: '';
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	transform: rotate(180deg);
+}
+.date-tabs {
+	padding-left: 40px;
+	padding-top: 20px;
+	position: relative;
+}
+:deep(.date-tabs) {
+	.el-tabs__header {
+		margin-bottom: 8px;
+		display: inline-block;
+		transform: translateY(-12px);
+	}
+
+	.el-tabs__content {
+		overflow: visible;
+	}
+
+	.el-tabs__item {
+		font-size: 18px;
+		color: #fff;
+		padding-left: 0 !important;
+		padding-right: 0 !important;
+		line-height: 36px !important;
+		height: 36px;
+	}
+	.el-tabs__item.is-active {
+		color: #0b58ff;
+	}
+}
+.current-date {
+	color: #fff;
+	font-size: 18px;
+	position: absolute;
+	left: 260px;
+	top: 14px;
+}
+.current-time {
+	color: #fff;
+	font-size: 18px;
+	position: absolute;
+	right: 38px;
+	top: 14px;
+}
+.main-top {
+	width: 100%;
+	padding: 0 20px 0 40px;
+	.title {
+		position: absolute;
+		left: 34px;
+		top: 20px;
+		width: 180px;
+		font-size: 32px;
+		z-index: 10;
+		.title-inner {
+			position: absolute;
+			left: 42px;
+			top: 5px;
+			font-size: 24px;
+		}
+	}
+	.box {
+		background-color: #fff;
+		border-radius: 24px;
+		height: 192px;
+		padding: 40px 24px 32px 24px;
+		margin-bottom: 20px;
+		box-shadow: 0 8px 8px 0 gray;
+		.num-box {
+			height: 120px;
+			padding-top: 26px;
+			text-align: center;
+			.num-style {
+				color: #000;
+				font-size: 40px;
+			}
+			.unit-style {
+				color: rgba(0, 0, 0, 0.7);
+				font-size: 18px;
+			}
+		}
+		.shadow {
+			background: linear-gradient(90deg, #ffffff 80%, #f2f4f9 100%);
+		}
+	}
+}
+.main-bottom {
+	width: 100%;
+	margin-top: 20px;
+	.chart-wrapper {
+		margin-left: 10px;
+		height: 425px;
+		background: #fff;
+		border-radius: 5px;
+		box-shadow: 0 3px 3px 0 gray;
+	}
+}
+</style>
+<style lang="scss">
+.home-page {
+	.el-progress-bar__inner {
+		background-image: url('~@/assets/img/home-progress-bg.png');
+		background-size: cover;
+	}
+}
+</style>
diff --git a/src/views/cost/raw/costEnergy/index.vue b/src/views/cost/raw/costEnergy/index.vue
index cba5f4f8..e86ebbbe 100644
--- a/src/views/cost/raw/costEnergy/index.vue
+++ b/src/views/cost/raw/costEnergy/index.vue
@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getDataList" />
+				@pagination="getNavDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -90,6 +90,10 @@ const tableProps = [
 		label: '日期',
 		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
 	},
+	{
+		prop: 'remark',
+		label: '备注',
+	},
 	{
 		prop: 'energyTypeName',
 		label: '能源类型',
@@ -115,6 +119,10 @@ const tableProps = [
 	},
 ];
 const tableProps2 = [
+	{
+		prop: 'remark',
+		label: '备注',
+	},
 	{
 		prop: 'energyTypeName',
 		label: '能源类型',
@@ -329,6 +337,13 @@ export default {
 				this.getDataList2();
 			}
 		},
+    getNavDataList(){
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+    },
 		// 获取数据2列表
 		getDataList2() {
 			if (this.listQuery.startTime) {
diff --git a/src/views/cost/raw/costMaterial/index.vue b/src/views/cost/raw/costMaterial/index.vue
index f49526a3..13a4df4c 100644
--- a/src/views/cost/raw/costMaterial/index.vue
+++ b/src/views/cost/raw/costMaterial/index.vue
@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getDataList" />
+				@pagination="getNavDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -91,17 +91,21 @@ const tableProps = [
 		label: '日期',
 		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
 	},
+	{
+		prop: 'remark',
+		label: '备注',
+	},
 	{
 		prop: 'materialName',
 		label: '原料名称',
 	},
 	{
 		prop: 'quantity',
-		label: '累计使用量(吨)',
+		label: '累计使用量(千克)',
 	},
 	{
 		prop: 'matPrice',
-		label: '单价(元/吨)',
+		label: '单价(元/千克)',
 		align: 'right',
 	},
 	{
@@ -111,6 +115,10 @@ const tableProps = [
 	},
 ];
 const tableProps2 = [
+	{
+		prop: 'remark',
+		label: '备注',
+	},
 	{
 		prop: 'materialName',
 		label: '原料名称',
@@ -123,11 +131,11 @@ const tableProps2 = [
 	},
 	{
 		prop: 'quantity',
-		label: '累计使用量(吨)',
+		label: '累计使用量(千克)',
 	},
 	{
 		prop: 'materialPrice',
-		label: '单价(元/吨)',
+		label: '单价(元/千克)',
 		align: 'right',
 	},
 	{
@@ -326,6 +334,13 @@ export default {
 				this.getDataList2();
 			}
 		},
+    getNavDataList(){
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+    },
 		// 获取数据2列表
 		getDataList2() {
 			if (this.listQuery.startTime) {
diff --git a/src/views/cost/raw/costOriginRatioHis/index.vue b/src/views/cost/raw/costOriginRatioHis/index.vue
index b1db84fa..f243e248 100644
--- a/src/views/cost/raw/costOriginRatioHis/index.vue
+++ b/src/views/cost/raw/costOriginRatioHis/index.vue
@@ -54,6 +54,10 @@ const tableProps = [
 		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
     width:130,
 	},
+	{
+		prop: 'remark',
+		label: '备注',
+	},
 	{
 		prop: 'bindObjectName',
 		label: '产线',
diff --git a/src/views/cost/raw/costOthercostHis/index.vue b/src/views/cost/raw/costOthercostHis/index.vue
index 1c6c8b29..250c4788 100644
--- a/src/views/cost/raw/costOthercostHis/index.vue
+++ b/src/views/cost/raw/costOthercostHis/index.vue
@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getDataList" />
+				@pagination="getNavDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -91,6 +91,10 @@ const tableProps = [
 		label: '日期',
 		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
 	},
+	{
+		prop: 'remark',
+		label: '备注',
+	},
 	{
 		prop: 'otherCostName',
 		label: '成本名称',
@@ -102,6 +106,10 @@ const tableProps = [
 	},
 ];
 const tableProps2 = [
+	{
+		prop: 'remark',
+		label: '备注',
+	},
 	{
 		prop: 'otherCostName',
 		label: '成本名称',
@@ -297,6 +305,13 @@ export default {
 				this.getDataList2();
 			}
 		},
+    getNavDataList(){
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+    },
 		// 获取数据2列表
 		getDataList2() {
 			getRawOthercostSunPage(this.listQuery).then((response) => {
diff --git a/src/views/cost/raw/costStatistics/index.vue b/src/views/cost/raw/costStatistics/index.vue
index b5c5e36b..0ea9d401 100644
--- a/src/views/cost/raw/costStatistics/index.vue
+++ b/src/views/cost/raw/costStatistics/index.vue
@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getDataList" />
+				@pagination="getNavDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -91,6 +91,10 @@ const tableProps = [
 		label: '时间',
 		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
 	},
+	{
+		prop: 'remark',
+		label: '备注',
+	},
 	{
 		prop: 'bindObjectName',
 		label: '产线',
@@ -124,6 +128,10 @@ const tableProps = [
 	},
 ];
 const tableProps2 = [
+	{
+		prop: 'remark',
+		label: '备注',
+	},
 	{
 		prop: 'bindObjectName',
 		label: '产线',
@@ -354,6 +362,13 @@ export default {
 				this.getDataList2();
 			}
 		},
+    getNavDataList(){
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+    },
 		// 获取数据2列表
 		getDataList2() {
 			if (this.listQuery.startTime) {
diff --git a/src/views/dashboard/BarChart.vue b/src/views/dashboard/BarChart.vue
index 88e7ef64..b8b20058 100644
--- a/src/views/dashboard/BarChart.vue
+++ b/src/views/dashboard/BarChart.vue
@@ -74,21 +74,21 @@ export default {
           }
         }],
         series: [{
-          name: 'pageA',
+          name: '成本1',
           type: 'bar',
           stack: 'vistors',
           barWidth: '60%',
           data: [79, 52, 200, 334, 390, 330, 220],
           animationDuration
         }, {
-          name: 'pageB',
+          name: '成本2',
           type: 'bar',
           stack: 'vistors',
           barWidth: '60%',
           data: [80, 52, 200, 334, 390, 330, 220],
           animationDuration
         }, {
-          name: 'pageC',
+          name: '成本3',
           type: 'bar',
           stack: 'vistors',
           barWidth: '60%',
diff --git a/src/views/monitoring/equipmentFullParams/index.vue b/src/views/monitoring/equipmentFullParams/index.vue
index 4e681abe..9234357f 100644
--- a/src/views/monitoring/equipmentFullParams/index.vue
+++ b/src/views/monitoring/equipmentFullParams/index.vue
@@ -1,4 +1,4 @@
-<!-- 
+<!--
     filename: index.vue
     author: liubin
     date: 2023-08-31 09:14:19
@@ -35,27 +35,27 @@
 					" />
 			</div>
 		</div>
-		<div v-else class="no-data-bg">
-		</div>
+		<div v-else class="no-data-bg"></div>
 	</div>
 </template>
 
 <script>
+import { Message } from 'element-ui';
 import LocalDataManager from './utils/local-data-manager';
 // import response from './response';
 import moment from 'moment';
+import { parseTime } from '@/utils/ruoyi'
 
 export default {
 	name: 'EquipmentFullParams',
 	components: {},
 	props: {},
 	data() {
-		const now = new Date();
-		const [y, m, d] = [now.getFullYear(), now.getMonth(), now.getDate()];
-		const today = new Date(y, m, d, 0, 0, 0, 0).getTime();
-		const aWeekAgo = today - 3600 * 1000 * 24 * 7;
+		// const now = new Date().getTime();
+		// const [y, m, d] = [now.getFullYear(), now.getMonth(), now.getDate()];
+		const today = new Date().getTime();
+		const tenminAgo = new Date(today - (10 * 60 * 1000)).getTime();
 		return {
-			tableList: [],
 			searchBarFormConfig: [
 				{
 					type: 'input',
@@ -74,10 +74,10 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间段',
-					dateType: 'daterange', // datetimerange
+					dateType: 'datetimerange', // datetimerange
 					format: 'yyyy-MM-dd HH:mm:ss',
 					// valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					valueFormat: 'timestamp',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
@@ -94,14 +94,20 @@ export default {
 				},
 			],
 			queryParams: {
-				id: null,
-				time: [new Date(aWeekAgo), new Date(today)],
+				equipmentId: null,
+				recordTime: [parseTime(tenminAgo), parseTime(today)],
 			},
 			tableList: [
 				// {
 				// 	key: 'base-table__key__1',
-				// 	tableProps: [],
-				// 	list: [],
+				// 	tableProps: [{
+				// 		prop: 'name',
+				// 		label: 'name'
+				// 	}],
+				// 	dataManager: {dataList: [{name: '1'}]},
+				// 	list: [{
+				// 		name: '11'
+				// 	}],
 				// 	pageNo: 1,
 				// 	pageSize: 3,
 				// 	total: 0,
@@ -109,35 +115,72 @@ export default {
 			],
 		};
 	},
-	computed: {
-		id() {
-			return this.$route.params.equipmentId;
-		},
-		code() {
-			return this.$route.params.equipmentCode;
-		},
-		name() {
-			return this.$route.params.equipmentName;
-		},
-	},
-	mounted() {
-		if (this.id) this.$set(this.queryParams, 'id', this.id);
-		if (this.code)
-			this.$set(this.searchBarFormConfig[0], 'defaultSelect', this.code);
-		if (this.name)
-			this.$set(this.searchBarFormConfig[1], 'defaultSelect', this.name);
+	beforeRouteEnter(to, from, next) {
+		if (Object.keys(to.params).length > 0) {
+			next((vm) => {
+				vm.$set(vm.queryParams, 'equipmentId', to.params.equipmentId);
+				vm.$set(
+					vm.searchBarFormConfig[0],
+					'defaultSelect',
+					to.params.equipmentName
+				);
+				vm.$set(
+					vm.searchBarFormConfig[1],
+					'defaultSelect',
+					to.params.equipmentCode
+				);
+				vm.$set(
+					vm.searchBarFormConfig[2],
+					'defaultSelect',
+					vm.queryParams.recordTime
+				);
+				vm.handleQuery();
+			});
+		} else {
+			// let timeleft = 3;
 
-		// this.handleResponse();
+			// const message = Message({
+			// 	type: 'warning',
+			// 	duration: 0,
+			// 	message: `请先选择设备, 即将引导进入设备状态和参数页面, 剩余 ${timeleft} s`,
+			// });
+
+			// const timer = setInterval(() => {
+			// 	if (timeleft > 0) {
+			// 		timeleft--;
+			// 		message.$data.message = `请先选择设备, 即将引导进入设备状态和参数页面, 剩余 ${timeleft} s`
+			// 		return;
+			// 	}
+			// 	message.close();
+			// 	clearInterval(timer);
+			// 	timer = null;
+			// }, 1000);
+
+			// next({ name: 'EquipmentStatusAndParams' });
+			next((vm) => {
+				vm.$message({
+					type: 'error',
+					message: `请先选择设备`,
+				});
+			});
+		}
+	},
+	beforeRouteLeave(to, from, next) {
+		// clean job
+		this.$set(this.queryParams, 'equipmentId', null);
+		this.$set(this.searchBarFormConfig[0], 'defaultSelect', null);
+		this.$set(this.searchBarFormConfig[1], 'defaultSelect', null);
+		this.tableList = [];
+		next();
 	},
 	methods: {
 		buildProps(table) {
-			console.log('building props', table);
 			// 通过 otherList 来构建 props
 			const { otherList } = table;
 			const props = [
 				{
 					// type: 'index',
-					width: 48,
+					width: 56,
 					prop: 'index',
 					label: '序号',
 				},
@@ -147,7 +190,7 @@ export default {
 					label: '时间',
 				},
 				{
-					width: 200,
+					width: 240,
 					prop: 'plcCode',
 					label: 'PLC编码',
 				},
@@ -161,7 +204,7 @@ export default {
 				props.push({
 					label: item.name,
 					prop: item.name,
-					width: 128,
+					// width: 128,
 				});
 				firstLineData[item.name] = `${item.minValue ?? ''}-${
 					item.maxValue ?? ''
@@ -237,11 +280,18 @@ export default {
 
 		async handleSearchBarBtnClick({ btnName, timeVal }) {
 			if (timeVal && timeVal.length > 0) {
-				this.queryParams.time = timeVal;
+				console.log('nihc ', timeVal)
+				if (new Date(timeVal[1]).getTime() - new Date(timeVal[0]).getTime() <= 30 * 60 * 1000) {
+					this.queryParams.recordTime = timeVal;
+					await this.handleQuery();
+				} else {
+					this.$message.warning('时间范围最大30分钟限制！')
+				}
 			} else {
-				this.queryParams.time = [];
+				this.queryParams.recordTime = [];
+				this.$message.warning('时间段必选！')
 			}
-			await this.handleQuery();
+
 		},
 
 		handleEmitFun(table, val) {
@@ -264,9 +314,12 @@ export default {
 }
 
 .tables {
-	display: grid;
-	grid-template-columns: 1fr 1fr;
-	gap: 18px;
+	/* display: grid; */
+	/* grid-template-columns: 1fr 1fr; */
+	/* gap: 18px; */
+	display: flex;
+	flex-direction: column;
+	width: 100%;
 }
 
 .tables >>> .baseTable {
@@ -275,5 +328,6 @@ export default {
 
 .custom-table {
 	overflow-x: hidden;
+	margin-bottom: 10px;
 }
 </style>
diff --git a/sync_line_sczg_aliyun.bat b/sync_line_sczg_aliyun.bat
new file mode 100644
index 00000000..26c6aa64
--- /dev/null
+++ b/sync_line_sczg_aliyun.bat
@@ -0,0 +1,68 @@
+@echo off
+setlocal enabledelayedexpansion
+set cmdstr=rsync
+set zipfile=cwrsync.zip
+set downurl=https://itefix.net/download/free/cwrsync_6.3.0_x64_free.zip
+set currpath=%~dp0
+set "rsynchome=%ProgramFiles%\%zipfile:~0,-4%"
+set passfile=%temp%\.password
+set syncdir=dist/
+:: ������Ҫ����ͬ��������
+set accountwithost=kszny@47.96.93.140::line-sczg-ui
+set "password=kszny@123"
+set "runcommand=%cmdstr% --port=873 -rlptvz --progress --password-file=%passfile% --exclude=google.exe --exclude=Lodap.zip %syncdir% %accountwithost%"
+
+where %cmdstr% >nul 2>nul
+::�д��������˵�������ڸ�����
+if %errorlevel% neq 0 (
+    ::��δ���ذ�װ����δ������ѹ����װĿ¼
+    if not exist "%rsynchome%" (
+        :: ������������ԱȨ��
+        echo Set UAC = CreateObject^("Shell.Application"^) > "%temp%\runAsAdmin.vbs"
+        echo UAC.ShellExecute "%~s0", "", "", "runas", 1 >> "%temp%\runAsAdmin.vbs"
+        "%temp%\runAsAdmin.vbs"
+        :: ��Ҫ��������ԱȨ�޲��ܴ�����Ŀ¼
+        mkdir "%rsynchome%"
+        del "%temp%\runAsAdmin.vbs"
+        exit /B
+    )
+
+    :: ʹ��powershell��curl����������
+    powershell curl  -o %temp%\%zipfile% %downurl%
+    :: ��ѹ
+    tar -xf "%temp%\%zipfile%" -C "%rsynchome%"
+    echo "%cmdstr%�Ѿ���װ����%rsynchome%Ŀ¼��"
+
+    :: ���·���Ƿ������ PATH ��
+    set "found=false"
+    for %%I in ("%PATH:;=";"%") do (
+        if /I "%%~I"=="%rsynchome%\bin" (
+            set "found=true"
+        )
+    )
+
+    :: δ���õ�path�����У����ӵ�path����
+    if "!found!"=="false" (
+        :: ����ע����е� PATH ������ͨ��setx��ʽ������ֵ���ȳ���1024���ַ��ͻᱻ�ض�
+        reg add "HKCU\Environment" /v PATH /t REG_EXPAND_SZ /d "%PATH%;%rsynchome%\bin" /f
+    )
+
+)
+
+::��ǰĿ¼��û��distĿ¼
+if not exist "%currpath%%syncdir%" (
+    echo ��ǰĿ¼��û����Ҫͬ����%syncdir%Ŀ¼�������Ҫͬ����%syncdir%Ŀ¼��������ǰĿ¼�£�
+) else (
+    echo !password!>%passfile%
+    echo ����ͬ����ʼ�����Ժ�...
+    !runcommand! && (
+        echo ����ͬ�����!
+    ) || (
+        echo !runcommand!
+        echo ����ͬ��ʧ�ܣ���ȷ���Ƿ�����VPN��
+    )
+    del %passfile%
+)
+
+endlocal
+pause
diff --git a/sync_line.bat b/sync_line_sczg_prod.bat
similarity index 94%
rename from sync_line.bat
rename to sync_line_sczg_prod.bat
index 57105ce1..b49b1029 100644
--- a/sync_line.bat
+++ b/sync_line_sczg_prod.bat
@@ -2,13 +2,13 @@
 setlocal enabledelayedexpansion
 set cmdstr=rsync
 set zipfile=cwrsync.zip
-set downurl=https://itefix.net/dl/free-software/cwrsync_6.3.0_x64_free.zip
+set downurl=https://itefix.net/download/free/cwrsync_6.3.0_x64_free.zip
 set currpath=%~dp0
 set "rsynchome=%ProgramFiles%\%zipfile:~0,-4%"
 set passfile=%temp%\.password
 set syncdir=dist/
 :: ������Ҫ����ͬ��������
-set accountwithost=kszny@47.96.93.140::line
+set accountwithost=kszny@100.64.0.45::line
 set "password=kszny@123"
 set "runcommand=%cmdstr% --port=873 -rlptvz --progress --password-file=%passfile% --exclude=google.exe --exclude=Lodap.zip %syncdir% %accountwithost%"