16点18分

build/utils.js

@@ -18,8 +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 = ['all'];
-let devModules = ['index','RMS'];
+let devModules = ['all'];
+// let devModules = ['index','TMS','statisticalReport','homepage','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

@@ -55,20 +55,20 @@ let proxyTable = {
     }
   },
   // 所有数据的请求域名地址
-  // "/api/v1": {
-  //   target: "http://172.16.33.166:8080",
-  //   ws: true,
-  //   pathRewrite: {
-  //     "^/api/v1": "/api/v1"
-  //   }
-  // },
   "/api/v1": {
-    target: "http://192.168.1.106:8080",
+    target: "http://172.16.33.166:8080",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"
     }
   },
+  // "/api/v1": {
+  //   target: "http://192.168.1.106:8080",
+  //   ws: true,
+  //   pathRewrite: {
+  //     "^/api/v1": "/api/v1"
+  //   }
+  // },
   "/views/api/v1": {
     target: "http://192.168.1.115:8080",
     ws: true,

src/components/main.vue

@@ -270,7 +270,7 @@
             <span
               class="ifCompany el-dropdown-link"
               v-if="companys.length === 1"
-              >{{ companyName }}1</span
+              >{{ companyName }}</span
             >
             <el-dropdown trigger="click" @command="selectComPany" v-else>
               <span class="el-dropdown-link">
@@ -638,7 +638,7 @@
       </div>
     </el-dialog>
   </div>
-</template>
+</template> 
 
 <script>
 import element_css_json_import from "../assets/json/element_css.js";
@@ -650,7 +650,8 @@ import { checkCharLength } from "@/utils/validator.js";
 import store from "@/store/index.js";
 //  字典数据
 import dataDictionary from "@/store/dataDictionary.js";
-import defaultVue from "./default.vue";
+// import defaultVue from "./defaultVue.vue";
+import defaultVue from '@/views/homepage/components/homepage.vue'
 import { proPath } from "@/config/config.js";
 import draggable from "vuedraggable";
 export default {

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

@@ -87,7 +87,7 @@ export default {
       option2: {
         // 表格请求数据的地址
         requestUrl:
-          "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=4&fuelOrder=1",
+          "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=1",
       },
     };
   },
@@ -99,7 +99,7 @@ export default {
           this.input;
       } else {
         this.option2.requestUrl =
-          "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=4&fuelOrder=1&con=" +
+          "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=1&con=" +
           this.input;
       }
     },

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

@@ -461,8 +461,7 @@ export default {
   },
 };
 </script>
-
-<style lang="scss" >
+<style lang="scss">
 .contractDetails {
   width: 100%;
 }

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

@@ -2,39 +2,120 @@
   <!-- 修改运输预约页面 -->
   <div id="contractDetails">
     <page-title>运输预约</page-title>
-    <div class="main">
-      <span class="text">修改运输预约</span>
-      <span class="a"></span>
-    </div>
     <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
-          <dil-form :formId="220" v-model="form1"></dil-form>
+      <div class="form-one">
+        <dil-form :formId="220" v-model="form1"> </dil-form>
+      </div>
+      <div class="btn">
+        <div class="btn1">
+          <el-button type="primary" @click="selectTruck">浏览</el-button>
+        </div>
+        <div class="btn1">
+          <el-button type="primary" @click="selectUnloadingPoint"
+            >浏览</el-button
+          >
         </div>
       </div>
