1

src/router/index.js

@@ -44,7 +44,7 @@ export const constantRoutes = [{
             meta: {
                 title: '首页',
                 icon: 'shouye',
-                checkIcon:'checkshouye'
+                checkIcon: 'checkshouye'
             }
         }]
     },
@@ -56,7 +56,7 @@ export const constantRoutes = [{
         meta: {
             title: '权限设置',
             icon: 'permission',
-            checkIcon:'checkpermission'
+            checkIcon: 'checkpermission'
         },
         children: [{
                 path: 'permissionSetting',

src/router/officialWebsiteManagement/index.js

@@ -11,17 +11,18 @@ const officialWebsiteManagement = {
         title: '官网管理',
         icon: 'guanwangguanli',
         checkIcon: 'checkguanwangguanli',
-        module: 'changyuntong.guanwangguanli',
+        module: 'changyuntong.sijiguanli',
     },
     alwaysShow: true,
     children: [{
-            path: '/news',
-            name: 'news',
+            path: '/newInfo',
+            name: 'newInfo',
             component: () =>
-                import ('@/views/officialWebsiteManagement/news'),
+                import ('@/views/officialWebsiteManagement/newInfo'),
             meta: {
                 title: '公告信息',
                 icon: '',
+                module: 'changyuntong.sijiguanli.view',
             }
         },
         {
@@ -31,7 +32,8 @@ const officialWebsiteManagement = {
                 import ('@/views/officialWebsiteManagement/newsAdd'),
             meta: {
                 title: '公告信息新增',
-                icon: ''
+                icon: '',
+
             },
             hidden: true
         },
@@ -64,7 +66,8 @@ const officialWebsiteManagement = {
                 import ('@/views/officialWebsiteManagement/notice'),
             meta: {
                 title: '处理公示',
-                icon: ''
+                icon: '',
+                module: 'changyuntong.sijiguanli.view',
             },
         },
         {
@@ -108,7 +111,8 @@ const officialWebsiteManagement = {
                 import ('@/views/officialWebsiteManagement/publicity'),
             meta: {
                 title: '行业资讯',
-                icon: ''
+                icon: '',
+                module: 'changyuntong.sijiguanli.view',
             }
         },
         {

src/views/cargoOwnerManagement/empowerExamine.vue

@@ -527,21 +527,21 @@ export default {
           this.forbiddenshow=true
           
         } else if (num == 2) {
-          title = "确定重新启用该用户？";
+          title = '确定重新启用该用户？';
           _examine.disableFlag = 2;
           _examine.identityFlag = 1;
-          this.$confirm(title, "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+          this.$confirm(title, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
         }).then(() => {
           this.listLoading = true;
           forbidden(_examine)
             .then((response) => {
                 this.$notify({
-                  title: "成功",
-                  message: "启用成功！",
-                  type: "success",
+                  title: '成功',
+                  message: '启用成功！',
+                  type: 'success',
                 });
               this.getList();
               this.listLoading = false;
@@ -554,10 +554,10 @@ export default {
       },
       submitforbidden(){
           if(!this.disabledDays){
-            this.$message.error("禁用天数不能为空");
+            this.$message.error('禁用天数不能为空');
             return
           }if(this.disabledDays<2){
-            this.$message.error("禁用天数输入错误");
+            this.$message.error('禁用天数输入错误');
             return
           }
           var _examine={}
@@ -569,9 +569,9 @@ export default {
           forbidden(_examine)
             .then((response) => {
                 this.$notify({
-                  title: "成功",
-                  message: "禁用成功！",
-                  type: "success",
+                  title: '成功',
+                  message: '禁用成功！',
+                  type: 'success',
                 });
                 this.forbiddenshow=false
               this.getList();

src/views/login/index.vue

@@ -66,54 +66,54 @@
 </template>
 
 <script>
-  import Cookies from "js-cookie";
+  import Cookies from 'js-cookie';
   import {
     mapActions
-  } from "vuex";
+  } from 'vuex';
   import {
     validUsername,
     isLoginName
-  } from "@/utils/validate";
+  } from '@/utils/validate';
   import {
     getVerifyCode,
     getCheckInfo,
     getlogin
   } from '@/api/user'
-  import SIdentify from "./sidentify";
+  import SIdentify from './sidentify';
   export default {
-    name: "Login",
+    name: 'Login',
     components: {
       SIdentify,
     },
     data() {
       const validateUsername = (rule, value, callback) => {
         if (!validUsername(value)) {
-          callback(new Error("请输入正确的账号"));
+          callback(new Error('请输入正确的账号'));
         } else {
           callback();
         }
       };
       const validatePassword = (rule, value, callback) => {
         if (value.length < 6) {
-          callback(new Error("请输入正确的密码"));
+          callback(new Error('请输入正确的密码'));
         } else {
           callback();
         }
       };
       const validateCode = (rule, value, callback) => {
         if (this.identifyCode !== value) {
-          this.loginForm.code = "";
+          this.loginForm.code = '';
           this.refreshCode();
-          callback(new Error("请输入正确的验证码"));
+          callback(new Error('请输入正确的验证码'));
         } else {
           callback();
         }
       };
       const checkCode = (rule, value, callback) => {
         if (this.identifyCode !== value || value.length != 6) {
-          this.loginForm.checkCode = "";
+          this.loginForm.checkCode = '';
           this.refreshCode();
-          callback(new Error("请输入正确的手机验证码"));
+          callback(new Error('请输入正确的手机验证码'));
         } else {
           callback();
         }
@@ -121,49 +121,49 @@
       return {
         isDebugLogin: false,
         loginForm: {
-          username: "",
-          password: "",
-          code: "",
+          username: '',
+          password: '',
+          code: '',
         },
-        identifyCodes: "1234567890",
-        identifyCode: "",
+        identifyCodes: '1234567890',
+        identifyCode: '',
         loginRules: {
           username: [{
               required: true,
-              trigger: "blur",
-              message: "请输入账号",
+              trigger: 'blur',
+              message: '请输入账号',
             },
             {
               min: 11,
               max: 11,
-              message: "请输入11位手机号",
-              trigger: "blur",
+              message: '请输入11位手机号',
+              trigger: 'blur',
             },
             {
               validator: isLoginName,
-              trigger: "blur",
+              trigger: 'blur',
             },
           ],
           password: [{
               required: true,
-              message: "请输入密码",
-              trigger: "blur",
+              message: '请输入密码',
+              trigger: 'blur',
             },
             {
               min: 1,
               max: 100,
-              message: "长度在1-100字符之间",
-              trigger: "blur",
+              message: '长度在1-100字符之间',
+              trigger: 'blur',
             },
           ],
           code: [{
               required: true,
-              message: "请输入验证码",
-              trigger: "blur",
+              message: '请输入验证码',
+              trigger: 'blur',
             },
             {
               validator: validateCode,
-              trigger: "blur",
+              trigger: 'blur',
             },
           ],
           // checkCode: [{
@@ -181,21 +181,23 @@
         },
         loading: false,
         rememberMe: true,
-        passwordType: "password",
+        passwordType: 'password',
         redirect: undefined,
-        codeText: "获取验证码",
+        codeText: '获取验证码',
       };
     },
     watch: {
       $route: {
         handler: function(route) {
+          console.log('route',route)
           this.redirect = route.query && route.query.redirect;
+          console.log('this.redirect,this.redirect')
         },
         immediate: true,
       },
       isDebugLogin(v) {
         if (v) {
-          this.loginForm.password = "123";
+          this.loginForm.password = '123';
           this.refreshCode();
         }
       },
@@ -222,12 +224,12 @@
       checkClick() { //获取验证码
         let that = this;
         if (that.identifyCode !== that.loginForm.code) {
-          this.loginForm.code = "";
-          that.$message.error("请输入正确的图片验证码")
+          this.loginForm.code = '';
+          that.$message.error('请输入正确的图片验证码')
           return
         }
         if (/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(that.loginForm.username)) {
-          if (that.codeText == "获取验证码" || that.codeText == "重新发送") {
+          if (that.codeText == '获取验证码' || that.codeText == '重新发送') {
             getVerifyCode({
               phone: that.loginForm.username,
               identification: 3
@@ -238,7 +240,7 @@
                   if (that.codeText > 0) {
                     that.codeText -= 1;
                   } else {
-                    that.codeText = "重新发送";
+                    that.codeText = '重新发送';
                   }
                 }, 1000);
               } else {
@@ -247,15 +249,15 @@
             })
           }
         } else {
-          that.$message.error("请输入正确的手机")
+          that.$message.error('请输入正确的手机')
         }
       },
-      ...mapActions("user", ["login"]),
+      ...mapActions('user', ['login']),
       randomNum(min, max) {
         return Math.floor(Math.random() * (max - min) + min);
       },
       refreshCode() {
-        this.identifyCode = "";
+        this.identifyCode = '';
         this.makeCode(this.identifyCodes, 4);
       },
       makeCode(o, l) {
@@ -265,10 +267,10 @@
         }
       },
       showPwd() {
-        if (this.passwordType === "password") {
-          this.passwordType = "";
+        if (this.passwordType === 'password') {
+          this.passwordType = '';
         } else {
-          this.passwordType = "password";
+          this.passwordType = 'password';
         }
         this.$nextTick(() => {
           this.$refs.password.focus();
@@ -333,38 +335,38 @@
         let that = this
         this.$refs.loginForm.validate(async (valid) => {
           if (valid) {
-            this.loginForm.companyName = "黑龙江中天昊元贸易有限公司";
+            this.loginForm.companyName = '黑龙江中天昊元贸易有限公司';
             this.loading = true;
             // this.$store.dispatch('user/login', this.loginForm)
             // const res = await this.$store.dispatch('user/login', this.loginForm)、
            const res = await getlogin({
               loginName: this.loginForm.username,
               loginPassword: this.loginForm.password,
-              compId: "2710b21efc1e4393930c5dc800010dc4",
+              compId: '2710b21efc1e4393930c5dc800010dc4',
             })
             
               if (res.code == 200) {
                 const res1 = await this.$store.dispatch('user/login', this.loginForm)
                 localStorage.setItem('UserInfo', JSON.stringify(res1.data))
-                localStorage.setItem("ws_login_type", 2);
-                Cookies.set("ws_login_companyShortName", this.loginForm.companyName, {
+                localStorage.setItem('ws_login_type', 2);
+                Cookies.set('ws_login_companyShortName', this.loginForm.companyName, {
                   expires: 365,
                 });
-                Cookies.set("ws_login_account", this.loginForm.username, {
+                Cookies.set('ws_login_account', this.loginForm.username, {
                   expires: 365,
                 });
                 if (this.rememberMe) {
-                  Cookies.set("ws_login_pwd", this.loginForm.password, {
+                  Cookies.set('ws_login_pwd', this.loginForm.password, {
                     expires: 365,
                   });
-                  Cookies.set("ws_login_rememberMe", 1, {
+                  Cookies.set('ws_login_rememberMe', 1, {
                     expires: 365,
                   });
                 } else {
-                  Cookies.remove("ws_login_companyShortName");
-                  Cookies.remove("ws_login_account");
-                  Cookies.remove("ws_login_pwd");
-                  Cookies.set("ws_login_rememberMe", 0, {
+                  Cookies.remove('ws_login_companyShortName');
+                  Cookies.remove('ws_login_account');
+                  Cookies.remove('ws_login_pwd');
+                  Cookies.set('ws_login_rememberMe', 0, {
                     expires: 365,
                   });
                 }
@@ -372,7 +374,7 @@
                 if (redirect) {
                   this.$router.push(redirect);
                 } else {
-                  this.$router.push("/");
+                  this.$router.push('/');
                 }
               } else {
                 this.$message.error(response.message)
@@ -388,7 +390,7 @@
             //   this.loading = false
             // })
           } else {
-            console.log("error submit!!");
+            console.log('error submit!!');
             return false;
           }
         });

src/views/orderManagement/orderAudit.vue

@@ -224,7 +224,7 @@
 
     <el-drawer title="订单详情" :visible.sync="rightSee" style="overflow-y: auto !important">
       <div class="right_css">
-        <div style='height:80vh;overflow-y:scroll;'>
+        <div>
           <div class="title_name">基本信息</div>
           <div class="right_item">订单编号：{{ costData.orderNo }}</div>
           <div class="right_title">货主</div>
@@ -381,29 +381,29 @@ import {
 } from '@/api/orderManagement'
 export default {
   components: {
-    "el-image-viewer": () =>
-      import("element-ui/packages/image/src/image-viewer"),
+    'el-image-viewer': () =>
+      import('element-ui/packages/image/src/image-viewer'),
   },
   data() {
     return {
       tableData: [],
       //分页
-      searchkeyWord: "",
+      searchkeyWord: '',
       currentPage: 1,
       pageSize: 10,
       deptBudgetTotal: 0,
       deptCircularPage: {},
-      search: "",
+      search: '',
       addressUrl: [],
       disabled: false,
       costInfo: false,
       userInfo: false,
       rejectInfo: false,
-      startDate: "",
-      endDate: "",
+      startDate: '',
+      endDate: '',
       form: {
         checkList: [],
-        textarea: "",
+        textarea: '',
       },
       value1: [],
       costData: {
@@ -424,19 +424,19 @@ export default {
     getDate() {//获取默认时间
       let date = new Date()
       let date1 = new Date().setTime(date.getTime() - 3 * 60 * 60 * 24 * 1000) //三天前的时间蹉
-      date1 = new Date(parseInt(date1)).toLocaleString().split(" ")[0].replaceAll("/", "-")
-      let nian = date1.split("-")[0]
-      let yue = date1.split("-")[1]
+      date1 = new Date(parseInt(date1)).toLocaleString().split(' ')[0].replaceAll('/', '-')
+      let nian = date1.split('-')[0]
+      let yue = date1.split('-')[1]
       if (yue < 10) {
-        yue = "0" + yue
+        yue = '0' + yue
       }
-      let ri = date1.split("-")[2]
+      let ri = date1.split('-')[2]
       if (ri < 10) {
-        ri = "0" + ri
+        ri = '0' + ri
       }
-      this.startDate = nian + "-" + yue + "-" + ri //三天前的時間
-      this.endDate = date.getFullYear() + "-" + (date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date
-        .getMonth() + 1) + "-" + (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) //當前時間
+      this.startDate = nian + '-' + yue + '-' + ri //三天前的時間
+      this.endDate = date.getFullYear() + '-' + (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date
+        .getMonth() + 1) + '-' + (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) //當前時間
       this.value1.push(this.startDate)
       this.value1.push(this.endDate)
     },
@@ -726,7 +726,7 @@ export default {
           this.formData.addressUrl = response;
         })
         .catch((res) => {
-          EventBus.$emit("error", (JSON.parse(res) || {}).message);
+          EventBus.$emit('error', (JSON.parse(res) || {}).message);
           this.$refs.upload.clearFiles();
         });
     },

vue.config.js

@@ -47,7 +47,7 @@ module.exports = {
     productionSourceMap: false,
     devServer: {
         port: port,
-        host:'0.0.0.0',
+        host: '0.0.0.0',
         disableHostCheck: true,
         open: false,
         overlay: {
@@ -56,7 +56,7 @@ module.exports = {
         },
         proxy: {
             '/pb': {
-                target: 'http://192.168.110.9:8099/', 
+                target: 'http://192.168.110.82:8099/',
                 // target: 'http://192.168.110.9:8099/',       
                 // target: 'https://apitest.changyuntong56.com',
                 changeOrigin: true, // 开启代理：在本地会创建一个虚拟服务端，然后发送请求的数据，并同时接收请求的数据，这样服务端和服务端进行数据的交互就不会有跨域问题