diff --git a/src/views/bi/dataset.vue b/src/views/bi/dataset.vue
index 1184119e..f050f816 100644
--- a/src/views/bi/dataset.vue
+++ b/src/views/bi/dataset.vue
@@ -17,7 +17,7 @@
           <scTable ref="table" :apiObj="apiObj" row-key="id" stripe>
             <el-table-column label="#" type="index" width="50"></el-table-column>
             <el-table-column label="名称" prop="name" width="200" :show-overflow-tooltip="true"></el-table-column>
-            <el-table-column label="sql语句" prop="sql_query" :show-overflow-tooltip="true"></el-table-column>
+            <el-table-column label="代号" prop="code" :show-overflow-tooltip="true"></el-table-column>
             <el-table-column label="操作" fixed="right" align="left" width="200">
               <template #default="scope">
                 <el-button type="primary" plain size="small" @click="handleShow(scope.row)"
diff --git a/src/views/bi/dataset_form.vue b/src/views/bi/dataset_form.vue
index 8ee8eaa4..a645d4b0 100644
--- a/src/views/bi/dataset_form.vue
+++ b/src/views/bi/dataset_form.vue
@@ -25,14 +25,18 @@
               </el-form-item>
             </el-col>
             <el-col :md="24" :sm="24" :xs="24">
-              <el-form-item label="图表配置">
-                <el-input v-model="form.echart_options" clearable type="textarea" :rows="8"></el-input>
+              <el-form-item label="默认参数">
+                <JsonEditorVue class="vueJsonEditor" v-model="form.default_param" @blur="validate" />
               </el-form-item>
             </el-col>
             <el-col :md="24" :sm="24" :xs="24">
-              <el-form-item label="默认参数">
-                <JsonEditorVue class="vueJsonEditor" v-model="form.default_param" @blur="validate" />
-                <!-- <el-input v-model="form.default_param" clearable type="textarea" :rows="8"></el-input> -->
+              <el-form-item label="测试参数">
+                <JsonEditorVue class="vueJsonEditor" v-model="form.test_param" @blur="validate" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="24" :sm="24" :xs="24">
+              <el-form-item label="图表配置">
+                <el-input v-model="form.echart_options" clearable type="textarea" :rows="8"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -66,7 +70,6 @@ export default {
       },
       visible: false,
       isSaveing: false,
-      default_param:{},
       selectionFilters: [],
       setFiltersVisible: false,
       belong_dept_options: []
