admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2024-06-05 10:32:38 +08:00
parent ac9264aef3
commit fecca362c4
9 changed files with 999 additions and 825 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/assets/js/api/laborPerson.js
View File

@ -63,6 +63,8 @@ export const editDepartmentInfo = data => post('xmgl/departmentInfo/edit', data)
//劳务管理 --- 新增设备
export const getProjectUfaceConfigInfo = data => post('xmgl/projectUfaceConfig/getProjectUfaceConfigInfo', data); //查询项目的对应的人脸设备配置信息
export const projectUfaceConfigEdit = data => post('xmgl/projectUfaceConfig/edit', data); //编辑项目对应的人脸设备配置信息
export const projectCarConfigInfoList = data => get('xmgl/projectCarCameraConfig/list', data); //查询车辆项目初始化
export const projectCarConfigInfoEdit = data => post('xmgl/projectCarCameraConfig/saveProjectCarCameraConfig', data); //编辑车辆项目初始化配置
export const ufaceDevAdd = data => post('xmgl/ufaceDev/add', data); //添加人脸设备信息
export const ufaceDevEdit = data => post('xmgl/ufaceDev/edit', data); //编辑人脸设备信息
export const ufaceDevDelete = data => post('xmgl/ufaceDev/delete', data); //删除人脸设备信息

657
src/store/index.js
View File

