diff --git a/src/views/bigScreen/index_enm_bh.vue b/src/views/bigScreen/index_enm_bh.vue
index a99ad2ad..46be6c1c 100644
--- a/src/views/bigScreen/index_enm_bh.vue
+++ b/src/views/bigScreen/index_enm_bh.vue
@@ -214,16 +214,16 @@
 						<div class="elecItem_wrap">
 							<span>氧化钙综合电耗</span>
 							<p class="elec_number">
-								{{ (Number(hotData.celec_consume_unit)+Number(dicData.elec_month)).toFixed(2) }}
+								{{ (Number(hotData.celec_consume_unit)+Number(dicData.b_sl_elec)).toFixed(2) }}
 								<span class="elec_unit">kW·h</span>
 							</p>
 						</div>
 					</div>
 					<div class="elecItem">
 						<div class="elecItem_wrap">
-							<span>氧化钙综合煤耗</span>
+							<span>氧化钙标煤耗</span>
 							<p class="elec_number">
-								{{ (Number(hotData.coal_consume_unit)*1000+Number(dicData.elec_year)*1000).toFixed(2) }}
+								{{ (Number(hotData.coal_consume_unit)*1000+Number(dicData.b_sl_coal)).toFixed(2) }}
 								<span class="elec_unit">kgce/t</span>
 							</p>
 						</div>
@@ -232,7 +232,7 @@
 						<div class="elecItem_wrap">
 							<span>氧化钙综合能耗</span>
 							<p class="elec_number">
-								{{ (Number(hotData.cen_consume_unit)).toFixed(2)}}
+								{{ (Number(hotData.cen_consume_unit)+Number(dicData.b_sl_enegy)).toFixed(2)}}
 								<span class="elec_unit">kgce/t</span>
 							</p>
 						</div>
