Explorar o código

1.样本库-故障未完成;2.新增样本库菜单;3.改马厂湖点位

mw_666 %!s(int64=3) %!d(string=hai) anos
pai
achega
53429aa5f6

+ 19 - 4
src/router/index.js

@@ -775,10 +775,25 @@ component:() => import("../views/MalfunctionWarning/MalfunctionWarning.vue")
 	name: "boosterAlarm",
 	component: () => import("../views/alarmCenter/boosterAlarm.vue")
 },
-{//样本库,基础库,知识库
-	path: "/others/otherComponent",
-	name: "otherComponent",
-	component: () => import("../views/Others/otherComponent.vue")
+{//故障样本库
+	path: "/others/gz",
+	name: "gz",
+	component: () => import("../views/Others/gz.vue")
+},
+{//性能样本库
+	path: "/others/xn",
+	name: "xn",
+	component: () => import("../views/Others/xn.vue")
+},
+{//预警样本库
+	path: "/others/yj",
+	name: "yj",
+	component: () => import("../views/Others/yj.vue")
+},
+{//智能样本库
+	path: "/others/zn",
+	name: "zn",
+	component: () => import("../views/Others/zn.vue")
 },
 // 报警中心-SCADA报警
 {

+ 443 - 128
src/views/Others/gz.vue

@@ -1,22 +1,32 @@
 <template>
-	<el-scrollbar :height="height" v-if="gzCgd == 1">
+	<el-scrollbar height="92vh" v-if="gzCgd == 1">
 		<div class="query mg-b-8">
 			<div class="query-items">
 				<div class="query-item">
-					<div class="lable">部件:</div>
+					<div class="lable">场站:</div>
 					<div class="search-input">
-						<el-select v-model="value1" clearable placeholder="请选择" popper-class="select" multiple>
+						<el-select v-model="station" placeholder="请选择" popper-class="select">
+							<el-option v-for="item in ChangZhan" :key="item.id" :value="item.id" :label="item.name">
+							</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="请选择"
+							popper-class="select">
 							<el-option v-for="item in BuJian" :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="lable">风机型号:</div>
 					<div class="search-input">
-						<el-select v-model="value2" multiple placeholder="请选择" popper-class="select">
-							<el-option v-for="item in TingJiLeiXing" :key="item.value" :value="item.value"
-								:label="item.label">
+						<el-select v-model="model" multiple collapse-tags clearable placeholder="请选择"
+							popper-class="select">
+							<el-option v-for="item in fjxh" :key="item.value" :value="item.value" :label="item.label">
 							</el-option>
 						</el-select>
 					</div>
@@ -24,8 +34,8 @@
 				<div class="query-item">
 					<div class="lable">时间:</div>
 					<div class="search-input">
-						<el-date-picker v-model="value3" type="datetimerange" range-separator="至"
-							start-placeholder="开始日期" end-placeholder="结束日期">
+						<el-date-picker v-model="time" type="datetimerange" range-separator="至" start-placeholder="开始日期"
+							end-placeholder="结束日期">
 						</el-date-picker>
 					</div>
 				</div>
@@ -37,47 +47,72 @@
 		</div>
 		<el-row :type="'flex'" class="content">
 			<el-col :span="24">
-				<ComTable :data="tableData" :pageSize="pageSize" @onPagging="onChangePage" height="84vh" v-loading="tableLoading"
-					element-loading-text="拼命加载中" element-loading-background="rgba(0, 0, 0, 0.8)"></ComTable>
+				<ComTable :data="tableData" :pageSize="pageSize" @onPagging="onChangePage" height="84vh"
+					v-loading="tableLoading" element-loading-text="拼命加载中"
+					element-loading-background="rgba(0, 0, 0, 0.8)"></ComTable>
 			</el-col>
 		</el-row>
 		<el-dialog :title="isvisiableType==1?'新增':'编辑'" v-model="isvisiable" width="45%" top="15vh" custom-class="modal"
-			:close-on-click-modal="false" :before-close="onClickDialogClose">
+			:close-on-click-modal="false" :before-close="onClickDialogClose" class="isvisiable">
 			<!-- 这里是新增或编辑 -->
-			<el-row type="flex">
+			<el-row type="flex" class="mb10">
 				<el-col :span="12">
-					字段1:
-					<el-input placeholder="请选择日期" v-model="myInput1" :value="myInput1">
-					</el-input>
+					<div>样本:</div>
+					<el-select v-model="tableTag" placeholder="请选择样本" popper-class="select" class="w">
+						<el-option v-for="item in tableTagArr" :key="item.value" :value="item.value" :label="item.label">
+						</el-option>
+					</el-select>
 				</el-col>
 				<el-col :span="12">
-					字段2:
-					<el-input placeholder="请选择日期" v-model="myInput2" :value="myInput2">
-					</el-input>
+					<div>风机型号:</div>
+					<el-select v-model="tableModel" placeholder="请选择风机型号" popper-class="select" class="w">
+						<el-option v-for="item in fjxh" :key="item.value" :value="item.value" :label="item.label">
+						</el-option>
+					</el-select>
 				</el-col>
 			</el-row>
-			<el-row type="flex">
+			<el-row type="flex" class="mb10">
+				<el-col :span="12">
+					<div>故障:</div>
+					<el-select v-model="tableFaulttype" placeholder="请选择故障" popper-class="select" class="w">
+						<el-option v-for="item in BuJian" :key="item.value" :value="item.value" :label="item.label">
+						</el-option>
+					</el-select>
+				</el-col>
 				<el-col :span="12">
-					字段3:
-					<el-input placeholder="请选择日期" v-model="myInput3" :value="myInput3">
+					<div>时间:</div>
+					<el-date-picker v-model="tableTime" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" class="w"> </el-date-picker>
+				</el-col>
+			</el-row>
+			<el-row type="flex" class="mb10">
+				<el-col :span="12">
+					<div>故障原因:</div>
+					<el-input placeholder="请输入故障原因" v-model="tableSymptom" :value="tableSymptom">
 					</el-input>
 				</el-col>
 				<el-col :span="12">
-					字段4:
-					<el-input placeholder="请选择日期" v-model="myInput4" :value="myInput4">
+					<div>风机厂商:</div>
+					<el-input placeholder="请输入风机厂商" v-model="tableManufacturer" :value="tableManufacturer">
+					</el-input>
+				</el-col>
+			</el-row>
+			<el-row type="flex" class="mb10">
+				<el-col :span="12">
+					<div>风机编号:</div>
+					<el-input placeholder="请输入风机编号" v-model="tableWindturbineid" :value="tableWindturbineid">
 					</el-input>
 				</el-col>
 			</el-row>
 			<el-row type="flex" justify="end">
 				<div class="query-actions" style="margin-top: 15px;">
 					<button class="btn" @click="onClickDialogClose">取消</button>
-					<button class="btn" @click="dialogSave()">保存</button>
+					<button class="btn" @click="dialogSave">保存</button>
 				</div>
 			</el-row>
 		</el-dialog>
 	</el-scrollbar>
-	<el-scrollbar :height="height" v-else>
-		<Cgd :data='gzCgdData' @gzCgdClick='gzCgdClick'/>
+	<el-scrollbar height="92vh" v-else>
+		<Cgd :data='gzCgdData' @gzCgdClick='gzCgdClick' />
 	</el-scrollbar>
 </template>
 
@@ -92,10 +127,19 @@
 		data() {
 			const that = this;
 			return {
+				tableTagArr:[{
+					label: '正样本',
+					value: 0
+				},
+				{
+					label: '负样本',
+					value: 1
+				}],
+				queryType: false, //没有改变select时,点击查询无效
 				pageIndex: 1,
-				            pageSize: 20,
-				gzCgd:1,//传感点组件隐藏或显示
-				gzCgdData:'',//传感点参数
+				pageSize: 20,
+				gzCgd: 1, //传感点组件隐藏或显示
+				gzCgdData: '', //传感点参数
 				BuJian: [{
 					label: '部件1',
 					value: '1'
@@ -103,20 +147,35 @@
 					label: '部件2',
 					value: '2'
 				}],
-				TingJiLeiXing: [{
+				ChangZhan: [{
+					label: '麻黄山风电场',
+					value: 'MHS_FDC'
+				}],
+				fjxh: [{
 					label: '类型1',
 					value: '1'
-				}, {
-					label: '类型2',
-					value: '2'
 				}],
-				value1: '',
-				value2: '',
-				value3: [],
-				myInput1: "",
-				myInput2: "",
-				myInput3: "",
-				myInput4: "",
+				fjxhArr: [{
+					id: "MHS_FDC",
+					value: ['UP77', 'UP82', 'UP105']
+				}],
+				widget: [],
+				model: [],
+				time: [],
+				station: '',
+				tableFaulttype: "",
+				tableTag: "",
+				tableModel: "",
+				tableTime: "",
+				tableSymptom: "",
+				tableManufacturer: "",
+				tableWindturbineid: "",
+				tableCategory: "",//隐藏保存部分
+				tableRemark: "",
+				tableFaultcode: "",
+				tableId: "",
+				tableSymptomcode:"",
+				tableStationen:"",
 				isvisiable: false,
 				isvisiableType: 1, //新增为1,编辑为2
 				tableData: {
@@ -124,31 +183,54 @@
 							name: "序号",
 							field: "index",
 							is_light: false,
+							width: '50px',
+						},
+						{
+							name: "样本",
+							field: "tableTag",
+							is_light: false,
+							width: '100px',
 						},
 						{
-							name: "字段1",
-							field: "myInput1",
+							name: "风机型号",
+							field: "tableModel",
 							is_light: false,
+							width: '150px',
 						},
 						{
-							name: "字段2",
-							field: "myInput2",
+							name: "故障",
+							field: "tableFaulttype",
 							is_light: false,
+							width: '150px',
 						},
 						{
-							name: "字段3",
-							field: "myInput3",
+							name: "时间",
+							field: "tableTime",
 							is_light: false,
+							width: '350px',
 						},
 						{
-							name: "字段4",
-							field: "myInput4",
+							name: "故障原因",
+							field: "tableSymptom",
 							is_light: false,
+							width: '350px',
+						},
+						{
+							name: "风机厂商",
+							field: "tableManufacturer",
+							is_light: false,
+							width: '150px',
+						},
+						{
+							name: "风机编号",
+							field: "tableWindturbineid",
+							is_light: false,
+							width: '150px',
 						},
 						{
 							name: "操作",
 							is_light: false,
-							width: 100,
+							width: '200px',
 							template: () => {
 								return (
 									"<el-button type='text' style='cursor: pointer;' value='edit'>编辑</el-button>&nbsp" +
@@ -162,32 +244,20 @@
 						},
 					],
 					data: [{
-							index: 1,
-							myInput1: "MG01-01",
-							myInput2: "0.1000",
-							myInput3: "0.1000",
-							myInput4: "0.1000",
-							value: '这里放隐藏值1',
-							is_light: false,
-						},
-						{
-							index: 2,
-							myInput1: "MG01-02",
-							myInput2: "2",
-							myInput3: "23",
-							myInput4: "24",
-							value: '这里放隐藏值2',
-							is_light: false,
-						},
-					],
+						index: 1,
+						tableTag: 0,
+						tableFaulttype: "MG01-01",
+						tableModel: "0.1000",
+						tableTime: "0.1000",
+						tableSymptom: "0.1000",
+						tableManufacturer: "0.1000",
+						tableWindturbineid: "0.1000",
+						value: '这里放隐藏值1',
+						is_light: false,
+					}],
 				}
 			};
 		},
-		props: {
-			height: {
-				type: String
-			},
-		},
 		methods: {
 			getTable() {
 				let that = this;
@@ -210,23 +280,6 @@
 								dataTab.push({ //表格
 									recodedata: that.formatTime(item.recodedata),
 									region: item.region,
-									weather: item.weather,
-									maximumtem: item.maximumtem,
-									minimumtem: item.minimumtem,
-									sunrise: item.sunrise,
-									sunset: item.sunset,
-									weather1: item.weather1,
-									weather2: item.weather2,
-									temperature1: item.temperature1,
-									temperature2: item.temperature2,
-									realfeel1: item.realfeel1,
-									realfeel2: item.realfeel2,
-									precipitation1: item.precipitation1,
-									precipitation2: item.precipitation2,
-									winddirection1: item.winddirection1,
-									winddirection2: item.winddirection2,
-									speed1: item.speed1,
-									speed2: item.speed2
 								})
 							})
 							that.tableData.data = dataTab;
@@ -245,48 +298,95 @@
 				this.getTable();
 			},
 			startAjax() {
-				// BuJian
-				// TingJiLeiXing
 				var that = this;
+				// that.time = [new Date((new Date() - 3600 * 1000 * 24 * 30)).formatDate("yyyy-MM-dd"), new Date().formatDate("yyyy-MM-dd")];
+				that.time = [new Date((new Date() - 3600 * 1000 * 24 * 360)).formatDate("yyyy-MM-dd"), new Date().formatDate("yyyy-MM-dd")];
 				that.API.requestData({
 					method: "GET",
 					baseURL: "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/wplist",
 					success(res) {
 						that.ChangZhan = res.data;
+						// that.station = res.data[0].name
+						that.station = res.data[1].name
+					},
+				});
+
+				that.API.requestData({
+					method: "GET",
+					baseURL: "http://192.168.1.18:9002/",
+					subUrl: "basic/widget/condition",
+					success(res) {
+						let keys = Object.keys(res.data[0]);
+						let bujian = [],
+							widget = [];
+						keys.forEach((ele, index) => {
+							bujian.push({
+								label: res.data[0]. [ele],
+								value: ele
+							})
+							widget.push(ele)
+						})
+
+						that.widget = widget;
+						that.BuJian = bujian;
+					},
+				});
+
+				that.API.requestData({
+					method: "GET",
+					baseURL: "http://192.168.1.18:9002/",
+					subUrl: "basic/station/all",
+					success(res) {
+						let fjxhArr = [];
+						let model = [],
+							fjxh = [];
+						res.data.forEach(ele => {
+							fjxhArr.push({
+								id: ele.id,
+								value: ele.model.split("/")
+							})
+							if (ele.id == "MHS_FDC") {
+								model = ele.model.split("/");
+								model.forEach(ele => {
+									fjxh.push({
+										label: ele,
+										value: ele
+									})
+								})
+							}
+						})
+						that.fjxhArr = fjxhArr;
+						that.model = model;
+						that.fjxh = fjxh;
 					},
 				});
 			},
 			query() {
-				var that = this;
-				console.log(that.value1)
-				console.log(that.value2)
-				console.log(that.value3)
-				if(that.value3){
-					that.value3[0].valueOf()//开始时间
-					that.value3[1].valueOf()//结束时间
+				if (this.queryType) {
+					this.list();
 				}
-				
-				// that.API.requestData({
-				// 	method: "GET",
-				// 	baseURL: "http://10.155.32.4:9001/",
-				// 	subUrl: "benchmarking/wplist",
-				// 	success(res) {
-				// 		that.ChangZhan = res.data;
-				// 	},
-				// });
 			},
 			addEdit() {
 				this.isvisiableType = 1;
-				this.myInput1 = '';
-				this.myInput2 = '';
-				this.myInput3 = '';
-				this.myInput4 = '';
+				this.tableFaulttype = '';
+				this.tableModel = '';
+				this.tableTime = '';
+				this.tableSymptom = '';
+				this.tableManufacturer = '';
+				this.tableWindturbineid = '';
+				
+				// this.tableCategory: data[i].category,
+				// this.tableRemark: data[i].remark,
+				// this.tableFaultcode: data[i].faultcode,
+				// this.tableId: data[i].id,
+				// this.tableSymptomcode:data[i].Symptomcode,
+				// this.tableStationen:data[i].stationen
+				
 				this.isvisiable = true;
 			},
 			onClickOption(e, row) { // 操作按钮
 				let that = this;
-				console.log(row.value) //通过这个value去执行相关操作
 				if ("delete" == e.target.getAttribute("value")) {
 					that
 						.$confirm("确认删除此条样本数据?", "提示", {
@@ -301,15 +401,30 @@
 				}
 				if ("edit" == e.target.getAttribute("value")) {
 					that.isvisiableType = 2;
-					that.$nextTick(()=>{
-						that.myInput1 = row.myInput1;
-						that.myInput2 = row.myInput2;
-						that.myInput3 = row.myInput3;
-						that.myInput4 = row.myInput4;
+					that.$nextTick(() => {
+						let tableTime = row.tableTime.split(" - ");
+						that.tableTag = row.tableTag;
+						that.BuJian.forEach(ele => {
+							if (ele.value == row.tableFaultcode) {
+								that.tableFaulttype = ele.label
+							}
+						})
+						that.tableModel = row.tableModel;
+						that.tableTime = [Date.parse(new Date(tableTime[0])),Date.parse(new Date(tableTime[1]))];
+						that.tableSymptom = row.tableSymptom;
+						that.tableManufacturer = row.tableManufacturer;
+						that.tableWindturbineid = row.tableWindturbineid;
+						
+						that.tableCategory= row.tableCategory;
+						that.tableRemark= row.tableRemark;
+						that.tableFaultcode= row.tableFaultcode;
+						that.tableId= row.tableId;
+						that.tableSymptomcode= row.tableSymptomcode;
+						that.tableStationen= row.tableStationen;
 					});
 					that.isvisiable = true;
 				}
-				if ("config" == e.target.getAttribute("value")) {//传感点
+				if ("config" == e.target.getAttribute("value")) { //传感点
 					that.gzCgdData = row.value;
 					that.gzCgd = 2;
 				}
@@ -319,23 +434,223 @@
 				this.isvisiableType = 1;
 			},
 			dialogSave() {
-				console.log(this.myInput1)
-				// myInput1: "",
-				// myInput2: "",
-				// myInput3: "",
-				// myInput4: "",
+				let that = this;
+				let tableTag = '';
+				// if (typeof that.tableTag.valueOf() == 'string') {
+				// 	that.tableTagArr.forEach(ele => {
+				// 		if (ele.label == that.tableTag) {
+				// 			tableTag = ele.value
+				// 		}
+				// 	})
+				// }
+				// console.log(tableTag == ''? that.tableTag : tableTag == 0? tableTag : that.tableTag)
+				
+				
+				
+				// console.log(that.tableTag =="正样本" ? 0 : 1)
+				// console.log(that.tableModel)
+				that.tableTime[0] = that.formatDate(that.tableTime[0].valueOf());
+				that.tableTime[1] = that.formatDate(that.tableTime[1].valueOf());
+				// console.log(that.tableFaulttype)
+				// console.log(that.tableTime)
+				// console.log(that.tableSymptom)
+				// console.log(that.tableManufacturer)
+				// console.log(that.tableWindturbineid)
+				
+				// console.log(that.tableCategory)
+				// console.log(that.tableRemark)
+				// console.log(that.tableFaultcode)
+				// console.log(that.tableId)
+				// console.log(that.tableSymptomcode)
+				// console.log(that.tableStationen)
+				
+				
+				// JSON.stringify({
+				// 	category: that.tableCategory,
+				// 	endtime: that.tableTime[1],
+				// 	faultcode: that.tableFaultcode,
+				// 	faulttype: that.tableFaulttype,
+				// 	id: that.tableId,
+				// 	manufacturer: that.tableManufacturer,
+				// 	model: that.tableModel,
+				// 	remark: that.tableRemark,
+				// 	starttime: that.tableTime[0],
+				// 	stationen: that.tableStationen,
+				// 	symptom: that.tableSymptom,
+				// 	symptomcode: that.tableSymptomcode,
+				// 	tag: that.tableTag =="正样本" ? 0 : 1,
+				// 	windturbineid: that.tableWindturbineid
+				// })
+				
+				let params={
+						category: that.tableCategory,
+						endtime: that.tableTime[1],
+						faultcode: that.tableFaultcode,
+						faulttype: that.tableFaulttype,
+						id: that.tableId,
+						manufacturer: that.tableManufacturer,
+						model: that.tableModel,
+						remark: that.tableRemark,
+						starttime: that.tableTime[0],
+						stationen: that.tableStationen,
+						symptom: that.tableSymptom,
+						symptomcode: that.tableSymptomcode,
+						tag: that.tableTag =="正样本" ? 0 : 1,
+						windturbineid: that.tableWindturbineid
+					}
+					
+					console.log(33333,JSON.stringify(params))
+				
+				that.API.requestData({
+					method: "POST",
+					baseURL: "http://192.168.1.18:9002/",
+					// headers:{
+					// 	'Content-Type': 'application/json;charset=utf-8',
+					// },
+					subUrl: "case/item/edit",
+					data:params,
+					success(res) {
+						console.log(res)
+					},
+				});
 			},
-			gzCgdClick(data){
+			gzCgdClick(data) {
 				this.gzCgd = data;
+			},
+			formatDate(date) {
+				var date = new Date(date);
+				var YY = date.getFullYear() + '-';
+				var MM = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
+				var DD = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate());
+				var hh = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
+				var mm = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
+				var ss = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
+				return YY + MM + DD + " " + hh + mm + ss;
+			},
+			list() {
+				var that = this;
+				let station = '',
+					widget = ''
+				if (typeof that.time[0].valueOf() != 'string') {
+					that.time[0] = that.formatDate(that.time[0].valueOf())
+				}
+				if (typeof that.time[1].valueOf() != 'string') {
+					that.time[1] = that.formatDate(that.time[1].valueOf())
+				}
+				if (typeof that.station.valueOf() == 'string') {
+					that.ChangZhan.forEach(ele => {
+						if (ele.name == that.station) {
+							station = ele.id
+						}
+					})
+				}
+				if (typeof that.widget.valueOf() == 'string') {
+					that.BuJian.forEach(ele => {
+						if (ele.label == that.widget) {
+							widget = ele.value
+						}
+					})
+				}
+				if (that.model.length == 0) {
+					that.BASE.showMsg({
+						type: "warning",
+						msg: "请选择风机型号",
+					});
+					return
+				}
+				if (that.widget.length == 0) {
+					that.BASE.showMsg({
+						type: "warning",
+						msg: "请选择部件",
+					});
+					return
+				}
+				that.API.requestData({
+					showLoading: true,
+					method: "GET",
+					baseURL: "http://192.168.1.18:9002/",
+					subUrl: "case/fault/all",
+					data: {
+						widget: widget ? widget : that.widget,
+						station: station ? station : that.station,
+						model: that.model,
+						st: that.time[0].valueOf(),
+						et: that.time[1].valueOf()
+					},
+					success(res) {
+						if (res.code == 200) {
+							console.log(res)
+							that.tableData.data = [];
+							if (res.data.length) {
+								let data = res.data;
+								for (var i = 0; i < data.length; i++) {
+									let obj = {
+										index: i + 1,
+										tableTag: data[i].tag == 0 ? '正样本' : '负样本',
+										tableFaulttype: data[i].faulttype,
+										tableModel: data[i].model,
+										tableTime: data[i].starttime + ' - ' + data[i].endtime,
+										tableSymptom: data[i].symptom,
+										tableManufacturer: data[i].manufacturer,
+										tableWindturbineid: data[i].windturbineid,
+										
+										tableCategory: data[i].category,
+										tableRemark: data[i].remark,
+										tableFaultcode: data[i].faultcode,
+										tableId: data[i].id,
+										tableSymptomcode:data[i].symptomcode,
+										tableStationen:data[i].stationen
+									};
+									that.tableData.data.push(obj);
+								}
+							}
+						}
+					},
+				});
+			},
+			dialogData(){
+				// this.tableFaulttypeArr
 			}
 		},
 		created() {
-			// this.startAjax();
+			let that = this;
+			that.startAjax();
+			setTimeout(function() {
+				that.list()
+			}, 500)
+		},
+		watch: {
+			station(res) {
+				let fjxh = [];
+				this.fjxhArr.forEach(ele => {
+					if (ele.id == res) {
+						ele.value.forEach(ele2 => {
+							fjxh.push({
+								label: ele2,
+								value: ele2
+							})
+						})
+						this.model = ele.value;
+					}
+				})
+				this.fjxh = fjxh;
+				this.queryType = true;
+			},
+			widget() {
+				this.queryType = true;
+			},
+			model() {
+				this.queryType = true;
+			},
+			time() {
+				this.queryType = true;
+			},
 		},
-		mounted() {},
 	};
 </script>
 
 <style lang="less" scoped>
-	
+	.mb10{margin-bottom: 10px;}
+	.el-select.w{width: 100%;}
+	// .el-range-editor.w{width: 100%;}
 </style>

+ 12 - 9
src/views/Others/otherComponent.vue

@@ -84,19 +84,22 @@
 					this.currTab = a.id;
 				}
 			},
+			treeItem(){
+				this.API.requestData({
+					method: "GET",
+					baseURL: "http://192.168.1.18:9002",
+					subUrl: "/basic/station/all",
+					success(res) {
+						console.log(res)
+					}
+				});
+			}
 		},
 		created() {
-			let that = this;
-			that.API.requestData({
-				method: "GET",
-				baseURL: "http://192.168.10.4:9002/",
-				subUrl: "basic/tables",
-				success(res) {
-					console.log(res)
-				},
-			});
+			
 		},
 		mounted() {
+			this.treeItem();
 			// jq实现的tree默认第一个节点选中
 			$('.el-tree .el-tree-node__children').eq(0).find('.el-tree-node').eq(0).addClass('is-current');
 			$('.el-tree .el-tree-node__children .el-tree-node').click(function(){

+ 2 - 26
src/views/WindSite/components/boosterstation/mch.vue

@@ -822,7 +822,7 @@
 								</text>
 								<text transform="matrix(0.9268 0 0 1 399.4001 419.3252)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.1235">
-									-5
+									-1
 								</text>
 								<text transform="matrix(0.9268 0 0 1 454.9011 419.0723)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.1235">
@@ -974,22 +974,6 @@
 
 								<line fill="none" stroke="#AAAAAA" stroke-width="1.6" stroke-miterlimit="10"
 									x1="443.452" y1="445.257" x2="446.306" y2="445.257"></line>
-								<text transform="matrix(0.9268 0 0 1 456.1941 482.8877)" fill="#FFFFFF"
-									font-family="'MicrosoftYaHei'" font-size="11.1235">
-									-05
-								</text>
-								<rect x="444.206" y="451.9" fill="#CAA51A" width="2.25" height="17.702"></rect>
-								<rect x="422.035" y="451.9" fill="#CAA51A" width="24.139" height="2.25"></rect>
-								<rect x="444.743" y="492.637" fill="#AAAAAA" width="2.855" height="7.871"></rect>
-
-								<line fill="none" stroke="#AAAAAA" stroke-width="1.6" stroke-miterlimit="10"
-									x1="440.407" y1="501.594" x2="451.935" y2="501.594"></line>
-
-								<line fill="none" stroke="#AAAAAA" stroke-width="1.6" stroke-miterlimit="10"
-									x1="442.786" y1="505.234" x2="449.557" y2="505.234"></line>
-
-								<line fill="none" stroke="#AAAAAA" stroke-width="1.6" stroke-miterlimit="10"
-									x1="444.746" y1="509.072" x2="447.6" y2="509.072"></line>
 								<rect x="418.851" y="488.23" fill="#CAA51A" width="2.25" height="19.676"></rect>
 								<path fill="none" stroke="#CAA51A" stroke-width="2.2" stroke-miterlimit="10"
 									d="M409.642,479.065   c0,5.708,4.627,10.334,10.334,10.334s10.334-4.626,10.334-10.334c0-5.707-4.627-10.334-10.334-10.334">
@@ -2796,15 +2780,7 @@
 										<line fill="none" stroke="#AAAAAA" stroke-width="1.5" stroke-miterlimit="10"
 											x1="451.688" y1="410.451" x2="444.875" y2="421.033"></line>
 									</g>
-									<g id="_x31_21-0on_2_">
-										<line fill="none" stroke="#AAAAAA" stroke-width="1.5" stroke-miterlimit="10"
-											x1="437.728" y1="472.156" x2="454.614" y2="472.156"></line>
-										<path fill="#AAAAAA"
-											d="M446.669,485.781c1.434,0,2.602,1.166,2.602,2.604c0,1.434-1.167,2.6-2.602,2.6     c-1.437,0-2.603-1.166-2.603-2.6C444.065,486.948,445.234,485.781,446.669,485.781 M446.669,483.879     c-2.488,0-4.507,2.016-4.507,4.506c0,2.484,2.019,4.504,4.507,4.504c2.485,0,4.506-2.02,4.506-4.504     C451.174,485.895,449.154,483.879,446.669,483.879L446.669,483.879z">
-										</path>
-										<line fill="none" stroke="#AAAAAA" stroke-width="1.5" stroke-miterlimit="10"
-											x1="452.981" y1="474.27" x2="446.171" y2="484.852"></line>
-									</g>
+									
 								</g>
 							</g>
 						</svg>

+ 27 - 0
src/views/layout/Menu.vue

@@ -919,6 +919,33 @@ export default {
                 },
               ],
             },
+			{
+			  text: "样本库",
+			  icon: "svg-预警记录",
+			  path: "/others/gz",
+			  children: [
+			    {
+			      text: "故障样本库",
+			      icon: "svg-matrix",
+			      path: "/others/gz",
+			    },
+			    {
+			      text: "性能下降样本库",
+			      icon: "svg-matrix",
+			      path: "/others/xn",
+			    },
+			    {
+			      text: "预警分析样本库",
+			      icon: "svg-matrix",
+			      path: "/others/yj",
+			    },
+			    {
+			      text: "智能营销样本库",
+			      icon: "svg-matrix",
+			      path: "/others/zn",
+			    }
+			  ],
+			},
           ],
         }
       ],

+ 0 - 1
src/views/warn/czjl.vue

@@ -197,7 +197,6 @@
 									that.tableData.data.push(obj);
 								}
 							}
-
 						}
 					},
 				});