Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

build/utils.js

@@ -18,7 +18,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //  'logistics', 'process', '   ', 'reportform', 'basicconfig', 'system']
 // let devModules = ['index', 'qualityControl', 'standard', 'basicconfig'];
 // let devModules = ['index','devops','workFlow','systemConfig', 'microService'];
-let devModules = ['index','TMS'];
+// let devModules = ['all'];
+let devModules = ['index','RMS'];
 // let devModules = ['index','systemConfig', 'formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'custom'];
 // let devModules = ['index', 'systemConfig','formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'btnControll'];
 if (pathSrc.indexOf('node_modules') > -1) {

config/index.js

@@ -70,7 +70,7 @@ let proxyTable = {
     }
   },
   "/views/api/v1": {
-    target: "http://172.16.33.166:8080",
+    target: "http://192.168.1.115:8080",
     ws: true,
     pathRewrite: {
       "^/views/api/v1": "/api/v1"

src/views/RMS/components/addPort.vue

@@ -2,9 +2,8 @@
   <!-- 添加港口信息 -->
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
-    <el-divider content-position="left">港口</el-divider>
-     <div class="form-box" style="margin-right: 10rem">
-        <dil-form :formId="271" v-model="form1" @change="onchange" ref="from1"></dil-form>
+     <div class="form-box" >
+        <dil-form :formId="271" v-model="form1" ref="from1"></dil-form>
       </div>
     <div class="button-box">
       <el-button @click="cancel">取消</el-button>
@@ -66,5 +65,13 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-
+.form-box,
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

src/views/RMS/components/pier.vue

@@ -87,10 +87,11 @@ export default {
 <style lang="scss" scode>
 .steel_inbound{
   .sache{
-    height: 80px;
-    display: flex;
-    align-items: center;
-    padding-left: 30px;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
   }
-}
 </style>

src/views/RMS/components/port.vue

@@ -46,9 +46,16 @@ export default {
   methods:{
      toInsert() {
       this.$router.push("/addPort");
-
     },
-
+    onclick(){
+      console.log(this.inputText)
+      if(this.inputText != null ){
+        this.options.requestUrl = "/api/v1/rms/getPort?apiId=222&con=" + this.inputText
+      }
+      else{
+        this.options.requestUrl = "/api/v1/rms/getPort?apiId=222&test=1"
+      }
+    },
     deleteBmsTrainFreight(scope){
       this.$confirm("是否删除", "提示", {
         confirmButtonText: "确定",
@@ -65,7 +72,7 @@ export default {
                   type: "success",
                   message: "删除成功!",
                 });     
-                this.$router.go(0);
+                this.options.requestUrl = "/api/v1/rms/getPort?apiId=222&test=1";
               } else {
                 this.$message({
                   message: "删除失败",
@@ -89,10 +96,11 @@ export default {
 <style lang="scss" scode>
 .steel_inbound{
   .sache{
-    height: 80px;
-    display: flex;
-    align-items: center;
-    padding-left: 30px;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
   }
-}
 </style>

src/views/RMS/components/portStorageYard.vue

@@ -89,10 +89,11 @@ export default {
 <style lang="scss" scode>
 .steel_inbound{
   .sache{
-    height: 80px;
-    display: flex;
-    align-items: center;
-    padding-left: 30px;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
   }
-}
 </style>

src/views/TMS/components/importedFuel/transportReserveFuAdd.vue

@@ -2,11 +2,9 @@
   <!-- 新增运输作业页面 -->
   <div id="contractDetails">
     <page-title>运输预约</page-title>
-
     <div class="main">
       <el-divider content-position="left">新增运输预约</el-divider>
     </div>
-
     <div class="material from">
       <span class="text">物资：</span>
       <el-input v-model="materialName" disabled> </el-input>