@ -8,41 +8,41 @@ Vue.use(Vuex);
// import imgReview from './module/imgReview'
export default new Vuex.Store({
plugins: [
createPersistedState({
storage: window.sessionStorage,
reducer(val) {
console.log("---------存进去", val);
return {
userInfo: val.userInfo,
currentUrl: val.currentUrl,
menuList: val.menuList,
projectManageMenuList: val.projectManageMenuList,
isShowBackIndex: val.isShowBackIndex,
projectSn: val.projectSn,
selectedGroupSn: val.selectedGroupSn,
groupTreeList: val.groupTreeList,
currentLanguage: val.currentLanguage,
currentProDetail: val.currentProDetail,
currentMoudle: val.currentMoudle,
mapBackArr: val.mapBackArr,
themeType: val.themeType,
chartOptions: val.chartOptions,
menuIndex: val.menuIndex,
subMenuIndex: val.subMenuIndex,
UPLOADURL: val.UPLOADURL,
FILEURL: val.FILEURL,
mouduleIndex: val.mouduleIndex,
secondMenuIndex: val.secondMenuIndex,
curModule: val.curModule,
thirdMenuIndex: val.thirdMenuIndex,
fourMenuIndex: val.fourMenuIndex,
uid: val.uid,
reloadPage: val.reloadPage,
};
},
}),
],
plugins: [
createPersistedState({
storage: window.sessionStorage,
reducer(val) {
console.log("---------存进去", val);
return {
userInfo: val.userInfo,
currentUrl: val.currentUrl,
menuList: val.menuList,
projectManageMenuList: val.projectManageMenuList,
isShowBackIndex: val.isShowBackIndex,
projectSn: val.projectSn,
selectedGroupSn: val.selectedGroupSn,
groupTreeList: val.groupTreeList,
currentLanguage: val.currentLanguage,
currentProDetail: val.currentProDetail,
currentMoudle: val.currentMoudle,
mapBackArr: val.mapBackArr,
themeType: val.themeType,
chartOptions: val.chartOptions,
menuIndex: val.menuIndex,
subMenuIndex: val.subMenuIndex,
UPLOADURL: val.UPLOADURL,
FILEURL: val.FILEURL,
mouduleIndex: val.mouduleIndex,
secondMenuIndex: val.secondMenuIndex,
curModule: val.curModule,
thirdMenuIndex: val.thirdMenuIndex,
fourMenuIndex: val.fourMenuIndex,
uid: val.uid,
reloadPage: val.reloadPage,
};
},
}),
],
state: {
PAGESIZRS: [10, 20, 30, 50],
@ -54,307 +54,312 @@ export default new Vuex.Store({
// FILEURL: "http://192.168.34.155:19111/image/", //洁本地
UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地
FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地
// WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地)
WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
// WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地)
// UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
// FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程
// UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试
// FILEURL:'http://42.180.188.17:11211/image/',//测试
// BASEURL: baseUrl
// ? baseUrl
// : window.location.protocol + "//" + window.location.host + "/", //正式环境
// UPLOADURL:
// window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
// // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
// // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
// // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址
// WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址
//---------------------------------------------------------------------------------------------
// BASEURL: baseUrl
// ? baseUrl
// : window.location.protocol + "//" + window.location.host + "/api/", //金林湾部署地址
// UPLOADURL:
// window.location.protocol +
// "//" +
// window.location.host +
// "/api/upload/image", //金林湾部署地址
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //金林湾部署地址
// FILEURL: 'http://182.90.224.237:7000/image/', // UPLOADURL: 'http://182.90.224.237:7000/upload/image',
// tag: 本地测试接口 // BASEURL:'http://192.168.34.174:6023/',
/* 2022-05-16 */
// tag: 部署河南项目时，需要打开这两行代码
// BASEURL: baseUrl ?
// baseUrl : window.location.protocol + "//" + window.location.host + "/", //正式环境
// UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
// // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
// // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
// // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址
// WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址
//---------------------------------------------------------------------------------------------
// BASEURL: baseUrl
// ? baseUrl
// : window.location.protocol + "//" + window.location.host + "/api/", //金林湾部署地址
// UPLOADURL:
// window.location.protocol +
// "//" +
// window.location.host +
// "/api/upload/image", //金林湾部署地址
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //金林湾部署地址
// FILEURL: 'http://182.90.224.237:7000/image/', // UPLOADURL: 'http://182.90.224.237:7000/upload/image',
// tag: 本地测试接口 // BASEURL:'http://192.168.34.174:6023/',
/* 2022-05-16 */
// tag: 部署河南项目时，需要打开这两行代码
// BASEURL: baseUrl
// ? baseUrl
// : window.location.protocol + "//" + window.location.host + "/", //正式环境
// UPLOADURL:
// window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
// WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
// WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
// WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址
// WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址
//---------------------------------------------------------------------------------------------
// BASEURL: baseUrl
// ? baseUrl
// : window.location.protocol + "//" + window.location.host + "/api/", //金林湾部署地址
// UPLOADURL:
// window.location.protocol +
// "//" +
// window.location.host +
// "/api/upload/image", //金林湾部署地址
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //金林湾部署地址
// FILEURL: 'http://182.90.224.237:7000/image/', // UPLOADURL: 'http://182.90.224.237:7000/upload/image',
// tag: 本地测试接口 // BASEURL:'http://192.168.34.174:6023/',
/* 2022-05-16 */
// tag: 部署河南项目时，需要打开这两行代码
// UPLOADURL: 'http://139.9.66.234:6324/upload/image',
// FILEURL: 'http://139.9.66.234:6324/image/',
/* 2022-06-06 广西本地的*/ // FILEURL: 'http://182.90.224.237:7000/image/',
// 邱平毅的
// BASEURL:'http://192.168.34.116:6023/',
// UPLOADURL: 'http://192.168.34.116:6023/upload/image',
// FILEURL: 'http://192.168.34.116:6023/image/',
// UPLOADURL: 'http://116.169.63.183:7070/upload/image',
// FILEURL: 'http:/116.169.63.183:7070/image/',
//---
// UPLOADURL: 'http://192.168.34.125:6023/upload/image',
// FILEURL: 'http://192.168.34.125:6023/image/',
// BASEURL: baseUrl
// ? baseUrl
// : window.location.protocol + "//" + window.location.host + "/", //正式环境
// UPLOADURL:
// window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
// WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
// WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
// WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址
// WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址
//---------------------------------------------------------------------------------------------
// BASEURL: baseUrl
// ? baseUrl
// : window.location.protocol + "//" + window.location.host + "/api/", //金林湾部署地址
// UPLOADURL:
// window.location.protocol +
// "//" +
// window.location.host +
// "/api/upload/image", //金林湾部署地址
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //金林湾部署地址
// FILEURL: 'http://182.90.224.237:7000/image/', // UPLOADURL: 'http://182.90.224.237:7000/upload/image',
// tag: 本地测试接口 // BASEURL:'http://192.168.34.174:6023/',
/* 2022-05-16 */
// tag: 部署河南项目时，需要打开这两行代码
// UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式
// FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式
// FILEURL:'http://'+"47.97.202.104:6023"+'/image/',//正式
// UPLOADURL: 'http://182.90.224.147:100/upload/image',//演示平台
// FILEURL: 'http://182.90.224.147:100/image/',//演示平台
// UPLOADURL: 'http://192.168.34.221:8070/upload/image',//演示平台郭圣雄本地
// FILEURL: 'http://192.168.34.221:8070/image/',//演示平台郭圣雄本地
// UPLOADURL: 'http://192.168.34.221:12350/upload/image',//金林湾本地
// FILEURL: 'http://192.168.34.221:12350/image/',//郭圣雄本地
// UPLOADURL: 'http://101.43.164.214:12345/upload/image',//内蒙古
// FILEURL: 'http://101.43.164.214:12345/image/',//内蒙古
// UPLOADURL: 'http://42.194.144.62:8088/upload/image',//中建四
// FILEURL: 'http://42.194.144.62:8088/image/',//中建四
// UPLOADURL: 'http://182.90.224.147:15551/upload/image',//四川成润(内部线上)
// FILEURL: 'http://182.90.224.147:15551/image/',//四川成润（内部线上）
// UPLOADURL: 'http://118.121.198.147:23232/upload/image',//四川成润（正式）
// FILEURL: 'http://118.121.198.147:23232/image/',//四川成润（正式）
// UPLOADURL: 'http://121.196.214.246/api/upload/image',//金林湾
// FILEURL: 'http://121.196.214.246/api/image/',//金林湾
// UPLOADURL: 'http://192.168.34.221:30002/upload/image',//郭圣雄本地
// FILEURL: 'http://192.168.34.221:30002/image/',//郭圣雄本地
// UPLOADURL: 'http://101.43.164.214:45011/upload/image',//上海优益
// FILEURL: 'http://101.43.164.214:45011/image/',//上海优益
// UPLOADURL: 'http://139.9.66.234:6324/upload/image',
// FILEURL: 'http://139.9.66.234:6324/image/',
/* 2022-06-06 广西本地的*/ // FILEURL: 'http://182.90.224.237:7000/image/',
// 邱平毅的
// BASEURL:'http://192.168.34.116:6023/',
// UPLOADURL: 'http://192.168.34.116:6023/upload/image',
// FILEURL: 'http://192.168.34.116:6023/image/',
// UPLOADURL: 'http://116.169.63.183:7070/upload/image',
// FILEURL: 'http:/116.169.63.183:7070/image/',
//---
// UPLOADURL: 'http://192.168.34.125:6023/upload/image',
// FILEURL: 'http://192.168.34.125:6023/image/',
// UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式
// FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式
// FILEURL:'http://'+"47.97.202.104:6023"+'/image/',//正式
// UPLOADURL: 'http://182.90.224.147:100/upload/image',//演示平台
// FILEURL: 'http://182.90.224.147:100/image/',//演示平台
// UPLOADURL: 'http://192.168.34.221:8070/upload/image',//演示平台郭圣雄本地
// FILEURL: 'http://192.168.34.221:8070/image/',//演示平台郭圣雄本地
// UPLOADURL: 'http://192.168.34.221:12350/upload/image',//金林湾本地
// FILEURL: 'http://192.168.34.221:12350/image/',//郭圣雄本地
// UPLOADURL: 'http://101.43.164.214:12345/upload/image',//内蒙古
// FILEURL: 'http://101.43.164.214:12345/image/',//内蒙古
// UPLOADURL: 'http://42.194.144.62:8088/upload/image',//中建四
// FILEURL: 'http://42.194.144.62:8088/image/',//中建四
// UPLOADURL: 'http://182.90.224.147:15551/upload/image',//四川成润(内部线上)
// FILEURL: 'http://182.90.224.147:15551/image/',//四川成润（内部线上）
// UPLOADURL: 'http://118.121.198.147:23232/upload/image',//四川成润（正式）
// FILEURL: 'http://118.121.198.147:23232/image/',//四川成润（正式）
// UPLOADURL: 'http://121.196.214.246/api/upload/image',//金林湾
// FILEURL: 'http://121.196.214.246/api/image/',//金林湾
// UPLOADURL: 'http://192.168.34.221:30002/upload/image',//郭圣雄本地
// FILEURL: 'http://192.168.34.221:30002/image/',//郭圣雄本地
// UPLOADURL: 'http://101.43.164.214:45011/upload/image',//上海优益
// FILEURL: 'http://101.43.164.214:45011/image/',//上海优益
ACCOUNTTYPE: [
"系统管理员",
"企业一级管理员",
"企业二级管理员",
"企业三级管理员",
"项目管理员",
], //1系统管理员，2企业管理员账号，3企业区账号，4企业市账号，5项目账号
userInfo: null, //登录返回的账号信息
// currentUrl:'',//当前路由地址
menuList: [], //当前菜单列表
projectManageMenuList: [], // 项目管理页菜单列表
isShowBackIndex: false,
projectSn: null, //项目后台 里的 项目 sn
selectedGroupSn: "",
groupTreeList: [],
currentLanguage: "zh",
currentProDetail: null,
currentMoudle: null,
mapBackArr: [],
themeType: "white",
chartOptions: {
labelColor: "rgba(38, 45, 72, 0.56)",
},
menuIndex: 0,
subMenuIndex: 0,
isExpand: false,
//档案管理
sideMenu: {
isFolder: sessionStorage.getItem("isFolder"), // 左侧栏是否折叠，0不折叠，1折叠
storageValue: 0, // 已使用存储容量
storageMaxValue: Math.pow(1024, 3) * 100, // 最大存储容量，100GB
},
fileList: {
operaColumnExpand: sessionStorage.getItem("operaColumnExpand"), // 操作列是否展开，0不展开，1展开
selectedColumnList: sessionStorage.getItem("selectedColumnList"), // 列显隐
fileModel: sessionStorage.getItem("fileModel"), // 文件展示模式，0列表模式，1网格模式 2时间线模式
},
imgReview: {
imgReviewVisible: false, // 图片查看组件显隐状态
imgReviewList: [], // 图片列表
defaultActiveIndex: 0, // 默认当前打开的图片的索引
},
mouduleIndex: 0,
secondMenuIndex: 0,
thirdMenuIndex: 0,
fourMenuIndex: 0,
curModule: {
name: "工作站",
id: 1,
url: "/projectV2/taskList",
menuList: [{
id: 100000,
menuName: "任务清单",
path: "/projectV2/taskList",
},
{
id: 100001,
menuName: "通知公告",
path: "/projectV2/noticeList",
},
{
id: 100002,
menuName: "工作日程",
path: "/projectV2/workerSchedule",
},
],
},
uid: false, //是否第三方免码登录 true为免码登录
reloadPage: false, //重载页面 因为动态加载资源 要刷新页面
ACCOUNTTYPE: [
"系统管理员",
"企业一级管理员",
"企业二级管理员",
"企业三级管理员",
"项目管理员",
], //1系统管理员，2企业管理员账号，3企业区账号，4企业市账号，5项目账号
userInfo: null, //登录返回的账号信息
// currentUrl:'',//当前路由地址
menuList: [], //当前菜单列表
projectManageMenuList: [], // 项目管理页菜单列表
isShowBackIndex: false,
projectSn: null, //项目后台 里的 项目 sn
selectedGroupSn: "",
groupTreeList: [],
currentLanguage: "zh",
currentProDetail: null,
currentMoudle: null,
mapBackArr: [],
themeType: "white",
chartOptions: {
labelColor: "rgba(38, 45, 72, 0.56)",
},
mutations: {
setUPLOADURL(state, data) {
state.UPLOADURL = data;
},
setFILEURL(state, data) {
state.FILEURL = data;
},
setUserInfo(state, data) {
state.userInfo = data;
},
setMenuList(state, data) {
state.menuList = data;
},
setIsShowBackIndex(state, data) {
state.isShowBackIndex = data;
},
setProjectManageMenuList(state, data) {
state.projectManageMenuList = data;
},
// setCurrentUrl(state,data){
// state.currentUrl = data
// }
setProjectSn(state, data) {
state.projectSn = data;
},
setSelectedGroupSn(state, data) {
state.selectedGroupSn = data;
},
setGroupTreeList(state, data) {
state.groupTreeList = data;
},
setLang(state, data) {
state.currentLanguage = data;
},
setProDetail(state, data) {
state.currentProDetail = data;
},
setMoudle(state, data) {
state.currentMoudle = data;
},
setMapBackArr(state, data) {
state.mapBackArr = data;
},
setThemeType(state, data) {
state.themeType = data;
},
setChartOptions(state, data) {
state.chartOptions = data;
},
setMenuIndex(state, data) {
state.menuIndex = data;
},
setSubMenuIndex(state, data) {
state.subMenuIndex = data;
},
setIsExpand(state, data) {
state.isExpand = data;
},
//档案管理
changeOperaColumnExpand(state, data) {
sessionStorage.setItem("operaColumnExpand", data);
state.fileList.operaColumnExpand = data;
},
changeSelectedColumnList(state, data) {
sessionStorage.setItem("selectedColumnList", data.toString());
state.fileList.selectedColumnList = data.toString();
},
changeFileModel(state, data) {
sessionStorage.setItem("fileModel", data);
state.fileList.fileModel = data;
},
setImgReviewData(state, data) {
if (data.imgReviewVisible) {
state.imgReview.imgReviewVisible = data.imgReviewVisible;
state.imgReview.imgReviewList = data.imgReviewList;
state.imgReview.defaultActiveIndex = data.activeIndex;
} else {
state.imgReview.imgReviewVisible = data.false;
state.imgReview.imgReviewList = [];
state.imgReview.defaultActiveIndex = 0;
}
},
changeIsFolder(state, data) {
sessionStorage.setItem("isFolder", data);
state.sideMenu.isFolder = data;
},
changeMouduleIndex(state, data) {
state.mouduleIndex = data;
},
changeSecondMenuIndex(state, data) {
state.secondMenuIndex = data;
},
changeThirdMenuIndex(state, data) {
state.thirdMenuIndex = data;
},
changeFourMenuIndex(state, data) {
state.fourMenuIndex = data;
},
setCurModule(state, data) {
state.curModule = data;
},
setUid(state, data) {
state.uid = data;
},
setReloadPage(state, data) {
state.reloadPage = data;
},
menuIndex: 0,
subMenuIndex: 0,
isExpand: false,
//档案管理
sideMenu: {
isFolder: sessionStorage.getItem("isFolder"), // 左侧栏是否折叠，0不折叠，1折叠
storageValue: 0, // 已使用存储容量
storageMaxValue: Math.pow(1024, 3) * 100, // 最大存储容量，100GB
},
getters: {
BASEURL: (state) => state.BASEURL,
UPLOADURL: (state) => state.UPLOADURL,
FILEURL: (state) => state.FILEURL,
isLogin: (state) => state.user.isLogin,
username: (state) => state.user.username,
userId: (state) => state.user.userId,
userImgUrl: (state) => state.user.userImgUrl,
userInfoObj: (state) => state.user.userInfoObj,
isFolder: (state) => Number(state.sideMenu.isFolder), // 左侧栏是否折叠，0不折叠，1折叠
operaColumnExpand: (state) =>
state.fileList.operaColumnExpand !== null ?
Number(state.fileList.operaColumnExpand) : document.body.clientWidth > 1280 ?
1 : 0, // 操作列是否展开，0不展开，1展开
selectedColumnList: (state) =>
state.fileList.selectedColumnList === null ? ["extendName", "fileSize", "uploadTime", "deleteTime"] : state.fileList.selectedColumnList.split(","), // 列显隐
fileModel: (state) =>
state.fileList.fileModel === null ? 0 : Number(state.fileList.fileModel), // 文件展示模式，0列表模式，1网格模式 2 时间线模式
fileList: {
operaColumnExpand: sessionStorage.getItem("operaColumnExpand"), // 操作列是否展开，0不展开，1展开
selectedColumnList: sessionStorage.getItem("selectedColumnList"), // 列显隐
fileModel: sessionStorage.getItem("fileModel"), // 文件展示模式，0列表模式，1网格模式 2时间线模式
},
actions: {
// currentUrl({commit},args) {
// commit('setCurrentUrl',args)
// }
imgReview: {
imgReviewVisible: false, // 图片查看组件显隐状态
imgReviewList: [], // 图片列表
defaultActiveIndex: 0, // 默认当前打开的图片的索引
},
modules: {
// user,
// fileList,
// sideMenu,
// imgReview
mouduleIndex: 0,
secondMenuIndex: 0,
thirdMenuIndex: 0,
fourMenuIndex: 0,
curModule: {
name: "工作站",
id: 1,
url: "/projectV2/taskList",
menuList: [
{
id: 100000,
menuName: "任务清单",
path: "/projectV2/taskList",
},
{
id: 100001,
menuName: "通知公告",
path: "/projectV2/noticeList",
},
{
id: 100002,
menuName: "工作日程",
path: "/projectV2/workerSchedule",
},
],
},
});
uid: false, //是否第三方免码登录 true为免码登录
reloadPage: false, //重载页面 因为动态加载资源 要刷新页面
},
mutations: {
setUPLOADURL(state, data) {
state.UPLOADURL = data;
},
setFILEURL(state, data) {
state.FILEURL = data;
},
setUserInfo(state, data) {
state.userInfo = data;
},
setMenuList(state, data) {
state.menuList = data;
},
setIsShowBackIndex(state, data) {
state.isShowBackIndex = data;
},
setProjectManageMenuList(state, data) {
state.projectManageMenuList = data;
},
// setCurrentUrl(state,data){
// state.currentUrl = data
// }
setProjectSn(state, data) {
state.projectSn = data;
},
setSelectedGroupSn(state, data) {
state.selectedGroupSn = data;
},
setGroupTreeList(state, data) {
state.groupTreeList = data;
},
setLang(state, data) {
state.currentLanguage = data;
},
setProDetail(state, data) {
state.currentProDetail = data;
},
setMoudle(state, data) {
state.currentMoudle = data;
},
setMapBackArr(state, data) {
state.mapBackArr = data;
},
setThemeType(state, data) {
state.themeType = data;
},
setChartOptions(state, data) {
state.chartOptions = data;
},
setMenuIndex(state, data) {
state.menuIndex = data;
},
setSubMenuIndex(state, data) {
state.subMenuIndex = data;
},
setIsExpand(state, data) {
state.isExpand = data;
},
//档案管理
changeOperaColumnExpand(state, data) {
sessionStorage.setItem("operaColumnExpand", data);
state.fileList.operaColumnExpand = data;
},
changeSelectedColumnList(state, data) {
sessionStorage.setItem("selectedColumnList", data.toString());
state.fileList.selectedColumnList = data.toString();
},
changeFileModel(state, data) {
sessionStorage.setItem("fileModel", data);
state.fileList.fileModel = data;
},
setImgReviewData(state, data) {
if (data.imgReviewVisible) {
state.imgReview.imgReviewVisible = data.imgReviewVisible;
state.imgReview.imgReviewList = data.imgReviewList;
state.imgReview.defaultActiveIndex = data.activeIndex;
} else {
state.imgReview.imgReviewVisible = data.false;
state.imgReview.imgReviewList = [];
state.imgReview.defaultActiveIndex = 0;
}
},
changeIsFolder(state, data) {
sessionStorage.setItem("isFolder", data);
state.sideMenu.isFolder = data;
},
changeMouduleIndex(state, data) {
state.mouduleIndex = data;
},
changeSecondMenuIndex(state, data) {
state.secondMenuIndex = data;
},
changeThirdMenuIndex(state, data) {
state.thirdMenuIndex = data;
},
changeFourMenuIndex(state, data) {
state.fourMenuIndex = data;
},
setCurModule(state, data) {
state.curModule = data;
},
setUid(state, data) {
state.uid = data;
},
setReloadPage(state, data) {
state.reloadPage = data;
},
},
getters: {
BASEURL: (state) => state.BASEURL,
UPLOADURL: (state) => state.UPLOADURL,
FILEURL: (state) => state.FILEURL,
isLogin: (state) => state.user.isLogin,
username: (state) => state.user.username,
userId: (state) => state.user.userId,
userImgUrl: (state) => state.user.userImgUrl,
userInfoObj: (state) => state.user.userInfoObj,
isFolder: (state) => Number(state.sideMenu.isFolder), // 左侧栏是否折叠，0不折叠，1折叠
operaColumnExpand: (state) =>
state.fileList.operaColumnExpand !== null
? Number(state.fileList.operaColumnExpand)
: document.body.clientWidth > 1280
? 1
: 0, // 操作列是否展开，0不展开，1展开
selectedColumnList: (state) =>
state.fileList.selectedColumnList === null
? ["extendName", "fileSize", "uploadTime", "deleteTime"]
: state.fileList.selectedColumnList.split(","), // 列显隐
fileModel: (state) =>
state.fileList.fileModel === null ? 0 : Number(state.fileList.fileModel), // 文件展示模式，0列表模式，1网格模式 2 时间线模式
},
actions: {
// currentUrl({commit},args) {
// commit('setCurrentUrl',args)
// }
},
modules: {
// user,
// fileList,
// sideMenu,
// imgReview
},
});

1087
src/views/equipmentCenter/carManage/carCameraDev.vue
View File

File diff suppressed because it is too large Load Diff

21
src/views/projectFront/carManage/carManage.vue
View File

@ -23,7 +23,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="车辆下发状态">
<el-form-item label="车辆下发状态" v-if="isIscDevice">
<el-select
size="medium"
v-model="tableParameter.sendSuccessStatus"
@ -238,7 +238,7 @@
<span v-else-if="scope.row.entryAndExitPermit === 1">多次</span>
</template>
</el-table-column>
<el-table-column width="120" align="center" label="车辆下发状态">
<el-table-column width="120" align="center" label="车辆下发状态" v-if="isIscDevice">
<template v-slot="{ row }">
<span
:class="[
@ -392,6 +392,7 @@
<div @click="bao(scope.row)" class="operationText"><img src="@/assets/images/bao.png" alt="">{{$t('message.alarmValueSet.bjz')}}
</div>-->
<div @click="showDetail(scope.row.id)" class="operationText"
v-if="isIscDevice"
v-permission="{
key: 'clgl_downDetail',
menuPath: '/project/carManage/carManage',
@ -1245,6 +1246,7 @@ import {
getEnterpriseInfoList,
xmglXzHikvisionSyncGetNewestList,
xmglXzHikvisionSyncRetryAPI,
projectCarConfigInfoList
} from "@/assets/js/api/laborPerson";
import store from "@/store";
import mqtt from "mqtt";
@ -1501,6 +1503,7 @@ export default {
entityDetail: {},
topicName: "topic",
userId: "",
isIscDevice: false
};
},
beforeDestroy() {
@ -1523,7 +1526,21 @@ export default {
client = mqtt.connect(mqttUrl, options);
this.mqttMSG();
},
created() {
this.getConfig();
},
methods: {
getConfig() {
projectCarConfigInfoList({
projectSn: this.$store.state.projectSn,
}).then((result) => {
if (result.success) {
if (result.result && result.result.length) {
this.isIscDevice = result.result[0].supplierType == 9 ? true: false;
}
}
});
},
// 监听mqtt下发信息然后刷新列表
mqttMSG() {
// mqtt连接 +"/#" +workerId

2
src/views/projectFront/laborManage/personDetails.vue
View File

@ -2812,6 +2812,8 @@ export default {
name: item.imageUrl.split("*")[0],
url: item.imageUrl.split("*")[1],
}];
} else {
item.fileList = []
}
}
});

20
src/views/projectFront/laborManage/personModule/administration.vue
View File

@ -320,6 +320,7 @@
>导入照片</el-button
>
<el-button
v-if="isIscDevice"
v-permission="{
key: 'rygl_distributeAccessEquipment',
menuPath: '/project/labor/personManage',
@ -425,12 +426,9 @@
key: 'rygl_refresh',
menuPath: '/project/labor/personManage',
}" -->
<el-button
type="warning"
@click="refreshBtn"
plain
>{{ $t("message.laborMange.refresh") }}</el-button
>
<el-button type="warning" @click="refreshBtn" plain>{{
$t("message.laborMange.refresh")
}}</el-button>
<el-button
title="按班组导出"
v-permission="{
@ -539,7 +537,7 @@
<!-- 测试 -->
<el-table-column prop="sendSuccessStatus">
<template v-slot="{ row }">
<div>
<div v-if="isIscDevice">
下发状态：
<span
:class="[
@ -574,6 +572,7 @@
<template slot-scope="scope">
<div class="tableBtns">
<el-button
v-if="isIscDevice"
v-permission="{
key: 'rygl_Check_Distribution',
menuPath: '/project/labor/personManage',
@ -2153,7 +2152,7 @@ import {
sendBatchWokerApi,
importImgDataApi,
xmglXzHikvisionSyncGetNewestList,
xmglXzHikvisionSyncRetryAPI,
xmglXzHikvisionSyncRetryAPI
} from "@/assets/js/api/laborPerson";
import { selectUserDevAuthorityByUserIdApi } from "@/assets/js/api/configManage";
import { getProjectConfigListApi } from "@/assets/js/api/project.js";
@ -2309,6 +2308,7 @@ export default {
umentScreenUrl: "./img/logo/" + LOGO_white + ".png",
base64Type: "data:image/jpeg;base64,",
isUploadToHouse: false, //是否显示上传到住建局按钮
isIscDevice: false, //是否是海康门禁isc设备
attendRulesList: [],
enterpriseTypeId: "",
enterpriseTypeList: [],
@ -2770,6 +2770,7 @@ export default {
if (result.success) {
if (result.result) {
this.isUploadToHouse = result.result.housing ? true : false;
this.isIscDevice = result.result.supplierType == 9 ? true: false;
}
}
});
@ -4017,6 +4018,9 @@ export default {
});
},
tableRowClassName({ row, rowIndex }) {
if(!this.isIscDevice){
return
}
if (row.sendSuccessStatus === 1) {
return "green2";
}

9
src/views/projectFront/laborManage/personModule/laborComponent.vue
View File

@ -281,6 +281,7 @@
>导入照片</el-button
>
<el-button
v-if="isIscDevice"
v-permission="{
key: 'rygl_distributeAccessEquipment',
menuPath: '/project/labor/personManage',
@ -507,7 +508,7 @@
<!-- 测试 -->
<el-table-column prop="sendSuccessStatus">
<template v-slot="{ row }">
<div>
<div v-if="isIscDevice">
下发状态：
<span
:class="[
@ -542,6 +543,7 @@
<template slot-scope="scope">
<div class="tableBtns">
<el-button
v-if="isIscDevice"
v-permission="{
key: 'rygl_Check_Distribution',
menuPath: '/project/labor/personManage',
@ -2575,6 +2577,7 @@ export default {
umentScreenUrl: "",
base64Type: "data:image/jpeg;base64,",
isUploadToHouse: false, //是否显示上传到住建局按钮
isIscDevice: false, //是否是海康门禁isc设备
attendRulesList: [],
enterpriseTypeId: "",
cropperOption: {
@ -2990,6 +2993,7 @@ export default {
if (result.success) {
if (result.result) {
this.isUploadToHouse = result.result.housing ? true : false;
this.isIscDevice = result.result.supplierType == 9 ? true: false;
}
}
});
@ -4679,6 +4683,9 @@ export default {
});
},
tableRowClassName({ row, rowIndex }) {
if(!this.isIscDevice){
return
}
if (row.sendSuccessStatus === 1) {
return "green2";
}

4
src/views/projectFront/laborManage/roster.vue
View File

@ -811,7 +811,7 @@ import {
deleteWorkerInfoAuditApi,
selectWorkerInfoAuditListApi,
ufaceDevList,
getEnterpriseInfoList,
getEnterpriseInfoList
} from "@/assets/js/api/laborPerson";
import {
getProjectConfigListApi,
@ -908,7 +908,7 @@ export default {
selectCompanyData: [],
itemSelectId: "",
disabledArr: [],
company: "",
company: ""
};
},
computed: {

22
src/views/projectFront/laborManage/rosterNew.vue
View File

@ -109,7 +109,7 @@
v-model="tableParameter.idCard"
></el-input>
</el-form-item>
<el-form-item label="人员下发状态">
<el-form-item label="人员下发状态" v-if="isIscDevice">
<el-select
size="medium"
v-model="tableParameter.sendSuccessStatus"
@ -362,7 +362,7 @@
<el-table-column align="lfet">
<template v-slot="{ row }">
<div>
<div>
<div v-if="isIscDevice">
下发状态：
<span
:class="[
@ -400,6 +400,7 @@
<template slot-scope="scope">
<div class="tableBtns">
<el-button
v-if="isIscDevice"
v-permission="{
key: 'hmc_ckxfxq',
menuPath: '/project/labor/roster',
@ -974,6 +975,7 @@ import {
getWorkerInfoList,
xmglXzHikvisionSyncGetNewestList,
xmglXzHikvisionSyncRetryAPI,
getProjectUfaceConfigInfo,
} from "@/assets/js/api/laborPerson";
import {
getProjectConfigListApi,
@ -1084,6 +1086,7 @@ export default {
pageSize: 10,
},
whoId: "",
isIscDevice: false
};
},
computed: {
@ -1119,8 +1122,20 @@ export default {
this.getInfoList();
this.getProjectList();
this.getProjectSetting();
this.getConfig();
},
methods: {
getConfig() {
getProjectUfaceConfigInfo({
projectSn: this.$store.state.projectSn,
}).then((result) => {
if (result.success) {
if (result.result) {
this.isIscDevice = result.result.supplierType == 9 ? true: false;
}
}
});
},
// 人员录入关闭
comboFormClose() {
this.comboFormVisible = false;
@ -1532,6 +1547,9 @@ export default {
});
},
tableRowClassName({ row, rowIndex }) {
if(!this.isIscDevice){
return
}
if (row.sendSuccessStatus === 1) {
return "green2";
}