Domů Procházet Nápověda
Přihlásit se
DAL-DAZHOU
/
icore-pass
9
0
Rozštěpit 0
Soubory Úkoly 0 Pull Requesty 0 Wiki
Procházet zdrojové kódy

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

zouzhd před 3 roky
rodič
9b6cd7e537 79e383c61b
revize
9997186fcc
28 změnil soubory, kde provedl 311 přidání a 102 odebrání
Rozdělené zobrazení Ukázat statistiku rozdílových dat
  1. 17 0
      build/utils.js
  2. 0 0
      public/favicon2.ico
  3. binární
      src/assets/img/favicon.ico
  4. binární
      src/assets/img/favicon1.ico
  5. 5 5
      src/components/main.vue
  6. 3 4
      src/views/RMS/app.html
  7. 62 4
      src/views/RMS/components/addCapacity.vue
  8. 13 7
      src/views/RMS/components/addCarDriver.vue
  9. 85 11
      src/views/RMS/components/addCarrier.vue
  10. 4 3
      src/views/RMS/components/addConsignee.vue
  11. 2 5
      src/views/RMS/components/addPersonnel.vue
  12. 3 3
      src/views/SporadicManage/app.html
  13. 4 6
      src/views/TMS/app.html
  14. 3 4
      src/views/WMS/app.html
  15. 3 4
      src/views/appoint/app.html
  16. 3 4
      src/views/configManager/app.html
  17. 3 4
      src/views/homepage/app.html
  18. 74 5
      src/views/homepage/components/homepage.vue
  19. 4 6
      src/views/index/app.html
  20. 4 5
      src/views/inward/app.html
  21. 3 4
      src/views/queue/app.html
  22. 3 4
      src/views/sale/app.html
  23. 3 3
      src/views/serviceManager/app.html
  24. 3 4
      src/views/statisticalReport/app.html
  25. 3 3
      src/views/systemConfig/app.html
  26. 1 1
      src/views/systemConfig/components/usersAddAndEdit.vue
  27. 3 3
      src/views/workFlow/app.html
  28. 0 0
      static/img/favicon2.ico

+ 17 - 0
build/utils.js
Zobrazit soubor 

@@ -18,8 +18,25 @@ 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','TMS','RMS']
 
+// let devModules = ['index','SporadicManage','TMS']
 
+// let devModules = ['index','SporadicManage'];
 
+// let devModules = ['index','systemConfig', 'formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'custom'];
 
+// let devModules = ['index', 'systemConfig','formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'btnControll'];
 
+
 
+ //let devModules = ['all'];
 
+// let devModules = ['index','RMS']
 
+//let devModules = ['index','SporadicManage','TMS']
 
+// let devModules = ['index','SporadicManage'];
 
+// let devModules = ['index','systemConfig', 'formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'custom'];
 
+// let devModules = ['index', 'systemConfig','formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'btnControll'];
 
+// let devModules = ['index','inward','SporadicManage']
 
 let devModules = ['all'];
 
 // let devModules = ['index','inward','appoint','sale']
 
+
 
+
 
 if (pathSrc.indexOf('node_modules') > -1) {
 
     devModules = require('../../../cors.js').devModules;
 
 }

+ 0 - 0
public/favicon.ico → public/favicon2.ico
Zobrazit soubor


binární
src/assets/img/favicon.ico
Zobrazit soubor


binární
src/assets/img/favicon1.ico
Zobrazit soubor


+ 5 - 5
src/components/main.vue
Zobrazit soubor 

@@ -293,12 +293,12 @@
 
               @command="selectOrg"
 
               v-if="orgDutyLinks.length > 0"
 
               :style="{
 
-                marginLeft: !styleControll ? '100px' : '20px',
 
+                marginLeft: !styleControll ? '50px' : '20px',
 
                 fontSize: '12px',
 
               }"
 
             >
 
-              <span class="el-dropdown-link">
 
-                {{ orgName }}<i class="el-icon-arrow-down el-icon--right"></i>
 