-    </div>  
- 
-    <div class="button-box">
+    </div>
+
+    <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
+
+    <el-drawer
+      :visible.sync="drawer"
+      :direction="direction"
+      size="40%"
+      :wrapperClosable="true"
+      :close-on-press-escape="false"
+      :destroy-on-close="false"
+      :show-close="false"
+      :withHeader="true"
+      modal
+    >
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        style="margin-top: 0.625rem; margin-left: 1.25rem; width: 200px"
+        clearable
+      ></el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="onclick(a)"
+        style="margin-bottom: 0.9375rem"
+      >
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <div v-show="a == 1">
+        <dilTable
+          v-bind.sync="third"
+          @radio-change="currentRadioChange"
+        ></dilTable>
+      </div>
+      <div v-show="a == 2">
+        <dilTable
+          v-bind.sync="unloadPoint"
+          @radio-change="currentRadioChange2"
+        ></dilTable>
+      </div>
+    </el-drawer>
   </div>
 </template>
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import {sjTime} from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
-    data(){
-          return {
-          form1: {},
-        }
-    },
+  data() {
+    return {
+      form1: {},
+      drawer: false,
+      direction: "rtl",
+      a: null,
+      third: {
+        requestUrl: "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248",
+        selectionType: "radio",
+      },
+      unloadPoint: {
+        requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
+        selectionType: "radio",
+      },
+      capacityId: null,
+      warehouseId: null,
+      input: null,
+      orderType:null,
+    };
+  },
   mounted() {
     this.information();
   },
   methods: {
+    onclick(a) {
+      if (a == 1) {
+        this.third.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&con=" + this.input;
+      } else if (a == 2) {
+      }
+    },
+    selectTruck() {
+      this.a = 1;
+      this.drawer = true;
+    },
+    selectUnloadingPoint() {
+      this.a = 2;
+      this.drawer = true;
+    },
+    currentRadioChange(row) {
+      this.form1.capacityNumber = row.capacityNumber;
+      this.capacityId = row.capacityId;
+    },
+    currentRadioChange2(row) {
+      this.form1.warehouseName = row.warehouseName;
+      this.warehouseId = row.warehouseId;
+    },
     information() {
       this.axios
         .post("/api/v1/oms/selectOrderByOrderId/" + this.$route.params.orderId)
@@ -44,40 +125,64 @@ export default {
           });
         });
     },
-     // 返回
+    // 返回
     onClickCancel() {
       this.$router.go(-1);
     },
-     // 确认
+    // 确认
     onClickConfirm() {
       let obj = {
-        orderId: this.$route.params.orderId,
-        materialId: this.form1.materialId,
-        orderEntryTime: sjTime(this.form1.orderEntryTime),
-        unloadPointId: this.form1.unloadPointId,
-        orderType: this.form1.orderType
-      };
-
-      if (
-        obj.orderId==null||
-        obj.materialId==null||
-        obj.unloadPointId==null||
-        obj.orderEntryTime==null
-      ) this.$message.error("存在空值！");
-      else
-      this.axios
-        .post("/api/v1/oms/updateOrder", obj)
-        .then(() => {
-          this.$message({
-            type: "success",  
-            message: "修改成功!",
-          });
-          this.$router.go(-1);
+          orderId:this.$route.params.orderId,
+          capacityId:parseInt(this.capacityId),
+          unloadPointId:this.warehouseId,
+          orderEntryTime:sjTime(this.form1.orderEntryTime),
+          orderType:parseInt(this.form1.orderType),
+        }
+        this.axios.post("/api/v1/oms/updateOrder", obj).then((res) => {
+          if(res.data.code == "200"){
+            this.$message({
+              type: "success",
+              message: "修改成功!",
+            });
+            this.$router.push("/transportReserveRan");
+            }
         });
-    },
+    }
   },
 };
 </script>
-<style lang="scss" scoped>
-// @import "@/styles/appoint/contract/ContractInsert.scss";
+<style lang="scss">
+.contractTitle {
+  display: flex;
+  justify-content: center;
+  margin: 20px;
+  .el-form-item {
+    display: flex;
+    justify-content: center;
+    .el-form-item__label {
+      display: flex;
+      align-items: center;
+      font-size: 14px;
+    }
+    .el-input {
+      width: 250px;
+    }
+  }
+  .btn {
+    margin-left: 20px;
+    padding-top: 105px;
+    .btn1 {
+      margin-bottom: 15px;
+    }
+  }
+}
+.button_box {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  .el-button {
+    width: 80px;
+    margin: 10px;
+  }
+}
 </style>

src/views/homepage/app.html

@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <meta content="工业互联网平台" name="keywords">
+    <meta content="工业互联网平台" name="description">
+    <title>工业互联网平台</title>
+    <link href="../static/css/common.css" rel="stylesheet"/>
+    <link href="../static/img/favicon.ico" rel="shortcut icon"/>
+    <script src="../static/lib/jquery/jquery.min.js" type="text/javascript"></script>
+    <script src="../static/lib/jquery/jquery.PrintArea.js" type="text/javascript"></script>
+    <script src="../static/lib/qrcode.min.js" type="text/javascript"></script>
+    <script src='../static/lib/XLSX/xlsx.core.min.js' type='text/javascript'></script>
+    <script src="../static/js/common.js" type="text/javascript"></script>
+     
+  </head>
+  <body>
+    <div id="app"></div>
+  </body>
+</html>

