mw_666 3 роки тому
батько
коміт
f83d3fcd3a

+ 1 - 1
src/views/Others/gz.vue

@@ -194,7 +194,7 @@
 				this.tableLoading = true;
 				that.API.requestData({
 					method: "GET",
-					baseURL: "http://10.155.32.4:9001/",
+					baseURL: "http://192.168.10.4:9002/",
 					subUrl: "benchmarking/wplist",
 					data: {
 						wpId: that.stationId,

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

@@ -86,7 +86,15 @@
 			},
 		},
 		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() {
 			// jq实现的tree默认第一个节点选中

+ 22 - 33
src/views/WindSite/components/generalappearance/hzj.vue

@@ -3976,8 +3976,8 @@
 								</g>
 							</g>
 						</g>
-						<g id="alldata_1_">
-							<g id="data1">
+						<g id="alldata">
+							<g id="data01">
 								<g>
 									<text transform="matrix(0.9357 0 0 1 24.0903 167.2197)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.1892">data</text>
 									<text transform="matrix(0.9357 0 0 1 24.0903 171.7324)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.1892">data2</text>
@@ -4059,7 +4059,7 @@
 									<text transform="matrix(0.9357 0 0 1 117.5425 265.165)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.1892">data3</text>
 								</g>
 							</g>
-							<g id="data2">
+							<g id="data02">
 								<g>
 									<text transform="matrix(0.9357 0 0 1 166.5703 166.7744)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.1892">data</text>
 									<text transform="matrix(0.9357 0 0 1 166.5703 171.2871)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.1892">data2</text>
@@ -4141,7 +4141,7 @@
 									<text transform="matrix(0.9357 0 0 1 260.0234 264.7197)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.1892">data3</text>
 								</g>
 							</g>
-							<g id="data3">
+							<g id="data03">
 								<g>
 									<text transform="matrix(0.9357 0 0 1 309.8208 166.1826)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.1892">data</text>
 									<text transform="matrix(0.9357 0 0 1 309.8208 170.6953)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.1892">data2</text>
@@ -4223,7 +4223,7 @@
 									<text transform="matrix(0.9357 0 0 1 403.2739 264.1279)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.1892">data3</text>
 								</g>
 							</g>
-							<g id="data4">
+							<g id="data04">
 								<g>
 									<text transform="matrix(0.9357 0 0 1 455.144 165.8389)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.1892">data</text>
 									<text transform="matrix(0.9357 0 0 1 455.144 170.3516)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.1892">data2</text>
@@ -4305,7 +4305,7 @@
 									<text transform="matrix(0.9357 0 0 1 548.5972 263.7842)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.1892">data3</text>
 								</g>
 							</g>
-							<g id="data5">
+							<g id="data05">
 								<g>
 									<text transform="matrix(0.9357 0 0 1 598.9165 166.3252)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.1892">data</text>
 									<text transform="matrix(0.9357 0 0 1 598.9165 170.8389)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.1892">data2</text>
@@ -4387,7 +4387,7 @@
 									<text transform="matrix(0.9357 0 0 1 692.3696 264.2715)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.1892">data3</text>
 								</g>
 							</g>
-							<g id="data6">
+							<g id="data06">
 								<g>
 									<text transform="matrix(0.9357 0 0 1 744.3413 165.8389)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.1892">data</text>
 									<text transform="matrix(0.9357 0 0 1 744.3413 170.3516)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.1892">data2</text>
@@ -4469,7 +4469,7 @@
 									<text transform="matrix(0.9357 0 0 1 837.7949 263.7842)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.1892">data3</text>
 								</g>
 							</g>
-							<g id="data7">
+							<g id="data07">
 								<g>
 									<text transform="matrix(0.9357 0 0 1 886.8223 167.0537)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.1892">data</text>
 									<text transform="matrix(0.9357 0 0 1 886.8223 171.5664)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.1892">data2</text>
@@ -4551,7 +4551,7 @@
 									<text transform="matrix(0.9357 0 0 1 980.2754 264.999)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.1892">data3</text>
 								</g>
 							</g>
-							<g id="data8">
+							<g id="data08">
 								<g>
 									<text transform="matrix(0.9357 0 0 1 23.7778 401.1396)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.1892">data</text>
 									<text transform="matrix(0.9357 0 0 1 23.7778 405.6523)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.1892">data2</text>
@@ -4633,7 +4633,7 @@
 									<text transform="matrix(0.9357 0 0 1 117.2305 499.0859)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.1892">data3</text>
 								</g>
 							</g>
-							<g id="data9">
+							<g id="data09">
 								<g>
 									<text transform="matrix(0.9357 0 0 1 166.2578 400.6943)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.1892">data</text>
 									<text transform="matrix(0.9357 0 0 1 166.2578 405.207)" fill="#3B8646" font-family="'MicrosoftYaHei'" font-size="2.1892">data2</text>
@@ -5152,29 +5152,14 @@
 				green: "#02A434",
 				red: "#FF0000",
 				datas: undefined,
-				dgIds: [
-					5,4,
-					7,6,
-					3,2,
-					21,1,
-					9,8,
-					11,10,
-					13,12,
-					15,14,
-					19,18,
-					17,16
-				],
+				dgIds: [],
 			};
 		},