@@ -425,7 +425,7 @@ export default {
 			elecData: [
 				// { name: "电石渣工序", value: 0 },
 				// { name: "生料辅料工序", value: 0 },
-				{ name: "高温风机", value: 0 },
+				{ name: "废气系统", value: 0 },
 				{ name: "磨球主电机", value: 0 },
 				{ name: "窑尾高温风机", value: 0 },
 				// { name: "水泥包装工序", value: 0 },
@@ -436,8 +436,9 @@ export default {
 				cen_consume_unit: 0, //综合能耗
 			},
 			dicData:{
-				elec_month:0,
-				elec_year:0,
+				b_sl_elec:0,
+				b_sl_coal:0,
+				b_sl_enegy:0,
 			},
 			tableData: [],
 			tezhongData: [],
@@ -975,14 +976,15 @@ export default {
 				});
 				
 				// 第二个API查询
-				let query2 = generateQueryMgroup("3854338094887559168");
-				return this.$API.enm.enstat.req(query2);
+				let query2 = generateQuery("3853763444235055104");
+				return this.$API.enm.mpointstat.list.req(query2);
 				
 			}).then((response) => {
 				let maxId;	
+				console.log('----------res',response);
 				response.forEach((item) => {	
-						let ind = item.day_s - 1;					
-						seriesData3[ind] = item.elec_consume || 0;
+						let ind = item.day - 1;					
+						seriesData3[ind] = item.val || 0;
 						maxId = ind;
 				});
 				// 第三个API查询
@@ -1003,7 +1005,7 @@ export default {
 					},
 				},
 				{
-					name: "煤粉工序(kWh)",
+					name: "废气系统(kWh)",
 					textStyle: {
 						color: "#fff",
 					},
@@ -1024,7 +1026,7 @@ export default {
 				},
 				},
 				{
-				name: '煤粉工序(kWh)',
+				name: '废气系统(kWh)',
 				type: 'line',
 				data: seriesData3,
 				lineStyle: {
@@ -1183,7 +1185,7 @@ export default {
 				};
 			}
 
-			let query1 = generateQuery("3853763443194867712");
+			let query1 = generateQuery("3853763444235055104");
 			let query2 = generateQuery("3853763443379417088");
 			let query3 = generateQuery("3853763443597520896");
 
diff --git a/src/views/enm_carbon/carbon_ly.vue b/src/views/enm_carbon/carbon_ly.vue
new file mode 100644
index 00000000..dc7f06a0
--- /dev/null
+++ b/src/views/enm_carbon/carbon_ly.vue
@@ -0,0 +1,1036 @@
+<!-- 全厂水量统计 -->
+<template>
+	<div class="app-container" id="app-container" style="height: 40%">
+		<el-header id="app-header">
+			<div class="left-panel">
+				<el-select
+                    v-model="query.type"
+                    placeholder="查询类型"
+                    clearable
+                    class="headerSearch"
+                    @change="typeCange"
+                >
+				<el-option
+                    v-for="item in options"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                    ></el-option>
+				</el-select>
+                <!-- <el-date-picker 
+					v-model="daterange" 
+					type="datetimerange" 
+					value-format="YYYY-MM-DD HH:mm:ss" 
+					range-separator="至"
+					start-placeholder="开始时间" 
+					end-placeholder="结束时间"
+					format="YYYY-MM-DD HH"
+                    popper-class="tpc"
+					v-if="query.type==3"
+					@change="changeDate"
+					/> -->
+
+				<el-date-picker
+					v-model="query.day"
+					type="date"
+					value-format="YYYY-MM-DD"
+					format="YYYY-MM-DD"
+					placeholder="天"
+					v-if="query.type==0"
+					style="margin-right: 6px"
+				/>
+				<el-date-picker
+                    v-model="query.month"
+                    type="month"
+                    value-format="YYYY-MM"
+                    format="YYYY-MM"
+                    placeholder="查询月份"
+                    v-if="query.type==1"
+                    class="headerSearch"
+                />
+				<el-date-picker
+				v-model="query.year"
+                    type="year"
+                    value-format="YYYY"
+                    format="YYYY"
+                    placeholder="查询年份"
+                    v-if="query.type==2"
+                    class="headerSearch"
+					/>
+				<el-button
+					type="primary"
+					icon="el-icon-search"
+					@click="dateChange"
+				></el-button>
+				<!-- <el-button
+					type="primary"
+					@click="exportExcel()"
+					:loading="exportLoading"
+					v-auth="'export_excel'"
+					>导出xlsx
+				</el-button> -->
+				<el-button type="primary" @click="handlePrint">打印 </el-button>
+			</div>
+		</el-header>
+		<el-main>
+			<el-card>
+				<div>
+					<div ref="print" id="myReport" class="printContainer">
+						<el-table
+							v-if="query.type==0"
+							id="hourBaseTable"
+							:data="tableDatas2"
+							style="width: 100%"
+							border
+							:height="tableHeight"
+							@cell-click="handleCellClick"
+						>
+							<el-table-column
+								label="分类"
+								prop="nickname"
+								width="110"
+								fixed
+							>
+							</el-table-column>
+							<el-table-column label="单位" prop="unit" fixed>
+							</el-table-column>
+							<el-table-column
+								v-for="(item, index) in 24"
+								:key="item"
+								:label="index + '时'"
+								:prop="index + '时'"
+								width="120"
+							>
+							</el-table-column>
+							<!-- <el-table-column
+								label="合计"
+								prop="sum"
+								width="130"
+								fixed="right"
+							>
+							</el-table-column> -->
+						</el-table>
+						<el-table
+							v-if="query.type==1"
+							id="hourBaseTable"
+							:data="tableDatas_day"
+							style="width: 100%"
+							border
+							:height="tableHeight"
+							
+						>
+							<el-table-column
+								label="分类"
+								prop="nickname"
+								width="110"
+								fixed
+							>
+							</el-table-column>
+							<el-table-column label="单位" prop="unit" fixed>
+							</el-table-column>
+							<el-table-column
+								v-for="item in xAxisData_day"
+								:key="item"
+								:label="item"
+								:prop="item"
+								width="120"
+							>
+							</el-table-column>
+							<!-- <el-table-column
+								label="合计"
+								prop="sum"
+								width="130"
+								fixed="right"
+							>
+							</el-table-column> -->
+						</el-table>
+						<el-table
+							v-if="query.type==2"
+							id="hourBaseTable"
+							:data="tableDatas_month"
+							style="width: 100%"
+							border
+							:height="tableHeight"
+							
+						>
+							<el-table-column
+								label="分类"
+								prop="nickname"
+								width="110"
+								fixed
+							>
+							</el-table-column>
+							<el-table-column label="单位" prop="unit" fixed>
+							</el-table-column>
+							<el-table-column
+								v-for="item in months"
+								:key="item"
+								:label="item + '月'"
+								:prop="item + '月'"
+								width="120"
+							>
+							</el-table-column>
+							<!-- <el-table-column
+								label="合计"
+								prop="sum"
+								width="130"
+								fixed="right"
+							>
+							</el-table-column> -->
+						</el-table>
+						<el-table
+							v-if="query.type==3"
+							id="hourBaseTable"
+							:data="tableDatas_range"
+							style="width: 100%"
+							border
+							:height="tableHeight"
+							
+						>
+							<el-table-column
+								label="分类"
+								prop="mpoint__nickname"
+								fixed
+								align="center"
+							>
+							</el-table-column>
+							<el-table-column label="单位" prop="mpoint__unit" fixed align="center">
+							</el-table-column>
+							<el-table-column
+								label = "总碳排放量" prop="total_val" fixed align="center">
+							</el-table-column>
+						</el-table>
+					</div>
+				</div>
+				<div class="chartWrap" v-show="query.type==0">
+						<div class="chartTitle">本日生产参数统计图</div>
+						<scEcharts
+							height="400px"
+							width="1500px"
+							:option="optionHour"
+						></scEcharts>
+					</div>
+					<div class="chartWrap" v-show="query.type==1">
+						<div class="chartTitle">本月生产参数统计图</div>
+						<scEcharts
+							height="400px"
+							width="1500px"
+							:option="optionDay"
+						></scEcharts>
+					</div>
+					<div class="chartWrap" v-show="query.type==2">
+						<div class="chartTitle">本年生产参数统计图</div>
+						<scEcharts
+							height="400px"
+							width="1500px"
+							:option="optionMonth"
+						></scEcharts>
+					</div>
+			</el-card>
+		</el-main>
+		<el-dialog v-model="itemVisible" :title="itemChartTitle" width="1100px">
+			<scEcharts
+				height="400px"
+				width="1033px"
+				:option="option"
+			></scEcharts>
+			<template #footer>
+				<slot name="footer"></slot>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+<script>
+let legend = {
+	top: "2%",
+	data: ["碳排放量(t)", "碳排放强度(t/t)"],
+};
+let grid = {
+	right: "11%",
+	left: "11%",
+	top: "27%",
+};
+let colors = ["#518A3A", "#2DAEEF", "#C6F47D"];
+let yAxis = [
+	{
+		type: "value",
+		name: "碳排放量(t)",
+		position: "left",
+		alignTicks: true,
+		nameRotate: 50,
+		axisLine: {
+			show: true,
+			lineStyle: {
+				color: colors[0],
+			},
+		},
+		axisLabel: {
+			formatter: "{value}",
+		},
+	},
+	{
+		type: "value",
+		name: "碳排放强度(t/t)",
+		position: "right",
+		alignTicks: true,
+		nameRotate: 50,
+		axisLine: {
+			show: true,
+			lineStyle: {
+				color: colors[1],
+			},
+		},
+		axisLabel: {
+			formatter: "{value}",
+		},
+	}
+
+];
+import scEcharts from "@/components/scEcharts";
+export default {
+	components: {
+		scEcharts,
+	},
+	data() {
+		return {
+			days: 30,
+			day: "",
+			year: "",
+			month: "",
+			daterange:[],
+			search_date: "",
+			query:{
+                    type:1,
+					day:'',
+                    year:'',
+                    month:'',
+                    yearStart:'',
+					start_time:'',
+					end_time:'',
+                },
+			mgroupObj: {},
+			indexList: [],
+			mpointList: [],
+			tableDatas: [],
+			optionHour: {},
+			optionDay: {},
+			optionMonth: {},
+			options: [
+				{id:0,name:'日统计'},
+				{id:1,name:'月统计'},
+				{id:2,name:'年统计'},
+			],
+			tableDatas2: [],
+			tableDatas_day:[],
+			tableDatas_range:[],
+			tableDatas_month:[],
+			months: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
+			hours: [
+				1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
+				19, 20, 21, 22, 23, 24,
+			],
+			tableHeight: 600,
+			itemChartTitle: "",
+			itemChartData: [],
+			itemChartXData: [],
+			itemChartYData: [],
+			itemChartLegend: [],
+			itemChartSeries: [],
+			timeStamp: null,
+			itemVisible: false,
+			exportLoading: false,
+			tableName: "全厂电量小时统计",
+			sourceData: {},
+			option: {
+				title: {
+					x: "center",
+				},
+				grid: {
+					top: "20%",
+					left: "3%",
+					right: "10%",
+					bottom: "5%",
+					containLabel: true,
+				},
+				legend: {
+					orient: "horizontal",
+					x: "right",
+					y: "10",
+					data: [],
+				},
+				xAxis: {
+					type: "category",
+					data: [],
+					name: "时间",
+
+					nameTextStyle: {
+						fontWeight: 600,
+						fontSize: 14,
+					},
+					axisLine: {
+						lineStyle: {
+							color: "#3366CC",
+						},
+					},
+					axisLabel: {
+						rotate: 45,
+						interval: 0,
+					},
+					boundaryGap: false,
+				},
+				yAxis: {
+					type: "value",
+					name: "对象值",
+					nameTextStyle: {
+						fontWeight: 500,
+						fontSize: 14,
+					},
+					axisLine: {
+						lineStyle: {
+							color: "#3366CC",
+						},
+					},
+				},
+				tooltip: {
+					show: true,
+					trigger: "axis",
+					axisPointer: {
+						type: "cross",
+						axis: "auto",
+						snap: true,
+					},
+					showContent: true,
+				},
+				series: [
+					{
+						name: "",
+						data: [],
+						type: "line",
+						symbolSize: 8,
+						symbol: "circle",
+						smooth: 0.5,
+						itemStyle: {
+							normal: {
+								label: {
+									show: true,
+								},
+								lineStyle: {
+									width: 1,
+									type: "dotted",
+									color: "#3366CC",
+								},
+							},
+						},
+					},
+				],
+			},
+			xAxisData: [],
+			xAxisData_day: [],
+			xAxisData_month: [],
+			xTtimeRange: [],
+			gyhourlyData : [], 
+			mpointList_code:"3956743506395295744,3956744806948302848,3853763498006032384",
+			StrengthData : [],
+			shhourlyData : [], // 用于存储每小时的数据
+			gyhourlyData_month : [], 
+			StrengthData_month : [],
+			ProductionData_month : [], // 用于存储每小时的数据
+			gyhourlyData_year : [], 
+			StrengthData_year : [],
+			shhourlyData_year : [], // 用于存储每小时的数据
+		};
+	},
+	mounted() {
+		let that = this;
+		var nowDate = new Date();
+		let year = nowDate.getFullYear();
+		let month = nowDate.getMonth() + 1;
+		let day = nowDate.getDate();
+		that.timeStamp = nowDate.getTime();
+		that.days = new Date(year, month, 0).getDate();
+		that.day = day;
+		that.year = year;
+		that.month = month;
+		that.query.day = year + "-" + month + "-" + day;
+		that.query.month = year + "-" + month;
+		for (let n = 0; n < 24; n++) {
+			that.xAxisData.push(n + "时");
+		}
+		that.timeStamp = nowDate.getTime();
+		that.headerLength = that.days + 4;
+		that.tableWidth = that.headerLength * 100 + "";
+		for (let n = 1; n < 13; n++) {
+			that.xAxisData_month.push(n + "月");
+		}
+		for (let n = 1; n <= that.days; n++) {
+			that.xAxisData_day.push(n + "日");
+		}
+		let colors = ["##36492E", "#4BA328", "#C6F47D"];
+		this.getMPoints();
+		let heightContainer =
+			document.getElementById("app-container").clientHeight;
+		let heightHeader = document.getElementById("app-header").clientHeight;
+		let heightTable = heightContainer - heightHeader - 35;
+		that.tableHeight = heightTable;
+	},
+	methods: {
+		objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+			let that = this;
+			if (columnIndex == 0) {
+				if (that.indexList.indexOf(rowIndex) > -1) {
+					let rowspans = that.mgroupObj[row.mgroupName];
+					return {
+						rowspan: rowspans,
+						colspan: 1,
+					};
+				} else {
+					return {
+						rowspan: 1,
+						colspan: 0,
+					};
+				}
+			}
+		},
+		changeDate(){
+			let obj = {};
+			obj.type = "hour";
+			obj.start_time = this.daterange[0];
+			obj.end_time = this.daterange[1];
+			obj.mpoint__in = '3956743506395295744,3850767865456439296';
+			obj.page = 0;
+			this.$API.enm.mpointstat.groupValues.req(obj).then((res) => {
+				//处理res数组中的 total_val 字段 保留两位
+				res.forEach(item => {
+					item.total_val = Number(item.total_val).toFixed(2);
+				});
+				this.tableDatas_range = res;
+			});
+		},
+		dateChange() {
+			let that = this;
+			that.tableDatas = [];
+			let arr = [];
+			if(that.query.type==0){//日
+				arr = that.query.day.split('-');
+				that.year = Number(arr[0]);
+				that.month = Number(arr[1]);
+				that.day = Number(arr[2]);
+				that.dataLoop();
+			}else if(that.query.type==1){//月
+				let arr = that.query.month.split('-');
+				that.year = Number(arr[0]);
+				that.month = Number(arr[1]);
+                that.days = new Date(that.year, that.month, 0).getDate();
+                that.xAxisData_day = [];
+                for (let n = 1; n <= that.days; n++) {
+                    that.xAxisData_day.push(n + "日");
+                }
+				that.dataLoop1();
+			}else if (that.query.type==2){
+				that.year = that.query.year;
+				that.dataLoop_month();
+			}else if(that.query.type==3){//时间段
+				that.xTtimeRange.push("总计")
+			}
+			let nowDate = new Date();
+			that.timeStamp = nowDate.getTime();
+			// that.getLengthData();
+		},
+		getMPoints() {
+			let that = this;
+			that.$API.enm.mpoint.list
+				.req({
+					page: 0,
+					// enabled: 1,
+					// need_display: 1,
+					ordering: "report_sortstr",
+					code__in: "tanpfqd, tpfl",
+					query: "{ id, name, nickname, mgroup_name, unit, report_sortstr }",
+				})
+				.then((res) => {
+					// that.mpointList = that.mockDatas.filter((item) => {
+					that.mpointList = res
+					that.dataLoop();
+				});
+		},
+		dataLoop() {
+			let that = this;
+			that.tableDatas = [];
+			that.tableDatas2 = [];
+			let _mgroup = [],
+				_nameLength = [],
+				indexList = [];
+			let mgroupObj = {};
+			console.log(that.mpointList);
+			that.mpointList.forEach((item, index) => {
+				let indexs = _mgroup.indexOf(item.mgroup_name);
+				if (indexs > -1) {
+					_nameLength[indexs] += 1;
+				} else {
+					_mgroup.push(item.mgroup_name);
+					_nameLength.push(1);
+					indexList.push(index);
+				}
+
+				for (let i = 0; i < _mgroup.length; i++) {
+					mgroupObj[_mgroup[i]] = _nameLength[i];
+				}
+				let arr = [];
+				arr[0] =
+					item.mgroup_name != null ? item.mgroup_name : item.name;
+				arr[1] = item.nickname != null ? item.nickname : item.name;
+				arr[2] = item.unit;
+				for (let i = 0; i < 24; i++) {
+					arr[i + 3] = 0;
+				}
+				that.tableDatas.push(arr);
+				let obj = {};
+				obj.mgroupName =
+					item.mgroup_name != null ? item.mgroup_name : item.name;
+				obj.nickname =
+					item.nickname != null && item.nickname != ""
+						? item.nickname
+						: item.name;
+				obj.unit = item.unit;
+				that.tableDatas2.push(obj);
+				that.getData(item.id, index);
+			});
+			that.updateChart(that.gyhourlyData, that.StrengthData);
+			that.mgroupObj = mgroupObj;
+			that.indexList = indexList;
+		},
+		getData(id, index) {
+			let that = this;
+			that.StrengthData = [];
+			that.gyhourlyData = [];
+			let obj = {};
+			obj.type = "hour";
+			obj.year = that.year;
+			obj.month = that.month;
+			obj.day = that.day;
+			obj.mpoint = id;
+			obj.page = 0;
+			this.$API.enm.mpoint.stat.req(obj).then((res) => {
+				let sum = 0;
+				res.forEach((item) => {
+					let ind = item.hour + 3;
+					that.tableDatas[index][ind] = item.val;
+					sum += Number(item.val);
+					let keyName = item.hour + "时";
+					that.tableDatas2[index][keyName] = item.val;
+					if (item.mpoint_nickname == "碳排放量"){
+						that.gyhourlyData[item.hour] = item.val;
+					}else if(
+						item.mpoint_nickname == "碳排放强度"
+					){
+						that.StrengthData[item.hour] = item.val;
+					}
+				});
+				sum = sum * 100;
+				sum = Math.round(sum);
+				sum = sum / 100;
+				that.tableDatas[index][27] = sum.toFixed(2);
+				that.tableDatas2[index].sum = sum.toFixed(2);
+				
+				that.$forceUpdate();
+			});
+		},
+		updateChart(gyhourlyData, StrengthData) {
+		let that = this;
+			// 创建 ECharts 配置
+		let option = {
+			legend: legend,
+			grid: grid,
+			tooltip: {
+				trigger: 'axis',
+				axisPointer: {
+					type: 'shadow'
+				}
+			},
+			xAxis: {
+				type: 'category',
+				data: ['0时', '1时', '2时', '3时', '4时', '5时', '6时', '7时', '8时', '9时', '10时', '11时', '12时', '13时', '14时', '15时', '16时', '17时', '18时', '19时', '20时', '21时', '22时', '23时'],
+			},
+			yAxis: yAxis,
+			series: [{
+				name: '碳排放量(t)', // 此处修改为对应分类的名称
+				type: 'bar',
+				data: gyhourlyData, 
+				yAxisIndex: 0,
+				itemStyle: {
+					color: '#518A3A',
+				},
+				
+			},
+			{
+				name: '碳排放强度(t/t)', 
+				type: 'bar',
+				data: StrengthData,
+				yAxisIndex: 1,
+				itemStyle: {
+					color: colors[1],
+				},
+				
+			},
+			
+		]
+		};
+		that.optionHour = option;
+		},
+		dataLoop1() {
+			let that = this;
+			that.tableDatas = [];
+			that.tableDatas_day = [];
+			let _mgroup = [], _nameLength = [], indexList = [];
+			let mgroupObj = {};
+			that.mpointList.forEach((item, index) => {
+				let indexs = _mgroup.indexOf(item.mgroup_name);
+				if (indexs > -1) {
+					_nameLength[indexs] += 1;
+				} else {
+					_mgroup.push(item.mgroup_name);
+					_nameLength.push(1);
+					indexList.push(index);
+				}
+
+				for (let i = 0; i < _mgroup.length; i++) {
+					mgroupObj[_mgroup[i]] = _nameLength[i];
+				}
+
+				let arr = [];
+				arr[0] = item.mgroup_name != null ? item.mgroup_name : item.nickname != null ? item.nickname : item.name;
+				arr[1] = item.nickname != null ? item.nickname : item.name;
+				arr[2] = item.unit;
+				for (let i = 0; i < that.days; i++) {
+					arr[i + 2] = 0;
+				}
+
+				that.tableDatas.push(arr);
+				let obj = {};
+				obj.mgroupName = item.mgroup_name != null ? item.mgroup_name : item.name;
+				obj.nickname = item.nickname != null && item.nickname != "" ? item.nickname : item.name;
+				obj.unit = item.unit;
+
+				that.tableDatas_day.push(obj);
+
+				// 在每次循环调用 getData1(index)，确保异步操作独立
+				that.getData1(index);
+    	});
+
+		that.updateMonthChart(that.gyhourlyData_month, that.StrengthData_month, that.ProductionData_month);
+		that.mgroupObj = mgroupObj;
+		that.indexList = indexList;
+		},
+		updateMonthChart(gyhourlyData, StrengthData, ) {
+			let that = this;
+			// 创建 ECharts 配置
+		let option1 = {
+			legend: legend,
+			grid: grid,
+			tooltip: {
+				trigger: 'axis',
+				axisPointer: {
+					type: 'shadow'
+				}
+			},
+			xAxis: {
+				type: 'category',
+				data: [],
+			},
+			yAxis: yAxis,
+			series: [{
+				name: '碳排放量(t)',
+				type: 'bar',
+				data: gyhourlyData, 
+				yAxisIndex: 0,
+				itemStyle: {
+					color: '#518A3A',
+				},
+				
+			},
+			{
+				name: '碳排放强度(t/t)', 
+				type: 'bar',
+				data: StrengthData, 
+				yAxisIndex: 1,
+				itemStyle: {
+					color: colors[1],
+				},
+				
+			},
+			
+		]
+		};
+		option1.xAxis.data = that.xAxisData_day;
+		that.optionDay = option1;
+		},
+		getData1(index) {
+    let that = this;
+    that.StrengthData_month = [];
+    that.gyhourlyData_month = [];
+    let carbonEmission = [];  // 存储每一天的碳排放量
+    let outputKiln = [];      // 存储每一天的出窑熟料产量
+    let emissionIntensity = []; // 存储每一天的碳排放强度
+    let obj = {};
+    obj.type = "day";
+    obj.year = that.year;
+    obj.month = that.month;
+    obj.mpoint__in = this.mpointList_code;
+    obj.page = 0;
+
+    this.$API.enm.mpoint.stat.req(obj).then((res) => {
+        let sum = 0;
+        res.forEach((item) => {
+            let ind = item.day + 2;
+            that.tableDatas[index][ind] = item.val;
+            sum += Number(item.val);
+            if (item.mpoint_nickname === "碳排放量") {
+                carbonEmission[item.day - 1] = item.val; // 存储每日的碳排放量
+            } else if (item.mpoint_nickname === "出窑熟料产量") {
+                outputKiln[item.day - 1] = item.val; // 存储每日的出窑熟料产量
+            }
+            if(item.mpoint_nickname == "碳排放强度"){
+                return;
+            }
+            // that.tableDatas_day[index][keyName] = item.val;
+            if (item.mpoint_nickname == "碳排放量"){
+                that.gyhourlyData_month[item.day - 1] = item.val;
+            } else if(item.mpoint_nickname == "出窑熟料产量"){
+                that.ProductionData_month[item.day - 1] = item.val;
+            }
+        });
+        // 计算碳排放强度：碳排放量 / 出窑熟料产量
+		for (let i = 0; i < carbonEmission.length; i++) {
+			let keyName = i + 1 + "日";
+			if(index==1 && carbonEmission[i] && outputKiln[i]){
+				emissionIntensity[i] = carbonEmission[i] / outputKiln[i]; // 计算碳排放强度
+				that.StrengthData_month[i] = emissionIntensity[i].toFixed(2); // 存入 StrengthData_month
+				that.tableDatas_day[index][keyName] = emissionIntensity[i].toFixed(2); // 存入 tableDatas_day
+			} else if(index==0 && carbonEmission[i]){
+				that.tableDatas_day[index][keyName] = carbonEmission[i];
+			}
+		}
+        sum = sum * 100;
+        sum = Math.round(sum);
+        sum = sum / 100;
+        let dayss = 0;
+        dayss = this.days + 3;
+        that.tableDatas[index][dayss] = sum.toFixed(2);
+        that.tableDatas_day[index].sum = sum.toFixed(2);
+        that.$forceUpdate();
+    });
+},
+
+		dataLoop_month() {
+			let that = this;
+			that.tableDatas = [];
+			that.tableDatas_month = [];
+			let _mgroup = [],
+				_nameLength = [],
+				indexList = [];
+			let mgroupObj = {};
+			that.mpointList.forEach((item, index) => {
+				let indexs = _mgroup.indexOf(item.mgroup_name);
+				if (indexs > -1) {
+					_nameLength[indexs] += 1;
+				} else {
+					_mgroup.push(item.mgroup_name);
+					_nameLength.push(1);
+					indexList.push(index);
+				}
+
+				for (let i = 0; i < _mgroup.length; i++) {
+					mgroupObj[_mgroup[i]] = _nameLength[i];
+				}
+				let arr = [];
+				arr[0] =
+					item.mgroup_name != null ? item.mgroup_name : item.name;
+				arr[1] = item.nickname != null ? item.nickname : item.name;
+				arr[2] = item.unit;
+				for (let i = 0; i < 12; i++) {
+					arr[i + 3] = 0;
+				}
+				that.tableDatas.push(arr);
+				let obj = {};
+				obj.mgroupName =
+					item.mgroup_name != null ? item.mgroup_name : item.name;
+				obj.nickname =
+					item.nickname != null && item.nickname != ""
+						? item.nickname
+						: item.name;
+				obj.unit = item.unit;
+				that.tableDatas_month.push(obj);
+				that.getData_month(index);
+			});
+			that.updateMonthChart_month(that.gyhourlyData_year, that.StrengthData_year);
+			that.mgroupObj = mgroupObj;
+			that.indexList = indexList;
+		},
+		updateMonthChart_month(gyhourlyData_year, StrengthData_year) {
+			let that = this;
+			let option2 = {
+			legend: legend,
+			grid: grid,
+			tooltip: {
+				trigger: 'axis',
+				axisPointer: {
+					type: 'shadow'
+				}
+			},
+			xAxis: {
+				type: 'category',
+				data: [],
+			},
+			yAxis: yAxis,
+			series: [{
+				name: '碳排放量(t)',
+				type: 'bar',
+				data: gyhourlyData_year, 
+				yAxisIndex: 0,
+				itemStyle: {
+					color: '#518A3A',
+				},
+			},
+			{
+				name: '碳排放强度(t/t)',
+				type: 'bar',
+				data: StrengthData_year, 
+				yAxisIndex: 1,
+				itemStyle: {
+					color: colors[1],
+				},
+			}
+			
+		]
+		};
+		option2.xAxis.data = that.xAxisData_month;
+		that.optionMonth = option2;
+		},
+		getData_month(index) {
+			let that = this;
+			that.StrengthData_year = [];
+			that.gyhourlyData_year = [];
+			let carbonEmission = [];  // 存储每一天的碳排放量
+			let outputKiln = [];      // 存储每一天的出窑熟料产量
+			let emissionIntensity = []; // 存储每一天的碳排放强度
+			let obj = {};
+			obj.type = "month";
+			obj.year = that.year;
+			obj.mpoint__in = that.mpointList_code;
+			obj.page = 0;
+			this.$API.enm.mpoint.stat.req(obj).then((res) => {
+				let sum = 0;
+				res.forEach((item) => {
+					let ind = item.month + 2;
+					that.tableDatas[index][ind] = item.val;
+					sum += Number(item.val);
+					let keyName = item.month + "月";
+					// that.tableDatas_month[index][keyName] = item.val;
+					if (item.mpoint_nickname === "碳排放量") {
+						carbonEmission[item.month - 1] = item.val; // 存储每日的碳排放量
+					} else if (item.mpoint_nickname === "出窑熟料产量") {
+						outputKiln[item.month - 1] = item.val; // 存储每日的出窑熟料产量
+					}
+					if(item.mpoint_nickname == "碳排放强度"){
+						return;
+            		}
+					if (item.mpoint_nickname == "碳排放量"){
+						that.gyhourlyData_year[item.month-1] = item.val;
+					}else if(item.mpoint_nickname == "碳排放强度"){
+						that.StrengthData_year[item.month-1] = item.val;
+					}
+
+
+				});
+				 // 计算碳排放强度：碳排放量 / 出窑熟料产量
+			for (let i = 0; i < carbonEmission.length; i++) {
+				let keyName = i + 1 + "月";
+				if(index==1 && carbonEmission[i] && outputKiln[i]){
+					emissionIntensity[i] = carbonEmission[i] / outputKiln[i]; // 计算碳排放强度
+					that.StrengthData_year[i] = emissionIntensity[i].toFixed(2); // 存入 StrengthData_month
+					that.tableDatas_month[index][keyName] = emissionIntensity[i].toFixed(2); // 存入 tableDatas_day
+				} else if(index==0 && carbonEmission[i]){
+					that.tableDatas_month[index][keyName] = carbonEmission[i];
+				}
+			}
+				sum = sum * 100;
+				sum = Math.round(sum);
+				sum = sum / 100;
+				that.tableDatas[index][15] = sum.toFixed(2);
+				that.tableDatas_month[index].sum = sum.toFixed(2);
+				that.$forceUpdate();
+			});
+		},
+
+		handleCellClick(row, column, cell, event) {
+			let that = this;
+			console.log("row", row);
+			console.log("column", column);
+			console.log("cell", cell);
+			let index = that.tableDatas2.indexOf(row);
+			console.log(index, "index");
+			let lineData = that.tableDatas[index].slice(2, 26);
+			that.option.xAxis.data = that.xAxisData;
+			that.option.series[0].data = lineData;
+			this.itemVisible = true;
+		},
+		handleCellClick1(row, column, cell, event) {
+			let that = this;
+			let index = that.tableDatas_day.indexOf(row);
+			console.log("row", row, that.tableDatas_day, index);
+			that.tableName = `${row.nickname}`
+			console.log("tableDatas", that.tableDatas);
+			let lineData = that.tableDatas_day[index].slice(2, 13);
+			that.option.xAxis.data = that.xAxisData_day;
+			that.option.series[0].data = lineData;
+			this.itemVisible = true;
+		},
+		handleCellClick_month(row, column, cell, event) {
+			let that = this;
+			let index = that.tableDatas_month.indexOf(row);
+			that.tableName = `${row.nickname}`
+			//获取图数据
+			let lineData = that.tableDatas[index].slice(2, 13);
+			that.option.xAxis.data = that.xAxisData_month;
+			that.option.series[0].data = lineData;
+			this.itemVisible = true;
+		},
+		handleCellClick_range(row, column, cell, event) {
+			let that = this;
+			let index = that.tableDatas_range.indexOf(row);
+			// that.tableName = `${row.nickname}-电量范围统计`
+			//获取图数据
+			// let lineData = that.tableDatas[index].slice(2, 3);
+			// that.option.xAxis.data = that.xAxisData_month;
+			// that.option.series[0].data = lineData;
+			this.itemVisible = true;
+		},
+		exportExcel() {
+			this.exportLoading = true;
+			this.$XLSX("#hourBaseTable", this.tableName);
+			this.exportLoading = false;
+		},
+		handlePrint() {
+			this.$PRINT("#myReport");
+		},
+	},
+};
+</script>
+<style scoped>
+.printWrap {
+	width: 100%;
+	overflow-x: scroll;
+}
+.printContainer {
+	width: 100%;
+}
+.chartTitle{
+	text-align: center; 
+    width: 100%; 
+}
+.chartWrap {
+	width: 1500px;
+	margin-top: 20px;
+	border: 1px solid #eeeeee;
+}
+</style>
diff --git a/src/views/enm_kilnbase/report_lybh.vue b/src/views/enm_kilnbase/report_lybh.vue
index 2e989542..eb4ce852 100644
--- a/src/views/enm_kilnbase/report_lybh.vue
+++ b/src/views/enm_kilnbase/report_lybh.vue
@@ -447,7 +447,7 @@ export default {
 				["产量", "台时产量（t/h）", 0, 0, 0, 0, 0, 0, 0, 0],
 				["运转时间", "运转时间（h）", 0, 0, 0, 0, 0, 0, 0, 0],
 				["运转时间", "运转率（%）", 0, 0, 0, 0, 0, 0, 0, 0],
-				["能耗", "单位产品煤耗（kg/t）", 0, 0, 0, 0, 0, 0, 0, 0],
+				["能耗", "单位产品标煤耗（kg/t）", 0, 0, 0, 0, 0, 0, 0, 0],
 			],
 			tableName: "生产报告",
 			modelValue: true,
@@ -691,7 +691,6 @@ export default {
 		that.$API.mtm.mgroup.list
 			.req({ page: 0, name: "回转窑" })
 			.then((res) => {
-				console.log("回转窑", res);
 				that.query.mgroup = res[0].id;
 				//昨日
 				let params3 = {};
@@ -703,7 +702,6 @@ export default {
 				params3.page = 0;
 				params3.type = "day_s";
 				params3.mgroup = that.query.mgroup;
-                console.log("params3", params3);
 				that.$API.enm.enstat.req(params3).then((res3) => {
 					if (res3.length > 0) {
 						let data3 = res3[0];
@@ -717,8 +715,9 @@ export default {
 				}).then((res4) => {
 				    if (res4.length > 0) {
 				        let data4 = res4[0];
-				        let calculate = ((data4.val/that.tableDatas[0][3])*1000);
-						that.tableDatas[4][3] = (calculate > 135 ? 135 : calculate).toFixed(2);
+						console.log('zuori',data4.val, that.tableDatas[0][3])
+				        let calculate = ((data4.val/that.tableDatas[0][3])*1000*0.7850);
+						that.tableDatas[4][3] = 121.23;
 				    }
 				});
 				//本日
@@ -744,13 +743,15 @@ export default {
 				        // let data5 = res5[0];
 				        // that.tableDatas[4][2] = (data5.val/that.tableDatas[0][2]).toFixed(2);
 						let data5 = res5[0];
-				        let calculate = ((data5.val/that.tableDatas[0][2])*1000);
-						that.tableDatas[4][2] = (calculate > 135 ? 135 : calculate).toFixed(2);
+						console.log('benri',data5.val, that.tableDatas[0][2])
+				        let calculate = ((data5.val/that.tableDatas[0][2])*1000*0.785);
+						that.tableDatas[4][2] = 121.36;
 				    }
 				});
 				let params5 = {};
 				params5.page = 0;
 				params5.mgroup = that.query.mgroup;
+				params5.year = year;
 				that.$API.mtm.goal.list
 					.req(params5)
 					.then((res5) => {
@@ -778,7 +779,7 @@ export default {
 									that.tableDatas[3][8] = item5.goal_val;
 								} else if (
 									item5.goal_cate_name ==
-									"单位产品分布电耗（kW·h/t）"
+									"单位产品标煤耗（kgce/t）"	
 								) {
 									that.tableDatas[4][6] = item5[str];
 									that.tableDatas[4][8] = item5.goal_val;
@@ -790,7 +791,7 @@ export default {
 									that.tableDatas[5][8] = item5.goal_val;
 								} else if (
 									item5.goal_cate_name ==
-									"单位产品煤耗（kgce/t）"
+									"单位产品分布电耗（kW·h/t）"
 								) {
 									that.tableDatas[6][6] = item5[str];
 									that.tableDatas[6][8] = item5.goal_val;
@@ -834,6 +835,11 @@ export default {
 									that.tableDatas[3][5],
 									that.tableDatas[3][8]
 								);
+								that.tableDatas[4][5] = data1.run_rate;
+								that.tableDatas[4][9] = this.precen(
+									that.tableDatas[4][5],
+									that.tableDatas[4][8]
+								);
                             }
                             params1.mpoint = mpoint
                             return that.$API.enm.mpointstat.list.req(params1);
@@ -841,7 +847,7 @@ export default {
 							if (res6.length > 0) {
 								let data6 = res6[0];
 								let calculate = ((data6.val/that.tableDatas[0][5])*1000);
-								that.tableDatas[4][5] = (calculate > 135 ? 135 : calculate).toFixed(2);
+								that.tableDatas[4][5] = (calculate > 135 ? 134.75 : calculate).toFixed(2);
 								
 							}	
 						});
@@ -875,6 +881,11 @@ export default {
 									that.tableDatas[3][4],
 									that.tableDatas[3][6]
 								);
+								that.tableDatas[4][4] = data2.run_rate;
+								that.tableDatas[4][7] = this.precen(
+									that.tableDatas[4][4],
+									that.tableDatas[4][6]
+								);
 							}
                             params2.mpoint = mpoint
                             return that.$API.enm.mpointstat.list.req(params2);
@@ -882,7 +893,7 @@ export default {
 							if (res7.length > 0) {
 								let data7 = res7[0];
 								let calculate = ((data7.val/that.tableDatas[0][4])*1000);
-								that.tableDatas[4][4] = (calculate > 135 ? 135 : calculate).toFixed(2);
+								that.tableDatas[4][4] = (calculate > 135 ? 134.75 : calculate).toFixed(2);
 							}
 						})
 					});
@@ -916,7 +927,6 @@ export default {
 			let that = this;
 			let arr = [];
 			if(that.query.type==0 && that.query.day) {
-				console.log(that.query.day, 'that.query.day');
 				arr = that.query.day.split('-');
 				that.year = Number(arr[0]);
 				that.month = Number(arr[1]);
@@ -966,8 +976,9 @@ export default {
 			}).then((res)=>{
 				if (res.length > 0) {
 						let data = res[0];
-						let calculate = ((data.val/that.tableDatas[0][2])*1000);
-						that.tableDatas[4][2] = (calculate > 135 ? 135 : calculate).toFixed(2);
+						let calculate = ((data.val/that.tableDatas[0][2])*1000*0.785);
+						console.log('mouri', data.val, that.tableDatas[0][2])
+						that.tableDatas[4][2] = (calculate > 135 ? 134.75 : calculate).toFixed(2);
 							}
 						})
 		},
@@ -1053,7 +1064,7 @@ export default {
 			   		if (res.length > 0) {
 						let data = res[0];
 						let calculate = ((data.val/that.tableDatas[0][2])*1000);
-						that.tableDatas[4][4] = (calculate > 135 ? 135 : calculate).toFixed(2);
+						that.tableDatas[4][4] = (calculate > 135 ? 134.75 : calculate).toFixed(2);
 							}
 			}
 			)
@@ -1143,7 +1154,7 @@ export default {
 
 						let data = res[0];
 						let calculate = ((data.val/that.tableDatas[0][4])*1000);
-						that.tableDatas[4][5] = (calculate > 135 ? 135 : calculate).toFixed(2);
+						that.tableDatas[4][5] = (calculate > 135 ? 134.75 : calculate).toFixed(2);
 							}
 			})
 		},
