diff --git a/config/index.js b/config/index.js index f6ea675..bc200d3 100644 --- a/config/index.js +++ b/config/index.js @@ -9,7 +9,15 @@ module.exports = { // Paths assetsSubDirectory: 'static', assetsPublicPath: '/', - proxyTable: {}, + proxyTable: { + '/api': { + target: 'http://192.168.0.29:8088/', + changeOrigin: true, + pathRewrite: { + '^/api': '' + } + } + }, // Various Dev Server settings host: 'localhost', // can be overwritten by process.env.HOST diff --git a/package.json b/package.json index 1a9eb6a..741f40a 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "author": "", "private": true, "scripts": { - "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js --host 192.168.151.43", + "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", "start": "npm run dev", "unit": "jest --config test/unit/jest.conf.js --coverage", "e2e": "node test/e2e/runner.js", @@ -24,10 +24,15 @@ "jspdf": "^2.5.1", "moment": "^2.29.1", "nprogress": "^0.2.0", + "path-to-regexp": "^7.1.0", + "qs": "^6.12.3", "relation-graph": "^2.0.26", + "throttle-debounce": "^5.0.2", + "viewerjs": "^1.11.6", "vue": "^2.5.2", "vue-baidu-map": "^0.21.22", "vue-count-to": "^1.0.13", + "vue-hot-reload-api": "^2.3.4", "vue-particles": "^1.0.9", "vue-pdf": "^4.3.0", "vue-print-nb": "^1.7.4", diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 34822f1..b2f2018 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -196,7 +196,7 @@ export default { { required: true, message: '请输入旧密码', trigger: 'blur' } ], newpwd: [ - { required: true,message: '请输入新密码', trigger: 'blur' }, + { required: true, message: '请输入新密码', trigger: 'blur' }, { pattern: /^(?=.*?[a-z])(?=.*?[A-Z])(?=.*?\d)(?=.*?[!#@*&.])[a-zA-Z\d!#@*&.]*.{8,16}$/, message: '请输入长度8-16位密码，必须由大写字母，小写字母，数字，特殊符号(!#@*&.)组成' diff --git a/src/views/personStrucManage/basicInfo.vue b/src/views/personStrucManage/basicInfo.vue new file mode 100644 index 0000000..b532844 --- /dev/null +++ b/src/views/personStrucManage/basicInfo.vue @@ -0,0 +1,22 @@ + + + + + diff --git a/src/views/personStrucManage/components/list.vue b/src/views/personStrucManage/components/list.vue new file mode 100644 index 0000000..deb0699 --- /dev/null +++ b/src/views/personStrucManage/components/list.vue @@ -0,0 +1,588 @@ + + + + + diff --git a/src/views/personStrucManage/mock/dataSource.js b/src/views/personStrucManage/mock/dataSource.js new file mode 100644 index 0000000..17687c7 --- /dev/null +++ b/src/views/personStrucManage/mock/dataSource.js @@ -0,0 +1,234 @@ +var mockVarList = [ + { + enterpriseName: '风力杭天', + groupUnit: '集团企业', + shareSuperdepart: '供水除尘部', + scale: '大型', + mainerPerson: '小美', + mainerPersonPhone: '13933293932', + enrollment: 90, + numQualiTrain: 120, + averageAge: 55, + ageUpperSixty: 4, + fiftyFiveAndSixty: 8, + ageUnderFiftyFive: 18, + workExprien: null, + belowHigh: 50, + high: 4, + mechanic: 40, + technicalOrSecondary: 20, + collegeOrCollege: 39, + graduateCollege: 1, + undergraduateCollege: 9, + manpersonNum: 2, + manRatio: '80%', + womanPersonNum: 9, + womanRatio: '30%', + numOfSecure: 40, + numOfworkRelated: 98, + numOfCommercial: 20, + numOfOther: 12, + numOfNone: 6, + totalPerson: 1200, + electricianWork: 9, + weldingAndHotCuttingWork: 3, + heightsWork: 1, + hoistingMachineryWork: 90, + motorVehiclesWork: 130, + otherSpecialWork: 34 + }, + { + enterpriseName: '行里力杭天', + groupUnit: '集团企业', + shareSuperdepart: '火力除尘部', + scale: '中小型', + mainerPerson: '轩里', + mainerPersonPhone: '150244938491', + enrollment: 90, + numQualiTrain: 120, + averageAge: 55, + ageUpperSixty: 4, + fiftyFiveAndSixty: 8, + ageUnderFiftyFive: 18, + workExprien: null, + belowHigh: 50, + high: 4, + mechanic: 40, + technicalOrSecondary: 20, + collegeOrCollege: 39, + graduateCollege: 1, + undergraduateCollege: 9, + manpersonNum: 2, + manRatio: '80%', + womanPersonNum: 9, + womanRatio: '30%', + numOfSecure: 40, + numOfworkRelated: 98, + numOfCommercial: 20, + numOfOther: 12, + numOfNone: 6, + totalPerson: 1200, + electricianWork: 9, + weldingAndHotCuttingWork: 3, + heightsWork: 1, + hoistingMachineryWork: 90, + motorVehiclesWork: 130, + otherSpecialWork: 34 + }, + { + enterpriseName: '意下提取', + groupUnit: '集团企业', + shareSuperdepart: '火力除尘部', + scale: '中小型', + mainerPerson: '轩里', + mainerPersonPhone: '150244938491', + enrollment: 90, + numQualiTrain: 120, + averageAge: 55, + ageUpperSixty: 4, + fiftyFiveAndSixty: 8, + ageUnderFiftyFive: 18, + workExprien: null, + belowHigh: 50, + high: 4, + mechanic: 40, + technicalOrSecondary: 20, + collegeOrCollege: 39, + graduateCollege: 1, + undergraduateCollege: 9, + manpersonNum: 2, + manRatio: '80%', + womanPersonNum: 9, + womanRatio: '30%', + numOfSecure: 40, + numOfworkRelated: 98, + numOfCommercial: 20, + numOfOther: 12, + numOfNone: 6, + totalPerson: 1200, + electricianWork: 9, + weldingAndHotCuttingWork: 3, + heightsWork: 1, + hoistingMachineryWork: 90, + motorVehiclesWork: 130, + otherSpecialWork: 34 + }, + { + enterpriseName: '燕来客机民众', + groupUnit: '集团企业', + shareSuperdepart: '火力除尘部', + scale: '中小型', + mainerPerson: '轩里', + mainerPersonPhone: '150244938491', + enrollment: 90, + numQualiTrain: 120, + averageAge: 55, + ageUpperSixty: 4, + fiftyFiveAndSixty: 8, + ageUnderFiftyFive: 18, + workExprien: null, + belowHigh: 50, + high: 4, + mechanic: 40, + technicalOrSecondary: 20, + collegeOrCollege: 39, + graduateCollege: 1, + undergraduateCollege: 9, + manpersonNum: 2, + manRatio: '80%', + womanPersonNum: 9, + womanRatio: '30%', + numOfSecure: 40, + numOfworkRelated: 98, + numOfCommercial: 20, + numOfOther: 12, + numOfNone: 6, + totalPerson: 1200, + electricianWork: 9, + weldingAndHotCuttingWork: 3, + heightsWork: 1, + hoistingMachineryWork: 90, + motorVehiclesWork: 130, + otherSpecialWork: 34 + }, + { + enterpriseName: '天河夜星天河夜星天河夜星天河夜星天河夜星天河夜星天河夜星天河夜星天河夜星天河夜星', + groupUnit: '集团企业', + shareSuperdepart: '火力除尘部', + scale: '中小型', + mainerPerson: '轩里', + mainerPersonPhone: '150244938491', + enrollment: 90, + numQualiTrain: 120, + averageAge: 55, + ageUpperSixty: 4, + fiftyFiveAndSixty: 8, + ageUnderFiftyFive: 18, + workExprien: null, + belowHigh: 50, + high: 4, + mechanic: 40, + technicalOrSecondary: 20, + collegeOrCollege: 39, + graduateCollege: 1, + undergraduateCollege: 9, + manpersonNum: 2, + manRatio: '80%', + womanPersonNum: 9, + womanRatio: '30%', + numOfSecure: 40, + numOfworkRelated: 98, + numOfCommercial: 20, + numOfOther: 12, + numOfNone: 6, + totalPerson: 1200, + electricianWork: 9, + weldingAndHotCuttingWork: 3, + heightsWork: 1, + hoistingMachineryWork: 90, + motorVehiclesWork: 130, + otherSpecialWork: 34 + }, + { + enterpriseName: '天河夜星天河夜星天河夜星天河夜星天河夜星天河夜星天河夜星天河夜星天河夜星天河夜星', + groupUnit: '集团企业', + shareSuperdepart: '火力除尘部', + scale: '中小型', + mainerPerson: '轩里', + mainerPersonPhone: '150244938491', + enrollment: 90, + numQualiTrain: 120, + averageAge: 55, + ageUpperSixty: 4, + fiftyFiveAndSixty: 8, + ageUnderFiftyFive: 18, + workExprien: null, + belowHigh: 50, + high: 4, + mechanic: 40, + technicalOrSecondary: 20, + collegeOrCollege: 39, + graduateCollege: 1, + undergraduateCollege: 9, + manpersonNum: 2, + manRatio: '80%', + womanPersonNum: 9, + womanRatio: '30%', + numOfSecure: 40, + numOfworkRelated: 98, + numOfCommercial: 20, + numOfOther: 12, + numOfNone: 6, + totalPerson: 1200, + electricianWork: 9, + weldingAndHotCuttingWork: 3, + heightsWork: 1, + hoistingMachineryWork: 90, + motorVehiclesWork: 130, + otherSpecialWork: 34 + } +] + +export { + mockVarList +} diff --git a/static/config.js b/static/config.js index 48b2ad0..924b62b 100644 --- a/static/config.js +++ b/static/config.js @@ -1,6 +1,7 @@ const config = { weburl: 'http://192.168.151.43:8088/', // 前台地址 - httpurl: 'http://192.168.151.43:8088/', // 后台地址 + // httpurl: 'http://192.168.151.43:8088/', // 后台地址 + httpurl: '/api', // 后台地址 qyurl: 'http://192.168.151.43:8088/', // 企业前台 adminurl: 'https://www.qdkjchina.com/qa-prevention-admin/', // 正式