@@ -133,6 +136,7 @@ export default {
 </script>
 
 <style>
-.vueJsonEditor{
+.vueJsonEditor {
   width: 100%;
-}</style>
+}
+</style>
diff --git a/src/views/statistics/pass_num.vue b/src/views/statistics/pass_num.vue
index 2efff321..91cd0240 100644
--- a/src/views/statistics/pass_num.vue
+++ b/src/views/statistics/pass_num.vue
@@ -3,30 +3,14 @@
 		<el-header>
 			<div class="right-panel">
 				<el-select v-model="queryType" @change="queryTypeChange">
-					<el-option v-for="item in typeOptions" 
-					:key="item" 
-					:label="item" 
-					:value="item"
-					>
+					<el-option v-for="item in typeOptions" :key="item" :label="item" :value="item">
 					</el-option>
 				</el-select>
-				<el-date-picker
-					v-if="queryType=='月'"
-					v-model="queryDate"
-					type="month"
-					placeholder="查询月期"
-					value-format="YYYY-MM"
-					style="width:100%"
-				>
+				<el-date-picker v-if="queryType == '月'" v-model="queryDate" type="month" placeholder="查询月期"
+					value-format="YYYY-MM" style="width:100%">
 				</el-date-picker>
-				<el-date-picker
-					v-if="queryType=='年'"
-					v-model="queryDate"
-					type="year"
-					placeholder="查询年份"
-					value-format="YYYY"
-					style="width:100%"
-				>
+				<el-date-picker v-if="queryType == '年'" v-model="queryDate" type="year" placeholder="查询年份"
+					value-format="YYYY" style="width:100%">
 				</el-date-picker>
 				<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
 			</div>
@@ -46,7 +30,7 @@
 								<el-table-column type="index" width="50" />
 								<el-table-column label="物料名" prop="物料名">
 								</el-table-column>
-								<el-table-column label="月份" prop="月" v-if="queryType=='年'">
+								<el-table-column label="月份" prop="月" v-if="queryType == '年'">
 								</el-table-column>
 								<el-table-column label="周" prop="周" v-else>
 								</el-table-column>
@@ -54,8 +38,14 @@
 								</el-table-column>
 								<el-table-column label="型号" prop="型号">
 								</el-table-column>
+								<el-table-column label="生产数" prop="生产数">
+								</el-table-column>
 								<el-table-column label="合格数" prop="合格数">
 								</el-table-column>
+								<el-table-column label="不合格数" prop="不合格数">
+								</el-table-column>
+								<el-table-column label="合格率" prop="合格率">
+								</el-table-column>
 							</el-table>
 						</el-card>
 					</el-col>
@@ -75,7 +65,7 @@
 								<el-table-column type="index" width="50" />
 								<el-table-column label="物料名" prop="物料名">
 								</el-table-column>
-								<el-table-column label="月份" prop="月" v-if="queryType=='年'">
+								<el-table-column label="月份" prop="月" v-if="queryType == '年'">
 								</el-table-column>
 								<el-table-column label="周" prop="周" v-else>
 								</el-table-column>
@@ -83,8 +73,14 @@
 								</el-table-column>
 								<el-table-column label="型号" prop="型号">
 								</el-table-column>
+								<el-table-column label="生产数" prop="生产数">
+								</el-table-column>
 								<el-table-column label="合格数" prop="合格数">
 								</el-table-column>
+								<el-table-column label="不合格数" prop="不合格数">
+								</el-table-column>
+								<el-table-column label="合格率" prop="合格率">
+								</el-table-column>
 							</el-table>
 						</el-card>
 					</el-col>
@@ -104,7 +100,7 @@
 								<el-table-column type="index" width="50" />
 								<el-table-column label="物料名" prop="物料名">
 								</el-table-column>
-								<el-table-column label="月份" prop="月" v-if="queryType=='年'">
+								<el-table-column label="月份" prop="月" v-if="queryType == '年'">
 								</el-table-column>
 								<el-table-column label="周" prop="周" v-else>
 								</el-table-column>
@@ -112,8 +108,14 @@
 								</el-table-column>
 								<el-table-column label="型号" prop="型号">
 								</el-table-column>
+								<el-table-column label="生产数" prop="生产数">
+								</el-table-column>
 								<el-table-column label="合格数" prop="合格数">
 								</el-table-column>
+								<el-table-column label="不合格数" prop="不合格数">
+								</el-table-column>
+								<el-table-column label="合格率" prop="合格率">
+								</el-table-column>
 							</el-table>
 						</el-card>
 					</el-col>
@@ -133,7 +135,7 @@
 								<el-table-column type="index" width="50" />
 								<el-table-column label="物料名" prop="物料名">
 								</el-table-column>
-								<el-table-column label="月份" prop="月" v-if="queryType=='年'">
+								<el-table-column label="月份" prop="月" v-if="queryType == '年'">
 								</el-table-column>
 								<el-table-column label="周" prop="周" v-else>
 								</el-table-column>
@@ -148,342 +150,341 @@
 	</el-container>
 </template>
 <script>
-	import * as echarts from "echarts";
-	import T from '@/components/scEcharts/echarts-theme-T.js';
-	echarts.registerTheme('T', T);
-	import scEcharts from '@/components/scEcharts';
-	function deepCopy(obj) {
-		return JSON.parse(JSON.stringify(obj));
-	}
-	export default {
-		name: 'chart',
-		components: {
-			scEcharts
-		},
-		data() {
-			return {
-				queryType:'月',
-				queryDate:'',
-				start_date:'',
-				end_date:'',
-				currentYear:'',
-				currentMonth:'',
-				xAxisOrigin:[],
-				xAxisData:[],
-				typeOptions:['月','年'],
-				basicOption: {
-					backgroundColor: 'transparent',
-					title: {
-						text: '',
-					},
-					grid: {
-						top: '80px'
-					},
-					tooltip: {
-						trigger: 'axis'
-					},
-					xAxis: {
-						type: 'category',
-						data: []
-					},
-					yAxis: {
-						type: 'value'
-					},
-					lenged:[],
-					series: [{
-						data: [0, 0, 0, 0, 0, 0, 0],
-						stack: 'Ad',
-						type: 'bar',
-						barWidth: '15px',
-					}]
+import * as echarts from "echarts";
+import T from '@/components/scEcharts/echarts-theme-T.js';
+echarts.registerTheme('T', T);
+import scEcharts from '@/components/scEcharts';
+function deepCopy(obj) {
+	return JSON.parse(JSON.stringify(obj));
+}
+export default {
+	name: 'chart',
+	components: {
+		scEcharts
+	},
+	data() {
+		return {
+			queryType: '月',
+			queryDate: '',
+			start_date: '',
+			end_date: '',
+			currentYear: '',
+			currentMonth: '',
+			xAxisOrigin: [],
+			xAxisData: [],
+			typeOptions: ['月', '年'],
+			basicOption: {
+				backgroundColor: 'transparent',
+				title: {
+					text: '',
 				},
-				tableData6:[],
-				tableData7:[],
-				tableData10:[],
-				tableDataAVG:[],
-				firstWeekNum:1,
-				endWeekNum:4,
-				monthList:['一月','二月','三月','四月','五月','六月','七月','八月','九月','十月','十一月','十二月']
+				grid: {
+					top: '80px'
+				},
+				tooltip: {
+					trigger: 'axis'
+				},
+				xAxis: {
+					type: 'category',
+					data: []
+				},
+				yAxis: {
+					type: 'value'
+				},
+				lenged: [],
+				series: [{
+					data: [0, 0, 0, 0, 0, 0, 0],
+					stack: 'Ad',
+					type: 'bar',
+					barWidth: '15px',
+				}]
+			},
+			tableData6: [],
+			tableData7: [],
+			tableData10: [],
+			tableDataAVG: [],
+			firstWeekNum: 1,
+			endWeekNum: 4,
+			monthList: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月']
+		}
+	},
+	mounted() {
+		let that = this;
+		let date = new Date();
+		let year = date.getFullYear();
+		let month = date.getMonth() + 1;
+		let days = new Date(year, month, 0).getDate();
+		that.currentYear = year;
+		that.currentMonth = month;
+		that.start_date = year + '-' + month + '-01';
+		that.end_date = year + '-' + month + '-' + new Date(year, month, 0).getDate();
+		let month1 = month;
+		if (month1 < 10) { month1 = '0' + month1 }
+		that.queryDate = year + '-' + month1;
+		that.firstWeekNum = that.getWeekOfYear(new Date(that.start_date));
+		that.endWeekNum = that.getWeekOfYear(new Date(that.end_date));
+		let duration = that.endWeekNum - that.firstWeekNum + 1;
+		for (let i = 1; i <= duration; i++) {
+			that.xAxisOrigin.push('第' + i + '周');
+		}
+		that.xAxisData = that.xAxisOrigin;
+		that.getData6();
+		that.getData7();
+		that.getData10();
+		that.getDataDAVG();
+	},
+	methods: {
+		setChart(name, option = null) {
+			// 根据name 渲染数据, option需填写，否则option为模拟数据
+			var myChart = echarts.getInstanceByDom(document.getElementById(name));
+			if (myChart == undefined) {
+				myChart = echarts.init(document.getElementById(name), 'T');
 			}
-		},
-		mounted(){
-			let that =this;
-			let date = new Date();
-			let year = date.getFullYear();
-			let month = date.getMonth()+1;
-			let days = new Date(year, month, 0).getDate();
-			that.currentYear = year;
-			that.currentMonth = month;
-			that.start_date =year+'-'+month+'-01';
-			that.end_date = year+'-'+month+'-'+new Date(year, month, 0).getDate();
-			let month1=month;
-			if(month1<10){month1='0'+month1}
-			that.queryDate = year+'-'+month1;
-			that.firstWeekNum = that.getWeekOfYear(new Date(that.start_date));
-			that.endWeekNum = that.getWeekOfYear(new Date(that.end_date));
-			let duration = that.endWeekNum - that.firstWeekNum + 1;
-			for(let i =1;i<=duration;i++ ){
-				that.xAxisOrigin.push('第'+i+'周');
+			if (option == null) {
+				option = Object.assign({}, this.basicOption)
 			}
-			that.xAxisData = that.xAxisOrigin;
-			that.getData6();
-			that.getData7();
-			that.getData10();
-			that.getDataDAVG();
+			setTimeout(() => {
+				try {
+					myChart.setOption(option);
+				} catch (error) { }
+			}, 500)
 		},
-		methods:{
-			setChart(name, option = null) {
-				// 根据name 渲染数据, option需填写，否则option为模拟数据
-				var myChart = echarts.getInstanceByDom(document.getElementById(name));
-				if (myChart == undefined) {
-					myChart = echarts.init(document.getElementById(name), 'T');
-				}
-				if (option == null) {
-					option = Object.assign({}, this.basicOption)
-				}
-				setTimeout(() => {
-					try {
-						myChart.setOption(option);
-					} catch (error) { }
-				}, 500)
-			},
-			queryTypeChange(value){
-				console.log(value)
-				this.queryDate = '';
-			},
-			getWeekOfYear(date) {
-				var target = new Date(date.getFullYear(), date.getMonth(), date.getDate()); // 创建目标日期对象
-				var firstDayOfYear = new Date(target.getFullYear(), 0, 1); // 创建当前年份第一天的日期对象
-				if(target.getTime()==firstDayOfYear.getTime()){
-					return 1;
-				}else{
-					return Math.ceil((target - firstDayOfYear + 8 * (firstDayOfYear.getTimezoneOffset() / 480)) / 604800000);
-				}
-				 // 计算两者之间相隔的周数并返回结果
-			},
-			getData6(){
-				let that = this;
-				let option = deepCopy(that.basicOption);
-				option.xAxis.data = that.xAxisData;
-				option.title.text = '6车间';
-				let exec = that.queryType=='月'?'productStatisticWeek':'productStatisticYear';
-				let obj = {
-					query: { start_date: that.start_date, end_date: that.end_date, dept_name: "6车间" },
-				};
-				that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
-					// console.log('6生产车间统计:',res);
-					let tableData6 =  res.data2.ds0?res.data2.ds0:[];
-					that.tableData6 = tableData6;
-					if(tableData6.length>0){
-						option.series = [];
-						let seriesData = [],nameList = [];
-						tableData6.forEach(ite=>{
-							if(nameList.indexOf(ite.物料名)>-1){}else{
-								nameList.push(ite.物料名);
-								seriesData.push([])
-							}
-						})
-						if(that.queryType=='月'){
-							tableData6.forEach(item => {
-								let indexX = nameList.indexOf(item.物料名);
-								let indexY = item.周-that.firstWeekNum;
-								seriesData[indexX][indexY]=item.合格数;
-							});
-						}else{
-							tableData6.forEach(item => {
-								let indexX = nameList.indexOf(item.物料名);
-								let indexY = item.month-1;
-								seriesData[indexX][indexY]=item.合格数;
-							});
+		queryTypeChange(value) {
+			console.log(value)
+			this.queryDate = '';
+		},
+		getWeekOfYear(date) {
+			var target = new Date(date.getFullYear(), date.getMonth(), date.getDate()); // 创建目标日期对象
+			var firstDayOfYear = new Date(target.getFullYear(), 0, 1); // 创建当前年份第一天的日期对象
+			if (target.getTime() == firstDayOfYear.getTime()) {
+				return 1;
+			} else {
+				return Math.ceil((target - firstDayOfYear + 8 * (firstDayOfYear.getTimezoneOffset() / 480)) / 604800000);
+			}
+			// 计算两者之间相隔的周数并返回结果
+		},
+		getData6() {
+			let that = this;
+			let option = deepCopy(that.basicOption);
+			option.xAxis.data = that.xAxisData;
+			option.title.text = '6车间';
+			let exec = that.queryType == '月' ? 'lineWeek' : 'lineMonth';
+			let obj = {
+				query: { start_date: that.start_date, end_date: that.end_date, dept_name: "6车间" },
+			};
+			that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
+				// console.log('6生产车间统计:',res);
+				let tableData6 = res.data2.ds0 ? res.data2.ds0 : [];
+				that.tableData6 = tableData6;
+				if (tableData6.length > 0) {
+					option.series = [];
+					let seriesData = [], nameList = [];
+					tableData6.forEach(ite => {
+						if (nameList.indexOf(ite.物料名) > -1) { } else {
+							nameList.push(ite.物料名);
+							seriesData.push([])
 						}
-						for(let n=0;n<seriesData.length;n++){
-							let obj = {};
-							obj.name= nameList[n];
-							obj.stack= 'Ad';
-							obj.type= 'bar';
-							obj.barWidth= '15px';
-							obj.data= seriesData[n];
-							option.series.push(obj)
-						}
-						that.setChart("bachart3", option);
-					}else{
-						that.setChart("bachart3", option);
-					}
-				});
-			},
-			getData7(){
-				let that = this;
-				let obj = {
-					query: { start_date: that.start_date, end_date: that.end_date, dept_name: "7车间" },
-				};
-				let option = deepCopy(that.basicOption);
-				option.xAxis.data = that.xAxisData;
-				option.title.text = '预制棒（7车间）';
-				let exec = that.queryType=='月'?'lineWeek':'lineMonth';
-				that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
-					console.log('7生产车间统计:',res);
-					let tableData7 =  res.data2.ds0?res.data2.ds0:[];
-					that.tableData7 = tableData7;
-					debugger;
-					if(tableData7.length>0){
-						debugger;
-						option.series = [];
-						let seriesData = [],nameList = [];
-						tableData7.forEach(ite=>{
-							if(nameList.indexOf(ite.物料名)>-1){}else{
-								nameList.push(ite.物料名);
-								seriesData.push([])
-							}
-						})
-						tableData7.forEach(item => {
-							let indexX=0,indexY=0;
-							if(that.queryType=='月'){
-								indexX = nameList.indexOf(item.物料名);
-								indexY = item.周-that.firstWeekNum;
-							}else{
-								indexX = nameList.indexOf(item.物料名);
-								indexY = item.月-1;
-							}
-							seriesData[indexX][indexY]=item.合格数;
+					})
+					if (that.queryType == '月') {
+						tableData6.forEach(item => {
+							let indexX = nameList.indexOf(item.物料名);
+							let indexY = item.周 - that.firstWeekNum;
+							seriesData[indexX][indexY] = item.合格数;
 						});
-						for(let n=0;n<seriesData.length;n++){
-							let obj = {};
-							obj.name= nameList[n];
-							obj.stack= 'Ad';
-							obj.type= 'bar';
-							obj.barWidth= '15px';
-							obj.data= seriesData[n];
-							option.series.push(obj)
-						}
-						that.setChart("bachart1", option);
-					}else{
-						that.setChart("bachart1", option);
-					}
-				});
-			},
-			getData10(){
-				let that = this;
-				let option = deepCopy(that.basicOption);
-				option.xAxis.data = that.xAxisData;
-				option.title.text = '预制管（10车间）';
-				let obj = {
-					query: { start_date: that.start_date, end_date: that.end_date, dept_name: "10车间" },
-				};
-				let exec = that.queryType=='月'?'lineWeek':'lineMonth';
-				that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
-					// console.log('10生产车间统计:',res);
-					let tableData10 = res.data2.ds0?res.data2.ds0:[];
-					that.tableData10 = tableData10;
-					if(tableData10.length>0){
-						option.series = [];
-						let seriesData = [],nameList = [];
-						tableData10.forEach(ite=>{
-							if(nameList.indexOf(ite.物料名)>-1){}else{
-								nameList.push(ite.物料名);
-								seriesData.push([])
-							}
-						})
-						tableData10.forEach(item => {
-							let indexX=0,indexY=0;
-							if(that.queryType=='月'){
-								indexX = nameList.indexOf(item.物料名);
-								indexY = item.周-that.firstWeekNum;
-							}else{
-								indexX = nameList.indexOf(item.物料名);
-								indexY = item.月-1;
-							}
-							seriesData[indexX][indexY]=item.合格数;
+					} else {
+						tableData6.forEach(item => {
+							let indexX = nameList.indexOf(item.物料名);
+							let indexY = item.month - 1;
+							seriesData[indexX][indexY] = item.合格数;
 						});
-						for(let n=0;n<seriesData.length;n++){
-							let obj = {};
-							obj.name= nameList[n];
-							obj.stack= 'Ad';
-							obj.type= 'bar';
-							obj.barWidth= '15px';
-							obj.data= seriesData[n];
-							option.series.push(obj)
-						}
-						that.setChart("bachart2", option);
-					}else{
-						that.setChart("bachart2", option);
 					}
-				});
-			},
-			getDataDAVG(){
-				let that = this;
-				let option = deepCopy(that.basicOption);
-				option.xAxis.data = that.xAxisData;
-				option.title.text = 'AVG';
-				let obj = {
-					query: { start_date: that.start_date, end_date: that.end_date},
-				};
-				let exec = that.queryType=='月'?'AVGWeek':'AVGMonth';
-				that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
-					// console.log('AVG统计:',res);
-					let tableDataAVG =  res.data2.ds0?res.data2.ds0:[];
-					let seriesData = [];
-					if(tableDataAVG.length>0){
-						tableDataAVG.forEach(item => {
-							let index=0;
-							if(that.queryType=='月'){
-								index = item.month-1;
-							}else{
-								index = item.周-that.firstWeekNum;
-							}
-							seriesData[index]=item.合格数;
-						});
+					for (let n = 0; n < seriesData.length; n++) {
 						let obj = {};
-						obj.name= 'AVG';
-						obj.type= 'bar';
-						obj.barWidth= '15px';
-						obj.data= seriesData;
+						obj.name = nameList[n];
+						obj.stack = 'Ad';
+						obj.type = 'bar';
+						obj.barWidth = '15px';
+						obj.data = seriesData[n];
 						option.series.push(obj)
-						that.setChart("bachart4", option);
-					}else{
-						that.setChart("bachart4", option);
 					}
-				});
-			},
-			handleQuery(){
-				let that = this;
-				if(this.queryType=='月'){
-					if(this.queryDate!==''&&this.queryDate!==null){
-						this.start_date =this.queryDate+'-01';
-						let arr = this.queryDate.split('-');
-						this.end_date = this.queryDate+'-'+new Date(arr[0], arr[1], 0).getDate();
-						this.firstWeekNum = this.getWeekOfYear(new Date(this.start_date));
-						this.endWeekNum = this.getWeekOfYear(new Date(this.end_date));
-						let duration = this.endWeekNum - this.firstWeekNum + 1;
-						let xAxisData = [];
-						for(let i =1;i<=duration;i++ ){
-							xAxisData.push('第'+i+'周');
-						}
-						that.xAxisData = xAxisData;
-					}else{
-						this.start_date =this.currentYear+'-'+this.currentMonth+'-01';
-						this.end_date = this.currentYear+'-'+this.currentMonth+'-'+new Date(this.currentYear, this.currentMonth, 0).getDate();
-						let date = new Date(this.start_date);
-						this.firstWeekNum = this.getWeekOfYear(date);
-						this.xAxisData = this.xAxisOrigin;
-					}
-				}else{
-					if(this.queryDate!==''&&this.queryDate!==null){
-						this.start_date = this.queryDate+'-01-01';
-						this.end_date = this.queryDate+'-12-31';
-					}else{
-						this.start_date = this.currentYear+'-01-01';
-						this.end_date = this.currentYear+'-12-31';
-					}
-					that.xAxisData = that.monthList;
+					that.setChart("bachart3", option);
+				} else {
+					that.setChart("bachart3", option);
 				}
-				this.getData6();
-				this.getData7();
-				this.getData10();
-				this.getDataDAVG();
-			},
+			});
 		},
-	}
+		getData7() {
+			let that = this;
+			let obj = {
+				query: { start_date: that.start_date, end_date: that.end_date, dept_name: "7车间" },
+			};
+			let option = deepCopy(that.basicOption);
+			option.xAxis.data = that.xAxisData;
+			option.title.text = '预制棒（7车间）';
+			let exec = that.queryType == '月' ? 'lineWeek' : 'lineMonth';
+			that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
+				console.log('7生产车间统计:', res);
+				let tableData7 = res.data2.ds0 ? res.data2.ds0 : [];
+				that.tableData7 = tableData7;
+				debugger;
+				if (tableData7.length > 0) {
+					debugger;
+					option.series = [];
+					let seriesData = [], nameList = [];
+					tableData7.forEach(ite => {
+						if (nameList.indexOf(ite.物料名) > -1) { } else {
+							nameList.push(ite.物料名);
+							seriesData.push([])
+						}
+					})
+					tableData7.forEach(item => {
+						let indexX = 0, indexY = 0;
+						if (that.queryType == '月') {
+							indexX = nameList.indexOf(item.物料名);
+							indexY = item.周 - that.firstWeekNum;
+						} else {
+							indexX = nameList.indexOf(item.物料名);
+							indexY = item.月 - 1;
+						}
+						seriesData[indexX][indexY] = item.合格数;
+					});
+					for (let n = 0; n < seriesData.length; n++) {
+						let obj = {};
+						obj.name = nameList[n];
+						obj.stack = 'Ad';
+						obj.type = 'bar';
+						obj.barWidth = '15px';
+						obj.data = seriesData[n];
+						option.series.push(obj)
+					}
+					that.setChart("bachart1", option);
+				} else {
+					that.setChart("bachart1", option);
+				}
+			});
+		},
+		getData10() {
+			let that = this;
+			let option = deepCopy(that.basicOption);
+			option.xAxis.data = that.xAxisData;
+			option.title.text = '预制管（10车间）';
+			let obj = {
+				query: { start_date: that.start_date, end_date: that.end_date, dept_name: "10车间" },
+			};
+			let exec = that.queryType == '月' ? 'lineWeek' : 'lineMonth';
+			that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
+				// console.log('10生产车间统计:',res);
+				let tableData10 = res.data2.ds0 ? res.data2.ds0 : [];
+				that.tableData10 = tableData10;
+				if (tableData10.length > 0) {
+					option.series = [];
+					let seriesData = [], nameList = [];
+					tableData10.forEach(ite => {
+						if (nameList.indexOf(ite.物料名) > -1) { } else {
+							nameList.push(ite.物料名);
+							seriesData.push([])
+						}
+					})
+					tableData10.forEach(item => {
+						let indexX = 0, indexY = 0;
+						if (that.queryType == '月') {
+							indexX = nameList.indexOf(item.物料名);
+							indexY = item.周 - that.firstWeekNum;
+						} else {
+							indexX = nameList.indexOf(item.物料名);
+							indexY = item.月 - 1;
+						}
+						seriesData[indexX][indexY] = item.合格数;
+					});
+					for (let n = 0; n < seriesData.length; n++) {
+						let obj = {};
+						obj.name = nameList[n];
+						obj.stack = 'Ad';
+						obj.type = 'bar';
+						obj.barWidth = '15px';
+						obj.data = seriesData[n];
+						option.series.push(obj)
+					}
+					that.setChart("bachart2", option);
+				} else {
+					that.setChart("bachart2", option);
+				}
+			});
+		},
+		getDataDAVG() {
+			let that = this;
+			let option = deepCopy(that.basicOption);
+			option.xAxis.data = that.xAxisData;
+			option.title.text = 'AVG';
+			let obj = {
+				query: { start_date: that.start_date, end_date: that.end_date },
+			};
+			let exec = that.queryType == '月' ? 'AVGWeek' : 'AVGMonth';
+			that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
+				// console.log('AVG统计:',res);
+				let tableDataAVG = res.data2.ds0 ? res.data2.ds0 : [];
+				let seriesData = [];
+				if (tableDataAVG.length > 0) {
+					tableDataAVG.forEach(item => {
+						let index = 0;
+						if (that.queryType == '月') {
+							index = item.month - 1;
+						} else {
+							index = item.周 - that.firstWeekNum;
+						}
+						seriesData[index] = item.合格数;
+					});
+					let obj = {};
+					obj.name = 'AVG';
+					obj.type = 'bar';
+					obj.barWidth = '15px';
+					obj.data = seriesData;
+					option.series.push(obj)
+					that.setChart("bachart4", option);
+				} else {
+					that.setChart("bachart4", option);
+				}
+			});
+		},
+		handleQuery() {
+			let that = this;
+			if (this.queryType == '月') {
+				if (this.queryDate !== '' && this.queryDate !== null) {
+					this.start_date = this.queryDate + '-01';
+					let arr = this.queryDate.split('-');
+					this.end_date = this.queryDate + '-' + new Date(arr[0], arr[1], 0).getDate();
+					this.firstWeekNum = this.getWeekOfYear(new Date(this.start_date));
+					this.endWeekNum = this.getWeekOfYear(new Date(this.end_date));
+					let duration = this.endWeekNum - this.firstWeekNum + 1;
+					let xAxisData = [];
+					for (let i = 1; i <= duration; i++) {
+						xAxisData.push('第' + i + '周');
+					}
+					that.xAxisData = xAxisData;
+				} else {
+					this.start_date = this.currentYear + '-' + this.currentMonth + '-01';
+					this.end_date = this.currentYear + '-' + this.currentMonth + '-' + new Date(this.currentYear, this.currentMonth, 0).getDate();
+					let date = new Date(this.start_date);
+					this.firstWeekNum = this.getWeekOfYear(date);
+					this.xAxisData = this.xAxisOrigin;
+				}
+			} else {
+				if (this.queryDate !== '' && this.queryDate !== null) {
+					this.start_date = this.queryDate + '-01-01';
+					this.end_date = this.queryDate + '-12-31';
+				} else {
+					this.start_date = this.currentYear + '-01-01';
+					this.end_date = this.currentYear + '-12-31';
+				}
+				that.xAxisData = that.monthList;
+			}
+			this.getData6();
+			this.getData7();
+			this.getData10();
+			this.getDataDAVG();
+		},
+	},
+}
 </script>
 