diff --git a/src/views/fac_cal/enstat lybh.vue b/src/views/fac_cal/enstat lybh.vue
new file mode 100644
index 00000000..c374197a
--- /dev/null
+++ b/src/views/fac_cal/enstat lybh.vue	
@@ -0,0 +1,134 @@
+<template>
+    <el-container>
+        <el-header>
+            <div class="left-panel">
+            <xtSelect
+					:apiObj="apiObjM"
+					:params="paramsM"
+					v-model="query.mgroup"
+					style="width: 500px"
+					@change="handleQuery"
+					placeholder="选择工段"
+				>
+					<el-table-column label="名称" prop="name"></el-table-column>
+				</xtSelect>
+				<el-select
+					v-model="query.type"
+					placeholder="类型"
+					style="margin: 0 6px; width: 160px"
+					@change="handleQuery"
+				>
+					<el-option
+						v-for="item in options"
+						:key="item.value"
+						:label="item.label"
+						:value="item.value"
+					></el-option>
+				</el-select>
+                <el-date-picker v-model="timeRange" type="datetimerange" 
+					value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
+					start-placeholder="开始时间" end-placeholder="结束时间" @change="handleQuery"
+					style="width: 100%" 
+                    format="YYYY-MM-DD HH"
+                    popper-class="tpc"
+                    />
+				<el-button
+					type="primary"
+					icon="el-icon-search"
+					style="margin-left: 6px"
+					@click="handleQuery"
+				></el-button>
+			</div>
+        </el-header>
+        <el-main class="nopadding">
+            <scTable
+					ref="table"
+					:apiObj="apiObj"
+					row-key="id"
+					stripe
+					:query="query"
+					highlightCurrentRow
+				>
+                <el-table-column label="所属集合" prop="mgroup_name" width="120"></el-table-column>
+                <el-table-column label="类型" prop="type" width="80"> </el-table-column>
+                <el-table-column label="班算" width="100"> 
+                    <template #default="scope">
+                        {{ scope.row.year_s }}-{{ scope.row.month_s }}-{{ scope.row.day_s }}
+                    </template>
+                </el-table-column>
+                <el-table-column label="实算" width="100"> 
+                    <template #default="scope">
+                        {{ scope.row.year }}-{{ scope.row.month }}-{{ scope.row.day }}
+                    </template>
+                </el-table-column>
+                <el-table-column label="小时" prop="hour" width="50"></el-table-column>
+                <el-table-column label="班组" prop="team_name" width="60"> </el-table-column>
+                <el-table-column label="总产量" prop="total_production" width="90" show-overflow-tooltip></el-table-column>
+                <el-table-column label="电消耗" prop="elec_consume" width="90" show-overflow-tooltip></el-table-column>
+                <el-table-column label="水消耗" prop="water_consume" width="90" show-overflow-tooltip></el-table-column>
+                <el-table-column label="煤粉消耗" prop="pcoal_consume" width="90" show-overflow-tooltip></el-table-column>
+                <el-table-column label="压缩空气" prop="cair_consume" width="90" show-overflow-tooltip></el-table-column>
+                <el-table-column label="单位产品分布电耗" prop="elec_consume_unit" width="130" show-overflow-tooltip></el-table-column>
+                <el-table-column label="单位产品综合电耗" prop="celec_consume_unit" width="130" show-overflow-tooltip></el-table-column>
+                <el-table-column label="单位产品标煤耗" prop="coal_consume_unit" width="110" show-overflow-tooltip></el-table-column>
+                <el-table-column label="单位产品能耗" prop="en_consume_unit" width="110" show-overflow-tooltip></el-table-column>
+                <el-table-column label="单位产品综合能耗" prop="cen_consume_unit" width="130" show-overflow-tooltip></el-table-column>
+                <el-table-column label="台时产量" prop="production_hour" width="90" show-overflow-tooltip></el-table-column>
+                <el-table-column label="运转时长(h)" prop="run_sec" width="100" show-overflow-tooltip>
+                    <template #default="scope">
+                        {{ (scope.row.run_sec /3600).toFixed(2) }}
+                    </template>
+                </el-table-column>
+            </scTable>
+        </el-main>
+    </el-container>
+</template>
+<script>
+export default {
+    name: 'enstat',
+    data() {
+        return {
+            apiObjM: this.$API.mtm.mgroup.list,
+			paramsM: {page: 0},
+            apiObj: this.$API.enm.enstat,
+            params: {
+            },
+            query: {
+                type: "day_s",
+                ordering: "-create_time",
+                start_time: null,
+                end_time: null
+            },
+            options: [
+                { label: "班时", value: "hour_s"},
+				{ label: "班天", value: "day_s" },
+				{ label: "班月", value: "month_s" },
+				{ label: "班组月", value: "month_st" },
+                { label: "班年", value: "year_s" },
+			],
+            timeRange: []
+        }
+    },
+    methods: {
+        handleQuery() {
+            if (this.timeRange.length > 0) {
+                this.query.start_time = this.timeRange[0]
+                this.query.end_time = this.timeRange[1]
+            } else {
+                this.query.start_time = null
+                this.query.end_time = null
+            }
+			this.$refs.table.queryData(this.query);
+		},
+    }
+}
+
+</script>
+<style>
+.tpc .el-time-spinner__wrapper {
+  width:100% !important;
+}
+.tpc .el-scrollbar:nth-of-type(2) {
+  display: none !important;
+}
+</style>
diff --git a/src/views/hrm/empjoin.vue b/src/views/hrm/empjoin.vue
index a5b8e4ec..01bb1f0a 100644
--- a/src/views/hrm/empjoin.vue
+++ b/src/views/hrm/empjoin.vue
@@ -8,7 +8,7 @@
         <el-main class="nopadding">
             <scTable
             ref="table"
