Merge branch 'dev' into 'master'

覆盖人员

See merge request !5

xichongSys/src/http/moudules/getlist.js

@@ -123,3 +123,13 @@ export const seledysqdc = (data) => {
     data
   })
 }
+
+
+//覆盖人员查询
+export const listAllBaseInfo = (data) => {
+  return axios({
+    url: '/baseInfo/getAllBaseInfo',
+    method: 'post',
+    data
+  })
+}

xichongSys/src/router/index.js

@@ -22,6 +22,7 @@ import drdysq from "@/views/Myvue/drdysq";
 import dryhkbg from "@/views/Myvue/dryhkbg";
 import drdcbg from "@/views/Myvue/drdcbg";
 import receivePersonnel from "@/views/Myvue/receivePersonnel";
+import AllbaseInfo from "@/views/Myvue/allbaseInfo"
 
 Vue.use(Router)
 
@@ -105,6 +106,11 @@ const router = new Router({
           path:"/newsupdata",
           name:"新闻发布",
           component: Newsupdata
+        },
+        {
+          path:"/AllbaseInfo",
+          name:"覆盖人员",
+          component: AllbaseInfo
         }
       ]
     },

xichongSys/src/utils/datetime.js

@@ -11,8 +11,12 @@
 export function format (datetime) {
   return formatWithSeperator(datetime, "-", ":");
 }
+export function formatDate (datetime) {
+  return formatWithSeperator(datetime, "-");
+}
 
 /**
+ *
  * 时间格式化
  * 将 2018-09-23T11:54:16.000+0000 格式化成类似 2018/09/23 11:54:16
  * 可以指定日期和时间分隔符
@@ -22,12 +26,19 @@ export function formatWithSeperator (datetime, dateSeprator, timeSeprator) {
   if (datetime != null) {
     const dateMat = new Date(datetime);
     const year = dateMat.getFullYear();
-    const month = dateMat.getMonth() + 1;
-    const day = dateMat.getDate();
-    const hh = dateMat.getHours();
-    const mm = dateMat.getMinutes();
-    const ss = dateMat.getSeconds();
+    const month = addZoo(dateMat.getMonth() + 1);
+    const day = addZoo(dateMat.getDate());
+    const hh = addZoo(dateMat.getHours());
+    const mm = addZoo(dateMat.getMinutes());
+    const ss = addZoo(dateMat.getSeconds());
+    if(!timeSeprator){
+      return year + dateSeprator + month + dateSeprator + day;
+    }
     const timeFormat = year + dateSeprator + month + dateSeprator + day + " " + hh + timeSeprator + mm + timeSeprator + ss;
     return timeFormat;
   }
 }
+function addZoo(val) {
+  return val < 9 ? 0+""+val : val;
+
+}

xichongSys/src/utils/global.js

@@ -6,7 +6,7 @@
 
 // 后台管理系统服务器地址
 //export const baseUrl = 'http://172.16.10.33:9002'
-export const baseUrl = 'http://172.16.10.25:9002'
+export const baseUrl = 'http://172.16.10.33:9002'
 //export const baseUrl2 ="http://172.16.10.33:9002"
 export const baseUrl2 = 'http://172.16.10.25:9999'
 // 系统数据备份还原服务器地址