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

Merge branch 'dev-xiaole' into shenzhen-dev

Browse Source
This commit is contained in:
骆乐 2022-09-06 13:15:20 +08:00
commit 2966eaefb0
16 changed files with 515 additions and 337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist.zip
View File

Binary file not shown.

2
src/assets/i18n/langs/cn/projectInfo.js
View File

@ -245,7 +245,7 @@ export default {
room:'户室',
roomNum:'户数',
building:'楼栋',
floorAndRoomRewriteName:'楼层|户名 重命名',
floorAndRoomRewriteName:'楼层|户名 重命名',
upFloorNum:'地上层数',
underFloorNum:'地下层数',
long:'长度',

239
src/components/map/gd-map.vue
View File

@ -1,120 +1,147 @@
<template>
<div>
<!-- 坐标拾取 -->
<el-dialog @close="closeMap"
:title="$t('message.alarmValueSet.coordinatePick')"
:visible.sync="dialogVisible"
:modal-append-to-body="false"
width="80%">
<div slot="default" class="coordinate-picking">
<!-- 地址 -->
{{$t('message.alarmValueSet.gdAddress')}}:
<el-input size="medium" v-model="coordinateInfo.city" id="tipinput" :placeholder="$t('message.alarmValueSet.placeholder')"></el-input>
<!-- <el-button type="primary" size="medium" @click="search">查询</el-button>-->
<!-- 经度 -->
{{$t('message.alarmValueSet.longitude')}}:
<el-input size="medium" v-model="coordinateInfo.lng" :placeholder="$t('message.alarmValueSet.placeholder')"></el-input>
<!-- 纬度 -->
{{$t('message.alarmValueSet.latitude')}}:
<el-input size="medium" v-model="coordinateInfo.lat" :placeholder="$t('message.alarmValueSet.placeholder')"></el-input>
<el-button size="medium" type="primary" @click="submit">
<!-- 提交 -->
{{$t('message.alarmValueSet.submit')}}
</el-button>
</div>
<div id="container"></div>
</el-dialog>
</div>
<div>
<!-- 坐标拾取 -->
<el-dialog
@close="closeMap"
:title="$t('message.alarmValueSet.coordinatePick')"
:visible.sync="dialogVisible"
:modal-append-to-body="false"
width="80%"
>
<div slot="default" class="coordinate-picking">
<!-- 地址 -->
{{$t('message.alarmValueSet.gdAddress')}}:
<el-input
size="medium"
v-model="coordinateInfo.city"
id="tipinput"
:placeholder="$t('message.alarmValueSet.placeholder')"
></el-input>
<!-- <el-button type="primary" size="medium" @click="search">查询</el-button>-->
<!-- 经度 -->
{{$t('message.alarmValueSet.longitude')}}:
<el-input
size="medium"
v-model="coordinateInfo.lng"
:placeholder="$t('message.alarmValueSet.placeholder')"
></el-input>
<!-- 纬度 -->
{{$t('message.alarmValueSet.latitude')}}:
<el-input
size="medium"
v-model="coordinateInfo.lat"
:placeholder="$t('message.alarmValueSet.placeholder')"
></el-input>
<el-button size="medium" type="primary" @click="submit">
<!-- 提交 -->
{{$t('message.alarmValueSet.submit')}}
</el-button>
</div>
<div id="container"></div>
</el-dialog>
</div>
</template>
<script>
export default {
name: "gd-map",
mounted() {
this.$nextTick(() => {
this.initMap();
})
},
data() {
return {
coordinateInfo: {
lng: '',
lat: '',
},
map: {},
auto: {},
placeSearch: {},
dialogVisible: true
}
},
methods: {
initMap() {
//地图加载
this.map = new AMap.Map("container", {
resizeEnable: true
});
//输入提示
var autoOptions = {
input: "tipinput"
};
this.auto = new AMap.Autocomplete(autoOptions);
this.placeSearch = new AMap.PlaceSearch({
map: this.map
}); //构造地点查询类
AMap.event.addListener(this.auto, "select", this.select);//注册监听，当选中某条记录时会触发
this.map.on('click', (e) => {
this.coordinateInfo.lng = e.lnglat.getLng();
this.coordinateInfo.lat = e.lnglat.getLat();
// console.log('您在 [ ' + e.lnglat.getLng() + ',' + e.lnglat.getLat() + ' ] 的位置单击了地图！');
});
},
select(e) {
console.log('select', e)
this.placeSearch.setCity(e.poi.adcode);
this.placeSearch.search(e.poi.name); //关键字查询查询
},
search() {
// console.log('a', e.poi.adcode, 'name', e.poi.name, '----------placeSearch', this.placeSearch)
// this.placeSearch.setCity(e.poi.adcode);
// this.placeSearch.search(e.poi.name); //关键字查询查询
},
submit() {
this.$emit('save', this.coordinateInfo);
},
closeMap() {
this.$emit('closeMap', false);
}
}
export default {
props: {
addProjectForm: {
type: Object,
default: {}
}
},
name: "gd-map",
data() {
return {
coordinateInfo: {
city:"",
lng: "",
lat: ""
},
map: {},
auto: {},
placeSearch: {},
dialogVisible: true
};
},
mounted() {
// console.log("过来了吗", this.addProjectForm);
this.coordinateInfo.city = this.addProjectForm.areaName
this.coordinateInfo.lng = this.addProjectForm.longitude
this.coordinateInfo.lat = this.addProjectForm.latitude
this.$nextTick(() => {
this.initMap();
});
},
methods: {
initMap() {
//地图加载
this.map = new AMap.Map("container", {
resizeEnable: true
});
//输入提示
var autoOptions = {
input: "tipinput"
};
this.auto = new AMap.Autocomplete(autoOptions);
this.placeSearch = new AMap.PlaceSearch({
map: this.map
}); //构造地点查询类
AMap.event.addListener(this.auto, "select", this.select); //注册监听，当选中某条记录时会触发
this.map.on("click", e => {
this.coordinateInfo.lng = e.lnglat.getLng();
this.coordinateInfo.lat = e.lnglat.getLat();
// console.log('您在 [ ' + e.lnglat.getLng() + ',' + e.lnglat.getLat() + ' ] 的位置单击了地图！');
});
},
select(e) {
console.log("select", e);
this.placeSearch.setCity(e.poi.adcode);
this.placeSearch.search(e.poi.name); //关键字查询查询
},
search() {
// console.log('a', e.poi.adcode, 'name', e.poi.name, '----------placeSearch', this.placeSearch)
// this.placeSearch.setCity(e.poi.adcode);
// this.placeSearch.search(e.poi.name); //关键字查询查询
},
submit() {
this.$emit("save", this.coordinateInfo);
},
closeMap() {
this.$emit("closeMap", false);
}
}
};
</script>
<style lang="less" scoped>
.flex {
display: flex;
}
.flex {
display: flex;
}
.coordinate-picking {
.flex;
/*justify-content: space-between;*/
align-items: center;
margin-bottom: 10px;
.coordinate-picking {
.flex;
/*justify-content: space-between;*/
align-items: center;
margin-bottom: 10px;
.el-input {
width: 20%;
margin: 0 10px 0 5px;
}
.el-input {
width: 20%;
margin: 0 10px 0 5px;
}
.el-button {
margin-right: 10px;
}
}
.el-button {
margin-right: 10px;
}
}
#container {
width: 100%;
height: 600px;
}
#container {
width: 100%;
height: 600px;
}
/deep/ .el-dialog__body {
padding-top: 10px;
}
/deep/ .el-dialog__body {
padding-top: 10px;
}
</style>

