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

16
src/store/index.js
View File

@ -51,12 +51,12 @@ export default new Vuex.Store({
BASEURL: baseUrl BASEURL: baseUrl
? baseUrl ? baseUrl
: window.location.protocol + "//" + window.location.host + "/", //正式环境 : window.location.protocol + "//" + window.location.host + "/", //正式环境
// UPLOADURL: UPLOADURL:
// window.location.protocol + window.location.protocol +
// "//" + "//" +
// window.location.host + window.location.host +
// "/upload/image", //正式环境 "/upload/image", //正式环境
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
//--------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------
// BASEURL: baseUrl // BASEURL: baseUrl
// ? baseUrl // ? baseUrl
@ -104,8 +104,8 @@ export default new Vuex.Store({
// FILEURL: 'http://118.121.198.147:23232/image/',//四川成润（正式） // FILEURL: 'http://118.121.198.147:23232/image/',//四川成润（正式）
// UPLOADURL: 'http://121.196.214.246/api/upload/image',//金林湾 // UPLOADURL: 'http://121.196.214.246/api/upload/image',//金林湾
// FILEURL: 'http://121.196.214.246/api/image/',//金林湾 // FILEURL: 'http://121.196.214.246/api/image/',//金林湾
UPLOADURL: 'http://192.168.34.221:30002/upload/image',//郭圣雄本地 // UPLOADURL: 'http://192.168.34.221:30002/upload/image',//郭圣雄本地
FILEURL: 'http://192.168.34.221:30002/image/',//郭圣雄本地 // FILEURL: 'http://192.168.34.221:30002/image/',//郭圣雄本地
// UPLOADURL: 'http://101.43.164.214:45011/upload/image',//上海优益 // UPLOADURL: 'http://101.43.164.214:45011/upload/image',//上海优益
// FILEURL: 'http://101.43.164.214:45011/image/',//上海优益 // FILEURL: 'http://101.43.164.214:45011/image/',//上海优益

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

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