src/views/homepage/app.js

@@ -0,0 +1,86 @@
+// The Vue build version to load with the `import` command
+// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
+import Vue from 'vue';
+import App from '@/components/App.vue';
+// include
+import '@/config/include.js';
+
+// 通用store
+import store from '@/store/index.js';
+
+// router
+import router from './router/index.js';
+
+import VueApollo from 'vue-apollo'
+
+import apollo from '@/config/apolloConfig.js'
+
+// 关闭生产模式下给出的提示
+Vue.config.productionTip = false;
+
+Vue.use(VueApollo)
+
+// 注册表格的全局组件
+import DilCommonUI from "@/components/DilCommonUI";
+Vue.use(DilCommonUI);
+
+const apolloProvider = new VueApollo({
+    defaultClient: apollo
+})
+
+ //把时间戳改为正常可读的时间
+ export function renderTime(date) {
+  if(date !== null){
+      let dateee = new Date(date).toJSON();
+      return new Date(+new Date(dateee) + 8 * 3600 * 1000).toISOString().replace(/T/g, " ").replace(/\.[\d]{3}Z/, "");
+  }
+  return null;
+}
+//把毫秒数转换分
+export function getDuration(my_time) { 
+  if(my_time !== null){
+      return Math.floor(my_time / 1000 / 60);
+  }
+  return null;
+}
+export function sjTime(orderPlanInTime) {
+  var stringTime = renderTime(orderPlanInTime);
+  var timestamp1 = stringTime.replace(/-/g, "/");
+  return new Date(timestamp1).getTime();
+}
+//验证电话号码
+export function VerifyPhoneNumber(Phone) {
+  var myreg=/^(13[0-9]|14[5|7]|15[0|1|2|3|4|5|6|7|8|9]|18[0|1|2|3|5|6|7|8|9])\d{8}$/;
+  if (!myreg.test(Phone)) {
+      return false;
+  } else {
+      return true;
+  }
+}
+export function isNumber(value) {
+  //验证是否为数字
+  var patrn = /^(-)?\d+(\.\d+)?$/;
+  if (patrn.exec(value) == null || value == "") {
+    return false;
+  } else {
+    return true;
+  }
+}
+export function isIntegerNumber(value) {
+  //验证是否为整数
+  var patrn = /^\+?[1-9][0-9]*$/g;
+  if (patrn.exec(value) == null || value == "") {
+    return false;
+  } else {
+    return true;
+  }
+}
+/* eslint-disable no-new */
+new Vue({
+  el: '#app',
+  router,
+  store,
+  components: { App },
+  provide: apolloProvider.provide(),
+  template: '<App/>'
+});

src/views/homepage/components/homepage.vue

@@ -0,0 +1,15 @@
+<template>
+  <div>首页
+      
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>

src/views/homepage/router/index.js

@@ -0,0 +1,33 @@
+import Vue from 'vue'
+import Router from 'vue-router'
+
+import routerBefore from '@/config/routerBefore.js'
+
+// 主要
+import main from '@/components/main.vue'
+// 系统配置管理
+import homepage from '../components/homepage.vue'
+Vue.use(Router)
+
+const constantRouterMap = [
+  {
+    path: '/',
+    name: 'main',
+    meta: {title: '首页', code: 'xtpzgl'},
+    component: main,
+    redirect: {name: 'cargoResult'},
+    children: [
+      {path: 'homepage', name: 'homepage', meta: {code: 'xtpzgl-jggl'}, component: homepage},
+    ]
+  }
+];
+
+const router = new Router({
+  routes: constantRouterMap
+})
+//  before
+routerBefore(router, constantRouterMap);
+
+export default router;
+//  constantRouterMap
+export const routes = constantRouterMap;

src/views/statisticalReport/app.js

@@ -15,6 +15,11 @@ import VueApollo from 'vue-apollo'
 
 import apollo from '@/config/apolloConfig.js'
 
+
+// 注册表格的全局组件
+import DilCommonUI from "@/components/DilCommonUI";
+Vue.use(DilCommonUI);
+
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 

src/views/statisticalReport/components/purchasFuelMonitor/purchasFuelNewMonitor.vue

