diff --git a/package.json b/package.json index f2570587c..d496e719a 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "axios": "^0.19.0", "babel-eslint": "^8.0.1", "babel-plugin-component": "^1.1.1", + "css-loader": "^5.0.0", "echarts": "^5.2.2", "echarts-gl": "^2.0.9", "element-theme": "2.0.1", @@ -41,7 +42,7 @@ "lodash": "^4.17.15", "mint-ui": "^2.2.13", "node-sass": "^4.12.0", - "ol": "^7.2.2", + "ol": "7.2.2", "portfinder": "^1.0.21", "proj4": "^2.8.0", "qs": "^6.7.0", @@ -74,6 +75,7 @@ "ol": "^7.2.2", "sass-loader": "^7.3.1", "script-loader": "^0.7.2", + "style-loader": "^3.3.3", "tinymce": "5.8.2", "vue-template-compiler": "^2.6.11" }, diff --git a/src/js/columns/constants/index.js b/src/js/columns/constants/index.js index e967b65cc..5ad06e88b 100644 --- a/src/js/columns/constants/index.js +++ b/src/js/columns/constants/index.js @@ -4,48 +4,58 @@ * @LastEditors: mk 2403457699@qq.com * @LastEditTime: 2023-08-04 18:02:54 * @Description: 此文件针对于本地字典,常用的男女或者是否一类需要在前端写的可以在此文件中添加 - * - * + * + * */ // constants.js export const genderList = [ { - label: "男", - value: "1", + label: '男', + value: '1' }, { - label: "女", - value: "2", - }, -]; + label: '女', + value: '2' + } +] export const binaryOptionList = [ { - label: "是", - value: 1, + label: '是', + value: 1 }, { - label: "否", - value: 0, - }, -]; + label: '否', + value: 0 + } +] export const politicsStatusList = [ { - label: "中国共产党党员", - value: 1, + label: '中国共产党党员', + value: 1 }, { - label: "群众", - value: 0, - }, -]; + label: '群众', + value: 0 + } +] export const healthStatusList = [ - { - label: "健康", - value: 1, - }, - { - label: "伤残", - value: 0, - }, - ]; + { + label: '健康', + value: 1 + }, + { + label: '伤残', + value: 0 + } +] +export const dormitoryTypeList = [ + { + label: '楼长', + value: 1 + }, + { + label: '单元长', + value: 0 + } +] diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index ae65548e2..04cae109b 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -2,138 +2,240 @@
- - - - - - - - - - - - - - - - - - - + + + - - 至 - + + + + + + + + + + + + + + + + + 至 + + + + + + + 至 + - - - - - - 至 - - - - - - + placeholder="请输入" + clearable + size="small"> + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - 所属组织: - + + + + + + + - + + + + + + + + + + + + + + + + + 所属组织: + + +
- 所属房屋: - - + 所属房屋: + + - - + + - - + + - - + +
- - - + + +
- - - {{ btnItem.name }} - - - - - + + + {{ btnItem.name }} + + + + + + 编辑 + + 删除 + + + +
+ + +
+
+ + + + + + + + + + + \ No newline at end of file diff --git a/src/views/modules/home/cpts/people-more.vue b/src/views/modules/home/cpts/people-more.vue index f8462012c..41055c480 100644 --- a/src/views/modules/home/cpts/people-more.vue +++ b/src/views/modules/home/cpts/people-more.vue @@ -133,7 +133,6 @@ :data="natList" border height="400" - " style="width: 100%"> { - const svgRule = config.module.rule("svg"); - svgRule.uses.clear(); - svgRule - .test(/\.svg$/) - .use("svg-sprite-loader") - .loader("svg-sprite-loader"); - }, - productionSourceMap: false, - outputDir: "epmet-work-pc", - assetsDir: "static", - devServer: { - proxy: { - // 如果请求地址以/api打头,就出触发代理机制 - // http://localhost:9588/api/login -> http://localhost:3000/api/login - "/linkdata/linkdata-gateway/route": { - target: "http://bipaas.elinkservice.cn", // 我们要代理的真实接口地址 - }, - }, - open: false, - port: 9001, - overlay: { - errors: true, - warnings: true, - }, - }, - // webpack简单配置 - configureWebpack: { - // debuge调试配置 - devtool: "source-map", - externals: { - AMap: "AMap", - }, - resolve: { - //配置路径别名 - // /node_modules/@vue/cli-service/lib/config/base.js中已经配好的@路径，所以这里可以直接使用@ - alias: { - "@js": "@/js", - "@c": "@/views/components", - "@v": "@/views", - "@m": "@/img", - }, - }, - }, -}; + baseUrl: process.env.NODE_ENV === 'production' ? '' : '/epmet-work-pc', + css: { + // 是否使用css分离插件 ExtractTextPlugin + extract: IS_PROD, + // 开启 CSS source maps? + sourceMap: false, + // css预设器配置项 + loaderOptions: {}, + // 启用 CSS modules for all css / pre-processor files. + modules: false + }, + chainWebpack: (config) => { + const svgRule = config.module.rule('svg') + svgRule.uses.clear() + svgRule + .test(/\.svg$/) + .use('svg-sprite-loader') + .loader('svg-sprite-loader') + }, + productionSourceMap: false, + outputDir: 'epmet-work-pc', + assetsDir: 'static', + devServer: { + proxy: { + // 如果请求地址以/api打头,就出触发代理机制 + // http://localhost:9588/api/login -> http://localhost:3000/api/login + '/linkdata/linkdata-gateway/route': { + target: 'http://bipaas.elinkservice.cn' // 我们要代理的真实接口地址 + } + }, + open: false, + port: 9001, + overlay: { + errors: true, + warnings: true + } + }, + // webpack简单配置 + configureWebpack: { + // debuge调试配置 + devtool: 'source-map', + externals: { + AMap: 'AMap' + }, + resolve: { + //配置路径别名 + // /node_modules/@vue/cli-service/lib/config/base.js中已经配好的@路径，所以这里可以直接使用@ + alias: { + '@js': '@/js', + '@c': '@/views/components', + '@v': '@/views', + '@m': '@/img' + } + } + } +}