+              <span class="el-dropdown-link"><!--<i class="el-icon-arrow-down el-icon--right"></i>-->
 
+                {{ orgName }}
 
               </span>
 
               <el-dropdown-menu slot="dropdown">
 
                 <div v-for="item in orgDutyLinks" :key="item.orgId">
 
@@ -308,9 +308,9 @@
 
                 </div>
 
               </el-dropdown-menu>
 
             </el-dropdown>
 
-            <span style="margin-left: 20px; font-size: 12px">{{
 
+            <!-- <span style="margin-left: 20px; font-size: 12px">{{
 
               dutyName
 
-            }}</span>
 
+            }}</span> -->
 
           </div>
 
           <div class="sl-header-li-lgbc">
 
             <span class="icore-icons icore-icons-right-arrow am-xz"></span>

+ 3 - 4
src/views/RMS/app.html
Zobrazit soubor 

@@ -4,9 +4,9 @@
 
     <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>
 
+    <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>
 
@@ -14,7 +14,6 @@
 
     <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>

+ 62 - 4
src/views/RMS/components/addCapacity.vue
Zobrazit soubor 

@@ -6,6 +6,17 @@
 
      <div class="form-box" style="margin-right: 10rem">
 
         <dil-form :formId="309" v-model="form1" ref="from1"></dil-form>
 
       </div>
 
+      <div class="inputBox">
 
+    <span class="text">所属单位类型</span>
 
+      <el-autocomplete
 
+        v-model="state"
 
+        @input="onInput"
 
+        :fetch-suggestions="querySearch"
 
+        placeholder="请输入内容"
 
+        :trigger-on-focus="false"
 
+        @select="handleSelect"
 
+      ></el-autocomplete>
 
+      </div>
 
     <div class="button-box">
 
       <el-button @click="cancel">取消</el-button>
 
       <el-button type="primary" @click="makeSure">确定</el-button>
 