@@ -0,0 +1,44 @@
+// 采购燃料新区汽运监控
+<template>
+  <div class="purchasFuelNewMonitor">
+    <div class="frameCalculation">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="option"></dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      option: {
+        requestUrl: "/api/v1/tms/getRLFLReport?apiId=382&orderType=7",
+      },
+      input: "",
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=7&con=" + this.input;
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.purchasFuelNewMonitor {
+  .frameCalculation {
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding-left: 50px;
+  }
+}
+</style>

src/views/statisticalReport/components/purchasFuelMonitor/purchasFuelOldMonitor.vue

@@ -0,0 +1,44 @@
+// 采购燃料老区汽运监控
+<template>
+  <div class="purchasFuelOldMonitor">
+    <div class="frameCalculation">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="option"></dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      option: {
+        requestUrl: "/api/v1/tms/getRLFLReport?apiId=382&orderType=6",
+      },
+      input: "",
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=6&con=" + this.input;
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.purchasFuelOldMonitor {
+  .frameCalculation {
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding-left: 50px;
+  }
+}
+</style>

src/views/statisticalReport/components/purchaseAccessoriesMonitor.vue

@@ -0,0 +1,44 @@
+// 采购辅料汽运监控
+<template>
+  <div class="purchaseAccessoriesMonitor">
+    <div class="frameCalculation">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="option"></dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      option: {
+        requestUrl: "/api/v1/tms/getRLFLReport?apiId=382&orderType=5",
+      },
+      input: "",
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=5&con=" + this.input;
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.purchaseAccessoriesMonitor {
+  .frameCalculation {
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding-left: 50px;
+  }
+}
+</style>

src/views/statisticalReport/router/index.js

@@ -6,9 +6,10 @@ import routerBefore from '@/config/routerBefore.js'
 // 主要
 import main from '@/components/main.vue'
 // 系统配置管理
-import columnItem from '../components/columnItem.vue'
-import Ship_dynamic_table from '../components/Ship_dynamic_table.vue'
-import tableItem from '../components/tableItem.vue'
+import ShipDynamicTable from '../components/Ship_dynamic_table.vue'
+import purchaseAccessoriesMonitor from '../components/purchaseAccessoriesMonitor.vue'
+import purchasFuelOldMonitor from '../components/purchasFuelMonitor/purchasFuelOldMonitor.vue'
+import purchasFuelNewMonitor from '../components/purchasFuelMonitor/purchasFuelNewMonitor.vue'
 Vue.use(Router)
 
 const constantRouterMap = [
@@ -19,9 +20,10 @@ const constantRouterMap = [
     component: main,
     redirect: {name: 'cargoResult'},
     children: [
-      {path: 'columnItem', name: 'columnItem', meta: {code: 'xtpzgl-jggl'}, component: columnItem},
-      {path: 'Ship_dynamic_table', name: 'Ship_dynamic_table', meta: {code: 'xtpzgl-yhgl'}, component: Ship_dynamic_table},
-      {path: 'tableItem', name: 'tableItem', meta: {code: 'xtpzgl-yhgl'}, component: tableItem},
+      {path: 'ShipDynamicTable', name: 'ShipDynamicTable', meta: {code: 'xtpzgl-yhgl'}, component: ShipDynamicTable},
+      {path: 'purchaseAccessoriesMonitor', name: 'purchaseAccessoriesMonitor', meta: {code: 'xtpzgl-yhgl'}, component: purchaseAccessoriesMonitor},
+      {path: 'purchasFuelOldMonitor', name: 'purchasFuelOldMonitor', meta: {code: 'xtpzgl-yhgl'}, component: purchasFuelOldMonitor},
+      {path: 'purchasFuelNewMonitor', name: 'purchasFuelNewMonitor', meta: {code: 'xtpzgl-yhgl'}, component: purchasFuelNewMonitor},
     ]
   }
 ];

文件目录.md

@@ -10,8 +10,8 @@
   * `config` 配置请求拦截器，同一处理报错方式。
   * `lib` 全局的公用组件存放位置。
   * `store` 是一个全局的共享数据库存储区域，就相当于是一个数据仓库。
-  * `tool` 自己编写的全局js工具文件夹。
-  * ``
+  * `utils` 自己编写的全局js工具文件夹。
+  * `views` 
 * `static` 静态html页面的css/js/img存放地，请勿轻易进行更改。
 * `test` 初始测试目录，本地测试类文件。
 * `.editorconfig` 定义和维护一致的编码样式。