修改行

src/components/map/index.vue

@@ -105,24 +105,12 @@
       </div>
     </div>
 
-    <el-dialog title="异常描述"  :visible.sync="dialogVisible" width="50%">
-
-      <el-table
-      :data="tableData"
-       max-height="500"
-      style="width: 100%">
-      <el-table-column
-        prop="analysisTypeName"
-        label="类型"
-        width="300">
-      </el-table-column>
-      <el-table-column
-        prop="errDesc"
-        label="描述"
-        >
-      </el-table-column>
- 
-    </el-table>
+    <el-dialog title="异常描述" :visible.sync="dialogVisible" width="50%">
+      <el-table :data="tableData" max-height="500" style="width: 100%">
+        <el-table-column prop="analysisTypeName" label="类型" width="300">
+        </el-table-column>
+        <el-table-column prop="errDesc" label="描述"> </el-table-column>
+      </el-table>
     </el-dialog>
   </div>
 </template>
@@ -162,7 +150,7 @@ export default {
   data() {
     return {
       dialogVisible: false,
-      tableData:[],
+      tableData: [],
       hoverInfo: null,
       hoverStyle: {
         position: "absolute",
@@ -209,8 +197,8 @@ export default {
         new TileLayer({
           source: new XYZ({
             // url: "http://127.0.0.1:8010/tiles/{z}/{x}/{y}.png", //本地
-            // url: "http://192.168.50.235/tiles/{z}/{x}/{y}.png", //内网
-            url: "http://106.120.102.238:18000/tiles/{z}/{x}/{y}.png", //外网
+            url: "http://192.168.50.235/tiles/{z}/{x}/{y}.png", //内网
+            // url: "http://106.120.102.238:18000/tiles/{z}/{x}/{y}.png", //外网
           }),
         }),
         new VectorLayer({
@@ -357,14 +345,13 @@ export default {
       });
     },
     handleFeatureClick(featureData) {
-
       let dateArr = {
         batchCode: this.$route.query.batchCode,
         engineCode: featureData.engineCode,
       };
       queryErrDescByEngine(dateArr).then((res) => {
         this.dialogVisible = true;
-      this.tableData=res.data
+        this.tableData = res.data;
       });
     },
 

src/views/ledger/draught.vue

@@ -473,7 +473,7 @@ export default {
       elevationHeight: "",
       latitude: "",
       sightcing: "",
-thisrow:"",
+      thisrow: "",
       fileList: [],
       globalFileList: [],
       nuedialog: false,
@@ -596,7 +596,6 @@ thisrow:"",
     },
     // 确认
     submitForm(formName) {
-    
       this.$refs[formName].validate((valid) => {
         const objData = {
           fieldCode: this.ruleForm.fieldCode,
@@ -608,10 +607,7 @@ thisrow:"",
           latitude: this.ruleForm.latitude,
           hubHeight: this.ruleForm.hubHeight,
           sightcing: this.ruleForm.sightcing,
-<<<<<<< HEAD
-          engineCode:this.thisrow
-=======
->>>>>>> 3bd7185b7f7775a80db9fefcddb4d0905ab712bc
+          engineCode: this.thisrow,
         };
 
         if (valid) {
@@ -719,14 +715,13 @@ thisrow:"",
 
     // 编辑
     compile(row) {
-      this.thisrow=row.engineCode
+      this.thisrow = row.engineCode;
       getWindEngineGroup({ engineCode: row.engineCode }).then((res) => {
         const item = JSON.parse(JSON.stringify(res.data));
         this.detail = item;
         Object.keys(this.ruleForm).forEach((key) => {
           this.ruleForm[key] = item[key];
         });
-
       });
       this.nuedialog = true;
       this.title = "编辑";