gjy 4 年 前
コミット
891986c5eb
2 ファイル変更6 行追加13 行削除
  1. 2 9
      src/views/organizationNew/shoreMemberAdd.vue
  2. 4 4
      vue.config.js

+ 2 - 9
src/views/organizationNew/shoreMemberAdd.vue

@@ -146,7 +146,7 @@
           <span class="operaction"
           <span class="operaction"
                 @click="setwork">设置</span>
                 @click="setwork">设置</span>
         </div>
         </div>
-        <div class="lastspan">
+       <!-- <div class="lastspan">
           <span class="star font">关联船舶</span>
           <span class="star font">关联船舶</span>
           <div class="ontent"
           <div class="ontent"
                style="width: 800px;">
                style="width: 800px;">
@@ -158,7 +158,7 @@
                   class="operaction shipSelectSet"
                   class="operaction shipSelectSet"
                   @click="setChargeShip">设置</span>
                   @click="setChargeShip">设置</span>
           </div>
           </div>
-        </div>
+        </div> -->
         <div style="display:flex">
         <div style="display:flex">
           <span class=" font">兼职职务</span>
           <span class=" font">兼职职务</span>
           <span class="operaction"
           <span class="operaction"
@@ -1358,13 +1358,6 @@ export default {
                 showClose: true
                 showClose: true
               });
               });
               return false;
               return false;
-            } else if (this.ruleForm.vessels.length === 0) {
-              this.$message({
-                type: "warning",
-                message: "请先设置关联船舶!",
-                showClose: true
-              });
-              return false;
             }
             }
           this.loading = true;
           this.loading = true;
           this.getSelectLabel();
           this.getSelectLabel();

+ 4 - 4
vue.config.js

@@ -2,7 +2,7 @@
 const path = require('path')
 const path = require('path')
 const pkg = require('./package.json')
 const pkg = require('./package.json')
 
 
-function resolve (dir) {
+function resolve(dir) {
   return path.join(__dirname, dir)
   return path.join(__dirname, dir)
 }
 }
 
 
@@ -40,7 +40,7 @@ module.exports = {
         logLevel: 'debug',
         logLevel: 'debug',
       },
       },
       '/pb': {
       '/pb': {
-        target: 'http://192.168.1.118:8090/',
+        target: 'http://192.168.1.124:8090/',
         // target: 'https://standard-dev.winsea.com/',
         // target: 'https://standard-dev.winsea.com/',
         changeOrigin: true, //开启代理:在本地会创建一个虚拟服务端,然后发送请求的数据,并同时接收请求的数据,这样服务端和服务端进行数据的交互就不会有跨域问题
         changeOrigin: true, //开启代理:在本地会创建一个虚拟服务端,然后发送请求的数据,并同时接收请求的数据,这样服务端和服务端进行数据的交互就不会有跨域问题
         pathRewrite: {
         pathRewrite: {
@@ -51,7 +51,7 @@ module.exports = {
       },
       },
     },
     },
 
 
-    after (app) {
+    after(app) {
       require('@babel/register')
       require('@babel/register')
       const bodyParser = require('body-parser')
       const bodyParser = require('body-parser')
 
 
@@ -80,7 +80,7 @@ module.exports = {
       }
       }
     }
     }
   },
   },
-  chainWebpack (config) {
+  chainWebpack(config) {
     config.plugins.delete('preload') // TODO: need test
     config.plugins.delete('preload') // TODO: need test
     config.plugins.delete('prefetch') // TODO: need test
     config.plugins.delete('prefetch') // TODO: need test