前端gjy

public/index.html

@@ -15,11 +15,9 @@
   <!-- 如果有安装 Google Chrome Frame 插件则强制为Chromium内核，否则强制本机支持的最高版本IE内核，作用于IE浏览器 -->
   <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
   <link rel="manifest" href="<%= BASE_URL %>/manifest.json" />
-  <link rel="icon" href="<%= BASE_URL %>/winseaLogo.ico" />
-  <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css[process.env.VUE_APP_PACKAGE_ENV]) { %>
-      <link href="<%= htmlWebpackPlugin.options.cdn.css[process.env.VUE_APP_PACKAGE_ENV][i] %>" rel="stylesheet">
-  <% } %>
-  <title>WinSea | 专注船舶管理服务</title>
+  <link rel="icon" href="<%= BASE_URL %>logo.ico">
+
+  <title>易粮易运</title>
   <% if (process.env.NODE_ENV === 'production') { %>
     <script>
     !(function(c,i,e,b){var h = i.createElement("script");var f = i.getElementsByTagName("script")[0];h.type = "text/javascript";h.crossorigin = true;h.onload = function(){try {c[b]||(c[b] = new c.wpkReporter({bid: 'qj3rmxes-10jz7agi',spa: true,  plugins: []}));c[b].installAll();} catch (e) {console.error('init wpkReporter fail', e);}};f.parentNode.insertBefore(h, f);h.src = e})(window, document, "https://g.alicdn.com/woodpeckerx/jssdk??wpkReporter.js", "__wpk");

src/layout/index/sidebar/index.vue

@@ -39,7 +39,6 @@ export default {
     return {}
   },
   created() {
-    console.log(this.menu)
   },
   computed: {
     ...mapGetters(['website', 'menu', 'tag', 'keyCollapse', 'screen']),

src/layout/index/top/index.vue

@@ -406,35 +406,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.taskType {
-  width: 100%;
-  background-color: #fff;
-  margin-top: 2px;
-  margin-bottom: 10px;
-  // padding-bottom: 20px;
-  li {
-    float: left;
-    border: 1px solid #6ea0f3;
-    border-radius: 5px;
-    max-width: 190px;
-    padding: 0 5px;
-    text-align: center;
-    margin-top: 20px;
-    margin-left: 20px;
-    cursor: pointer;
-    font-size: 14px;
-    p {
-      margin: 8px 0px;
-      span {
-        color: #e74c3c;
-      }
-    }
-  }
-  li:hover {
-    background-color: #e4eeff;
-    color: #1d6ced;
-  }
-}
 .dayClass {
   font-size: 14px !important;
   span {

src/utils/getHasPermission.js

@@ -10,7 +10,6 @@ export function getHp (data) {
  */
 export function hasPermission (data) {
   let userPermissionList = Array.isArray(data) ? data : [data];
-  console.log(userPermissionList)
   // 当前用户的权限列表
   return userPermissionList.some(e => store.getters.roles.includes(e))
 }

src/views/tranManagement/tranManagementDriverEdit.vue

@@ -810,7 +810,7 @@ export default {
       console.log(this.selectedOptions)
     },
     returnsales() {
-      this.$router.push({ path: 'tranManagementDriver' })
+      this.$router.go(-1)
     },
     // confirmPosition() {
     //   this.draggable = false
@@ -864,7 +864,7 @@ export default {
             .toPromise()
             .then((response) => {
               this.$message.success('添加成功')
-              this.$router.push({ path: 'tranManagementDriver' })
+              this.$router.go(-1)
             })
         } else {
           EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))

src/views/tranManagement/tranManagementShipping.vue

@@ -326,7 +326,7 @@ export default {
     // 派船
     shipping(row){
         this.$router.push({
-           name: 'tranManagementShippingArrangemen',
+           name: 'shippingDispatchingcar',
            query:{
                  id: row.id , 
               // infoId:row.infoId,

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -22,52 +22,38 @@
         <div class="basicInformation">
           <div class="small-title">任务详情</div>
           <ws-info-table>
-            <!-- 任务编号 -->
-            <ws-form-item label="任务编号" span="1" prop="processNo">{{deptBudgetList.processNo}}</ws-form-item>
-            <!-- 货名 -->
+             <ws-form-item label="任务编号" span="1" prop="processNo">{{deptBudgetList.processNo}}</ws-form-item>
             <ws-form-item label="货名" span="1" prop="goodsName">{{deptBudgetList.goodsName}}</ws-form-item>
-            <!--重量（吨）-->
             <ws-form-item label="重量（吨）" span="1" prop="weight">{{deptBudgetList.weight}}</ws-form-item>
-            <!--发货地址-->
             <ws-form-item
               label="发货地址"
               span="1"
               prop="sendDetailedAddress"
-            >{{deptBudgetList.sendPrivate}}{{deptBudgetList.sendCity}}{{deptBudgetList.sendArea}}</ws-form-item>
-            <!--发货人-->
-            <ws-form-item label="发货人" span="1" prop="sender">{{deptBudgetList.sender}}</ws-form-item>
-
-            <!--发货人电话-->
+            >{{deptBudgetList.sendDetailedAddress}}</ws-form-item>
+           <ws-form-item label="发货人" span="1" prop="sender">{{deptBudgetList.sender}}</ws-form-item>
             <ws-form-item label="发货人电话" span="1" prop="senderPhone">{{deptBudgetList.senderPhone}}</ws-form-item>
-            <!--收货地址-->
             <ws-form-item
               label="收货地址"
               span="1"
               prop="receiveDetailedAddress"
-            >{{deptBudgetList.receivePrivate}}{{deptBudgetList.receiveCity}}{{deptBudgetList.receiveArea}}</ws-form-item>
-            <!--收货人-->
+            >{{deptBudgetList.receiveDetailedAddress}}</ws-form-item>
             <ws-form-item label="收货人" span="1" prop="receiver">{{deptBudgetList.receiver}}</ws-form-item>
-
-            <!--收货人电话-->
             <ws-form-item
               label="收货人电话"
               span="1"
               prop="receiverPhone"
             >{{deptBudgetList.receiverPhone}}</ws-form-item>
-            <!--发货日期-->
             <ws-form-item
               label="发货日期"
               span="1"
               prop="deliveryDateStart"
             >{{deptBudgetList.deliveryDateStart}}</ws-form-item>
-            <!--最晚发货日期-->
             <ws-form-item
               label="最晚到货日期"
               span="1"
               prop="deliveryDateEnd"
             >{{deptBudgetList.deliveryDateEnd}}</ws-form-item>
-            <!--合同编号-->
-            <ws-form-item label="合同编号" span="1" prop="contractNo">{{deptBudgetList.contractNo}}</ws-form-item>
+            <ws-form-item label="合同编号" span="1" prop="contractNo">{{deptBudgetList.contractNo}}</ws-form-item> 
           </ws-info-table>
           <div
             class="position siji"
@@ -76,8 +62,6 @@
           >
             <div class="small-title">联络员及航次</div>
             <div class="zhong">
-              <ws-info-table>
-                <!--姓名-->
                 <ws-form-item label="姓名" span="1" prop="driver" class="siji">
                   <el-select
                     v-model="item.driver"
@@ -94,7 +78,6 @@
                     />
                   </el-select>
                 </ws-form-item>
-                <!--电话-->
                 <ws-form-item label="电话" span="1" prop="driverPhone" class="siji">
                   <ws-input
                     :readonly="true"
@@ -104,7 +87,6 @@
                     size="small"
                   />
                 </ws-form-item>
-                <!--发船日期-->
                 <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="siji">
                   <ws-date-picker
                     v-model="item.sendDateStart"
@@ -113,7 +95,6 @@
                     value-format="yyyy-MM-dd"
                   />
                 </ws-form-item>
-                <!--预计到港日-->
                 <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="siji">
                   <ws-date-picker
                     v-model="item.receiveDateEnd"
@@ -122,7 +103,6 @@
                     value-format="yyyy-MM-dd"
                   />
                 </ws-form-item>
-                <!-- 船名 -->
                 <ws-form-item label="船名" span="1" prop="shipName" class="siji">
                   <ws-input
                     v-model="item.shipName"
@@ -131,11 +111,9 @@
                     size="small"
                   ></ws-input>
                 </ws-form-item>
-                <!-- 航次 -->
                 <ws-form-item label="航次" span="1" prop="shipNo" class="siji">
                   <ws-input v-model="item.shipNo" placeholder="请选择航次" maxlength="100" size="small"></ws-input>
                 </ws-form-item>
-                <!-- 类型 -->
                 <ws-form-item label="类型" span="1" prop="shipType" class="siji">
                   <ws-select v-model="item.shipType" placeholder="请输入" class="typeselect">
                     <ws-option
@@ -209,7 +187,7 @@
             </div>
           </div>
         </div>
-      </ws-form>
+      </ws-form> 
       <div style="text-align: right; padding: 10px">
         <el-button class="bg-bottom-up" type="primary" size="small" @click="submit()">提交</el-button>
       </div>
@@ -375,24 +353,24 @@ export default {
         .toPromise()
         .then(response => {
           this.deptBudgetList = response
-          for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
-            var num = this.deptBudgetList.tranCarInfoList[
-              i
-            ].positionWeight.split(',')
-            for (var j = 0; j < num.length; j++) {
-              var num2 = num[j].split('/')
-              this.freightspace.push({
-                impurity: num2[i],
-                positionWeight: num2[num2.length - 1]
-              })
-            }
-          }
+          // for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+          //   var num = this.deptBudgetList.tranCarInfoList[
+          //     i
+          //   ].positionWeight.split(',')
+          //   for (var j = 0; j < num.length; j++) {
+          //     var num2 = num[j].split('/')
+          //     this.freightspace.push({
+          //       impurity: num2[i],
+          //       positionWeight: num2[num2.length - 1]
+          //     })
+          //   }
+          // }
         })
     },
     //返回按钮
     revert() {
       this.freightspace = []
-      this.$router.push({ name: 'tranManagementShipping' })
+      this.$router.go(-1)
     },
     del(index) {
       if (this.freightspace.length > 1) {
@@ -540,9 +518,7 @@ export default {
                   this.deptBudgetList = {}
                   this.freightspace = {}
                   this.selectedOptions = ''
-                  this.$router.push({
-                    path: 'tranManagementShipping'
-                  })
+                  this.$router.go(-1)
                 })
             } else {
               // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
@@ -819,4 +795,7 @@ export default {
   background: #f6f7fc;
   border: 1px solid #d8dce6;
 }
+.bg-left {
+  padding-left: 30px;
+}
 </style>

vue.config.js

@@ -143,7 +143,7 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.121:8090/',
-        target: 'http://192.168.1.115:8090/',
+        target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',