-<style>
-</style>
+<style></style>
diff --git a/src/views/statistics/ppass_num.vue b/src/views/statistics/ppass_num.vue
index fa82e0b6..995f9df5 100644
--- a/src/views/statistics/ppass_num.vue
+++ b/src/views/statistics/ppass_num.vue
@@ -34,6 +34,10 @@
 							</el-table-column>
 							<el-table-column label="合格数" prop="合格数">
 							</el-table-column>
+							<el-table-column label="完成进度" prop="完成进度">
+							</el-table-column>
+							<el-table-column label="合格率" prop="合格率">
+							</el-table-column>
 						</el-table>
 					</el-card>
 				</el-col>
diff --git a/src/views/statistics/user_statistics.vue b/src/views/statistics/user_statistics.vue
index bf9547f3..c1968c03 100644
--- a/src/views/statistics/user_statistics.vue
+++ b/src/views/statistics/user_statistics.vue
@@ -2,24 +2,12 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
-				<el-select 
-				v-model="queryBelongDept" 
-				clearable 
-				style="width:200px"
-				placeholder="请选择部门">
-					<el-option v-for="item in deptData" 
-					:key="item.id" 
-					:label="item.name" 
-					:value="item.name">
+				<el-select v-model="queryBelongDept" clearable style="width:200px" placeholder="请选择部门">
+					<el-option v-for="item in deptData" :key="item.id" :label="item.name" :value="item.name">
 					</el-option>
 				</el-select>
