瀏覽代碼

修改状态

rui.jiang 10 月之前
父節點
當前提交
4e53fe643b
共有 4 個文件被更改,包括 13 次插入8 次删除
  1. 2 2
      src/components/map/index.vue
  2. 6 3
      src/views/ledger/milltype.vue
  3. 3 1
      src/views/ledger/windsite.vue
  4. 2 2
      vue.config.js

+ 2 - 2
src/components/map/index.vue

@@ -197,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({

+ 6 - 3
src/views/ledger/milltype.vue

@@ -554,10 +554,11 @@ export default {
           objectdata.millTypeCode = this.detail.millTypeCode;
         }
 
+      
         const API = !this.isEdit
-          ? createEngineMill(objectdata)
-          : updateWindEngineMill(objectdata);
-
+          ? createEngineMill(objectdata) //新增
+          : updateWindEngineMill(objectdata); //编辑
+          console.log(this.isEdit,API,'APIAPI');
         API.then((res) => {
           this.nuedialog = false;
           this.onSubmit();
@@ -570,10 +571,12 @@ export default {
     resetForm(formName) {
       this.$refs[formName].resetFields();
       this.nuedialog = false;
+      this.isEdit  = false;
     },
     handleClose(done) {
       this.$refs.ruleForm.resetFields();
       this.nuedialog = false;
+      this.isEdit  = false;
       done();
     },
 

+ 3 - 1
src/views/ledger/windsite.vue

@@ -989,7 +989,9 @@ export default {
       }
     },
     batch(row) {
-      if (row.contractNumber != 0) {
+   
+
+      if (row.wegNumber != 0) {
         getWindEngineGroupListByFieldCode({ fieldCode: row.fieldCode }).then(
           (res) => {
             this.batchList = res.data;

+ 2 - 2
vue.config.js

@@ -65,10 +65,10 @@ 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重写的,