diff --git a/.env.development b/.env.development index 9163a1a..da638a2 100644 --- a/.env.development +++ b/.env.development @@ -7,6 +7,7 @@ VUE_APP_ENV = 'development' # 实名制管理系统/开发环境 VUE_APP_BASE_API = '/dev-api' +VUE_APP_SHOW_PARAMETER = false # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/.env.production b/.env.production index 13a6e72..e597bc9 100644 --- a/.env.production +++ b/.env.production @@ -4,6 +4,7 @@ VUE_APP_TITLE = 实名制管理系统 # 生产环境配置 ENV = 'production' VUE_APP_ENV = 'production' +VUE_APP_SHOW_PARAMETER = true # 实名制管理系统/生产环境 VUE_APP_BASE_API = '/hd-real-name' diff --git a/public/人员入场-模版.xlsx b/public/人员入场-模版.xlsx index a766b69..e20e134 100644 Binary files a/public/人员入场-模版.xlsx and b/public/人员入场-模版.xlsx differ diff --git a/src/api/construction-person/red-green-light-mange/red-list.js b/src/api/construction-person/red-green-light-mange/red-list.js new file mode 100644 index 0000000..a325381 --- /dev/null +++ b/src/api/construction-person/red-green-light-mange/red-list.js @@ -0,0 +1,19 @@ +import request from '@/utils/request' +import requestFormData from '@/utils/request_formdata' + +// 红绿灯统计 红名单列表查询接口 +export const getRedListAPI = (data) => { + return request({ + url: '/bmw/workerBlack/getWorkerBlackList', + method: 'GET', + params: data, + }) +} + +// 红绿灯统计 红名单解除 +export const removeRedListAPI = (id) => { + return request({ + url: `/bmw/workerBlack/remove/${id}`, + method: 'POST', + }) +} diff --git a/src/router/index.js b/src/router/index.js index 6589130..c4b4e92 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -61,6 +61,25 @@ export const constantRoutes = [ component: () => import('@/views/error/401'), hidden: true, }, + + { + path: '/parameter', + component: Layout, + redirect: 'index', + + permissions: ['parameter:decryption:list'], + children: [ + { + path: 'index', + name: 'ParameterDecryption', + component: () => import('@/views/parameter-decryption/index'), + permissions: ['parameter:decryption:list'], + meta: { title: '参数解密', icon: 'lock' }, + hidden: + process.env.VUE_APP_SHOW_PARAMETER == 'true' ? true : false, // 从环境变量取值决定是否显示 + }, + ], + }, { path: '', component: Layout, diff --git a/src/views/construction-person/red-green-light-mange/dishonesty-person/config.js b/src/views/construction-person/red-green-light-mange/dishonesty-person/config.js index 7ae817a..152ee1e 100644 --- a/src/views/construction-person/red-green-light-mange/dishonesty-person/config.js +++ b/src/views/construction-person/red-green-light-mange/dishonesty-person/config.js @@ -75,7 +75,7 @@ export const columnsList = [ export const dialogConfig = { outerVisible: false, outerTitle: '新增失信人员', - outerWidth: '50%', + outerWidth: '60%', minHeight: '', - maxHeight: '', + maxHeight: '93vh', } diff --git a/src/views/construction-person/red-green-light-mange/dishonesty-person/index.vue b/src/views/construction-person/red-green-light-mange/dishonesty-person/index.vue index 6d48f65..2f8d967 100644 --- a/src/views/construction-person/red-green-light-mange/dishonesty-person/index.vue +++ b/src/views/construction-person/red-green-light-mange/dishonesty-person/index.vue @@ -260,14 +260,17 @@ - - - 永久 - - + + + + 永久 + diff --git a/src/views/construction-person/red-green-light-mange/red-list/config.js b/src/views/construction-person/red-green-light-mange/red-list/config.js new file mode 100644 index 0000000..90ef399 --- /dev/null +++ b/src/views/construction-person/red-green-light-mange/red-list/config.js @@ -0,0 +1,81 @@ +export const formLabel = [ + { + f_label: '姓名', + f_model: 'name', + f_type: 'ipt', + f_width: '180px', + isShow: false, // 是否展示label + }, + { + f_label: '身份证', + f_model: 'idNumber', + f_type: 'ipt', + f_width: '180px', + isShow: false, // 是否展示label + }, + { + f_label: '工程', + f_model: 'proName', + f_type: 'ipt', + f_width: '180px', + isShow: false, // 是否展示label + }, + { + f_label: '分包', + f_model: 'subName', + f_type: 'ipt', + f_width: '180px', + isShow: false, // 是否展示label + }, + { + f_label: '状态', + f_model: 'isRemove', + f_type: 'sel', + f_width: '180px', + isShow: false, // 是否展示label + f_selList: [ + { + label: '执行中', + value: 0, + }, + { + label: '已解除', + value: 1, + }, + { + label: '已到解除时间', + value: 2, + }, + ], // 状态列表 + }, +] + +export const columnsList = [ + { t_props: 'name', t_label: '姓名' }, + { t_label: '身份证', t_slot: 'idNumber' }, + { t_props: 'postName', t_label: '工种/岗位' }, + { t_props: 'proName', t_label: '工程名称' }, + { + t_props: 'subName', + t_label: '分包名称', + }, + { t_props: 'reason', t_label: '事件' }, + { t_props: 'remark', t_label: '备注' }, + // { t_slot: 'file', t_label: '附件', t_width: '200px' }, + { + t_label: '起止时间', + t_slot: 'time', + }, + { + t_label: '状态', + t_slot: 'isRemove', + }, +] + +export const dialogConfig = { + outerVisible: false, + outerTitle: '新增失信人员', + outerWidth: '60%', + minHeight: '', + maxHeight: '93vh', +} diff --git a/src/views/construction-person/red-green-light-mange/red-list/index.vue b/src/views/construction-person/red-green-light-mange/red-list/index.vue new file mode 100644 index 0000000..1435463 --- /dev/null +++ b/src/views/construction-person/red-green-light-mange/red-list/index.vue @@ -0,0 +1,151 @@ + + + diff --git a/src/views/home-index/components/projectInfo/index.vue b/src/views/home-index/components/projectInfo/index.vue index 79ad08d..0b895c0 100644 --- a/src/views/home-index/components/projectInfo/index.vue +++ b/src/views/home-index/components/projectInfo/index.vue @@ -51,9 +51,7 @@ import ItemOne from './components/item-one.vue' import ItemTwo from './components/item-two.vue' import ItemThree from './components/item-three.vue' - import ProjectList from '../dataOverviewProject/components/item-two.vue' - import DialogModel from '@/components/DialogModel' import { getProjectInfoAPI } from '@/api/home-index/index' diff --git a/src/views/parameter-decryption/index.vue b/src/views/parameter-decryption/index.vue new file mode 100644 index 0000000..6063280 --- /dev/null +++ b/src/views/parameter-decryption/index.vue @@ -0,0 +1,157 @@ + + + + + diff --git a/vue.config.js b/vue.config.js index f7e06a9..31745eb 100644 --- a/vue.config.js +++ b/vue.config.js @@ -7,9 +7,9 @@ function resolve(dir) { const CompressionPlugin = require('compression-webpack-plugin') -const name = process.env.VUE_APP_TITLE || '博诺思管理系统' // 网页标题 +const name = process.env.VUE_APP_TITLE || '实名制管理系统' // 网页标题 -const port = process.env.port || process.env.npm_config_port || 80 // 端口 +const port = process.env.port || process.env.npm_config_port || 88 // 端口 // vue.config.js 配置说明 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions @@ -18,7 +18,7 @@ module.exports = { // 部署生产环境和开发环境下的URL。 // 默认情况下,Vue CLI 会假设你的应用是被部署在一个域名的根路径上 // 例如 https://www.bonus.vip/。如果应用被部署在一个子路径上,你就需要用这个选项指定这个子路径。例如,如果你的应用被部署在 https://www.bonus.vip/admin/,则设置 baseUrl 为 /admin/。 - publicPath: process.env.NODE_ENV === 'production' ? '/' : '/', + publicPath: process.env.NODE_ENV === 'production' ? '/hd-realname' : '/', // 在npm run build 或 yarn build 时 ,生成文件的目录名称(要和baseUrl的生产环境路径一致)(默认dist) outputDir: 'dist', // 用于放置生成的静态资源 (js、css、img、fonts) 的;(项目打包之后,静态资源会放在这个文件夹下) @@ -35,22 +35,14 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - // target: `http://192.168.2.209:38080`, - target: `http://192.168.0.38:38080`, - // target: `http://192.168.0.244:18877`, - changeOrigin: true, + // target: `http://192.168.0.234:38080/hd-real-name`, // 方亮 + // target: `http://192.168.0.60:38080//hd-real-name`, // 赵福海 + // target: `http://192.168.0.133:38080`, // 梁超 + target: `http://192.168.0.14:1999/hd-real-name/`, // 测试环境 pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: '', }, }, - '/api': { - target: 'http://192.168.0.21:17861', - //设置允许跨域——此处我经过测试发现可有可无 - changeOrigin: true, - pathRewrite: { - '^/api': '', - }, - }, }, disableHostCheck: true, },