-				<el-date-picker
-					v-model="queryDate"
-					type="month"
-					placeholder="查询月期"
-					value-format="YYYY-MM"
-					style="width:200px"
-				>
+				<el-date-picker v-model="queryDate" type="month" placeholder="查询月期" value-format="YYYY-MM"
+					style="width:200px">
 				</el-date-picker>
 				<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
 			</div>
@@ -46,8 +34,14 @@
 							<el-table-column label="车间">
 								{{ queryBelongDept }}
 							</el-table-column>
+							<el-table-column label="生产数" prop="生产数">
+							</el-table-column>
 							<el-table-column label="合格数" prop="合格数">
 							</el-table-column>
+							<el-table-column label="不合格数" prop="不合格数">
+							</el-table-column>
+							<el-table-column label="合格率" prop="合格率">
+							</el-table-column>
 						</el-table>
 					</el-card>
 				</el-col>
@@ -57,111 +51,110 @@
 </template>
 
 <script>
-	import scEcharts from '@/components/scEcharts';
-	export default {
-		name: 'chart',
-		components: {
-			scEcharts
-		},
-		data() {
-			return {
-				queryBelongDept:'',
-				queryDate:'',
-				start_date:'',
-				end_date:'',
-				currentYear:'',
-				currentMonth:'',
-				deptData:[],
-				tableData:[],
-				option: {
-					title: {
-						text: '人员统计',
-						// subtext: '',
-					},
-					grid: {
-						top: '80px'
-					},
-					tooltip: {
-						trigger: 'axis'
-					},
-					xAxis: {
-						type: 'value',
-						position:'top',
-						axisLine:{
-							show:true
-						}
-					},
-					yAxis: {
-						type: 'category',
-						data: []
-					},
-					series: {
-						data: [],
-						type: 'bar',
-						barWidth: '15px',
+import scEcharts from '@/components/scEcharts';
+export default {
+	name: 'chart',
+	components: {
+		scEcharts
+	},
+	data() {
+		return {
+			queryBelongDept: '',
+			queryDate: '',
+			start_date: '',
+			end_date: '',
+			currentYear: '',
+			currentMonth: '',
+			deptData: [],
+			tableData: [],
+			option: {
+				title: {
+					text: '人员统计',
+					// subtext: '',
+				},
+				grid: {
+					top: '80px'
+				},
+				tooltip: {
+					trigger: 'axis'
+				},
+				xAxis: {
+					type: 'value',
+					position: 'top',
+					axisLine: {
+						show: true
 					}
 				},
-			}
-		},
-		mounted(){
-			let date = new Date();
-			let year = date.getFullYear();
-			let month = date.getMonth()+1;
-			let days = new Date(year, month, 0).getDate();
-			this.currentYear = year;
-			this.currentMonth = month;
-			this.start_date =year+'-'+month+'-01';
-			this.end_date = year+'-'+month+'-'+new Date(year, month, 0).getDate();
-			this.queryDate = year+'-'+month;
-			this.getData();
-			this.getDept();
-		},
-		methods:{
-			getDept() {
-				this.$API.system.dept.list.req({ page: 0,type:'dept'}).then(res=>{
-					this.deptData = res;
-					this.queryBelongDept = res[0].name;
-				});
-			},
-			queryTypeChange(value){
-				this.queryDate = '';
-			},
-			getData(){
-				let that = this;
-				let obj = {
-					query: { start_date: this.start_date, end_date: this.end_date, dept_name:this.queryBelongDept },
-				};
-				that.$API.bi.dataset.exec.req('performance', obj).then((res) => {
-					console.log('绩效统计:',res);
-					let data = res.data2.ds0;
-					let seriesData = [],yAxisData=[];
-					data.forEach(item=>{
-						seriesData.push(item.合格数);
-						yAxisData.push(item.操作人);
-					})
-					console.log(yAxisData)
-					console.log(seriesData)
-					console.log(data)
-					that.tableData = data;
-					that.option.yAxis.data = yAxisData;
-					that.option.series.data = seriesData;
-				});
-			},
-			handleQuery(){
-				if(this.queryDate!==''){
-					this.start_date =this.queryDate+'-01';
-						let arr = this.queryDate.split('-');
-						this.end_date = this.queryDate+'-'+new Date(arr[0], arr[1], 0).getDate();
-				}else{
-					this.start_date =this.currentYear+'-'+this.currentMonth+'-01';
-					this.end_date = this.currentYear+'-'+this.currentMonth+'-'+new Date(this.currentYear, this.currentMonth, 0).getDate();
+				yAxis: {
+					type: 'category',
+					data: []
+				},
+				series: {
+					data: [],
+					type: 'bar',
+					barWidth: '15px',
 				}
-				console.log('查询query',this.start_date,this.end_date)
-				this.getData();
 			},
+		}
+	},
+	mounted() {
+		let date = new Date();
+		let year = date.getFullYear();
+		let month = date.getMonth() + 1;
+		let days = new Date(year, month, 0).getDate();
+		this.currentYear = year;
+		this.currentMonth = month;
+		this.start_date = year + '-' + month + '-01';
+		this.end_date = year + '-' + month + '-' + new Date(year, month, 0).getDate();
+		this.queryDate = year + '-' + month;
+		this.getData();
+		this.getDept();
+	},
+	methods: {
+		getDept() {
+			this.$API.system.dept.list.req({ page: 0, type: 'dept' }).then(res => {
+				this.deptData = res;
+				this.queryBelongDept = res[0].name;
+			});
 		},
-	}
+		queryTypeChange(value) {
+			this.queryDate = '';
+		},
+		getData() {
+			let that = this;
+			let obj = {
+				query: { start_date: this.start_date, end_date: this.end_date, dept_name: this.queryBelongDept },
+			};
+			that.$API.bi.dataset.exec.req('performance', obj).then((res) => {
+				console.log('绩效统计:', res);
+				let data = res.data2.ds0;
+				let seriesData = [], yAxisData = [];
+				data.forEach(item => {
+					seriesData.push(item.合格数);
+					yAxisData.push(item.操作人);
+				})
+				console.log(yAxisData)
+				console.log(seriesData)
+				console.log(data)
+				that.tableData = data;
+				that.option.yAxis.data = yAxisData;
+				that.option.series.data = seriesData;
+			});
+		},
+		handleQuery() {
+			if (this.queryDate !== '') {
+				this.start_date = this.queryDate + '-01';
+				let arr = this.queryDate.split('-');
+				this.end_date = this.queryDate + '-' + new Date(arr[0], arr[1], 0).getDate();
+			} else {
+				this.start_date = this.currentYear + '-' + this.currentMonth + '-01';
+				this.end_date = this.currentYear + '-' + this.currentMonth + '-' + new Date(this.currentYear, this.currentMonth, 0).getDate();
+			}
+			console.log('查询query', this.start_date, this.end_date)
+			this.getData();
+		},
+	},
+}
 </script>
 
-<style>
-</style>
+<style></style>