mw_666 3 vuotta sitten
vanhempi
commit
b32c624064

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 32 - 21
src/views/HealthControl/gradeHistory.vue


+ 23 - 1
src/views/malfunctionDiagnose/index.vue

@@ -82,6 +82,8 @@
       </div>
       <div class="query-actions">
         <button class="btn green" @click="search()">查询</button>
+		<button class="btn green" @click="">导入</button>
+		<button class="btn green" @click="export">导出</button>
       </div>
     </div>
     <div class="df-table">
@@ -266,7 +268,6 @@ export default {
         });
       }
     },
-
     // 获取故障诊断树
     getTree(item) {
       let that = this;
@@ -289,6 +290,27 @@ export default {
     search() {
       this.getTableData();
     },
+	formatJson(filterVal, jsonData) {
+		return jsonData.map(v => filterVal.map(j => v[j]));
+	},
+	export() {
+	// 	let that = this;
+	// 	const {export_json_to_excel} = require('@tools/excel/Export2Excel.js'); // 注意这个Export2Excel路径      
+	// 	let tHeader = []; // 上面设置Excel的表格第一行的标题       
+	// 	let filterVal = []; // 上面的index、nickName、name是tableData里对象的属性key值
+	
+	// 	that.tableData.column.forEach(ele => {
+	// 		tHeader.push(ele.name);
+	// 		filterVal.push(ele.field);
+	// 	});
+	// 	var list = [];
+	// 	that.tableData.data.forEach((i, index) => {
+	// 		list.push(i);
+	// 	})
+	// 	list.push(that.tableDataEnd)
+	// 	const data = that.formatJson(filterVal, list);
+	// 	export_json_to_excel(tHeader, data, '导出的Excel'); // 最后一个是表名字
+	},
   },
 
   created() {

+ 9 - 0
src/views/sampleDatabase/fault/index.vue

@@ -12,6 +12,15 @@
 					</div>
 				</div>
 				<div class="query-item">
+					<div class="lable">样本类型:</div>
+					<div class="search-input">
+						<el-select v-model="tableTag" placeholder="请选择样本" popper-class="select">
+							<el-option v-for="item in tableTagArr" :key="item.value" :value="item.value" :label="item.label">
+							</el-option>
+						</el-select>
+					</div>
+				</div>
+				<div class="query-item">
 					<div class="lable">故障分类:</div>
 					<div class="search-input">
 						<el-select v-model="widget" multiple collapse-tags clearable placeholder="请选择"

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 520 - 14
src/views/sampleDatabase/performance/index.vue