2
src/views/projectAdmin/zjsj/carbon/leftTop.vue
View File

@ -51,7 +51,7 @@ export default {
color: #c5c7cc;
.num1 {
position: absolute;
top: 38%;
top: 46%;
left: 43%;
}
.text {

23
src/views/projectAdmin/zjsj/security/centerBottom.vue
View File

@ -15,8 +15,8 @@
<div class="td" style="width:90px;">序号</div>
<div class="td">验收项目</div>
<div class="td">验收要求</div>
<div class="td">验收结果</div>
<div class="td">专业承包单位</div>
<div class="td">验收结果</div>
<div class="td">防护责任人</div>
<div class="td">验收日期</div>
</div>
@ -27,8 +27,8 @@
<div class="td" style="width:90px;">{{i}}</div>
<div class="td">深基坑临边防护</div>
<div class="td">砌筑200mm以上挡水墙</div>
<div class="td">符合要求</div>
<div class="td">中国建筑第四工程局有限公司</div>
<div class="td">符合要求</div>
<div class="td">王明</div>
<div class="td">2022-09-01</div>
</div>
@ -157,39 +157,36 @@ export default {
height: 32px;
line-height: 32px;
text-align: center;
justify-content: center;
&:nth-child(1) {
width: 150px;
// flex: 1;
}
&:nth-child(2) {
// width: 110px;
flex: 1;
}
&:nth-child(3) {
flex: 1;
// width: 110px;
}
&:nth-child(4) {
width: 90px;
flex: 1;
}
&:nth-child(5) {
flex: 1;
}
&:nth-child(6) {
// width: 90px;
flex: 1;
}
&:nth-child(7) {
width: 90px;
flex: 1;
}
}
}
.dataImg {
margin-left: 500px;
margin-top: 50px;
p {
margin-left: 4%;
}
margin-left: 500px;
margin-top: 50px;
p {
margin-left: 4%;
}
}
}
</style>

