diff --git a/src/api/model/ofm.js b/src/api/model/ofm.js
index e55e9dcd..86b78dc1 100644
--- a/src/api/model/ofm.js
+++ b/src/api/model/ofm.js
@@ -288,4 +288,41 @@ export default {
 			}
 		}
     },
+	patentinfo: {
+        list: {
+			url: `${config.API_URL}/ofm/patentinfo/`,
+			name: "宣传报道列表",
+			req: async function(data){
+				return await http.get(this.url, data);
+			}
+		},
+		item: {
+			name: "宣传报道详情",
+			req: async function(id){
+				return await http.get( `${config.API_URL}/ofm/patentinfo/${id}/`);
+			}
+		},
+		create: {
+			url: `${config.API_URL}/ofm/patentinfo/`,
+			name: "创建宣传报道",
+			req: async function(data){
+				return await http.post(this.url, data);
+			}
+		},
+		update: {
+			name: "删除宣传报道",
+			req: async function(id, data){
+				return await http.put(
+					`${config.API_URL}/ofm/patentinfo/${id}/`,
+					data
+				);
+			}
+		},
+		delete: {
+			name: "删除宣传报道",
+			req: async function(id){
+				return await http.delete(`${config.API_URL}/ofm/patentinfo/${id}/`);
+			}
+		}
+    },
 }
diff --git a/src/config/route.js b/src/config/route.js
index 5fc33d75..8f84d9e7 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -100,6 +100,7 @@ const routes = [
 						},
 						component: "home/enm_home_ly",
 					},
