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

flx：冲突

Browse Source
This commit is contained in:
X_Rian 2024-06-05 16:02:58 +08:00
commit 7a2c3a6dc9
22 changed files with 950 additions and 583 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); //删除人脸设备信息

2
src/assets/js/http.js
View File

@ -385,4 +385,4 @@ function startLoading() {
function endLoading() {
loading.close()
}
}

34
src/components/centerChange.vue
View File

@ -13,6 +13,16 @@
<span>个人中心</span>
<div class="row-line"></div>
<div class="classify-item">
<div
@click="jumpRouter(item.modulePath)"
:class="isActive(item.modulePath) ? 'active-item' : ''"
v-for="(item,index) in moduleList"
:key="index"
>
{{item.moduleName}}
</div>
</div>
<!-- <div class="classify-item">
<div
@click="jumpRouter('/workSpace')"
:class="isActive('/workSpace') ? 'active-item' : ''"
@ -31,7 +41,7 @@
>
消息中心
</div>
</div>
</div> -->
</div>
</div>
<!-- 点击内容 -->
@ -45,15 +55,35 @@
</div>
</template>
<script>
import {
getNewUserAllModulePageApi,
} from "@/assets/js/api/jxjadmin.js";
export default {
data() {
return {
visible: false,
moduleList: []
};
},
created() {},
created() {
this.getModuleList();},
mounted() {},
methods: {
// 查询全部模块(拿到工作流的模块菜单)
getModuleList() {
getNewUserAllModulePageApi({
projectSn: this.$store.state.projectSn,
moduleType: 7,
userId: this.$store.state.userInfo.userId,
}).then((res) => {
if(res.result && res.result.moduleList){
this.moduleList = res.result.moduleList;
console.log(this.moduleList,123321)
} else {
this.moduleList = [];
}
});
},
isActive(val) {
return this.$route.path.indexOf(val) != -1 ? true : false;
},

24
src/components/header.vue
View File

@ -55,7 +55,7 @@
<div class="title_near flex" v-if="![1,2].includes($store.state.userInfo.accountType)">
<userChange></userChange>
</div>
<div class="title_near-tow flex" v-if="![11,1,2].includes($store.state.userInfo.accountType)">
<div class="title_near-tow flex" v-if="![11,1,2].includes($store.state.userInfo.accountType) && workSpaceShow">
<div class="divider-line"></div>
<centerChange></centerChange>
</div>
@ -226,7 +226,8 @@ export default {
timer: null,
jumpToken: "",
showQrCode: false,
educationId: ""
educationId: "",
workSpaceShow: false
};
},
components: {
@ -267,6 +268,9 @@ export default {
}
this.loginData = JSON.parse(localStorage.getItem("systemInfo"));
// console.log('信息',this.loginData)\
if(this.$store.state.projectSn){
this.getModuleList();
}
},
mounted() {
if (localStorage.getItem("systemInfo")) {
@ -311,6 +315,22 @@ export default {
},
},
methods: {
// 查询全部模块(拿到工作流的模块菜单)
getModuleList() {
getNewUserAllModulePageApi({
projectSn: this.$store.state.projectSn,
moduleType: 7,
userId: this.$store.state.userInfo.userId,
}).then((res) => {
let all = res.result.moduleList;
if (all.length == 0) {
this.workSpaceShow = false;
return;
} else {
this.workSpaceShow = true;
}
});
},
getEduIdFn(){
let data = {
projectSn: this.$store.state.projectSn,

138
src/components/userChange.vue
View File

@ -46,7 +46,7 @@
:style="{ height: groupListData.length > 4 ? '300px' : 'auto' }"
v-if="isUserList"
>
<vue-scroll style="height: 100%;" v-if="groupListData.length > 0">
<vue-scroll style="height: 100%" v-if="groupListData.length > 0">
<div
class="content-list-item"
v-for="(item, index) in groupListData"
@ -68,44 +68,47 @@
</div> -->
</div>
<div class="tree-group" v-else>
<div class="select-list" :style="{ height: selectedGroupData.length > 4 ? '300px' : 'auto' }">
<vue-scroll style="height: 100%;">
<el-input
placeholder="输入关键字进行查找"
v-model="filterText"
style="width: 98%;"
suffix-icon="el-icon-search"
size="medium"
>
</el-input>
<el-tree
:data="selectedGroupData"
:default-expanded-keys="expandKey"
:default-expand-all="false"
node-key="sn"
ref="tree"
:props="selectTreeProps"
:filter-node-method="filterNode"
:highlight-current="true"
:check-on-click-node="false"
style="margin:10px 5px;"
>
<span class="custom-tree-node" slot-scope="{ node, data }">
<span
style="
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
display: inline-block;
"
@click="treeClick(data)"
:class="data.projectSn ? 'projectStyle' : 'companyStyle'"
:title="node.label"
>{{ node.label }}</span
>
</span>
</el-tree>
<div
class="select-list"
:style="{ height: selectedGroupData.length > 4 ? '300px' : 'auto' }"
>
<vue-scroll style="height: 100%">
<el-input
placeholder="输入关键字进行查找"
v-model="filterText"
style="width: 98%"
suffix-icon="el-icon-search"
size="medium"
>
</el-input>
<el-tree
:data="selectedGroupData"
:default-expanded-keys="expandKey"
:default-expand-all="false"
node-key="sn"
ref="tree"
:props="selectTreeProps"
:filter-node-method="filterNode"
:highlight-current="true"
:check-on-click-node="false"
style="margin: 10px 5px"
>
<span class="custom-tree-node" slot-scope="{ node, data }">
<span
style="
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
display: inline-block;
"
@click="treeClick(data)"
:class="data.projectSn ? 'projectStyle' : 'companyStyle'"
:title="node.label"
>{{ node.label }}</span
>
</span>
</el-tree>
</vue-scroll>
</div>
</div>
@ -132,6 +135,7 @@
<script>
import { getGroupListApi } from "@/assets/js/api/loginSign.js";
import { getComapnyStatisticsSupplierListApi } from "@/assets/js/api/company/project";
import { getNewUserAllModulePageApi } from "@/assets/js/api/jxjadmin.js";
export default {
data() {
return {
@ -148,7 +152,8 @@ export default {
expandKey: [],
selectFirst: 0,
isShowGroup: false,
selectGroupFirst: 0
selectGroupFirst: 0,
workSpaceShow: false,
};
},
created() {
@ -162,9 +167,26 @@ export default {
this.expandKey = [this.selectedProjectSn];
}
this.loadData();
this.getModuleList();
},
mounted() {},
methods: {
// 查询全部模块(拿到工作流的模块菜单)
getModuleList() {
getNewUserAllModulePageApi({
projectSn: this.$store.state.projectSn,
moduleType: 7,
userId: this.$store.state.userInfo.userId,
}).then((res) => {
let all = res.result.moduleList;
if (all.length == 0) {
this.workSpaceShow = false;
return;
} else {
this.workSpaceShow = true;
}
});
},
// 获取是否只有一个企业一个项目，只有一个企业一个项目时隐藏
loadData() {
let that = this;
@ -177,13 +199,13 @@ export default {
sn: sn,
projectType: projectType,
}).then((res) => {
console.log(res,666555444)
if(res.result && res.result.companyList){
if(res.result.companyList.length > 1){
console.log(res, 666555444);
if (res.result && res.result.companyList) {
if (res.result.companyList.length > 1) {
that.isShowGroup = true;
} else {
if(res.result.companyList.length == 1){
that.selectShowGroup(res.result.companyList[0])
if (res.result.companyList.length == 1) {
that.selectShowGroup(res.result.companyList[0]);
} else {
that.isShowGroup = false;
}
@ -262,11 +284,14 @@ export default {
this.selectedGroupData = [item];
this.$store.commit("setSelectedGroupSn", item.companySn); // 存储选中的组织Sn
this.filterTreeData(this.selectedGroupData);
if (this.$route.path.indexOf("supplier") == -1) {
this.$router.push("/workSpace");
if (this.workSpaceShow) {
if (this.$route.path.indexOf("supplier") == -1) {
this.$router.push("/workSpace");
} else {
this.$router.push("/supplierIndex");
}
} else {
this.$router.push("/supplierIndex");
this.$router.push("/projectIndex");
}
console.log(this.selectedGroupData);
} else {
@ -300,7 +325,10 @@ export default {
this.filterTreeData(this.selectedGroupData);
this.$nextTick(() => {
// 默认选中项目
if(this.$route.path.indexOf("/supplierIndex") != -1 && !this.$store.state.projectSn){
if (
this.$route.path.indexOf("/supplierIndex") != -1 &&
!this.$store.state.projectSn
) {
this.selectProject(this.selectedGroupData[0]);
} else {
this.setTreeActive();
@ -332,10 +360,14 @@ export default {
// 收起popover
this.visible = false;
}
if (this.$route.path.indexOf("supplier") == -1) {
this.$router.push("/workSpace");
if (this.workSpaceShow) {
if (this.$route.path.indexOf("supplier") == -1) {
this.$router.push("/workSpace");
} else {
this.$router.push("/supplierIndex");
}
} else {
this.$router.push("/supplierIndex");
this.$router.push("/projectIndex");
}
},
filterNode(value, data) {

2
src/store/index.js
View File

@ -357,4 +357,4 @@ export default new Vuex.Store({
// sideMenu,
// imgReview
},
});
});

27
src/views/companyAdmin/layout.vue
View File

@ -15,7 +15,7 @@
<!-- <div class="title_near flex" v-if="![1,2].includes($store.state.userInfo.accountType)">
<userChange></userChange>
</div> -->
<div class="title_near-tow flex" v-if="![11,1,2].includes($store.state.userInfo.accountType)">
<div class="title_near-tow flex" v-if="![11,1,2].includes($store.state.userInfo.accountType) && workSpaceShow">
<div class="divider-line"></div>
<centerChange></centerChange>
</div>
@ -74,6 +74,9 @@
import account from "@/components/account.vue";
import userChange from "@/components/userChange.vue";
import centerChange from "@/components/centerChange.vue";
import {
getNewUserAllModulePageApi,
} from "@/assets/js/api/jxjadmin.js";
export default {
data() {
return {
@ -101,7 +104,8 @@ export default {
"loginLogo": "",
"platformLogo": "",
"platformName": "智慧工地云平台"
}
},
workSpaceShow: false
};
},
components:{
@ -112,6 +116,9 @@ export default {
created() {
this.company = COMPANY;
console.log(COMPANY)
if(this.$store.state.projectSn){
this.getModuleList();
}
},
mounted(){
this.getAllModule()
@ -123,6 +130,22 @@ export default {
},
methods: {
// 查询全部模块(拿到工作流的模块菜单)
getModuleList() {
getNewUserAllModulePageApi({
projectSn: this.$store.state.projectSn,
moduleType: 7,
userId: this.$store.state.userInfo.userId,
}).then((res) => {
let all = res.result.moduleList;
if (all.length == 0) {
this.workSpaceShow = false;
return;
} else {
this.workSpaceShow = true;
}
});
},
hasSubMenu(list) {
//用于判断有没有下级菜单
let onoff = false;

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

File diff suppressed because it is too large Load Diff

6
src/views/equipmentCenter/laborManage/devConfig.vue
View File

@ -137,7 +137,7 @@
</el-button>
</el-form-item>
<!-- v-if="beaconForm.supplierType!=5" -->
<el-form-item :label="$t('message.laborDev.appID')" v-if="beaconForm.supplierType!=5" prop="appId" :rules='[
<el-form-item :label="$t('message.laborDev.appID')" v-if="![5,7,9].includes(beaconForm.supplierType)" prop="appId" :rules='[
{
required: true,
message: this.$t("message.personnelPosition.required"),
@ -149,7 +149,7 @@
:placeholder="$t('message.personnelPosition.please_enter')"
></el-input>
</el-form-item>
<el-form-item v-if="beaconForm.supplierType!=4&&beaconForm.supplierType!=6&&beaconForm.supplierType!=5" :label="$t('message.laborDev.projectAppKey')" prop="appKey" :rules='[
<el-form-item v-if="![4,5,6,7,9].includes(beaconForm.supplierType)" :label="$t('message.laborDev.projectAppKey')" prop="appKey" :rules='[
{
required: true,
message: this.$t("message.personnelPosition.required"),
@ -161,7 +161,7 @@
:placeholder="$t('message.personnelPosition.please_enter')"
></el-input>
</el-form-item>
<el-form-item v-if="beaconForm.supplierType!=6&&beaconForm.supplierType!=5" :label="$t('message.laborDev.projectAppSecret')" prop="appSecret" :rules='[
<el-form-item v-if="![5,6,7,9].includes(beaconForm.supplierType)" :label="$t('message.laborDev.projectAppSecret')" prop="appSecret" :rules='[
{
required: true,
message: this.$t("message.personnelPosition.required"),

27
src/views/infoCenter/layout.vue
View File

@ -15,7 +15,7 @@
<!-- <div class="title_near flex" v-if="![1,2].includes($store.state.userInfo.accountType)">
<userChange></userChange>
</div> -->
<div class="title_near-tow flex" v-if="![11,1,2].includes($store.state.userInfo.accountType)">
<div class="title_near-tow flex" v-if="![11,1,2].includes($store.state.userInfo.accountType) && workSpaceShow">
<div class="divider-line"></div>
<centerChange></centerChange>
</div>
@ -83,6 +83,9 @@
import account from "@/components/account.vue";
import userChange from "@/components/userChange.vue";
import centerChange from "@/components/centerChange.vue";
import {
getNewUserAllModulePageApi,
} from "@/assets/js/api/jxjadmin.js";
export default {
data() {
return {
@ -98,7 +101,8 @@ export default {
"loginLogo": "",
"platformLogo": "",
"platformName": "智慧工地云平台"
}
},
workSpaceShow: false
};
},
components:{
@ -109,6 +113,9 @@ export default {
created() {
this.company = COMPANY;
console.log(COMPANY)
if(this.$store.state.projectSn){
this.getModuleList();
}
},
mounted(){
// this.getAllModule()
@ -120,6 +127,22 @@ export default {
},
methods: {
// 查询全部模块(拿到工作流的模块菜单)
getModuleList() {
getNewUserAllModulePageApi({
projectSn: this.$store.state.projectSn,
moduleType: 7,
userId: this.$store.state.userInfo.userId,
}).then((res) => {
let all = res.result.moduleList;
if (all.length == 0) {
this.workSpaceShow = false;
return;
} else {
this.workSpaceShow = true;
}
});
},
backTo(){
this.$router.back();
},

23
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',
@ -1060,7 +1061,7 @@
</div>
</el-col>
<el-col :span="12">
<div class="grid-content">
<div class="grid-content" v-if="isIscDevice">
<span class="label">车辆下发状态：</span>
<span class="value">
<span
@ -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

17
src/views/projectFront/carManage/realTimeData.vue
View File

@ -57,6 +57,7 @@
>{{ $t("message.deviceManage.query") }}</el-button
>
<el-button
v-if="isIscDevice"
v-permission="{
key: 'clgl_synchronizeVchicleTrafficData',
menuPath: '/project/carManage/realTimeData',
@ -253,6 +254,9 @@ import {
getCarPassRecordListByPageApi,
pullCarDataApi
} from "@/assets/js/api/carManage";
import {
projectCarConfigInfoList
} from "@/assets/js/api/laborPerson";
export default {
name: "historyData",
data() {
@ -288,14 +292,27 @@ export default {
pageNo: 1,
pageSize: 10,
total: 0,
isIscDevice: false
};
},
created() {
this.projectSn = this.$store.state.projectSn;
this.selectNowDate()
this.onSubmit();
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;
}
}
});
},
// 确认拉取数据
confirmPullData(){
if(!this.timeRange || this.timeRange.length == 0){

30
src/views/projectFront/examSystem2/questionManagement/questionManagement.vue
View File

@ -90,7 +90,11 @@
style="width: 100%; color: #737996"
@selection-change="handleCheckedCitiesChange"
>
<el-table-column prop="questionName" label="试题内容"></el-table-column>
<el-table-column prop="questionName" label="试题内容">
<template slot-scope="scope">
<div v-html="scope.row.questionName"></div>
</template>
</el-table-column>
<el-table-column prop="type" width="100px" label="题目类型">
<template slot-scope="scope">
<div>{{ scope.row.type && typeArr[scope.row.type - 1].name }}</div>
@ -656,7 +660,7 @@ export default {
// + '&endReceiveTime=' + this.time[1] + '&startReceiveTime=' + this.time[0] + '&devName=' + this.devName, {
// fetch(this.$http.defaults.baseURL + 'exam/questionBank/exportXls?&projectSn=' + this.projectSn + "&subjectId=" + this.subjectId,{
let data = {
projectSn:this.projectSn,
projectSn:this.$store.state.projectSn,
subjectId:this.subjectId
}
fetch(this.$http.defaults.baseURL + 'exam/questionBank/exportXls',{
@ -739,7 +743,7 @@ export default {
},
getExamSubjectList() { // 获取科目类型列表
let data = {
sn: this.projectSn,
projectSn: this.$store.state.projectSn,
}
// listTreeExamSubjectApi(data).then((res) => {
listExamSubjectApi(data).then((res) => {
@ -752,10 +756,10 @@ export default {
//获取列表数据
getExamSubjectTreeList() {
let data = {
sn: this.$store.state.projectSn,
// projectSn: this.$store.state.projectSn,
}
listTreeExamSubjectApi(data).then((res) => {
// listExamSubjectApi(data).then((res) => {
// listTreeExamSubjectApi(data).then((res) => {
listExamSubjectApi(data).then((res) => {
if (res.code == 200) {
this.level1CompanyData = res.result;
console.log('11111111111111',res);
@ -777,6 +781,7 @@ export default {
pageSize: this.pageSize,
questionName: this.tableParameter.name,
subjectId: this.subjectId,
projectSn: this.$store.state.projectSn
}).then((result) => {
if (result.success) {
console.log(result);
@ -872,7 +877,8 @@ export default {
optionList:tempOptions,
options:this.questionForm.type == 1 ? this.questionForm.options : multiOptions,
score:this.questionForm.score,
subjectId:this.subjectId,
subjectId:this.questionForm.subjectId,
projectSn:this.$store.state.projectSn
}).then(result => {
if (result.success) {
this.$message.success(result.message);
@ -914,7 +920,7 @@ export default {
options:this.questionForm.type == 1 ? option : multiOptions,
score:this.questionForm.score,
subjectId:this.subjectId,
projectSn: this.projectSn,
projectSn: this.$store.state.projectSn,
}).then(result => {
if (result.success) {
console.log('信息添加成功', result);
@ -941,7 +947,8 @@ export default {
// 预览
previewDialog(item) {
detailIdQuestionBankApi({
id: item.id
id: item.id,
projectSn: this.$store.state.projectSn
}).then(result => {
if (result.success) {
this.questionForm = result.result;
@ -1072,7 +1079,7 @@ export default {
refreshBtn() {
window._paq.push(['trackEvent', '点击', '刷新', '刷新人员信息'])
this.page = 1
this.tableParameter.name = ''
// this.tableParameter.workerName = ''
// this.tableParameter.inserviceType = ''
@ -1144,7 +1151,8 @@ export default {
moveQuestionBankApi({
id:this.editQuestion.id,
subjectId:this.subjectId2
subjectId:this.subjectId2,
projectSn: this.$store.state.projectSn
}).then(result => {
if (result.success) {
this.$message.success(result.message);

2
src/views/projectFront/examSystem2/subjectManagement/subjectManagement.vue
View File

@ -139,7 +139,7 @@ export default {
//获取列表数据
getExamSubjectList() {
let data = {
// sn: this.projectSn,
projectSn: this.projectSn,
pageNo: this.pagInfo.pageNo,
pageSize: this.pagInfo.pageSize,
}

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";
}

26
src/views/supplierAdmin/layout.vue
View File

@ -15,7 +15,7 @@
<!-- <div class="title_near flex" v-if="![1,2].includes($store.state.userInfo.accountType)">
<userChange></userChange>
</div> -->
<div class="title_near-tow flex" v-if="![11,1,2].includes($store.state.userInfo.accountType)">
<div class="title_near-tow flex" v-if="![11,1,2].includes($store.state.userInfo.accountType) && workSpaceShow">
<div class="divider-line"></div>
<centerChange></centerChange>
</div>
@ -107,6 +107,9 @@ import userChange from "@/components/userChange.vue";
import centerChange from "@/components/centerChange.vue";
import { getGroupListByCompanyApi, jumpLargeUserInfoApi } from "@/assets/js/api/loginSign.js";
import { getProjectDetail } from "@/assets/js/api/baseInfo.js";
import {
getNewUserAllModulePageApi,
} from "@/assets/js/api/jxjadmin.js";
export default {
data() {
return {
@ -124,7 +127,7 @@ export default {
"platformLogo": "",
"platformName": "智慧工地云平台"
},
projectSn: ""
workSpaceShow: false
};
},
components:{
@ -140,6 +143,9 @@ export default {
this.getGroupTreeData();
this.company = COMPANY;
console.log(COMPANY)
if(this.$store.state.projectSn){
this.getModuleList();
}
},
mounted(){
// this.getAllModule()
@ -151,6 +157,22 @@ export default {
},
methods: {
// 查询全部模块(拿到工作流的模块菜单)
getModuleList() {
getNewUserAllModulePageApi({
projectSn: this.$store.state.projectSn,
moduleType: 7,
userId: this.$store.state.userInfo.userId,
}).then((res) => {
let all = res.result.moduleList;
if (all.length == 0) {
this.workSpaceShow = false;
return;
} else {
this.workSpaceShow = true;
}
});
},
//获取详情
getDataDateils() {
let data = {

28
src/views/userCenter/layout.vue
View File

@ -15,7 +15,7 @@
<!-- <div class="title_near flex" v-if="![1,2].includes($store.state.userInfo.accountType)">
<userChange></userChange>
</div> -->
<div class="title_near-tow flex" v-if="![11,1,2].includes($store.state.userInfo.accountType)">
<div class="title_near-tow flex" v-if="![11,1,2].includes($store.state.userInfo.accountType) && workSpaceShow">
<div class="divider-line"></div>
<centerChange></centerChange>
</div>
@ -83,6 +83,9 @@
import account from "@/components/account.vue";
import userChange from "@/components/userChange.vue";
import centerChange from "@/components/centerChange.vue";
import {
getNewUserAllModulePageApi,
} from "@/assets/js/api/jxjadmin.js";
export default {
data() {
return {
@ -96,7 +99,8 @@ export default {
"loginLogo": "",
"platformLogo": "",
"platformName": "智慧工地云平台"
}
},
workSpaceShow: false
};
},
components:{
@ -107,6 +111,9 @@ export default {
created() {
this.company = COMPANY;
console.log(COMPANY)
if(this.$store.state.projectSn){
this.getModuleList();
}
},
mounted(){
// this.getAllModule()
@ -115,9 +122,24 @@ export default {
}
document.title='企业后台'
console.log('mounted',this.$route.path)
},
methods: {
// 查询全部模块(拿到工作流的模块菜单)
getModuleList() {
getNewUserAllModulePageApi({
projectSn: this.$store.state.projectSn,
moduleType: 7,
userId: this.$store.state.userInfo.userId,
}).then((res) => {
let all = res.result.moduleList;
if (all.length == 0) {
this.workSpaceShow = false;
return;
} else {
this.workSpaceShow = true;
}
});
},
backTo(){
this.$router.back();
},

1
src/views/workSpace/index.vue
View File

@ -183,6 +183,7 @@ export default {
let all = res.result.moduleList;
if (all.length == 0) {
this.workSpaceShow = false;
this.$router.push("/projectIndex")
return;
} else {
this.workSpaceShow = false;