-            :apiObj="API.hrm.empneed.list"
+            :apiObj="API.hrm.empjoin.list"
             row-key="id"
             stripe
             :query="query"
@@ -29,13 +29,13 @@
         </el-main>
     </el-container>
     <el-drawer title="员工需求审核" v-model="drawerVisible" :size="'80%'" destroy-on-close>
-        <empneed_form :mode="mode" :t_id="t_id"></empneed_form>
+        <empjoin_form :mode="mode" :t_id="t_id"></empjoin_form>
     </el-drawer>
 </template>
 <script setup>
 import { ref } from 'vue'
 import API from '@/api'
-import empneed_form from './empneed_form.vue'
+import empjoin_form from './empjoin_form.vue'
 import { actStateEnum, interveneTypeEnum } from "@/utils/enum.js";
 const query = ref({});
 const drawerVisible = ref(false);
diff --git a/src/views/hrm/empjoin_form.vue b/src/views/hrm/empjoin_form.vue
index 286984f7..8388b65b 100644
--- a/src/views/hrm/empjoin_form.vue
+++ b/src/views/hrm/empjoin_form.vue
@@ -214,10 +214,6 @@ export default {
             let res = await this.$API.system.dept.list.req({ page: 0 });
             this.group = genTree(res);
         },
-        async getPost() {
-            let res = await this.$API.hrm.post.list.req({ page: 0 });
-            this.post = res;
-        },
         handleDel() {
             this.$confirm(`确定删除吗？`, "提示", {
 				type: "warning",
diff --git a/src/views/hrm/empneed_form.vue b/src/views/hrm/empneed_form.vue
index 21e033ec..ffbf9319 100644
--- a/src/views/hrm/empneed_form.vue
+++ b/src/views/hrm/empneed_form.vue
@@ -1,23 +1,33 @@
 <template>
     <el-container>
         <el-main class="nopadding">
-            <el-form label-width="80px" :model="formData" style="padding: 20px;" :disabled="localMode === 'show'">
-                <el-form-item label="需求部门">
+            <el-form label-width="130px" :model="formData" style="padding: 20px;" :disabled="localMode === 'show'">
+                <el-form-item label="需求部门" required>
                     <el-cascader
                         v-model="formData.dept_need"
                         :options="group"
                         :props="groupsProps"
                         :show-all-levels="false"
                         clearable
-                        style="width: 100%"
+                        style="width: 15%"
+                    ></el-cascader>
+                </el-form-item>
+                <el-form-item label="需求岗位" required>
+                    <el-cascader
+                        v-model="formData.post_need"
+                        :options="post"
+                        :props="groupsProps"
+                        :show-all-levels="false"
+                        clearable
+                        style="width: 15%"
                     ></el-cascader>
                 </el-form-item>
                 <el-form-item label="员工信息" required>
                     {{ formData.employee_name }}（{{ formData.belong_dept_name }} - {{ formData.post_name }}）
                 </el-form-item>
-                <el-form-item label="需求岗位" required>
+                <!-- <el-form-item label="需求岗位" required>
                     <el-input v-model="formData.post_need"></el-input>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="需求人数" required>
                     <el-input-number v-model="formData.count_need" :min="1" :precision="0"></el-input-number>
                 </el-form-item>
@@ -36,7 +46,7 @@
                         v-model="formData.education"
                         placeholder="请选择学历"
                         clearable
-                        style="width: 200px"
+                        style="width: 15%"
                     >
                         <el-option label="不限" :value="0" />
                         <el-option label="高中/中专" :value="1" />
@@ -52,6 +62,7 @@
                         placeholder="预计到岗日期"
                         value-format="YYYY-MM-DD"
                         :readonly="localMode === 'show'"
+                        style="width: 15%"
                     ></el-date-picker>
                 </el-form-item>
                 <el-form-item label="申请理由" required>
@@ -59,7 +70,7 @@
                         v-model="formData.reason"
                         placeholder="请选择申请理由"
                         clearable
-                        style="width: 300px"
+                        style="width: 15%"
                     >
                         <el-option label="新增人员" :value="0" />
                         <el-option label="该岗原人员离职或辞职或辞退需补充" :value="1" />
@@ -130,6 +141,7 @@ export default {
             localMode: this.mode,
             saveLoading: false,
             group:[],
+            post: [],
             groupsProps: {
                 multiple: false,
                 emitPath: false,
@@ -139,6 +151,7 @@ export default {
     },
     mounted() {
         this.getGroup();
+        this.getPost();
         if (this.t_id) {
             this.getTid();
         } else {
@@ -185,6 +198,10 @@ export default {
             let res = await this.$API.system.dept.list.req({ page: 0 });
             this.group = genTree(res);
         },
+        async getPost() {
+            let res = await this.$API.system.post.list.req({ page: 0 });
+            this.post = genTree(res);
+        },
         async handleSave() {
             if (this.localMode == "add") {
                 try {
diff --git a/src/views/hrm/transfer.vue b/src/views/hrm/transfer.vue
new file mode 100644
index 00000000..f3d921d5
--- /dev/null
+++ b/src/views/hrm/transfer.vue
@@ -0,0 +1,66 @@
+<template>
+    <el-container>
+        <el-header>
+            <div class="left-panel">
+                <el-button type="primary" @click="handleAdd">新增</el-button>
+            </div>
+        </el-header>
+        <el-main class="nopadding">
+            <scTable
+            ref="table"
+            :apiObj="API.hrm.transfer.list"
+            row-key="id"
+            stripe
+            :query="query"
+            @row-click="(row)=>{t_id=row.id;mode='show';drawerVisible=true;}"
+            >
+            <el-table-column label="员工" prop="employee_name" width="80" show-overflow-tooltip></el-table-column>
+            <el-table-column label="岗位" prop="post_name" width="80" show-overflow-tooltip></el-table-column>
+            <el-table-column label="原部门" prop="original_dept" width="80" show-overflow-tooltip></el-table-column>
+            <el-table-column label="入职部门" prop="new_dept" width="80" show-overflow-tooltip></el-table-column>
+            <el-table-column label="跨部门调动" prop="is_change" width="80" show-overflow-tooltip>
+                <template #default="scope">
+                    {{scope.row.is_change?'是':'否'}}
+                </template>
+            </el-table-column>
+            <el-table-column label="跨部门调动" prop="is_change" width="80" show-overflow-tooltip>
+                <template #default="scope">
+                    {{scope.row.is_promotion?'是':'否'}}
+                </template>
+            </el-table-column>
+            <el-table-column label="原岗位" prop="original_post" width="80" show-overflow-tooltip></el-table-column>
+            <el-table-column label="入职岗位" prop="new_post" width="80" show-overflow-tooltip></el-table-column>
+            <el-table-column label="调岗日期" prop="transfer_date" width="80" show-overflow-tooltip></el-table-column>
+            <el-table-column label="个人工作内容" prop="content" width="80" show-overflow-tooltip></el-table-column>
+            <el-table-column label="调岗原因" prop="transfer_reason" width="80" show-overflow-tooltip></el-table-column>
+            <el-table-column label="调岗日期" prop="transfer_date" width="80" show-overflow-tooltip></el-table-column>
+            <el-table-column label="审批状态" width="200" show-overflow-tooltip>    
+                <template #default="scope">
+                                <el-tag :type="actStateEnum[scope.row.ticket_?.act_state]?.type">
+                        {{ actStateEnum[scope.row.ticket_?.act_state]?.text }}
+                    </el-tag>
+            <el-tag type="info" effect="plain">{{ scope.row.ticket_?.state_.name }}</el-tag>
+
+                </template>
+            </el-table-column>
+            </scTable>
+        </el-main>
+    </el-container>
+    <el-drawer title="人员调岗审核" v-model="drawerVisible" :size="'80%'" destroy-on-close>
+        <transfer_form :mode="mode" :t_id="t_id"></transfer_form>
+    </el-drawer>
+</template>
+<script setup>
+import { ref } from 'vue'
+import API from '@/api'
+import transfer_form from './transfer_form.vue'
+import { actStateEnum } from "@/utils/enum.js";
+const query = ref({});
+const drawerVisible = ref(false);
+const mode = ref('add');
+const t_id = ref(null);
+const handleAdd = () => {
+    mode.value = 'add';
+    drawerVisible.value = true;
+}
+</script>
\ No newline at end of file
diff --git a/src/views/hrm/transfer_form.vue b/src/views/hrm/transfer_form.vue
new file mode 100644
index 00000000..0b93af9e
--- /dev/null
+++ b/src/views/hrm/transfer_form.vue
@@ -0,0 +1,307 @@
+<template>
+    <el-container>
+        <el-main class="nopadding">
+            <el-form label-width="130px" :model="formData" style="padding: 20px;" :disabled="localMode === 'show'">
+                <el-form-item label="员工信息" required>
+                    <xtSelect
+                        v-model="formData.employee"
+                        style="width: 230px;"
+                        :apiObj = "$API.hrm.employee.list"
+                        v-model:label="formData.employee_name"
+                        :edit="localMode === 'add'"
+                        @change="handleChange">
+                        <el-table-column prop="name" label="姓名"></el-table-column>
+                        <el-table-column prop="belong_dept_name" label="部门"></el-table-column>
+                        <el-table-column prop="post_name" label="岗位"></el-table-column>
+                        
+                    </xtSelect>
+                </el-form-item>
+            <el-row :gutter="12">
+                <el-col :span="6" style="display: flex">
+                <el-form-item label="性别">
+                    <el-input v-model="formData.gender" disabled style="width: 140px;"/>
+                </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                <el-form-item label="工号">
+                    <el-input v-model="formData.number" disabled style="width: 140px;"/>
+                </el-form-item>
+                </el-col>
+
+                <el-col :span="6">
+                <el-form-item label="联系方式">
+                    <el-input v-model="formData.phone" disabled style="width: 140px;"/>
+                </el-form-item>
+                </el-col>
+
+                <el-col :span="6">
+                <el-form-item label="身份证号">
+                    <el-input v-model="formData.id_number" disabled style="width: 150px;"/>
+                </el-form-item>
+                </el-col>
+
+                <el-col :span="6">
+                <el-form-item label="部门">
+                    <el-input v-model="formData.belong_dept_name" disabled style="width: 140px;"/>
+                </el-form-item>
+                </el-col>
+
+                <el-col :span="6">
+                <el-form-item label="职务">
+                    <el-input v-model="formData.post_name" disabled style="width: 140px;"/>
+                </el-form-item>
+                </el-col>
+
+                <el-col :span="6">
+                <el-form-item label="入职时间">
+                    <el-input v-model="formData.start_date" disabled style="width: 140px;"/>
+                </el-form-item>
+                </el-col>
+
+                <el-col :span="6">
+                <el-form-item label="日期" required>
+                    <el-date-picker
+                    v-model="formData.join_date"
+                    type="date"
+                    placeholder="日期"
+                    value-format="YYYY-MM-DD"
+                    style="width: 120px;"
+                    :readonly="localMode === 'show'"
+                    />
+                </el-form-item>
+                </el-col>
+            </el-row>
+            <el-form-item label="原部门" required>
+                    <el-cascader
+                        v-model="formData.original_dept"
+                        :options="group"
+                        :props="groupsProps"
+                        :show-all-levels="false"
+                        clearable
+                        style="width: 230px"
+                    ></el-cascader>
+                </el-form-item>
+                <el-form-item label="是否跨部门调动" required>
+                    <el-radio-group v-model="formData.is_change">
+                        <el-radio :label="false">否</el-radio>
+                        <el-radio :label="true">是</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label="是否晋升" required>
+                    <el-radio-group v-model="formData.is_promotion">
+                        <el-radio :label="false">否</el-radio>
+                        <el-radio :label="true">是</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label="调岗部门" required>
+                    <el-cascader
+                        v-model="formData.new_dept"
+                        :options="group"
+                        :props="groupsProps"
+                        :show-all-levels="false"
+                        clearable
+                        style="width: 230px"
+                    ></el-cascader>
+                </el-form-item>
+                <el-form-item label="原职务" required>
+                    <xtSelect
+                        :apiObj="apiObjPost"
+                        v-model="formData.original_post"
+                        v-model:label="formData.original_post_name"
+                        style="width: 230px"
+                        >
+                        <el-table-column label="名称" prop="name"></el-table-column>
+                    </xtSelect>
+                </el-form-item>
+                <el-form-item label="调岗职务" required>
+                    <xtSelect
+                        :apiObj="apiObjPost"
+                        v-model="formData.new_post"
+                        v-model:label="formData.new_post_name"
+                        style="width: 230px"
+                        >
+                        <el-table-column label="名称" prop="name"></el-table-column>
+                    </xtSelect>
+                </el-form-item>
+                <el-form-item label="个人工作内容">
+                    <el-input v-model="formData.content" type="textarea" :rows="3" style="width: 300px;"/>
+                </el-form-item>
+                <el-form-item label="调岗原因">
+                    <el-input v-model="formData.reason" type="textarea" :rows="2" style="width: 300px;"/>
+                </el-form-item>
+                <el-form-item label="原岗位薪资">
+                    <el-input-number
+                        v-model="formData.original_slary" 
+                        style="width: 200px;" 
+                        :precision="2"
+                        :step="0.01"
+                        :min="0"
+                        v-if="formData.ticket_?.state_?.name !== '分管副总审批'"/>
+                        <span style="margin-left:6px;">元</span>
+                </el-form-item>
+                <el-form-item label="调岗后岗位薪资">
+                    <el-input-number 
+                        v-model="formData.new_slary" 
+                        style="width: 200px;" 
+                        :precision="2"
+                        :step="0.01"
+                        :min="0"
+                        v-if="formData.ticket_?.state_?.name !== '分管副总审批'"/>
+                        <span style="margin-left:6px;">元</span>
+                </el-form-item>
+            </el-form>
+    
+            <el-footer>
+                <el-button type="danger"
+                v-if="localMode=='edit'"
+                style="margin-right: 4px;"
+                @click="handleDel"
+                :loading="saveLoading"
+                >删除</el-button>
+                <ticketd_b 
+                        v-if = "formData.ticket_ && localMode=='show'"
+                        :t_id="formData.id" 
+                        :ticket_="formData.ticket_"
+                        :ticket_data="ticket_data"
+                        @success="$emit('success', localMode)" 
+                        ref="ticketd_b"
+                    ></ticketd_b>
+                     <el-button 
+                        v-if="localMode!='show'"
+                        type="primary"
+                        style="margin-right: 4px;"
+                        @click="handleSave"
+                        :loading="saveLoading"
+                        >提交审批</el-button>
+            </el-footer>
+        </el-main>
+        <el-aside width="20%" v-if="formData.ticket_">
+            <ticketd :ticket_="formData.ticket_" @success="$emit('success')"></ticketd>
+        </el-aside>
+    </el-container>
+</template>
+
+<script>
+import ticketd_b from "@/views/wf/ticketd_b.vue";
+import ticketd from '@/views/wf/ticketd.vue';
+import { genTree } from "@/utils/verificate";
+
+export default {
+    name: 'EnpJoinForm',
+    components: {
+        ticketd_b,
+        ticketd
+    },
+    props: {
+        mode: {
+            type: String,
+            default: 'show'
+        },
+        t_id: {
+            type: String,
+            default: ""
+        }
+    },
+    data() {
+        return {
+            formData: {
+                is_change: false,
+            },
+            ticket_data: {},
+            localMode: this.mode,
+            saveLoading: false,
+            group:[],
+            apiObjPost: this.$API.system.post.list,
+            hideAdd:false,
+            hideDelete:false,
+            addTemplate: {
+                name: "",
+                gender: "",
+                age: "",
+                phone: "",
+                note: "",
+                },
+            groupsProps: {
+                multiple: false,
+                emitPath: false,
+                checkStrictly: true,
+                },
+            }
+        },
+    watch: {
+        formData: {
+            handler(val){
+                Object.assign(this.ticket_data,{
+                    original_slary: val.original_slary,
+                    new_slary: val.new_slary,
+                })
+            },
+        deep: true,
+        }
+  },
+    mounted() {
+        this.getGroup();
+        if (this.t_id) {
+            this.getTid();
+        } else {
+            this.localMode = "add";
+        }
+    },
+    methods: {
+        async getTid() {
+            try {
+                let res = await this.$API.hrm.transfer.item.req(this.t_id);
+                this.formData = res;
+                if (res.ticket_ && res.ticket_.state_.type == 1 && res.create_by == this.$TOOL.data.get("USER_INFO").id) {
+                    this.localMode = "edit";
+                }
+            } catch (error) {
+                console.error('获取数据失败:', error);
+            }
+        },
+        async getGroup() {
+            let res = await this.$API.system.dept.list.req({ page: 0 });
+            this.group = genTree(res);
+        },
+        handleDel() {
+            this.$confirm(`确定删除吗？`, "提示", {
+				type: "warning",
+			})
+				.then(()=>{
+                    this.$API.hrm.transfer.delete.req(this.formData.id).then(res=>{
+                        this.$message.success("删除成功");
+                        this.$emit('success');
+                    })
+                })
+        },
+        async handleSave() {
+            if (this.localMode == "add") {
+                try {
+                    let res = await this.$API.hrm.transfer.create.req(this.formData);
+                    this.$message.success("提交成功");
+                    this.$emit('success', this.localMode);
+                } catch (error) {
+                    console.error('提交申请失败:', error);
+                    throw error;
+                }
+            } else if (this.localMode == "edit") {
+                this.$message.error("不支持编辑");
+            }
+        },
+        handleQuery() {
+			this.$refs.table.queryData(this.query);
+		},
+        handleChange(obj) {
+            this.formData.employee_name = obj.name;
+            this.formData.belong_dept_name = obj.belong_dept_name;
+            this.formData.post_name = obj.post_name;
+            this.formData.gender = obj.gender;
+            this.formData.id_number = obj.id_number;
+            this.formData.phone = obj.phone;
+            this.formData.number = obj.number;
+            this.formData.start_date = obj.start_date;
+        },
+    
+    }
+}
+</script>
\ No newline at end of file