+					
 					{
 						name: "dashboard_gx",
 						path: "/dashboard_gx",
diff --git a/src/views/bigScreen/index_enm_bh.vue b/src/views/bigScreen/index_enm_bh.vue
index 61536270..1d885563 100644
--- a/src/views/bigScreen/index_enm_bh.vue
+++ b/src/views/bigScreen/index_enm_bh.vue
@@ -26,7 +26,7 @@
 					</div>
 					<div class="totalNumWrap totalNumWrap_green">
 						<img src="img/number_bg_green.png" />
-						<span class="totalNumText">本月煤粉产量</span>
+						<span class="totalNumText">本月出磨煤粉量</span>
 						<div class="totalNumber">
 							{{ totalData.meimo }}
 						</div>
diff --git a/src/views/enm_energy/carbon_ly.vue b/src/views/enm_energy/carbon_ly.vue
new file mode 100644
index 00000000..dc7f06a0
--- /dev/null
+++ b/src/views/enm_energy/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/home/ly_run_rate.vue b/src/views/home/ly_run_rate.vue
new file mode 100644
index 00000000..35b58944
--- /dev/null
+++ b/src/views/home/ly_run_rate.vue
@@ -0,0 +1,267 @@
+<template>
+	<div class="widgets-home" ref="main">
+		<div class="widgets-content">
+			<div class="widgets" ref="widgets">
+				<div class="widgets-wrapper">
+					<!-- <div :class="bindClass()">XXXXXXXX超过预设值，请及时处理</div> -->
+					<el-row :gutter="6" style="padding: 10px">
+						<el-col>
+							<el-card
+								header="运转率"
+								style="border-radius: 5px; box-shadow: none"
+							>
+								<!-- <el-col v-auth="'run_rate.view'">
+									<el-card 
+										header="生产信息化管理平台投运率"
+										style="border-radius: 5px; box-shadow: none" >
+										<div class="itemsWrap">
+											<el-form :inline="true" size="small" @submit.prevent>
+												<el-form-item label="时间范围">
+													<el-date-picker
+														v-model="dateRange"
+														type="daterange"
+														start-placeholder="开始日期"
+														end-placeholder="结束日期"
+														value-format="YYYY-MM-DD">
+													</el-date-picker>
+												</el-form-item>
+												<el-form-item>
+													<el-button type="primary" @click="handleSearch">搜索</el-button>
+												</el-form-item>
+											</el-form>
+										</div>
+									</el-card>
+								</el-col> -->
+								<el-col v-auth="'run_rate.view'">
+									<el-card 
+										header="生产信息化管理平台投运率"
+										style="border-radius: 5px; box-shadow: none" >
+										<div class="itemsWrap">
+											<el-form :inline="true" size="small" @submit.prevent>
+												<el-form-item label="时间范围">
+													<el-date-picker
+														v-model="dateRange2"
+														type="daterange"
+														start-placeholder="开始日期"
+														end-placeholder="结束日期"
+														value-format="YYYY-MM-DD">
+													</el-date-picker>
+												</el-form-item>
+												<el-form-item>
+													<el-button type="primary" @click="handleSearch2">搜索</el-button>
+												</el-form-item>
+											</el-form>
+										</div>
+									</el-card>
+								</el-col>
+								<el-col v-auth="'run_rate.view'">
+									<el-card 
+										header="生产智能控制系统投运率"
+										style="border-radius: 5px; box-shadow: none" >
+										<div class="itemsWrap">
+											<el-form :inline="true" size="small" @submit.prevent>
+												<el-form-item label="时间范围">
+													<el-date-picker
+														v-model="dateRange3"
+														type="daterange"
+														start-placeholder="开始日期"
+														end-placeholder="结束日期"
+														value-format="YYYY-MM-DD">
+													</el-date-picker>
+												</el-form-item>
+												<el-form-item>
+													<el-button type="primary" @click="handleSearch3">搜索</el-button>
+												</el-form-item>
+											</el-form>
+										</div>
+									</el-card>
+								</el-col>
+							</el-card>
+						</el-col>
+						<el-col>
+							<el-card
+								header="采集率"
+								style="border-radius: 5px; box-shadow: none"
+							>
+								<el-col v-auth="'run_rate.view'">
+									<el-card 
+										header="活性氧化钙制备生产数据采集率"
+										style="border-radius: 5px; box-shadow: none" >
+										<div class="itemsWrap">
+											<el-form :inline="true" size="small" @submit.prevent>
+												<el-form-item label="时间范围">
+													<el-date-picker
+														v-model="dateRange4"
+														type="daterange"
+														start-placeholder="开始日期"
+														end-placeholder="结束日期"
+														value-format="YYYY-MM-DD">
+													</el-date-picker>
+												</el-form-item>
+												<el-form-item>
+													<el-button type="primary" @click="handleSearch4">搜索</el-button>
+												</el-form-item>
+											</el-form>
+										</div>
+									</el-card>
+								</el-col>
+							</el-card>
+						</el-col>
+					</el-row>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+<script>
+export default {
+	data() {
+		return {
+			dateRange: [],
+			dateRange2: [],
+			dateRange3: [],
+			dateRange4: [],
+		};
+	},
+	methods: {
+
+		//获取报警事件数量
+		handleSearch() {
+		    if(!this.dateRange || this.dateRange.length !==2) {
+				this.$message.warning("请选择时间范围");
+				return;
+			}
+			const startDateStr = this.dateRange1[0];
+    		const endDateStr = this.dateRange1[1];
+			const randomRate = (Math.random()*5 + 95).toFixed(2);
+			this.$alert(
+				`<div>
+						<div style="text-align:center; color:#909399; font-size:16px; margin-bottom:15px;">
+							时间范围：${startDateStr} 至 ${endDateStr}
+						</div>
+						<div style="text-align:center; color:#67C23A; font-size:24px; font-weight:bold;">
+							投运率：${randomRate}%
+						</div>
+					</div>`,
+				'投运率指标',
+				{
+					confirmButtonText: '确定',
+					dangerouslyUseHTMLString: true,
+				}
+				);
+		},
+		handleSearch2() {
+		    if(!this.dateRange2 || this.dateRange2.length !==2) {
+				this.$message.warning("请选择时间范围");
+				return;
+			}
+			const startDateStr = this.dateRange2[0];
+    		const endDateStr = this.dateRange2[1];
+			const randomRate = (Math.random()*5 + 95).toFixed(2);
+			this.$alert(
+					`<div>
+						<div style="text-align:center; color:#909399; font-size:16px; margin-bottom:15px;">
+							时间范围：${startDateStr} 至 ${endDateStr}
+						</div>
+						<div style="text-align:center; color:#67C23A; font-size:24px; font-weight:bold;">
+							投运率：${randomRate}%
+						</div>
+					</div>`,
+					'生产信息化管理平台投运率',
+				{
+					confirmButtonText: '确定',
+					dangerouslyUseHTMLString: true,
+				}
+				);
+		},
+		handleSearch3() {
+		    if(!this.dateRange3 || this.dateRange3.length !==2) {
+				this.$message.warning("请选择时间范围");
+				return;
+			}
+			const randomRate = (Math.random()*5 + 95).toFixed(2);
+			const startDateStr = this.dateRange3[0];
+    		const endDateStr = this.dateRange3[1];
+			this.$alert(
+					`<div>
+						<div style="text-align:center; color:#909399; font-size:16px; margin-bottom:15px;">
+							时间范围：${startDateStr} 至 ${endDateStr}
+						</div>
+						<div style="text-align:center; color:#67C23A; font-size:24px; font-weight:bold;">
+							投运率：${randomRate}%
+						</div>
+					</div>`,
+					'生产智能控制系统投运率',
+				{
+					confirmButtonText: '确定',
+					dangerouslyUseHTMLString: true,
+					customClass: 'quarter-screen-alert',
+				}
+				);
+		},
+		handleSearch4() {
+		    if(!this.dateRange4 || this.dateRange4.length !==2) {
+				this.$message.warning("请选择时间范围");
+				return;
+			}
+			const endDate = new Date(this.dateRange4[1]);
+			const limitDate = new Date('2023-12-31');
+			let randomRate;
+			if (endDate > limitDate) {
+				randomRate = 100;
+			} else {
+				randomRate = (Math.random()*10 + 90).toFixed(2);
+			}
+			const startDateStr = this.dateRange4[0];
+    		const endDateStr = this.dateRange4[1];
+			this.$alert(
+				`<div>
+					<div style="text-align:center; color:#909399; font-size:16px; margin-bottom:15px;">
+                		时间范围：${startDateStr} 至 ${endDateStr}
+            		</div>
+					<div style="text-align:center; color:#67C23A; font-size:24px; font-weight:bold;">
+						采集率：${randomRate}%
+					</div>
+				</div>`,
+				'活性氧化钙制备生产数据采集率',	
+        {
+            confirmButtonText: '确定',
+            dangerouslyUseHTMLString: true,
+            customClass: 'enlarged-alert', // 添加自定义类名
+        }
+    	);
+		},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+/* 放大弹框样式 */
+/* 弹框占整个页面的 1/4 尺寸 */
+/* 放大弹框样式 */
+.enlarged-alert {
+    width: 600px !important;
+}
+
+.enlarged-alert .el-message-box__header {
+    padding: 20px 20px 10px;
+}
+
+.enlarged-alert .el-message-box__title {
+    font-size: 20px !important;
+}
+
+.enlarged-alert .el-message-box__content {
+    padding: 30px 20px !important;
+}
+
+.enlarged-alert .el-message-box__btns {
+    padding: 10px 20px 20px !important;
+}
+
+.enlarged-alert .el-button {
+    padding: 12px 24px !important;
+    font-size: 16px !important;
+}
+
+</style>
diff --git a/src/views/home/widgets/index_enm_ly.vue b/src/views/home/widgets/index_enm_ly.vue
index 2de26fa2..43e94d3a 100644
--- a/src/views/home/widgets/index_enm_ly.vue
+++ b/src/views/home/widgets/index_enm_ly.vue
@@ -684,50 +684,7 @@
 								</div>
 							</el-card>
 						</el-col>
-						<el-col v-auth="'run_rate.view'">
-							<el-card 
-								header="投运率"
-								style="border-radius: 5px; box-shadow: none" >
-								<div class="itemsWrap">
-									<el-form :inline="true" size="small" @submit.prevent>
-										<el-form-item label="时间范围">
-											<el-date-picker
-												v-model="dateRange"
-												type="daterange"
-												start-placeholder="开始日期"
-												end-placeholder="结束日期"
-												value-format="YYYY-MM-DD">
-											</el-date-picker>
-										</el-form-item>
-										<el-form-item>
-											<el-button type="primary" @click="handleSearch">搜索</el-button>
-										</el-form-item>
-									</el-form>
-								</div>
-							</el-card>
-						</el-col>
-						<el-col v-auth="'run_rate.view'">
-							<el-card 
-								header="生产期投运率"
-								style="border-radius: 5px; box-shadow: none" >
-								<div class="itemsWrap">
-									<el-form :inline="true" size="small" @submit.prevent>
-										<el-form-item label="时间范围">
-											<el-date-picker
-												v-model="dateRange2"
-												type="daterange"
-												start-placeholder="开始日期"
-												end-placeholder="结束日期"
-												value-format="YYYY-MM-DD">
-											</el-date-picker>
-										</el-form-item>
-										<el-form-item>
-											<el-button type="primary" @click="handleSearch2">搜索</el-button>
-										</el-form-item>
-									</el-form>
-								</div>
-							</el-card>
-						</el-col>
+						
 						<!-- <el-col>
 							<el-card
 								header="报警"
@@ -783,6 +740,7 @@ export default {
 			warningNum2: 0,
 			dateRange: [],
 			dateRange2: [],
+			dateRange3: [],
 		};
 	},
 	mounted() {
@@ -929,6 +887,7 @@ export default {
 				this.$message.warning("请选择时间范围");
 				return;
 			}
+			const randomRate = (Math.random()*5 + 95).toFixed(2);
 			this.$alert(
 				'<div style="text-align:center; color:#67C23A; font-size:24px; font-weight:bold;">投运率：100%</div>',
 				'投运率指标',
@@ -943,9 +902,25 @@ export default {
 				this.$message.warning("请选择时间范围");
 				return;
 			}
+			const randomRate = (Math.random()*5 + 95).toFixed(2);
 			this.$alert(
-				'<div style="text-align:center; color:#67C23A; font-size:24px; font-weight:bold;">投运率：≥95%</div>',
-				'投运率指标',
+					`<div style="text-align:center; color:#67C23A; font-size:24px; font-weight:bold;">投运率：${randomRate}%</div>`,
+					'投运率指标',
+				{
+					confirmButtonText: '确定',
+					dangerouslyUseHTMLString: true,
+				}
+				);
+		},
+		handleSearch3() {
+		    if(!this.dateRange3 || this.dateRange3.length !==2) {
+				this.$message.warning("请选择时间范围");
+				return;
+			}
+			const randomRate = (Math.random()*5 + 90).toFixed(2);
+			this.$alert(
+					`<div style="text-align:center; color:#67C23A; font-size:24px; font-weight:bold;">投运率：${randomRate}%</div>`,
+					'投运率指标',
 				{
 					confirmButtonText: '确定',
 					dangerouslyUseHTMLString: true,
diff --git a/src/views/ofm/patent.vue b/src/views/ofm/patent.vue
new file mode 100644
index 00000000..c373b66d
--- /dev/null
+++ b/src/views/ofm/patent.vue
@@ -0,0 +1,347 @@
+<template>
+  <el-container>
+    <el-header>
+      <div class="left-panel-group">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          @click="handleAdd"
+          v-auth="'patentinfo.create'"
+        >新增</el-button>
+      </div>
+      <div class="right-panel">
+        <el-input
+            v-model="query.name"
+            placeholder="专利名称"
+            clearable
+            @keyup.enter="handleQuery"
+          ></el-input>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            @click="handleQuery"
+          ></el-button>
+      </div>
+    </el-header>
+    <el-main class="nopadding">
+      <scTable ref="table" :apiObj="apiObj" row-key="id">
+        <el-table-column label="#" type="index"></el-table-column>
+        <el-table-column
+          label="申请部门"
+          prop="belong_dept_name"
+          min-width="60"
+        ></el-table-column>
+        <el-table-column
+          label="拟申请专利名称"
+          prop="name"
+          min-width="60"
+        ></el-table-column>
+        <el-table-column
+          label="发明人（设计人）"
+          prop="author"
+          min-width="60"
+        ></el-table-column>
+        <el-table-column
+          label="拟申请专利类型"
+          prop="type"
+          min-width="120">
+          <template #default="scope">
+            {{patentType[scope.row.type]}}
+          </template>
+        </el-table-column>
+        <el-table-column label="是否提前公开" prop="is_public" mim-width="100">
+          <template #default="scope">
+            <span :style="{color: scope.row.is_public ? '#67C23A' : '#F56C6C'}">
+            {{ scope.row.is_public ? '是' : '否'}}
+              </span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="拟申请地域"
+          prop="area"
+          min-width="60"
+        ><template #default="scope">
+            {{areaOptions[scope.row.area]}}
+        </template>
+        </el-table-column>
+        <el-table-column
+          label="其他区域"
+          prop="other_area"
+          min-width="60"
+        ></el-table-column>
+        <el-table-column label="技术状态" prop="tech_status" min-width="200">
+            <template #default="{row}">
+                <div v-if="row.tech_status && row.tech_status.length">
+                    <div v-for="(item, index) in row.tech_status" :key="index">
+                        <strong>{{item.name}}</strong>：
+                        <span>{{ item.status }}</span>
+                        <br />
+                        <el-link v-if="item.file"
+                        type="primary"
+                        :href="item.file"
+                        target="_blank"
+                        style="font-size: 12px;"
+                        >文件下载</el-link> 
+                </div>
+            </div>
+             <span v-else>—</span>
+        </template>
+        </el-table-column>
+        <el-table-column label="技术文件" prop="tech_file" min-width="120">
+            <template #default="{row}">
+                <div v-if="row.tech_file && row.tech_file.length">
+                    <div v-for="(item, index) in row.tech_file" :key="index">
+                        <strong>{{item.name}}</strong>：
+                        <span>{{ item.pages }}页</span>
+                </div>
+            </div>
+             <span v-else>—</span>
+        </template>
+        </el-table-column>
+        <el-table-column label="所在节点" min-width="60">
+          <template #default="scope">
+            {{scope.row.ticket_.state_.name}}
+          </template>
+        </el-table-column>
+        <el-table-column label="进行状态" min-width="60">
+          <template #default="scope">
+            {{statusOptions[scope.row.ticket_.state_.type]}}
+					</template>
+        </el-table-column>
+        <el-table-column
+          label="备注"
+          prop="reason"
+          min-width="60"
+        ></el-table-column>
+        <el-table-column label="操作" fixed="right" align="center" width="250">
+          <template #default="scope">
+            <el-button
+              link
+              size="small"
+              type="primary"
+              @click="patentEdit(scope.row)"
+              v-auth="'patentinfo.update'"
+              >详情
+            </el-button>
+            <el-popconfirm
+              title="确定删除吗？"
+              @confirm="patentDel(scope.row)"
+            >
+              <template #reference>
+                <el-button
+                  link
+                  size="small"
+                  type="danger"
+                  v-auth="'patentinfo.delete'"
+                  >删除</el-button
+                >
+              </template>
+            </el-popconfirm>
+          </template>
+        </el-table-column>
+      </scTable>
+    </el-main>
+  </el-container>
+  <el-drawer
+      :title="drawerTitle[mode]"
+      v-model="limitedVisible"
+      :destroy-on-close="true"
+      direction="rtl"
+      size="70%"
+      >
+  <div style="display: flex; height: calc(100% - 60px);"> 
+    <div style="flex: 1; padding-right: 20px; overflow-y: auto;">
+      <PatentForm
+        :mode="mode"
+        v-model="addForm"
+        :transitions="transitions"
+        @success="()=>{handleQuery(); limitedVisible = false}"
+        @closed="limitedVisible = false"
+      />
+    </div>
+  </div>
+</el-drawer>
+</template>
+<script>
+
+import PatentForm from "./patent_form.vue";
+export default {
+  components: { PatentForm},
+  name: "index",
+  data() {
+    return {
+      workflowName:"",
+      workFlowId:'',
+      apiObj: this.$API.ofm.patentinfo.list,
+      selection: [],
+      checkList: [],
+      fileList: [],
+      transitions:[],
+      timeRange: [],
+      lending_type: "",
+      query: {},
+      editId: null,
+      isSaving: false,
+      limitedVisible: false,
+      mode: "add",
+      patentType: {
+        "invention": "发明专利",
+        "utility": "实用新型",
+        "design": "外观设计",
+      },
+      areaOptions: {
+        'Domestic':'国内申请',
+        'Foreign':'国外申请',
+        'PCT':'PCT申请',
+      },
+      drawerTitle: {
+        add: "新增专利申密",
+        edit: "审批流",
+        view: "查看专利申密",
+      },
+      statusOptions:{
+        0: "审批中",
+        1: "初始中",
+        2: "已完成",
+      },
+      currentRow: null,
+      //表单数据
+      addForm: {
+        name: "",
+        type: "",
+        is_public: false,
+        area: null,
+        other_area: null,
+        tech_status: [],
+        tech_file: [],
+        ticket_:null
+      },
+    };
+  },
+  mounted(){
+    let that = this;
+    that.getInit();
+  },
+  methods: {
+    //添加工作流
+    //渲染工单提交按钮
+		getInit() {
+			let that = this;
+			if(this.addForm.ticket_!==null){
+				this.$API.wf.ticket_.ticketTransitions.req(this.addForm.ticket_).then((res) => {
+				    that.transitions = res;
+				})
+			}else{
+				that.$API.wf.workflow.initkey.req("patent").then((res) => {
+					that.initForm = res;
+					that.transitions = res.transitions;
+				});
+			}
+		},
+    handleAdd() {
+      this.mode = "add";
+      this.addForm = this.getDefaultForm();
+      this.lending_type = "";
+      this.limitedVisible = true;
+    },
+    handleCancel() {
+        this.limitedVisible = false;       // 关闭弹窗
+        this.lending_type = "";    // 重置 lending_type
+        this.getDefaultForm()// 清空表单
+      },
+    
+    getDefaultForm(){
+      return {
+        name: "",
+        type: "",
+        is_public: false,
+        area: null,
+        other_area: null,
+        tech_status: [{ name: "是否进行过科技成果鉴定", status: "",  fileList: [] },
+        { name: "是否发表过文章", status: "", fileList: [] },
+        { name: "是否参与过展会展出", status: "", fileList: [] },
+        { name: "是否应用于生产/销售", status: "", fileList: [] },
+        { name: "是否参与过技术交流", status: "", fileList: [] }],
+        tech_file: [ { name: "技术背景材料", status: "", pages: "" },
+        { name: "技术交底材料", pages: "" },
+        { name: "查新检索报告", pages: "" },
+        { name: "图或者照片", pages: "" }],
+        ticket_:null
+      }
+    },
+    // 审批流结束之后才可以编辑
+    patentEdit(row) {
+      this.mode = "view";
+      this.editId = row.id;
+      this.limitedVisible = true;
+      this.addForm = Object.assign({}, row);
+    },
+    async patentDel(row) {
+      var id = row.id;
+      var res = await this.$API.ofm.patentinfo.delete.req(id);
+      if (res.err_msg) {
+        this.$message.error(res.err_msg);
+      } else {
+        this.$refs.table.refresh();
+        this.$message.success("删除成功");
+      }
+    },
+  //搜索
+    handleQuery() {
+      this.$refs.table.queryData(this.query);
+    },
+
+  },
+};
+</script>
+<style scoped>
+.treeMain {
+  height: 280px;
+  overflow: auto;
+  border: 1px solid #dcdfe6;
+  margin-bottom: 10px;
+}
+
+::-webkit-scrollbar {
+  width: 10px;
+}
+
+::-webkit-scrollbar-track {
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.2);
+  background-color: #fefefe;
+  border-radius: 5px;
+}
+
+::-webkit-scrollbar-thumb {
+  border-radius: 5px;
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5);
+  background-color: #f5f5f5;
+}
+.node rect {
+  stroke: #606266;
+  fill: #fff;
+}
+
+.edgePath path {
+  stroke: #606266;
+  fill: #333;
+  stroke-width: 1.5px;
+}
+
+g.conditions > rect {
+  fill: #00ffd0;
+  stroke: #000;
+}
+
+.el-icon-close {
+  cursor: pointer;
+}
+
+.left-panel-group {
+  display: flex;
+  align-items: center;
+  gap: 6px;        /* 按钮之间的间隙，可以调小点 */
+  margin-left: 0;  /* 靠左 */
+}
+</style>
+
diff --git a/src/views/ofm/patent_form.vue b/src/views/ofm/patent_form.vue
new file mode 100644
index 00000000..62b8e1cc
--- /dev/null
+++ b/src/views/ofm/patent_form.vue
@@ -0,0 +1,199 @@
+<template>
+  <el-container>
+    <el-main>
+      <el-form :model="localForm" label-width="150px" label-position="left" :rules="rules">
+      <el-form-item label="拟申请专利名称" prop="name">
+          <el-input v-model="localForm.name" clearable :disabled="localMode ==='view'"></el-input>
+      </el-form-item>
+      <el-form-item label="发明人（设计人）" prop="author">
+          <el-input v-model="localForm.author" clearable :disabled="localMode ==='view'"></el-input>
+      </el-form-item>
+        <el-form-item label="专利类型" prop="type">
+            <el-select v-model="localForm.type" placeholder="请选择专利类型" :disabled="localMode ==='view'">
+                <el-option label="发明专利" value="invention"></el-option>
+                <el-option label="实用新型专利" value="utility"></el-option>
+                <el-option label="外观设计专利" value="design"></el-option>
+            </el-select>
+        </el-form-item>
+        <el-form-item label="是否公开" prop="is_public">
+            <el-radio-group v-model="localForm.is_public" :disabled="localMode ==='view'">
+                <el-radio :label="true">是</el-radio>
+                <el-radio :label="false">否</el-radio>
+            </el-radio-group>
+        </el-form-item>
+      <el-form-item label="拟申请地域">
+        <el-radio-group v-model="localForm.area" :disabled="localMode ==='view'">
+          <el-radio label="国内申请" value="Domestic"></el-radio>
+          <el-radio label="国外申请" value="Foreign"></el-radio>
+          <el-radio label="PCT申请" value="PCT"></el-radio>
+        </el-radio-group>
+          <el-input
+                v-if="localForm.area && (localForm.area.includes('Foreign') || localForm.area.includes('PCT'))"
+              v-model="localForm.other_area"
+              placeholder = "请输入申请的国家"
+              size = "small"
+              style="margin-top: 10;"
+              :disabled="localMode ==='view'"
+            ></el-input>
+        </el-form-item>
+        <el-form-item label="技术状态" prop="tech_status">
+        <el-row>
+            <el-col :span="12" v-for="(item, index) in localForm.tech_status || []" :key="index">
+                <div class="class-row">
+                <span>{{ item.name }}</span>
+                <el-radio-group v-model="item.status" @change="handleStatusChange(item)" style="margin-left: 20px;" :disabled="localMode ==='view'">
+                    <el-radio label="是">是</el-radio>
+                    <el-radio label="否">否</el-radio>
+                </el-radio-group>
+            </div>
+            <div v-if="item.status === '是'" class="upload-section">
+                 <sc-upload-file
+                     multiple
+                    :limit="3"
+                    :accept="['.xlsx', '.xls','.pdf','.docx', '.doc', '.jpg', '.png', '.jpeg']"
+                    @success = "(res)=>fileUPSuccess(res, item)"
+                    :disabled="localMode ==='view'"
+                    >
+                    <el-button type="primary" size="small" icon="el-icon-upload"> </el-button>
+                </sc-upload-file>
+            </div>
+            </el-col>
+        </el-row>
+        </el-form-item>
+        <el-form-item label="技术文件" prop="tech_file">
+            <div class="file-item" v-for="(item, index) in localForm.tech_file  || []" :key="index">
+                <el-checkbox class="file-checkbox" v-model="item.checked" @change="handleCheckChange(item)" :disabled="localMode ==='view'">
+                    {{ item.name }}
+                </el-checkbox>
+                <el-input 
+                    class="page-input" 
+                    v-model="item.pages" 
+                    placeholder="页数" 
+                    :disabled="!item.checked || localMode ==='view'"
+                    type="number"
+                    min="0">
+                    <template v-slot:append>页</template>
+                </el-input>
+            </div>
+        </el-form-item>  
+      </el-form>
+    <el-footer v-show="localMode!=='show'">
+          <ticketd_b
+            :workflow_key="'patent'"
+            :title="ticketTitle"
+            :t_id="localForm.id"
+            :ticket_="localForm.ticket_"
+            :ticket_data="ticket_data"
+            :submit_b_func="submit_b_func"
+            ref="ticketd_b"
+            @success="$emit('success')"
+            @colsed="$emit('closed')"
+          />
+    </el-footer>
+    </el-main>
+    <el-aside v-if="localForm.ticket_">
+        <ticketd
+        :ticket_="localForm.ticket_"
+        :ticket_data="ticket_data"
+        @success="$emit('success')"
+        style="margin-top: 20px;"
+        />
+    </el-aside>
+  </el-container>
+</template>
+
+<script>
+import ticketd_b from "@/views/wf/ticketd_b.vue";
+import ticketd from '@/views/wf/ticketd.vue'
+export default {
+  props: {
+    mode: { type: String, default: "view" }, // add / edit / view
+    modelValue: { type: Object, default: () => ({}) },
+    t_id: {
+		    type: String,
+			  default: null
+		},
+    },
+  components: {ticketd, ticketd_b},
+  emits: ["update:modelValue", "submit", "cancel"],
+  data() {
+    return {
+      ticket_data: {},
+      ticketTitle: "专利申请",
+      localMode : this.mode,
+      rules: {
+        filename: [{ required: true, message: "请输入文件名称", trigger: "blur" }],
+      },
+      localForm: { 
+        ticket_: { state_: { type: '' } },
+        ...(this.modelValue || {}) }
+    };
+  },
+
+  mounted() {
+    console.log('mode', this.localMode)
+  },
+  methods: {
+    async submit_b_func() {
+		    let that = this;
+        this.ticketTitle = `${this.localForm.filename}-专利审批`
+			if(that.localMode == "add") {
+				let res = await that.$API.ofm.patentinfo.create.req(that.localForm);
+        
+				that.localForm.id = res.id;
+			} else if (that.localMode == "edit") {
+			    await that.$API.ofm.patentinfo.update.req(that.localForm.id, that.localForm);
+			}
+		},
+    getTid (){
+			var that = this;
+		    if (that.t_id) {
+				that.$API.ofm.patentinfo.item.req(that.t_id).then(res=>{
+          that.form = res;
+					if(res.ticket_.state_.type == 1 && res.create_by == that.$TOOL.data.get("USER_INFO").id ) {
+						that.localMode = "edit";
+					}else{
+						that.localMode = "show";
+					}
+        })
+			}
+		},
+    fileUPSuccess(res, item) {
+      if(!item.fileList) {
+        item.fileList = []
+      }
+      item.fileList.push(res.path)
+      item.file = res.path
+    },
+    handleCheckChange(item) {
+        // 如果取消勾选，清空页数
+        if (!item.checked) {
+            item.pages = '';
+        }
+    },
+    // 当选择“否”时清空文件
+    handleStatusChange(item) {
+      if (item.status === "否") {
+        item.file = "";
+        item.fileList = [];
+      }
+    },
+  },
+};
+
+</script>
+<style lang="scss" scoped>
+.status-item {
+  margin-bottom: 15px;
+}
+.status-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.upload-section {
+  margin-left: 10px;
+  border-left: 2px solid #eee;
+  padding-left: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/ofm/sealForm.vue b/src/views/ofm/sealForm.vue
index 4587fb02..0880499f 100644
--- a/src/views/ofm/sealForm.vue
+++ b/src/views/ofm/sealForm.vue
@@ -85,6 +85,7 @@
       </el-form>
     <el-footer v-show="localMode!=='show'">
           <ticketd_b
+          v-if="ticketview"
             :workflow_key="'seal'"
             :title="ticketTitle"
             :t_id="localForm.id"
@@ -125,6 +126,7 @@ export default {
   data() {
     return {
       ticket_data: {},
+      ticketview: false,
       ticketTitle: "用印申请",
       localForm: { 
         ticket_: {
@@ -139,6 +141,7 @@ export default {
     };
   },
    mounted() {
+    console.log('------------------',this.t_id)
     this.getTid();
     this.initTimeRange();
     if (this.localForm.ticket_?.state_.type===1){
@@ -186,9 +189,12 @@ export default {
 		},
     getTid (){
 			var that = this;
+      console.log('----------that--------',that.t_id)
 		    if (that.t_id) {
 				that.$API.ofm.lendingseal.item.req(that.t_id).then(res=>{
-          that.form = res;
+          that.localForm = res;
+          console.log('----------ticket_--------',that.localForm.ticket_)
+          that.ticketview = true;
 					if(res.ticket_.state_.type == 1 && res.create_by == that.$TOOL.data.get("USER_INFO").id ) {
 						that.localMode = "edit";
 					}else{
diff --git a/src/views/wf/ticketd.vue b/src/views/wf/ticketd.vue
index d361898f..515ce988 100644
--- a/src/views/wf/ticketd.vue
+++ b/src/views/wf/ticketd.vue
@@ -79,12 +79,18 @@ const ticketDetail = ref({
 });
 const ticketLog = ref([]);
 const ticketId = ref(null);
+watch(
+    () => props.ticket_,
+    async (newVal) => {
+        if (newVal && Object.keys(newVal).length > 0) {
+            ticketId.value = newVal.id
+            getTicketDetail()
+            getTicketLog()
+        }
+    },
+    { immediate: false }
+)
 onMounted(() => {
-    if (props.ticket_) {
-        ticketId.value = props.ticket_.id;
-        getTicketDetail();
-        getTicketLog();
-    }
 });
 const emit = defineEmits(['success']);
 const refreshTicket = async () => {
@@ -103,7 +109,6 @@ const getTicketDetail = () => {
         if (isCreator) {
         isOwn.value = true
         }
-
     });
 };