diff --git a/.postcssrc.js b/.postcssrc.js index 2cac06a4..7be86b7f 100644 --- a/.postcssrc.js +++ b/.postcssrc.js @@ -4,7 +4,7 @@ module.exports = ({ file }) => { 　　let remUnit; 　　// 判断条件 请自行调整 我使用的是 mand-mobile ui 没有对vant引入进行测试 　　//link https://github.com/youzan/vant/issues/1181 - + 　　if (file && file.dirname && file.dirname.indexOf("vant") > -1) { 　　　　remUnit = 37.5; 　　}else { @@ -12,11 +12,17 @@ module.exports = ({ file }) => { 　　} 　　return { 　　　　plugins: [ -　　　　　　px2rem({ remUnit: remUnit}), -　　　　　　AutoPrefixer({ browsers: ["last 20 versions", "android >= 4.0"] }) +　　　　 px2rem({ remUnit: remUnit}), +　　　　　AutoPrefixer({ browsers: ["last 20 versions", "android >= 4.0"] }) -　　　　] +　　　　], + "postcss-pxtorem": { + rootValue: 23.4375, // 640 + propList: ['*'], + selectorBlackList: ['.tree-xxx'], + minPixelValue: 1, + exclude: /vue-search-tree/ig // src 目录下样式全部不转义 + } 　　}; }; - \ No newline at end of file diff --git a/config/index.js b/config/index.js index a6bfcb08..c8263309 100644 --- a/config/index.js +++ b/config/index.js @@ -13,9 +13,8 @@ module.exports = { "/api": { // 请求的目标主机 //target: 'http://116.255.135.38:8081/nsgk_test/', - target: 'http://localhost:8080/', - //target:'192.168.31.228:8080', - //target:'192.168.31.228:8080', + //target: 'http://localhost:8080/', + target:'http://192.168.31.26:8080', changeOrigin: true, pathRewrite: { '^/api': '' @@ -25,7 +24,7 @@ module.exports = { // Various Dev Server settings host: '0.0.0.0', // can be overwritten by process.env.HOST - port: 85, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined + port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, notifyOnErrors: true, diff --git a/package-lock.json b/package-lock.json index 7dd78f75..dd22957c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -337,6 +337,14 @@ "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==", "dev": true }, + "async-validator": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz", + "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==", + "requires": { + "babel-runtime": "6.x" + } + }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -630,8 +638,7 @@ "babel-helper-vue-jsx-merge-props": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz", - "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg==", - "dev": true + "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg==" }, "babel-helpers": { "version": "6.24.1", @@ -1159,7 +1166,6 @@ "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", - "dev": true, "requires": { "core-js": "^2.4.0", "regenerator-runtime": "^0.11.0" @@ -2136,8 +2142,7 @@ "core-js": { "version": "2.6.12", "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz", - "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==", - "dev": true + "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==" }, "core-util-is": { "version": "1.0.2", @@ -3246,6 +3251,11 @@ "regexp.prototype.flags": "^1.2.0" } }, + "deepmerge": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz", + "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==" + }, "define-properties": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", @@ -3562,6 +3572,19 @@ "integrity": "sha512-zok2y37qR00U14uM6qBz/3iIjWHom2eRfC2S1StA0RslP7x34jX+j4mxv80t8OEOHLJPVG54ZPeaFxEI7gPrwg==", "dev": true }, + "element-ui": { + "version": "2.15.6", + "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.6.tgz", + "integrity": "sha512-rcYXEKd/j2G0AgficAOk1Zd1AsnHRkhmrK4yLHmNOiimU2JfsywgfKUjMoFuT6pQx0luhovj8lFjpE4Fnt58Iw==", + "requires": { + "async-validator": "~1.8.1", + "babel-helper-vue-jsx-merge-props": "^2.0.0", + "deepmerge": "^1.2.0", + "normalize-wheel": "^1.0.1", + "resize-observer-polyfill": "^1.5.0", + "throttle-debounce": "^1.0.1" + } + }, "elliptic": { "version": "6.5.4", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", @@ -4475,6 +4498,11 @@ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, + "fuzzy-match-js": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/fuzzy-match-js/-/fuzzy-match-js-0.0.3.tgz", + "integrity": "sha512-lK+PZ9Sd8uz8rQJq4Hy870FUW4a75AmfDO15kiemoU4z81OAVM7cvZVzbFtGOf7qd5asLgFqrt3DA6F9fmmaiA==" + }, "gauge": { "version": "2.7.4", "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", @@ -6793,6 +6821,11 @@ "sort-keys": "^1.0.0" } }, + "normalize-wheel": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz", + "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU=" + }, "npm-run-path": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", @@ -10178,8 +10211,7 @@ "regenerator-runtime": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", - "dev": true + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" }, "regenerator-transform": { "version": "0.10.1", @@ -10357,6 +10389,11 @@ "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", "dev": true }, + "resize-observer-polyfill": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz", + "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==" + }, "resolve": { "version": "1.20.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", @@ -11489,6 +11526,11 @@ } } }, + "throttle-debounce": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz", + "integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg==" + }, "through2": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", @@ -12112,6 +12154,14 @@ "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.1.tgz", "integrity": "sha512-RRQNLT8Mzr8z7eL4p7BtKvRaTSGdCbTy2+Mm5HTJvLGYSSeG9gDzNasJPP/yOYKLy+/cLG/ftrqq5fvkFwBJEw==" }, + "vue-search-tree": { + "version": "1.9.9", + "resolved": "https://registry.npmjs.org/vue-search-tree/-/vue-search-tree-1.9.9.tgz", + "integrity": "sha512-qj2X6HQFq4GZfqwmkk5xYDiDswzcPYQU6F0y6P132IgeMkHah2Tud56eI8hgSTf5NujExfg8cXXoZts6mVyzJA==", + "requires": { + "fuzzy-match-js": "0.0.3" + } + }, "vue-style-loader": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-3.1.2.tgz", diff --git a/package.json b/package.json index f5d12287..18ec5cb2 100644 --- a/package.json +++ b/package.json @@ -11,8 +11,9 @@ }, "dependencies": { "axios": "^0.21.1", - "jquery": "^3.6.0", + "element-ui": "^2.15.6", "global": "^4.4.0", + "jquery": "^3.6.0", "js-cookie": "^2.2.1", "lib-flexible": "^0.3.2", "node-sass": "^5.0.0", @@ -22,6 +23,7 @@ "vant": "^2.12.8", "vue": "^2.5.2", "vue-router": "^3.0.1", + "vue-search-tree": "^1.9.9", "vuex": "^3.6.2", "weixin-js-sdk": "^1.6.0" }, diff --git a/src/main.js b/src/main.js index 82f9327f..9b383095 100644 --- a/src/main.js +++ b/src/main.js @@ -10,6 +10,8 @@ import 'amfe-flexible/index.js' import './config/flexible' import store from './store/' import './permission' // permission control +import SearchTree from 'vue-search-tree' + import global from '@/utils/global'; @@ -29,6 +31,7 @@ Vue.prototype.global = global import Vant from 'vant'; import 'vant/lib/index.css'; Vue.use(Vant) +Vue.use(SearchTree) /*解决手动点击与真正触发click事件会存在300ms的延迟*/ if ('addEventListener' in document) { diff --git a/src/router/index.js b/src/router/index.js index 17577251..d89d1f0e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -833,6 +833,24 @@ export const constantRoutes = [ hidden: true, }, component: (resolve) => require(['@/views/onlineHome/homestead/paidExit/paidExitModify'], resolve) + }, + { + path: '/task', + name: 'task', + meta: { + title: '发布任务', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/homestead/task/taskList'], resolve) + }, + { + path: '/taskRelease', + name: 'taskRelease', + meta: { + title: '发布任务', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/homestead/task/taskRelease'], resolve) } ]; diff --git a/src/views/onlineHome/homestead/homeApplication/applicationForm.vue b/src/views/onlineHome/homestead/homeApplication/applicationForm.vue index 335f9c5a..c7b98651 100644 --- a/src/views/onlineHome/homestead/homeApplication/applicationForm.vue +++ b/src/views/onlineHome/homestead/homeApplication/applicationForm.vue @@ -392,6 +392,123 @@ + + +
+ + 审核
意见 + + + 同意 + 驳回 + + + + +
+ +
+ + 农业
农村
部门
审查
意见 + + + + + + + + + + + + + + + +
+ +
+ + 自然
资源
部门
意见 + + + + + + + + + + + + +
+ +
+ + 农业
农村
部门
审查
意见 + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + 上传
附件 + + + + +
+ @@ -1005,6 +1122,27 @@ .app-container { padding-bottom: 5%; } + .examine_box{ + background-color: #1D6FE9!important; + padding: 0.18rem!important; + padding-left: 0!important; + border-radius: 0.15rem!important; + margin-top: 0.3rem!important; + } + .examine_box .van-col:first-child{ + color: #FFF!important; + font-size: 0.45rem!important; + text-align: center!important; + } + .examine_box .van-col:last-child{ + background-color: #FFF!important; + border-radius: 0.15rem!important; + overflow: hidden!important; + .van-radio-group--horizontal{ + padding: 0.2rem 0; + border-bottom: 1px solid #eee; + } + } #mapWrap{ width: 96%; margin: 0 auto; diff --git a/src/views/onlineHome/homestead/homeApplication/applicationList.vue b/src/views/onlineHome/homestead/homeApplication/applicationList.vue index f8d425c7..f13a62b5 100644 --- a/src/views/onlineHome/homestead/homeApplication/applicationList.vue +++ b/src/views/onlineHome/homestead/homeApplication/applicationList.vue @@ -31,7 +31,14 @@ @@ -107,7 +114,7 @@ export default { } - diff --git a/src/views/onlineHome/homestead/task/taskRelease.vue b/src/views/onlineHome/homestead/task/taskRelease.vue new file mode 100644 index 00000000..3c5fb607 --- /dev/null +++ b/src/views/onlineHome/homestead/task/taskRelease.vue @@ -0,0 +1,115 @@ + + + + + diff --git a/static/images/icon/icon_tr.png b/static/images/icon/icon_tr.png new file mode 100644 index 00000000..89d6a499 Binary files /dev/null and b/static/images/icon/icon_tr.png differ