Browse Source

2023.7.25

nanMing 1 year ago
parent
commit
a642bbf5de

+ 10 - 5
ruoyi-ui/src/views/bigScreen/resources/details/OldmanInfo.vue

@@ -202,16 +202,21 @@ export default {
 			deep: true,
 			handler(newVal) {
 				if (newVal) {
-					let result = getOldmanDetails({ lrid: '5dde3f1b0e2c4d237088d122' })
-					this.info = result[0]
+					var xhr = new XMLHttpRequest()
+					xhr.open("get", '/getxflrinfo?lrid=' + newVal, false);
+					xhr.setRequestHeader("Content-Type","application/json;charset=utf-8");
+					xhr.send();
+					let data = JSON.parse(xhr.responseText);
+					console.log(data)
+					this.info = data[0]
 				}
 			}
 		}
 	},
 	created() {
-		getOldmanDetails({ lrid: '5dde3f1b0e2c4d237088d122' }).then((res) => {
-			console.log(res)
-		})
+		// getOldmanDetails({ lrid: '5dde3f1b0e2c4d237088d122' }).then((res) => {
+		// 	console.log(res)
+		// })
 	},
 	methods: {
 		handleClose() {

+ 4 - 2
ruoyi-ui/src/views/bigScreen/resources/index.vue

@@ -76,7 +76,7 @@
     </div>
     <el-radio-group class="bottom-group" :class="{hide:!hideTopNav}" v-model="pattern" @input="patternChange">
       <el-radio :label="0">资源分布</el-radio>
-      <el-radio :label="1" disabled="true">资源密度</el-radio>
+      <el-radio :label="1" :disabled="true">资源密度</el-radio>
       <el-radio :label="2">生活圈模式</el-radio>
       <el-radio :label="3">区划钻取</el-radio>
     </el-radio-group>
@@ -891,7 +891,9 @@ export default {
       this.addCluster(3);
     },
     markerClick(e) {
-      this.jgId = e.target._opts.label.extData
+	    console.log(e.target._opts.extData.id)
+      // this.jgId = e.target._opts.label.extData
+	    this.jgId =  e.target._opts.extData.id
       this.isShowInfo = true
     },