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

安全管理模块还原初始版本

Browse Source
This commit is contained in:
jxj_yjl 2023-11-04 15:11:45 +08:00
parent 758308e57d
commit 4adc406712
3 changed files with 34 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/js/config.js
View File

@ -1,5 +1,5 @@
//-------项目配置标识-------
var COMPANY = '' //通用
// var COMPANY = '' //通用
// var COMPANY='zhongjian'; //中建，和沃尔对接的插件版用这个企业
// var COMPANY='hezhan'; //合展-宿迁
// var COMPANY='nanchang'; //南昌地铁、衢州
@ -16,7 +16,7 @@ var COMPANY = '' //通用
// COMPANY = 'sccr'//四川成润
// COMPANY = 'pssh'//坪山沙湖项目
// COMPANY = 'jlw'//金林湾
// COMPANY = 'shzj'//上海张江
COMPANY = 'shzj'//上海张江
// COMPANY = 'shjg'//上海优益（上海建工）
// COMPANY = 'syhy'//沈阳和盈

16
src/store/index.js
View File

@ -51,12 +51,12 @@ export default new Vuex.Store({
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/", //正式环境
UPLOADURL:
window.location.protocol +
"//" +
window.location.host +
"/upload/image", //正式环境
FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
//---------------------------------------------------------------------------------------------
// BASEURL: baseUrl
// ? baseUrl
@ -104,8 +104,8 @@ export default new Vuex.Store({
// 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://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/',//上海优益

71
src/views/projectFront/safeManage/v2/checkStandingBook.vue
View File

@ -614,7 +614,7 @@
<el-divider
content-position="left"
v-if="
detailData.reviewId == $store.state.userInfo.userId &&
detailData.changeUser == $store.state.userInfo.userId &&
detailData.status == 2
"
>{{
@ -649,7 +649,7 @@
$t('message.safeMangeCheck.dialog.content')
"
v-if="
detailData.reviewId == $store.state.userInfo.userId &&
detailData.changeUser == $store.state.userInfo.userId &&
detailData.status == 2
"
prop="inspectTypeId"
@ -696,7 +696,7 @@
<el-form-item
:label="$t('message.safeMangeCheck.dialog.photo')"
v-if="
detailData.reviewId == $store.state.userInfo.userId &&
detailData.changeUser == $store.state.userInfo.userId &&
detailData.status == 2
"
>
@ -721,15 +721,7 @@
</vue-scroll>
</div>
<div class="btn-box">
<el-button
type="primary"
@click="submitForm2"
v-if="
(detailData.reviewId == $store.state.userInfo.userId &&
detailData.status == 2) ||
detailData.status == 3
"
>
<el-button type="primary" @click="submitForm2">
{{
detailData.reviewId == $store.state.userInfo.userId &&
detailData.status == 3
@ -746,14 +738,9 @@
@click="closeDialog2"
>{{ $t('message.safeMangeCheck.dialog.back') }}</el-button
>
<el-button
v-if="
detailData.reviewId == $store.state.userInfo.userId &&
detailData.status == 2
"
@click="dialogVisible = false"
>{{ $t('message.safeMangeCheck.dialog.cancel') }}</el-button
>
<el-button v-else @click="closeDialog2">{{
$t('message.safeMangeCheck.dialog.cancel')
}}</el-button>
</div>
<!-- <el-divider content-position="left">复查记录</el-divider> -->
</el-dialog>
@ -851,17 +838,14 @@
:value="item.id">
</el-option>
</el-select> -->
<el-cascader
class="cascaStyle"
:options="inspectOptions3"
v-model="formData.checkSubitem"
style="width: 100%"
:props="opts"
@change="handleChange"
ref="cascaderAddr"
>
</el-cascader>
></el-cascader>
<!-- @expand-change="showSecondTree" -->
</el-form-item>
<!-- 隐患内容 -->
@ -1112,7 +1096,7 @@ export default {
value: 'id',
label: 'hiddenDangerName',
// children: 'children',
checkStrictly: false,
checkStrictly: true,
lazy: true,
lazyLoad(node, resolve) {
console.log(node, that)
@ -1123,7 +1107,7 @@ export default {
getinspectHiddenDangerItemRecordListApi({
libraryId: node.data.id
}).then((res) => {
console.log("res", res)
console.log(res)
if (res.code == 200) {
let arr = []
res.result.forEach((item) => {
@ -1137,13 +1121,14 @@ export default {
checkContent: item.checkContent,
val: item.rectifyRequire,
hiddenDangerLevel: item.hiddenDangerLevel,
leaf: true
leaf: node.level >= 2
})
})
console.log("arr", arr)
resolve(arr)
}
})
} else if (node.level == 2) {
resolve([])
}
}
},
@ -1253,7 +1238,7 @@ export default {
}
},
created() {
console.log('当前用户id', this.$store.state.userInfo.userId)
// console.log(this.statusArr)
this.COMPANY = COMPANY
this.projectSn = this.$store.state.projectSn
this.userInfo = this.$store.state.userInfo
@ -1346,7 +1331,7 @@ export default {
}
})
} else if (
this.detailData.changeUser == this.$store.state.userInfo.userId &&
this.detailData.reviewId == this.$store.state.userInfo.userId &&
this.detailData.status == 3
) {
data = {
@ -1432,7 +1417,6 @@ export default {
this.dialogVisible = false
},
close() {
this.$refs['formData'].resetFields()
this.formData = {
inspectTypeId: '',
status: 2,
@ -1497,17 +1481,18 @@ export default {
})
this.inspectOptions3 = arr3
// this.$forceUpdate()
console.log('级联选择器数据', this.inspectOptions3)
console.log(this.inspectOptions3)
}
}
)
},
handleChange(val) {
console.log(val)
console.log(this.$refs['cascaderAddr'].getCheckedNodes()[0])
if (this.$refs['cascaderAddr'].getCheckedNodes()[0].data.checkContent) {
this.formData.checkContent =
this.$refs['cascaderAddr'].getCheckedNodes()[0].data.checkContent
}
if (this.$refs['cascaderAddr'].getCheckedNodes()[0].data.val) {
this.formData.rectifyRequire =
this.$refs['cascaderAddr'].getCheckedNodes()[0].data.val
@ -1522,7 +1507,6 @@ export default {
this.formData.hiddenDangerLevel =
this.$refs['cascaderAddr'].getCheckedNodes()[0].data.hiddenDangerLevel
}
// getinspectHiddenDangerItemRecordListApi({libraryId: val[0]}).then(res=>{
// console.log(res)
// if(res.code == 200){
@ -1544,34 +1528,30 @@ export default {
// })
},
checkOptions(val) {
console.log(val)
this.inspectOptions2.forEach((item) => {
if (item.id == val) {
this.formData.checkItem2 = item.hiddenDangerName
// console.log(item.hiddenDangerName);
// item.children.forEach((item) => {
// item.children = null
// })
item.children.forEach((item) => {
item.children = []
})
this.inspectOptions3 = item.children
console.log('级联', this.inspectOptions3)
}
})
},
getinspectHiddenDangerLibraryList() {
getinspectHiddenDangerLibraryListApi({
sn: this.userInfo.headquartersSn
}).then((res) => {
console.log(res.result)
this.inspectOptions2 = res.result
// console.log('获取级联',res)
})
},
getInspectTypeList() {
getInspectTypeListApi({ sn: this.userInfo.headquartersSn }).then(
(res) => {
this.inspectOptions = res.result
// console.log('级联',res)
}
)
},
@ -1650,7 +1630,6 @@ export default {
},
//显示检查详细弹框
showDetailFn(row) {
console.log('显示检查详细弹框', row);
console.log(row)
this.getRectifyRecordList(row.id)
this.replyData = {
@ -1826,10 +1805,4 @@ export default {
width: 300px;
box-sizing: border-box;
}
/deep/.el-cascader-menu__wrap .el-scrollbar__wrap {
display: none !important;
}
// /deep/ .el-cascader-menu:last-child {
// display: none !important;
// }
</style>