Merge remote-tracking branch 'origin/master'

src/components/map/index.vue

@@ -168,11 +168,12 @@ export default {
     },
   },
   mounted() {
+
     this.map = new Map({
       target: "map",
       view: new View({
         projection: "EPSG:4326",
-        center: fromLonLat([116.389, 39.903]), //地图中心
+        center: fromLonLat([116.389, 39.903]), //地图中心 
         zoom: 5, //默认缩放级别
         minZoom: 5, //最小缩放级别
         maxZoom: 15, //最大缩放级别
@@ -183,8 +184,9 @@ export default {
       layers: [
         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://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", //外网
           }),
         }),
         new VectorLayer({

src/views/ledger/anemometer.vue

@@ -475,12 +475,12 @@ export default {
 
     // 数字验证
     validateNumber(rule, value, callback) {
-      const numberRegex = /^\d{1,3}(\.\d{1,5})?$/; // 匹配不超过四位数且小数点后不超过二位数的数字
+      const numberRegex = /^\d{1,3}(\.\d{1,8})?$/; // 匹配不超过四位数且小数点后不超过二位数的数字
       if (!value) {
         callback(new Error("该项不能为空"));
       } else if (!numberRegex.test(value)) {
         callback(
-          new Error("该项必须为不超过三位数且小数点后不超过五位数的数字")
+          new Error("该项必须为不超过三位数且小数点后不超过八位数的数字")
         );
       } else {
         callback();

src/views/ledger/component/windsitetower.vue

@@ -31,6 +31,10 @@
         >
         </el-table-column>
         <el-table-column prop="sightcing" align="center" label="是否标杆">
+          <template slot-scope="scope">
+          <span v-if="scope.row.sightcing === 1 || scope.row.sightcing === '是'">是</span>
+          <span v-else-if="scope.row.sightcing === 2 || scope.row.sightcing === '否'">否</span>
+        </template>
         </el-table-column>
         <el-table-column
           prop="elevationHeight"

src/views/ledger/draught.vue

@@ -562,12 +562,12 @@ export default {
     },
     // 数字验证
     validateNumber(rule, value, callback) {
-      const numberRegex = /^\d{1,3}(\.\d{1,5})?$/; // 匹配不超过四位数且小数点后不超过二位数的数字
+      const numberRegex = /^\d{1,3}(\.\d{1,8})?$/; // 匹配不超过四位数且小数点后不超过二位数的数字
       if (!value) {
         callback(new Error("该项不能为空"));
       } else if (!numberRegex.test(value)) {
         callback(
-          new Error("该项必须为不超过三位数且小数点后不超过五位数的数字")
+          new Error("该项必须为不超过三位数且小数点后不超过八位数的数字")
         );
       } else {
         callback();

src/views/ledger/windsite.vue

@@ -468,7 +468,10 @@ export default {
   methods: {
     handleClose(value, dialogName) {
       this[dialogName] = value;
-      this.$refs.formRef.resetFields();
+      if (this.$refs.formRef) {
+        this.$refs.formRef.resetFields();
+      }
+      // this.$refs.formRef.resetFields();
       this.form = Object.assign({}, this.$options.data().form);
     },
 
@@ -559,19 +562,15 @@ export default {
       this.loading = true;
 
       WindFieldListPage(paramsData)
-
         .then((res) => {
           this.tableData = res.data.list;
           this.formInline.totalSize = res.data.totalSize;
           this.loading = false;
-    
         })
         .catch((error) => {
           this.loading = false;
           console.error(error);
-  
         });
-  
     },
     //分页数据切换
     handleCurrentChange(val) {
@@ -820,8 +819,8 @@ export default {
         case "longitude":
         case "latitude":
           return {
-            regex: /^\d{1,3}(\.\d{1,5})?$/,
-            errorMessage: "该项必须为不超过三位数且小数点后不超五位数的数字",
+            regex: /^\d{1,3}(\.\d{1,8})?$/,
+            errorMessage: "该项必须为不超过三位数且小数点后不超八位数的数字",
           };
         default:
           return {

vue.config.js

@@ -65,9 +65,9 @@ module.exports = {
     proxy: {
       "/api": {
         // target: "http://192.168.5.4:16200", // 石月
-        target: "http://192.168.50.235:16200", //内网
+        // target: "http://192.168.50.235:16200", //内网
         // target: "http://192.168.5.15:16200",
-        // target: "http://106.120.102.238:16600", //外网
+        target: "http://106.120.102.238:16600", //外网
         changeOrigin: true,
         pathRewrite: {
           "^/api": "", // 需要regit write重写的,