15
src/views/projectAdmin/zjsj/security/leftBottom.vue
View File

@ -11,7 +11,9 @@
<div class="tbody">
<vue-scroll>
<div class="row" v-for="i in 9" :key="i">
<div><img src="../assets/images/common/bg_fgy.png" /></div>
<div>
<img src="../assets/images/common/bg_fgy.png" />
</div>
<div class="carNum">未穿反光衣</div>
<div class="datetime">2011-02-03 15:30</div>
</div>
@ -22,10 +24,10 @@
</template>
<script>
import Card from '../components/Card.vue'
import Card from "../components/Card.vue";
export default {
components: { Card }
}
};
</script>
<style lang="less" scoped>
@ -50,10 +52,13 @@ export default {
div {
text-align: center;
&:last-child {
width: 160px;
flex: 1;
}
&:first-child {
width: 100px;
}
&:not(:last-child) {
flex: 1;
width: 100px;
}
img {
width: 80px;

7
src/views/projectAdmin/zjsj/sourse/components/CarTable.vue
View File

@ -43,10 +43,13 @@ export default {}
div {
text-align: center;
&:last-child {
width: 160px;
flex: 1;
}
&:first-child {
width: 120px;
}
&:not(:last-child) {
flex: 1;
width: 120px;
}
img {
width: 80px;

9
src/views/projectAdmin/zjsj/sourse/components/MaterialTable.vue
View File

@ -23,7 +23,7 @@
</template>
<script>
export default {}
export default {};
</script>
<style lang="less" scoped>
@ -56,10 +56,13 @@ export default {}
div {
text-align: center;
&:last-child {
width: 160px;
flex: 1;
}
&:first-child {
width: 100px;
}
&:not(:last-child) {
flex: 1;
width: 100px;
}
img {
width: 80px;

390
src/views/projectFront/configManage/roleManage.vue
View File

@ -7,70 +7,56 @@
v-model="queryInfo.name"
:placeholder="$t('message.alarmValueSet.placeholder')"
></el-input>
</el-form-item> -->
</el-form-item>-->
<el-form-item>
<!-- 请输入角色名称 -->
<el-input
style="display: inline-block"
v-model="workerName"
:placeholder="$t('message.projectInfo.pleaseChoose')+$t('message.projectInfo.roleName')"
style="display: inline-block"
v-model="workerName"
:placeholder="$t('message.projectInfo.pleaseChoose')+$t('message.projectInfo.roleName')"
></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" plain @click="query">{{
<el-button type="primary" plain @click="query">
{{
$t("message.alarmWarning.query")
}}</el-button>
<el-button type="warning" plain @click="refresh">{{
}}
</el-button>
<el-button type="warning" plain @click="refresh">
{{
$t("message.alarmValueSet.refresh")
}}</el-button>
<el-button type="primary" @click="add">{{
}}
</el-button>
<el-button type="primary" @click="add">
{{
$t("message.videoManage.add")
}}</el-button>
}}
</el-button>
</el-form-item>
</el-form>
</div>
<div class="table_wrap whiteBlock">
<vue-scroll style="height: 70%">
<el-table class="tables" :data="List"
><!--align="center"-->
<el-table-column
prop="roleName"
:label="$t('message.roleManage.juese')"
></el-table-column>
<el-table class="tables" :data="List">
<!--align="center"-->
<el-table-column prop="roleName" :label="$t('message.roleManage.juese')"></el-table-column>
<!-- 是否能进入设备中台 -->
<el-table-column
prop="roleName"
:label="$t('message.projectInfo.isJoinDev')"
>
<el-table-column prop="roleName" :label="$t('message.projectInfo.isJoinDev')">
<template slot-scope="scope">
<!-- '是':'否' -->
{{scope.row.seeEquipment==0?$t('message.projectInfo.is'):$t('message.projectInfo.isNot')}}
</template>
</el-table-column>
<el-table-column
prop="roleDesc"
:label="$t('message.roleManage.miaoshu')"
></el-table-column>
<el-table-column
:label="$t('message.alarmValueSet.operation')"
align="center"
>
<el-table-column prop="roleDesc" :label="$t('message.roleManage.miaoshu')"></el-table-column>
<el-table-column :label="$t('message.alarmValueSet.operation')" align="center">
<template slot-scope="scope">
<div class="tableBtns">
<div @click="edit(scope.row)" class="operationText">
<img
src="@/assets/images/icon-edit.png"
width="15px"
height="15px"
/>
<img src="@/assets/images/icon-edit.png" width="15px" height="15px" />
<span>{{ $t("message.alarmValueSet.edit") }}</span>
</div>
<div @click="deleteDev(scope.row)" class="operationText">
<img
src="@/assets/images/icon-delete.png"
width="15px"
height="15px"
/>
<img src="@/assets/images/icon-delete.png" width="15px" height="15px" />
<span>{{ $t("message.alarmValueSet.delete") }}</span>
</div>
<div @click="power(scope.row)" class="operationText">
@ -92,7 +78,7 @@
layout="total, sizes, prev, pager, next"
:total="pagInfo.total"
background
></el-pagination> -->
></el-pagination>-->
</div>
<el-dialog
:modal-append-to-body="false"
@ -111,26 +97,20 @@
class="dialogFormBox"
:rules="formRules"
>
<el-form-item
:label="$t('message.roleManage.name')"
prop="roleName"
>
<el-form-item :label="$t('message.roleManage.name')" prop="roleName">
<el-input
v-model="addEditForm.roleName"
:placeholder="$t('message.alarmValueSet.placeholder')"
></el-input>
</el-form-item>
<el-form-item
:label="$t('message.projectInfo.isJoinDev')"
prop="seeEquipment"
>
<el-form-item :label="$t('message.projectInfo.isJoinDev')" prop="seeEquipment">
<el-radio v-model="addEditForm.seeEquipment" label="0">
<!-- 是 -->
{{$t('message.projectInfo.is')}}
</el-radio>
<el-radio v-model="addEditForm.seeEquipment" label="1">
<!-- 否 -->
{{$t('message.projectInfo.isNot')}}
{{$t('message.projectInfo.isNot')}}
</el-radio>
</el-form-item>
<el-form-item :label="$t('message.roleManage.miaoshu')">
@ -140,8 +120,7 @@
:placeholder="$t('message.safeManage.placeholder')"
v-model="addEditForm.roleDesc"
size="medium"
>
</el-input>
></el-input>
</el-form-item>
<div class="dialog-footer">
<el-button
@ -149,20 +128,18 @@
@click="Popup.show = false"
icon="el-icon-circle-close"
size="medium"
>{{ $t("message.alarmValueSet.cancel") }}
</el-button>
>{{ $t("message.alarmValueSet.cancel") }}</el-button>
<el-button
type="primary"
icon="el-icon-circle-check"
@click="submit"
size="medium"
>{{ $t("message.alarmValueSet.save") }}
</el-button>
>{{ $t("message.alarmValueSet.save") }}</el-button>
</div>
</el-form>
</div>
</el-dialog>
<!-- 权限分配-->
<!-- 权限分配-->
<el-dialog
:modal-append-to-body="false"
:title="$t('message.roleManage.Popup_title')[Popup.type]"
@ -171,55 +148,59 @@
>
<div class="dialog_content">
<!-- default-expand-all -->
<!-- <div>项目模块</div> -->
<!-- <div>
<!-- <div>项目模块</div> -->
<!-- <div>
<el-checkbox
v-model="checkAll"
@change="selectAll">全选</el-checkbox>
</div> -->
<!-- :props="props" -->
<el-tree ref="tree"
v-bind="myTree"
node-key="authorityId"
:data="projectMenus"
show-checkbox
:default-expand-all="isExpand"
:filter-node-method="filterNode"
@check-change="handleCheckChange"
>
<span class="custom-tree-node" slot-scope="{ node, data }">
<span :class="data.actionName?'actionName':''">{{ data.moduleName?data.moduleName:data.name }}
<span v-show="data.moduleType==4" class="moudleType">
<!-- 模块类型：项目看板 -->
{{$t('message.projectInfo.modelType')}}
</div>-->
<!-- :props="props" -->
<!-- :default-expand-all="isExpand"
:filter-node-method="filterNode" -->
<el-tree
ref="tree"
v-bind="myTree"
node-key="authorityId"
:data="projectMenus"
show-checkbox
@check-change="handleCheckChange"
>
<span class="custom-tree-node" slot-scope="{ node, data }">
<span :class="data.actionName?'actionName':''">
{{ data.moduleName?data.moduleName:data.name }}
<span
v-show="data.moduleType==4"
class="moudleType"
>
<!-- 模块类型：项目看板 -->
</span>
{{$t('message.projectInfo.modelType')}}
</span>
<!-- <div style="display:inline-block" v-if="data.operateList">
</span>
<!-- <div style="display:inline-block" v-if="data.operateList">
<el-checkbox-group @change="selectOperateFn" class="" v-model="data.selectOperateList" >
<el-checkbox :label="item.operateCode" v-for="(item,index) in data.operateList" :key="index">{{item.operateName}}</el-checkbox>
</el-checkbox-group>
</div> -->
<!-- {{data.selectOperateList}} -->
<!-- {{JSON.stringify(data)}} -->
</span>
</el-tree>
<div class="dialog-footer">
<el-button
class="cancleBtn"
@click="Popup.power = false"
icon="el-icon-circle-close"
size="medium"
>{{ $t("message.alarmValueSet.cancel") }}
</el-button>
<el-button
type="primary"
icon="el-icon-circle-check"
@click="saveRoleMenu"
size="medium"
>{{ $t("message.alarmValueSet.save") }}
</el-button>
</div>
</div>-->
<!-- {{data.selectOperateList}} -->
<!-- {{JSON.stringify(data)}} -->
</span>
</el-tree>
<div class="dialog-footer">
<el-button
class="cancleBtn"
@click="cancleBtn"
icon="el-icon-circle-close"
size="medium"
>{{ $t("message.alarmValueSet.cancel") }}</el-button>
<el-button
type="primary"
icon="el-icon-circle-check"
@click="saveRoleMenu"
size="medium"
>{{ $t("message.alarmValueSet.save") }}</el-button>
</div>
</div>
</el-dialog>
</div>
@ -229,53 +210,56 @@ import {
addBaseRoleApi,
editBaseRoleApi,
deleteBaseRoleApi,
getBaseRoleListApi,getRoleBaseMenuListApi,editBaseRoleMenuApi,
getBaseRoleListApi,
getRoleBaseMenuListApi,
editBaseRoleMenuApi,
getProjectModuleGroupMenuListApi
} from "@/assets/js/api/configManage";
export default {
mounted() {
this.getProjectMenu()
this.getProjectMenu();
this.getList();
},
data() {
return {
myTree:{
data:[],
myTree: {
data: [],
dataList:[],
props: {
label: "name",
children: "menuList",
},
treeAllChildNode: [], // 数所有的可选择的子节点
checkAll:false, //是否全选
label: "name",
children: "menuList"
},
treeAllChildNode: [], // 数所有的可选择的子节点
checkAll: false //是否全选
},
addEditForm: {
roleName: "",
roleDesc: "",
projectSn: "",
seeEquipment:1
seeEquipment: 1
},
formRules: {
roleName: [
{
required: true,
message: this.$t("message.personnelPosition.required"),
trigger: "blur",
},
trigger: "blur"
}
],
roleDesc: [
{
required: true,
message: this.$t("message.personnelPosition.required"),
trigger: "blur",
},
],
trigger: "blur"
}
]
},
List: [],
Popup: {
type: "add",
show: false,
show: false
},
queryInfo: {},
// pagInfo: {
@ -284,59 +268,85 @@ export default {
// total: 0, //总条数
// },
// count: 0,
projectMenus:[],
selectRoleMenus:[],
allOperateList:[],
arr:[],
workerName:''
projectMenus: [],
selectRoleMenus: [],
allOperateList: [],
arr: [],
workerName: ""
};
},
watch: {
"Popup.show": {
deep: true,
handler(newVal, oldVal) {
console.log("----newVal", newVal);
console.log("----oldVal", oldVal);
if (this.Popup.type == "power") {
if (oldVal == undefined || oldVal == false) {
this.dataList = []
}
}
}
}
},
methods: {
//获取角色配置的菜单
getRoleMenu(){
getRoleMenu() {
console.log(this.addEditForm.roleId);
getRoleBaseMenuListApi({roleId:this.addEditForm.roleId}).then(res=>{
getRoleBaseMenuListApi({ roleId: this.addEditForm.roleId }).then(res => {
var arr = res.result;
var arr2 = []
// var arr2 = [];
console.log(arr);
if(arr.length>0){
if (arr.length > 0) {
arr.forEach(element => {
if(element.authorityId){
arr2.push(element.authorityId)
}
// else{
// arr2.push(element.moduleId)
// }
});
if (element.authorityId) {
this.dataList.push(element.authorityId);
}
// else{
// arr2.push(element.moduleId)
// }
});
}
this.$nextTick(()=>{
this.$refs.tree.setCheckedKeys(arr2);
})
this.$nextTick(() => {
this.$refs.tree.setCheckedKeys(this.dataList);
});
});
},
// 取消菜单配置
cancleBtn() {
this.Popup.power = false;
this.resetChecked();
},
resetChecked() {
this.$nextTick(()=>{
this.$refs.tree.setCheckedKeys([])
})
},
//保存角色菜单
saveRoleMenu(){
//
// var arr =this.$refs.tree.getCheckedKeys()
// arr.forEach((element,index) => {
// if(element==undefined||element==""){
// arr.splice(index, 1);
// }
// });
// console.log(arr)
let nodeList = Array.from(new Set([...this.$refs.tree.getCheckedKeys(),...this.$refs.tree.getHalfCheckedKeys()]))
nodeList.splice(nodeList.findIndex(item => item === undefined), 1)
// console.log(nodeList)
editBaseRoleMenuApi({roleId:this.addEditForm.roleId,authorityIds:nodeList.join(',')}).then(res=>{
this.Popup.power=false;
})
saveRoleMenu() {
let nodeList = Array.from(
new Set([
...this.$refs.tree.getCheckedKeys(),
...this.$refs.tree.getHalfCheckedKeys()
])
);
nodeList.splice(
nodeList.findIndex(item => item === undefined),
1
);
editBaseRoleMenuApi({
roleId: this.addEditForm.roleId,
authorityIds: nodeList.join(",")
}).then(res => {
this.Popup.power = false;
});
},
//获取项目下模块及菜单
getProjectMenu(){
getProjectModuleGroupMenuListApi({projectSn:this.$store.state.projectSn}).then(res=>{
var DATA=res.result
getProjectMenu() {
getProjectModuleGroupMenuListApi({
projectSn: this.$store.state.projectSn
}).then(res => {
var DATA = res.result;
// DATA.forEach((element,i) => {
// var arr = element.menuList
// arr.forEach((item,index) => {
@ -373,21 +383,21 @@ export default {
// });
// });
console.log(DATA)
this.projectMenus=DATA
console.log('this.projectMenus')
console.log(this.projectMenus)
})
console.log(DATA);
this.projectMenus = DATA;
console.log("this.projectMenus");
console.log(this.projectMenus);
});
},
selectOperateFn(data){
console.log('selectOperateFn')
console.log(data)
selectOperateFn(data) {
console.log("selectOperateFn");
console.log(data);
},
handle(type, show) {
//打开弹窗前的统一处理
this.Popup = {
type: type,
show: show,
show: show
};
},
query() {
@ -417,11 +427,11 @@ export default {
cancelButtonText: this.$t(
"message.personnelPosition.cancelButtonText"
),
type: "warning",
type: "warning"
}
)
.then(() => {
deleteBaseRoleApi({ id: obj.roleId }).then((result) => {
deleteBaseRoleApi({ id: obj.roleId }).then(result => {
if (result.success) {
this.$message.success(result.message);
this.getList();
@ -434,19 +444,19 @@ export default {
// console.log(obj);
this.Popup = {
type: "power",
power: true,
power: true
};
this.addEditForm = JSON.parse(JSON.stringify(obj));
console.log(this.addEditForm);
this.getRoleMenu()
this.getRoleMenu();
},
submit() {
this.$refs["addEditForm"].validate((valid) => {
this.$refs["addEditForm"].validate(valid => {
if (valid) {
let params = this.addEditForm;
params.projectSn = this.$store.state.projectSn;
if (this.Popup.type === "add") {
addBaseRoleApi(params).then((result) => {
addBaseRoleApi(params).then(result => {
if (result.success) {
this.$message.success(result.message);
this.getList();
@ -454,7 +464,7 @@ export default {
});
} else if (this.Popup.type === "edit") {
console.log("编辑信息", this.addEditForm);
editBaseRoleApi(params).then((result) => {
editBaseRoleApi(params).then(result => {
if (result.success) {
this.$message.success(result.message);
this.getList();
@ -469,25 +479,26 @@ export default {
});
},
refresh() {
this.workerName = ''
this.workerName = "";
this.getList();
},
getList() {
getBaseRoleListApi({ projectSn: this.$store.state.projectSn,roleName:this.workerName }).then(
(result) => {
if (result.success) {
this.List = result.result;
console.log("列表", result);
}
getBaseRoleListApi({
projectSn: this.$store.state.projectSn,
roleName: this.workerName
}).then(result => {
if (result.success) {
this.List = result.result;
console.log("列表", result);
}
);
});
},
close() {
this.addEditForm = {
roleName: "",
roleDesc: "",
projectSn: "",
seeEquipment:1
seeEquipment: 1
};
this.$nextTick(() => {
this.$refs.addEditForm.clearValidate();
@ -505,18 +516,8 @@ export default {
//console.log('eeee',e)
// console.log(data, checked, indeterminate);
// console.log('选择',this.$refs.tree.getCheckedKeys());
},
// 全选反选
// selectAll(){
// if(this.checkAll){
// // for(let i = 0;)
// console.log('111111',this.$refs)
// this.$refs.tree.setCheckedNodes(this.projectMenus);
// }else{
// this.$refs.tree.setCheckedKeys([])
// }
// },
},
}
}
};
</script>
<style lang="less" scoped>
@ -528,26 +529,25 @@ export default {
// .yj-dialogFormBox {
// width: 462px;
// }
.el-icon-s-operation{
.el-icon-s-operation {
font-size: 18px;
margin-right: 6px;
}
.treeName{
.treeName {
display: inline-block;
width: 150px;
}
/deep/.el-checkbox-group{
/deep/.el-checkbox-group {
display: inline-block;
}
// /deep/.el-tree-node__children{
// .el-tree-node{
// display: inline-block;
// }
// }
.moudleType{
.moudleType {
margin-left: 20px;
font-size: 12px;
opacity: 0.6;
font-size: 12px;
opacity: 0.6;
}
</style>

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

@ -3499,7 +3499,7 @@ export default {
}
this.personForm.employmentCard = arrJoin.join(',')
} else if (type == 8) {
console.log(file)
console.log('身份证正面上传',file)
let data = {
name: file.data[0].filename,
url: file.data[0].imageUrl
@ -4029,7 +4029,9 @@ export default {
side: type
}
getIdCardInfoApi(data).then((res) => {
console.log('返回值',res)
if (res.code == 200) {
console.log('成了吗',res)
let val = res.result
if (type == 1) {
this.personForm.nation =

112
src/views/projectFront/laborManage/personModule/temporary.vue
View File

@ -347,6 +347,118 @@
placeholder="请选择日期"
></el-date-picker>
</el-form-item>-->
<el-col :span="12">
<!-- <el-form-item
:label="$t('message.laborMange.frontAndBackOfIdCard')"
prop="idCardUpPhotoUrl"
>
<div class="flex3" style="width: 160px">
<div>
<div
v-if="personForm.idCardUpPhotoUrl"
style="
position: relative;
width: 60px;
height: 38px;
"
>
<img
:src="fileUrl + personForm.idCardUpPhotoUrl"
style="width: 60px; height: 38px"
@click="
handlePreview(
fileUrl + personForm.idCardUpPhotoUrl,
0
)
"
/>
<img
v-if="
personForm.idCardUpPhotoUrl &&
titleType != 'detail'
"
src="@/assets/images/shut_icon.png"
width="15px"
height="15px"
class="shut_icon"
@click="shutIconBtn(2)"
/>
</div>
<el-upload
v-else
class="upload-demo identity_card"
:action="uploadUrl"
:on-remove="(file) => handleRemove(file, 8)"
:on-success="(file) => handleSuccess(file, 8)"
:on-error="(file) => handleError(file, 8)"
:on-preview="(file) => handlePreview(file, 8)"
:beforeUpload="
(file) => handleBeforeUpload(file, 8)
"
name="files"
:class="titleType == 'detail' ? 'margin_top35' : ''"
:file-list="idCardUpPhotoUrlFile"
:disabled="titleType == 'detail'"
:show-file-list="false"
>
<img src="@/assets/images/cockade.png" />
</el-upload>
</div>
<div>
<div
v-if="personForm.idCardDownPhotoUrl"
style="
position: relative;
width: 60px;
height: 38px;
"
>
<img
:src="fileUrl + personForm.idCardDownPhotoUrl"
style="width: 60px; height: 38px"
@click="
handlePreview(
fileUrl + personForm.idCardDownPhotoUrl,
0
)
"
/>
<img
v-if="
personForm.idCardDownPhotoUrl &&
titleType != 'detail'
"
src="@/assets/images/shut_icon.png"
width="15px"
height="15px"
class="shut_icon"
@click="shutIconBtn(3)"
/>
</div>
<el-upload
v-else
class="upload-demo identity_card"
:action="uploadUrl"
:on-remove="(file) => handleRemove(file, 9)"
:on-success="(file) => handleSuccess(file, 9)"
:on-error="(file) => handleError(file, 9)"
:on-preview="(file) => handlePreview(file, 9)"
:beforeUpload="
(file) => handleBeforeUpload(file, 9)
"
name="files"
:class="titleType == 'detail' ? 'margin_top35' : ''"
:file-list="idCardDownPhotoUrlFile"
:disabled="titleType == 'detail'"
:show-file-list="false"
>
<img src="@/assets/images/portrait.png" />
</el-upload>
</div>
</div>
</el-form-item> -->
</el-col>
</el-col>
</el-row>
</el-col>

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

@ -665,6 +665,10 @@ export default {
});
},
addPoint() {
// 清空图片
this.cardForm.eduBeforePhoto= "";
this.cardForm.eduInPhoto= "";
this.cardForm.eduAfterPhoto= "";
this.isAdd = true;
this.cardDialog = true;
this.$nextTick(() => {

2
src/views/projectFront/projectSummary/baseInfo.vue
View File

@ -649,7 +649,7 @@
<img width="100%" :src="bigImageUrl" alt />
</el-dialog>
<!--高德地图-->
<gd-map v-if="showMap" @closeMap="closeMap" @save="getLngLat"></gd-map>
<gd-map v-if="showMap" :addProjectForm="addProjectForm" @closeMap="closeMap" @save="getLngLat"></gd-map>
</div>
</template>
<script>

39
src/views/projectFront/projectSummary/cooperationUnit.vue
View File

@ -198,7 +198,7 @@
:visible.sync="addEnterpriseDialog"
width="750px"
>
<vue-scroll style="height: 618px">
<vue-scroll class="adddialog" style="height: 618px">
<div class="dialog_content" ref="enterpriseDialog">
<el-form
size="small"
@ -233,13 +233,14 @@
</el-col>
</el-row>
<el-row :gutter="24">
<!-- 企业类型 -->
<el-col :span="12">
<el-form-item
:label="$t('message.laborMange.formOfBusiness')"
prop="enterpriseTypeId"
prop="companyTypeName"
>
<el-select
v-model="enterpriseForm.enterpriseTypeId"
v-model="enterpriseForm.companyTypeName"
:placeholder="$t('message.laborMange.pleaseChoose')"
style="width: 100%"
:disabled="true"
@ -248,7 +249,7 @@
v-for="item in enterpriseTypeList"
:key="item.id"
:label="item.companyTypeName"
:value="item.id"
:value="item.companyTypeName"
></el-option>
</el-select>
</el-form-item>
@ -561,13 +562,13 @@
</el-col>
</el-row>
</el-form>
<div class="dialog-footer">
<div class="dialog-footer addpage">
<el-button
class="cancleBtn"
@click="addEnterpriseDialog = false"
icon="el-icon-circle-close"
size="medium"
>{{ $t("message.laborMange.cancel") }}</el-button
>{{ $t("message.laborMange.cancel")}}</el-button
>
<el-button
type="primary"
@ -692,6 +693,7 @@ export default {
enterpriseEmail: "", //企业邮箱
enterpriseLegalPerson: "", //法定代表人
enterpriseName: "", //企业名称
companyTypeName:"",//企业类型名称
enterpriseProperty: "", //单位性质 1.国有企业 2三资企业 3集体企业 4私营企业
enterpriseQualificationUrl: "", //企业资质图片地址
enterpriseSafeAllow: "", //企业安全生产许可证
@ -750,10 +752,11 @@ export default {
let data = {};
getEnterpriseTypeList(data).then((res) => {
if (res.code == 200) {
console.log(res);
console.log('获取企业类型列表',res);
this.enterpriseTypeList = res.result;
this.enterpriseTypeId = res.result[0].id;
this.enterpriseTypeName = res.result[0].companyTypeName;
this.enterpriseForm.companyTypeName= res.result[0].companyTypeName;
console.log(this.enterpriseTypeList);
this.getCooperatorList();
}
@ -803,9 +806,10 @@ export default {
},
//切换 单位类型
selectMenu(value) {
// console.log('切换菜单',value)
this.checkedId = value.id;
this.enterpriseTypeId = value.id;
this.enterpriseTypeName = value.companyTypeName;
this.enterpriseForm.companyTypeName = value.companyTypeName;
this.getCooperatorList();
},
//新增按钮
@ -820,6 +824,7 @@ export default {
enterpriseEmail: "", //企业邮箱
enterpriseLegalPerson: "", //法定代表人
enterpriseName: "", //企业名称
companyTypeName : this.enterpriseForm.companyTypeName,
enterpriseProperty: "", //单位性质 1.国有企业 2三资企业 3集体企业 4私营企业
enterpriseQualificationUrl: "", //企业资质图片地址
enterpriseSafeAllow: "", //企业安全生产许可证
@ -835,6 +840,7 @@ export default {
departmentType:"", // 企业管理
sortNum: 0,
};
// console.log('==========',this.enterpriseForm.companyTypeName)
this.aptitudeFileList = [];
this.logoFileList = [];
this.enterpriseDialogType = 1;
@ -1250,4 +1256,21 @@ export default {
margin-top: 10px;
}
}
.adddialog{
position: relative;
.dialog_content{
height: 500px;
overflow: auto;
}
::-webkit-scrollbar {
width: 2px;
}
.addpage{
position: absolute;
top: 80%;
left: 60%;
}
}
</style>

2
src/views/projectFront/projectSummary/cooperatorDatails.vue
View File

@ -496,8 +496,10 @@ export default {
let data = this.qualificationForm;
(data.enterpriseId = this.$props.projectEnterpriseId),
addEnterpriseQualification(data).then((res) => {
// console.log('新增成功了吗',res)
this.getQueryById();
this.$refs.upload.clearFiles();
this.fileList = [];
this.$refs.qualificationForm.resetFields();
});
this.qualificationDialog = false;

2
src/views/projectFront/projectSummary/manageTeam.vue
View File

@ -11,7 +11,7 @@
<el-table-column prop="personName" :label="$t('message.manageTeam.personName')"
align="center"></el-table-column>
<el-table-column prop="phone" :label="$t('message.manageTeam.phone')" align="center"></el-table-column>
<el-table-column width="80" align="center">
<el-table-column :label="$t('message.manageTeam.imageUrl')" width="80" align="center">
<div slot slot-scope="scope">
<img :preview="scope.row.imageUrl[0]?scope.row.imageUrl[0].url:[]"
:src="scope.row.imageUrl[0]?scope.row.imageUrl[0].url:[]"