diff --git a/src/common/globalRouter.js b/src/common/globalRouter.js index c36e897..2d503bc 100644 --- a/src/common/globalRouter.js +++ b/src/common/globalRouter.js @@ -1,73 +1,75 @@ -import { createRouter, createWebHistory, createWebHashHistory } from "vue-router"; +import { + createRouter, + createWebHistory, + createWebHashHistory, +} from "vue-router"; let routes = [ - { - path: "/", - // redirect: "/home", - redirect: "/enforceHome", - // redirect: "/login", - name: "App", - }, - { - path: "/:pathMatch(.*)*", - name: "404", - component: () => import("@/views/404"), - }, + { + path: "/", + // redirect: "/home", + redirect: "/enforceHome", + // redirect: "/login", + name: "App", + }, + { + path: "/:pathMatch(.*)*", + name: "404", + component: () => import("@/views/404"), + }, ]; routes = $globalRouterModules(routes); // 加载模块路由 const $globalRouter = createRouter({ - // 企业端u - // history: createWebHashHistory(), - // 执法端 - history: createWebHistory(), - routes, + // 企业端u + history: createWebHashHistory(), + // 执法端 + // history: createWebHistory(), + routes, }); $globalExpandRouter($globalRouter, routes); // 添加路由扩展 $globalRouter.beforeEach((to, from, next) => { + // let pattern3 = new RegExp("^[0-9]*$"); + // if (null != to.query) { + // for (let key in to.query) { + // if (pattern3.test(to.query[key])) { + // if (to.query[key].toString().lengeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeth > 9) { + // console.log(to.query[key]) + // to.query[key] = 0; + // console.log(to.query[key]) + // } + // } else { + // if (to.query[key].toString().length > 33) { + // to.query[key] = ""; + // } + // } + // } + // } + // + // if (null != to.params) { + // for (let key in to.params) { + // if (pattern3.test(to.params[key])) { + // if (to.params[key].toString().length > 9) { + // to.params[key] = 0; + // } + // } else { + // if (to.params[key].toString().length > 33) { + // to.params[key] = ""; + // } + // } + // } + // } - // let pattern3 = new RegExp("^[0-9]*$"); - // if (null != to.query) { - // for (let key in to.query) { - // if (pattern3.test(to.query[key])) { - // if (to.query[key].toString().length > 9) { - // console.log(to.query[key]) - // to.query[key] = 0; - // console.log(to.query[key]) - // } - // } else { - // if (to.query[key].toString().length > 33) { - // to.query[key] = ""; - // } - // } - // } - // } - // - // if (null != to.params) { - // for (let key in to.params) { - // if (pattern3.test(to.params[key])) { - // if (to.params[key].toString().length > 9) { - // to.params[key] = 0; - // } - // } else { - // if (to.params[key].toString().length > 33) { - // to.params[key] = ""; - // } - // } - // } - // } - - // if (to.path.includes('src')) { - // // 可以重定向或者做其他处理 - // next('/'); // 或者 next(from.path) 返回之前的路径 - // } else { - // next(); // 允许路由继续 - // } - next(); // 允许路由继续 - + // if (to.path.includes('src')) { + // // 可以重定向或者做其他处理 + // next('/'); // 或者 next(from.path) 返回之前的路径 + // } else { + // next(); // 允许路由继续 + // } + next(); // 允许路由继续 }); export { $globalRouter }; diff --git a/src/config/env.js b/src/config/env.js index c48f620..4d05095 100644 --- a/src/config/env.js +++ b/src/config/env.js @@ -2,12 +2,12 @@ // let baseUrl="http://139.186.135.156:86"; // let baseUrl="http://10.132.108.1:85"; //正式环境 -let baseUrl="http://jdm.szssfj.cn/jdmApi"; +let baseUrl = "http://jdm.szssfj.cn/jdmApi"; //测试环境 // let baseUrl="http://jdm.szssfj.cn/jdmTestApi"; // let baseUrl="http://localhost:85"; // let wsUrl='ws://10.76.108.1:9326'; export { - baseUrl, - // wsUrl -} \ No newline at end of file + baseUrl, + // wsUrl +}; diff --git a/src/views/enforce/enterpriseBaseInfo.vue b/src/views/enforce/enterpriseBaseInfo.vue index d1b5992..184d017 100644 --- a/src/views/enforce/enterpriseBaseInfo.vue +++ b/src/views/enforce/enterpriseBaseInfo.vue @@ -1,700 +1,811 @@ diff --git a/src/views/enforce/enterpriseScanPreview.vue b/src/views/enforce/enterpriseScanPreview.vue index b8b16d6..75ce32a 100644 --- a/src/views/enforce/enterpriseScanPreview.vue +++ b/src/views/enforce/enterpriseScanPreview.vue @@ -1,7 +1,7 @@ diff --git a/src/views/enforce/outsideRegister.vue b/src/views/enforce/outsideRegister.vue index 37dda94..e159897 100644 --- a/src/views/enforce/outsideRegister.vue +++ b/src/views/enforce/outsideRegister.vue @@ -37,21 +37,19 @@ @@ -122,9 +116,7 @@ -
- - - +
+ + + - -
-
-
-
    -
  • - {{item.content}} - -
    • -
-
    -
  • 近一星期暂无通知消息
    • -
-
-
-
-
- -
- - +
+
+
+
    +
  • + {{ item.content }} + +
    • +
+
    +
  • 近一星期暂无通知消息
    • +
+
+
+
+ +
+ + -
- 扫码入企 -
行政执法非行政执法
-
-
-
- -
- 行政执法信息 -
-
- 统计分析 -
-
+
+ 扫码入企 +
+ 行政执法非行政执法
+
- - -
- +
+ +
+ 行政执法信息 +
+
+ 统计分析 +
+
+ + +
+ +
+
diff --git a/src/views/enterprise/complaintDetailView.vue b/src/views/enterprise/complaintDetailView.vue index 35655dd..6467b6e 100644 --- a/src/views/enterprise/complaintDetailView.vue +++ b/src/views/enterprise/complaintDetailView.vue @@ -298,6 +298,7 @@ data.isSelect = route?.query?.isSelect; submitData.comOrOpi = route?.query?.comOrOpi; complaintInfoById({id:route?.query?.id},success =>{ + console.log("---->>>>: ", success); submitData.authorization = success.data.authorization; if (submitData.authorization == 0) { data.has_authorization = false; diff --git a/src/views/enterprise/registrationEdit.vue b/src/views/enterprise/registrationEdit.vue index 67482e6..18a6b4a 100644 --- a/src/views/enterprise/registrationEdit.vue +++ b/src/views/enterprise/registrationEdit.vue @@ -657,8 +657,10 @@ import {showFailToast, showSuccessToast} from 'vant'; submitData.lawEnforcement = success.data.dept.deptName; submitData.lawEnforcementId = success.data.dept.deptId; //局级部门 - submitData.bureauDeptName = success.data.bureauDept.deptName; - submitData.bureauDeptId = success.data.bureauDept.deptId; + // submitData.bureauDeptName = success.data.bureauDept.deptName; + // submitData.bureauDeptId = success.data.bureauDept.deptId; + submitData.bureauDeptName = '司法局'; + submitData.bureauDeptId = '20210922212955057-A601-27251E588'; } },error=>{ diff --git a/src/views/login.vue b/src/views/login.vue index be4d237..7c5f52e 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -45,9 +45,9 @@ testLogin({"secretName": loginParam.secretName, "secretKey": values.secretKey}, success => { if (success.success) { //企业端 - // router.push({ name: "Home" }); + router.push({ name: "Home" }); //执法端 - router.push({name: "enforceHome"}); + // router.push({name: "enforceHome"}); //设置全局变量 useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString()); useCommon.SET_USER_ID(success.data.userId); diff --git a/src/views/non-law/enterpriseBaseInfo.vue b/src/views/non-law/enterpriseBaseInfo.vue index e44384d..533ca1b 100644 --- a/src/views/non-law/enterpriseBaseInfo.vue +++ b/src/views/non-law/enterpriseBaseInfo.vue @@ -1,363 +1,377 @@ diff --git a/src/views/non-law/outsideRegister.vue b/src/views/non-law/outsideRegister.vue index 12a51df..9231250 100644 --- a/src/views/non-law/outsideRegister.vue +++ b/src/views/non-law/outsideRegister.vue @@ -32,15 +32,15 @@ /> @@ -181,6 +181,8 @@ const submitData = reactive({ enterpriseAddress:"", //法人 legalPerson:"", + // 联系电话 + enterpriseTel:"", //成立日期 establishmentTime:"", //注册资本 diff --git a/src/views/non-law/sign.vue b/src/views/non-law/sign.vue index 9f76410..8a77547 100644 --- a/src/views/non-law/sign.vue +++ b/src/views/non-law/sign.vue @@ -400,6 +400,9 @@ // 执法主体 submitData.bureauDeptName = success.data.bureauDept.deptName; submitData.bureauDeptId = success.data.bureauDept.deptId; + // 执法主体 + // submitData.bureauDeptName = '司法局'; + // submitData.bureauDeptId = '20210922212955057-A601-27251E588'; } }, error => {}) diff --git a/vite-config/index.js b/vite-config/index.js index 2751f11..6226ff0 100644 --- a/vite-config/index.js +++ b/vite-config/index.js @@ -44,7 +44,14 @@ const baseCfg = (viteEnv = {}) => { }, build: { outDir: "dist", + sourcemap: false, // 生产环境关闭 source map，防止源代码泄露 minify: "terser", // esbuild 打包更快，但是不能去除 console.log，去除 console 使用 terser 模式 + terserOptions: { + compress: { + drop_console: true, // 移除 console + drop_debugger: true, // 移除 debugger + }, + }, rollupOptions: { output: { chunkFileNames: "js/[name]-[hash].js", // 引入文件名的名称