@@ -22,11 +33,45 @@ export default {
 
     return {
 
       form1: {},
 
       // value: undefined,
 
-     
+     carrierIds:"",
 
+      state: "",
 
+      restaurants: [],
 
     };
 
   },
 
   mounted() {},
 
   methods: {
 
+     onInput() {
 
+      this.axios.post(
 
+        "/api/v1/rms/getCarrierName?state="+this.state,
 
+      )
 
+      .then((res) => {
 
+        if(res.data.code == "200"){
 
+          res.data.data.forEach(element => {
 
+            this.restaurants.push({
 
+              value:element.carrierName,
 
+              carrierIds:element.carrierId
 
+            })
 
+          });
 
+        }
 
+        
+      });
 
+    },
 
+    querySearch(queryString, cb) {
 
+        var restaurants = this.restaurants;
 
+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
 
+        // 调用 callback 返回建议列表的数据
 
+        cb(results);
 
+      },
 
+      createFilter(queryString) {
 
+        return (restaurant) => {
 
+          return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
 
+        };
 
+      },
 
+    handleSelect(item){
 
+      this.carrierIds=item.carrierIds;
 
+      console.log(item)
 
+    },
 
+   
      makeSure() {
 
        console.log(this.from1)
 
        let RmsCapacity={
 
@@ -36,7 +81,10 @@ export default {
 
          capacityOwneris:this.form1.capacityOwneris,
 
          capacityVip:this.form1.capacityVip,
 
          capacityBlacklist:this.form1.capacityBlacklist,
 
-         carrierId:this.form1.carrierId,
 
+        // carrierId:this.form1.carrierId,
 
+        state:this.state,
 
+        carrierName:this.state,
 
+        carrierIds: this.carrierIds,
 
        };
 
        if(
 
          RmsCapacity.capacityNumber==null ||
 
@@ -44,7 +92,7 @@ export default {
 
          RmsCapacity.capacityOwneris==null ||
 
          RmsCapacity.capacityVip==null ||
 
          RmsCapacity.capacityBlacklist==null ||
 
-         RmsCapacity.carrierId==null
 
+         RmsCapacity.carrierIds==null
 
        )this.$message.error("存在空值！");
 
        else
 
       this.axios
 
@@ -52,6 +100,7 @@ export default {
 
           "/api/v1/rms/insertCapacity", RmsCapacity
 
         )
 
         .then((res) => {
 
+          console.log("res.data.code",res.data.code);
 
           if (res.data.code == 200) {
 
             this.$message({
 
               type: "success",
 
@@ -62,7 +111,7 @@ export default {
 
           } else {
 
             this.$message.error("新增失败,可能存在重复！");
 
           }
 
-          this.$refs['table'].resetField();
 
+          // this.$refs['table'].resetField();
 
         });
 
     },
 
     // 取消
 
@@ -81,6 +130,15 @@ export default {
 
   margin-top: 0.3125rem;
 
   margin-bottom: 1.25rem;
 
 }
 
+.inputBox{
 
+     display: flex;
 
+  text-align: center;
 
+  align-items: center;
 
+  justify-content: center;
 
+  margin-top: 0.1000rem;
 
+  margin-bottom: 0.25rem;
 
+  margin-left: -12rem;
 
+}
 
 .form-box{
 
   display: flex;
 
   justify-content: center;

+ 13 - 7
src/views/RMS/components/addCarDriver.vue
Zobrazit soubor 

@@ -20,9 +20,10 @@
 
     <div class="photoBox">
 
    <el-upload
 
   class="upload-demo"
 
-  action="http://192.168.1.120:8080/api/v1/rms/rmscardriver/upload"
 
+  action="http://localhost:8080/api/v1/rms/upload"
 
   :on-preview="handlePreview"
 
   :on-remove="handleRemove"
 
+  :on-success="handleAvatarSuccess"
 
   :file-list="fileList"
 
   list-type="picture">
 
   <div>行驶证照片
 
@@ -34,9 +35,10 @@
 
      <div class="photoBox">
 
    <el-upload
 
   class="upload-demo"
 
-  action="http://192.168.1.120:8080/api/v1/rms/rmscardriver/upload"
 
+  action="http://localhost:8080/api/v1/rms/upload"
 
   :on-preview="handlePreview"
 
   :on-remove="handleRemove"
 
+  :on-success="handleAvatarSuccess"
 
   :file-list="fileList"
 
   list-type="picture">
 
   <div>驾驶证照片
 
@@ -48,9 +50,10 @@
 
       <div class="photoBox">
 
    <el-upload
 
   class="upload-demo"
 
-  action="http://192.168.1.120:8080/api/v1/rms/rmscardriver/upload"
 
+  action="http://localhost:8080/api/v1/rms/upload"
 
   :on-preview="handlePreview"
 
   :on-remove="handleRemove"
 
+  :on-success="handleAvatarSuccess"
 
   :file-list="fileList"
 
   list-type="picture">
 
   <div>运输证照片
 
@@ -63,9 +66,10 @@
 
  <div class="photoBox">
 
    <el-upload
 
   class="upload-demo"
 
-  action="http://192.168.1.120:8080/api/v1/rms/rmscardriver/upload"
 
+  action="http://localhost:8080/api/v1/rms/upload"
 
   :on-preview="handlePreview"
 
   :on-remove="handleRemove"
 
+  :on-success="handleAvatarSuccess"
 
   :file-list="fileList"
 
   list-type="picture">
 
   <div>从业资格证照片
 
@@ -96,7 +100,7 @@ export default {
 
       fileList: [],
 
       carrierIds:"",
 
       state: "",
 
-     
+      imageUrl:"",
 
     };
 
   },
 
   mounted() {},
 
@@ -132,7 +136,9 @@ export default {
 
       this.carrierIds=item.carrierIds;
 
       console.log(item)
 
     },
 
-   
+    handleAvatarSuccess(res,file){
 
+      this.imageUrl=URL.createObjectURL(file.raw);
 
+    },
 
     handleRemove(file, fileList) {
 
         console.log(file, fileList);
 
       },
 
@@ -185,7 +191,7 @@ export default {
 
           } else {
 
             this.$message.error("新增失败,可能存在重复！");
 
           }
 
-          this.$refs['table'].resetField();
 
+          //this.$refs['table'].resetField();
 
         });
 
     },
 
     // 取消

+ 85 - 11
src/views/RMS/components/addCarrier.vue
Zobrazit soubor 

@@ -8,16 +8,42 @@
 
       </div>
 
     <el-upload
 
       class="upload-demo"
 
-      action="http://localhost:8060/api/v1/rms/rmscarrier/uploadCarrier"
 
+      action="http://localhost:8070/api/v1/rms/rmscarrier/uploadCarrier1"
 
       :on-preview="handlePreview"
 
       :on-remove="handleRemove"
 
-      :on-success="handleAvatarSuccess"
 
+      :on-success="handleAvatarSuccess1"
 
       :file-list="fileList"
 
+      :before-upload="beforeUpload2"
 
       list-type="picture">
 
-      <el-button size="small" type="primary">点击上传照片</el-button>
 
+      <el-button size="small" type="primary">点击上传运输证</el-button>
 
+      <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
 
+    </el-upload>
 
+    <el-upload
 
+      class="upload-demo"
 
+      action="http://localhost:8070/api/v1/rms/rmscarrier/uploadCarrier2"
 
+      :on-preview="handlePreview"
 
+      :on-remove="handleRemove"
 
+      :on-success="handleAvatarSuccess2"
 
+      :file-list="fileList"
 
+      :before-upload="beforeUpload2"
 
+      list-type="picture">
 
+      <el-button size="small" type="primary">点击上传经营许可证</el-button>
 
+      <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
 
+    </el-upload>
 
+    <el-upload
 
+      class="upload-demo"
 
+      action="http://localhost:8070/api/v1/rms/rmscarrier/uploadCarrier3"
 
+      :on-preview="handlePreview"
 
+      :on-remove="handleRemove"
 
+      :on-success="handleAvatarSuccess3"
 
+      :file-list="fileList"
 
+      :before-upload="beforeUpload2"
 
+      list-type="picture">
 
+      <el-button size="small" type="primary">点击上传营业执照</el-button>
 
       <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
 
     </el-upload>
 
 
+
 
     <div class="form-box f1">
 
       <el-form :inline="true" :model="formInline" class="demo-form-inline">
 
     <el-form-item>
 
@@ -79,12 +105,52 @@ export default {
 
          registerDate:"",
 
          mapValue:""
 
       },
 
-      imageUrl:""
 
+      imageUrl1:"",
 
+      imageUrl2:"",
 
+      imageUrl3:"",
 
+      imageUrls:[],
 
     };
 
   },
 
   methods: {
 
-    handleAvatarSuccess(res,file){
 
-      this.imageUrl=URL.createObjectURL(file.raw);
 
+    beforeUpload2 (file) {
 
+        const isLt2M = file.size < 1024 * 1024 * 0.5
 
+        console.log('大小' + isLt2M)
 
+        if (!isLt2M) {
 
+          this.$message.error('上传文件大小不能超过500kb!')
 
+        }
 
+        let size = file.size / 1024
 
+        console.log('大小' + size)
 
+        let _URL = window.URL || window.webkitURL
 
+        let img = new Image()
 
+        img.onload = function () {
 
+          let width = img.width
 
+          let height = img.height
 
+          console.log('width--->' + width)
 
+          console.log('height--->' + height)
 
+        }
 
+        img.src = _URL.createObjectURL(file)
 
+        return isLt2M
 
+    },
 
+    handleAvatarSuccess1(res,file){
 
+      this.imageUrl1=URL.createObjectURL(file.raw);
 
+      // this.axios
 
+      // .then((res) => {
 
+      //   if (res.data.code == 200) {
 
+      //     this.$message({
 
+      //     type: "success",
 
+      //     message: "新增成功!",
 
+      //     });
 
+      //   } 
+      //   else {
 
+      //     this.$message.error("图片上传失败，图片格式不得超过500kb且只能是jpg/png文件！");
 
+      //   }
 
+      // });
 
+    },
 
+    handleAvatarSuccess2(res,file){
 
+      this.imageUrl2=URL.createObjectURL(file.raw);
 
+    },
 
+    handleAvatarSuccess3(res,file){
 
+      this.imageUrl3=URL.createObjectURL(file.raw);
 
     },
 
     handleRemove(file,fileList){
 
       console.log(file,fileList)
 
@@ -98,7 +164,6 @@ export default {
 
     },
 
     currentRadioChange(selection){
 
       this.mapList=selection, 
-      console.log(this.mapList) 
       this.bidArea=this.mapList.bidArea
 
      
     },
 
@@ -130,18 +195,27 @@ export default {
 
       let registerDate={
 
         registerDate: this.form1.registerDate,
 
       };
 
+      let imageUrls={
 
+        imageUrl1:this.imageUrl1,
 
+        imageUrl1:this.imageUrl2,
 
+        imageUrl1:this.imageUrl3
 
+      };
 
+      console.log(imageUrls)
 
       let mapValue={
 
         RmsCarrier:RmsCarrier,
 
-        registerDate:registerDate
 
+        registerDate:registerDate,
 
+        imageUrls:imageUrls
 
       };
 
       if(
 
         reg.test(RmsCarrier.carrierContactNumber)==false
 
       )this.$message.error("输入的格式不正确");
 
        else if(
 
           RmsCarrier.carrierName ==null ||
 
-        // RmsCarrier.carrierTransportCertificate ==null ||
 
-        // RmsCarrier.carrierBusinessLicense ==null ||
 
-        // RmsCarrier.carrierBusinessAblelicense ==null ||
 
+
 
+          // imageUrls.imageUrl1 ==null ||
 
+          // imageUrls.imageUrl2 ==null ||
 
+          // imageUrls.imageUrl3 ==null ||
 
+
 
           RmsCarrier.carrierAbbreviation ==null ||
 
           RmsCarrier.carrierAddress ==null ||
 
           RmsCarrier.registerNo ==null ||

+ 4 - 3
src/views/RMS/components/addConsignee.vue
Zobrazit soubor 

@@ -26,7 +26,6 @@ export default {
 
   mounted() {},
 
   methods: {
 
      makeSure() {
 
-       console.log("enter11111111111111111111111")
 
        console.log(this.form1)
 
        let RmsConsignee={
 
          companyName:this.form1.companyName,
 
@@ -53,7 +52,9 @@ export default {
 
             "/api/v1/rms/insertConsignee",
 
             RmsConsignee
 
           )
 
+    
           .then((res) => {
 
+               console.log("res.data.code",res.data.code);
 
             if (res.data.code == 200) {
 
               this.$message({
 
                 type: "success",
 
@@ -62,9 +63,9 @@ export default {
 
               // this.$refs.table.refreshData();
 
               this.$router.go(-1);
 
             } else {
 
-              this.$message.error("新增失败");
 
+              this.$message.error("新增失败,可能有重复");
 
             }
 
-           this.$refs['table'].resetField();
 
+          // this.$refs['table'].resetField();
 
           });
 
     },
 
     // 取消

+ 2 - 5
src/views/RMS/components/addPersonnel.vue
Zobrazit soubor 

@@ -36,8 +36,7 @@ export default {
 
         personnelWorkshopid: this.form1.personnelWorkshopid,
 
         personnelShifts: this.form1.personnelShifts,
 
         personnelTeam:this.form1.personnelTeam,
 
-        departmentId: this.form1.shipperId,
 
-        username:this.form1.username
 
+        departmentId: this.form1.shipperId
 
       };
 
       if(
 
         RmsPersonnel.personnelJobNumber ==null ||
 
@@ -46,11 +45,9 @@ export default {
 
         RmsPersonnel.personnelWorkshopid==null ||
 
         RmsPersonnel.personnelShifts==null ||
 
         RmsPersonnel.departmentId==null ||
 
-        RmsPersonnel.personnelTeam==null||
 
-        RmsPersonnel.username==null
 
+        RmsPersonnel.personnelTeam==null
 
       )this.$message.error("存在空值！");
 
       else
 
-      
       this.axios
 
         .post(
 
           "/api/v1/rms/insertPersonnel",

+ 3 - 3
src/views/SporadicManage/app.html
Zobrazit soubor 

@@ -4,9 +4,9 @@
 
     <meta charset="utf-8">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
     <meta name="renderer" content="webkit">
 
-    <meta content="工业互联网平台 iCore-ICP" name="keywords">
 
-    <meta content="工业互联网平台 iCore-ICP" name="description">
 
-    <title>加载中... - 工业互联网平台 iCore-ICP</title>
 
+    <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>

+ 4 - 6
src/views/TMS/app.html
Zobrazit soubor 

@@ -1,12 +1,12 @@
 
 <!DOCTYPE html>
 
-<html style="overflow: hidden;">
 
+<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>首页 - 工业互联网平台 iCore-ICP</title>
 
+    <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>
 
@@ -14,10 +14,8 @@
 
     <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>
 
-    <!-- test set app -->
 
   </body>
 
 </html>

+ 3 - 4
src/views/WMS/app.html
Zobrazit soubor 

@@ -4,9 +4,9 @@
 
     <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>
 
+    <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>
 
@@ -14,7 +14,6 @@
 
     <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>

+ 3 - 4
src/views/appoint/app.html
Zobrazit soubor 

@@ -4,9 +4,9 @@
 
     <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>
 
+    <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>
 
@@ -14,7 +14,6 @@
 
     <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>

+ 3 - 4
src/views/configManager/app.html
Zobrazit soubor 

@@ -4,9 +4,9 @@
 
     <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>
 
+    <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>
 
@@ -14,7 +14,6 @@
 
     <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>

+ 3 - 4
src/views/homepage/app.html
Zobrazit soubor 

@@ -4,9 +4,9 @@
 
     <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>
 
+    <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>
 
@@ -14,7 +14,6 @@
 
     <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>

+ 74 - 5
src/views/homepage/components/homepage.vue
Zobrazit soubor 

@@ -1,15 +1,84 @@
 
 <template>
 
-  <div>首页
 
-      
+  <div>
 
+    首页
 
+    <el-button @click="onClick">ces1</el-button>
 
   </div>
 
 </template>
 
 
 <script>
 
 export default {
 
-
 
-}
 
+  methods: {
 
+    onClick() {
 
+      let data = {
 
+        userId: "",
 
+        userCode: "A12345",
 
+        userName: "A12345",
 
+        qrCode: "",
 
+        sex: "",
 
+        age: "",
 
+        cardNo: "",
 
+        birthDate: "",
 
+        nativePlace: "",
 
+        orgCode: "yunli",
 
+        orgName: "运力",
 
+        dep: "",
 
+        workTeam: "",
 
+        profilePhoto: "",
 
+        photo: "",
 
+        mobile: "13487481520",
 
+        qq: "",
 
+        wechat: "",
 
+        tel: "",
 
+        email: "213213@qq.com",
 
+        homeAddr: "",
 
+        entryDate: "",
 
+        workDate: "",
 
+        political: "",
 
+        title: "",
 
+        degree: "",
 
+        major: "",
 
+        gradSchool: "",
 
+        ability: "",
 
+        tranHis: "",
 
+        certificate: "",
 
+        special: "",
 
+        assessment: "",
 
+        leaveStatus: "",
 
+        onlineStatus: "",
 
+        status: "",
 
+        remark: "",
 
+        expireDays: "",
 
+        leave: "",
 
+        address: "",
 
+        ip: "",
 
+        rank: "",
 
+        responsibility: "",
 
+        groupData: "",
 
+        companyData: "",
 
+        groupId: "506514577756917769",
 
+        companyId: "713710108567277568",
 
+        photoType: "",
 
+        orgId: "922512907093282816",
 
+      };
 
+      this.store.dispatch("system/usersManage/addUser", data).then((res) => {
 
+        console.log(res);
 
+        if (res.code === "0") {
 
+          if (this.qrRole.length > 0) {
 
+            this.addRoleToUser(res.data.userId, res.data.userCode);
 
+          }
 
+          if (form.dutys.length > 0) {
 
+            this.addUserDutys(res.data.userId, form.dutys);
 
+          }
 
+          this.$message.success("添加成功");
 
+          this.$emit("on-then", "success", form);
 
+        } else {
 
+          this.$message.error(res.message);
 
+        }
 
+      });
 
+    },
 
+  },
 
+};
 
 </script>
 
 
 <style>
 
-
 
 </style>

+ 4 - 6
src/views/index/app.html
Zobrazit soubor 

@@ -1,12 +1,12 @@
 
 <!DOCTYPE html>
 
-<html style="overflow: hidden;">
 
+<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>首页 - 工业互联网平台 iCore-ICP</title>
 
+    <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>
 
@@ -14,10 +14,8 @@
 
     <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>
 
-    <!-- test set app -->
 
   </body>
 
 </html>

+ 4 - 5
src/views/inward/app.html
Zobrazit soubor 

@@ -1,12 +1,12 @@
 
 <!DOCTYPE html>
 
-<html style="overflow: hidden;">
 
+<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>首页 - 工业互联网平台 iCore-ICP</title>
 
+    <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>
 
@@ -17,6 +17,5 @@
 
   </head>
 
   <body>
 
     <div id="app"></div>
 
-    <!-- test set app -->
 
   </body>
 
 </html>

+ 3 - 4
src/views/queue/app.html
Zobrazit soubor 

@@ -4,9 +4,9 @@
 
     <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>
 
+    <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>
 
@@ -14,7 +14,6 @@
 
     <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>

+ 3 - 4
src/views/sale/app.html
Zobrazit soubor 

@@ -4,9 +4,9 @@
 
     <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>
 
+    <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>
 
@@ -14,7 +14,6 @@
 
     <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>

+ 3 - 3
src/views/serviceManager/app.html
Zobrazit soubor 

@@ -4,9 +4,9 @@
 
     <meta charset="utf-8">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
     <meta name="renderer" content="webkit">
 
-    <meta content="工业互联网平台 iCore-ICP" name="keywords">
 
-    <meta content="工业互联网平台 iCore-ICP" name="description">
 
-    <title>加载中... - 工业互联网平台 iCore-ICP</title>
 
+    <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>

+ 3 - 4
src/views/statisticalReport/app.html
Zobrazit soubor 

@@ -4,9 +4,9 @@
 
     <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>
 
+    <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>
 
@@ -14,7 +14,6 @@
 
     <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>

+ 3 - 3
src/views/systemConfig/app.html
Zobrazit soubor 

@@ -4,9 +4,9 @@
 
     <meta charset="utf-8">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
     <meta name="renderer" content="webkit">
 
-    <meta content="工业互联网平台 iCore-ICP" name="keywords">
 
-    <meta content="工业互联网平台 iCore-ICP" name="description">
 
-    <title>加载中... - 工业互联网平台 iCore-ICP</title>
 
+    <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>

+ 1 - 1
src/views/systemConfig/components/usersAddAndEdit.vue
Zobrazit soubor 

@@ -616,7 +616,7 @@
 
                 style="float: right"
 
                 @click="formSubmit"
 
                 size="small"
 
-                >保 存</el-button
 
+                >保 存1</el-button
 
               >
 
               <el-button
 
                 plain

+ 3 - 3
src/views/workFlow/app.html
Zobrazit soubor 

@@ -4,9 +4,9 @@
 
     <meta charset="utf-8">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
     <meta name="renderer" content="webkit">
 
-    <meta content="工业互联网平台 iCore-ICP" name="keywords">
 
-    <meta content="工业互联网平台 iCore-ICP" name="description">
 
-    <title>加载中... - 工业互联网平台 iCore-ICP</title>
 
+    <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>

+ 0 - 0
static/img/favicon.ico → static/img/favicon2.ico
Zobrazit soubor