-
-		created() {},
-
 		methods: {
 			// 渲染每个机箱的表格参数
-			renderData(data = {}) {
+			renderData(data) {
 				// 取出开关的 DOM
 				const switchDom = $("#data").find("rect");
-
 				// 遍历数据,首先取出开关单独写逻辑渲染颜色,除了开关以外的就是每个机箱的数据
 				for (let key in data) {
 					// 渲染开关
@@ -5186,8 +5171,11 @@
 					} else if (key === "dwkdqmx315") {
 						switchDom.eq(2).attr("fill", item ? this.green : this.red);
 					} else {
+						// var str = 'hzj0101gl';
+						// $('#alldata').find('#data'+str.slice(3,5)).find('g').eq(parseInt(str.slice(5,7)) - 1).find('text').eq(0).html('564654')
 						// 渲染电柜参数数据
 						const spKey = key.replace(/[^0-9]/gi, "");
+						// const dgDom = $("#_x23_" + spKey).find("text");
 						const dgDom = $("#_x23_" + spKey).find("text");
 
 						if (dgDom && key.indexOf("dl") !== -1) {
@@ -5201,13 +5189,13 @@
 				}
 
 				// 给电柜上个色呗
-				this.dgIds.forEach((dgId) => {
-					const dgDom = $("#diangui_" + dgId + "_").find("polygon");
+				// this.dgIds.forEach((dgId) => {
+				// 	const dgDom = $("#diangui_" + dgId + "_").find("polygon");
 
-					for (let i = 0; i < dgDom.length; i++) {
-						dgDom.eq(i).attr("fill", this.getColor());
-					}
-				});
+				// 	for (let i = 0; i < dgDom.length; i++) {
+				// 		dgDom.eq(i).attr("fill", this.getColor());
+				// 	}
+				// });
 			},
 
 			randomNum(minNum, maxNum) {
@@ -5236,6 +5224,7 @@
 
 			// 总貌数据
 			zmmap(value) {
+				console.log(value)
 				this.renderData(value);
 			},
 		},

+ 4 - 6
src/views/warn/czjl.vue

@@ -31,7 +31,6 @@
 				</div>
 			</div>
 			<div class="query-actions" style="margin-right: 1500px">
-				<button class="btn green" @click="requestSafeList">查询</button>
 				<button class="btn green" @click="exportCsv">导出</button>
 			</div>
 		</div>
@@ -58,7 +57,6 @@
 				wpArray: [],
 				wpName: "",
 				wtId: "",
-				wtIdWait:1,
 				tableData: {
 					column: [{
 							name: "编号",
@@ -206,10 +204,10 @@
 		},
 		watch:{
 			wtId(e){
-				if(this.wtIdWait == 1){//这里只让执行一次
-					this.requestSafeList(this.wpId,e);
-					this.wtIdWait = 2;
-				}
+				this.requestSafeList(this.wpId,e);
+			},
+			value1(){
+				this.requestSafeList(this.wpId,this.wtId);
 			}
 		}
 	};

+ 4 - 6
src/views/warn/ztzhjl.vue

@@ -31,7 +31,6 @@
 				</div>
 			</div>
 			<div class="query-actions" style="margin-right: 1500px">
-				<button class="btn green" @click="requestSafeList">查询</button>
 				<button class="btn green" @click="exportCsv">导出</button>
 			</div>
 		</div>
@@ -58,7 +57,6 @@
 				wpArray: [],
 				wpName: "",
 				wtId: "",
-				wtIdWait:1,
 				tableData: {
 					column: [{
 							name: "编号",
@@ -219,10 +217,10 @@
 		},
 		watch:{
 			wtId(e){
-				if(this.wtIdWait == 1){//这里只让执行一次
-					this.requestSafeList(this.wpId,e);
-					this.wtIdWait = 2;
-				}
+				this.requestSafeList(this.wpId,e);
+			},
+			value1(){
+				this.requestSafeList(this.wpId,this.wtId);
 			}
 		}
 	};