guoyuepeng
/
qa-regulatory-gwj-vue
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/pet' into pet 

# Conflicts:
#	src/views/map/index.vue
pet-人员中台对接-xuyifeng-7.24
guoyuepeng 2024-06-28 21:08:44 +08:00
parent 6e7452c113 b2ffac3acd
commit 5ce51685d6
4 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/dangerousWork/blindboard/components/detail.vue
View File

@ -229,7 +229,7 @@ export default {
this.listLoading = false this.listLoading = false
this.pd = data.pd // 参数map this.pd = data.pd // 参数map
this.imgList = data.imgList this.imgList = data.imgList
this.imgList1 = data.imgList this.imgList1 = data.imgList1
this.boardList = data.boardList // 参数map this.boardList = data.boardList // 参数map
this.measuresList = data.measuresList // 参数map this.measuresList = data.measuresList // 参数map
this.pd.APPLY_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0] this.pd.APPLY_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]

2
src/views/dangerousWork/breakground/components/detail.vue
View File

@ -244,7 +244,7 @@ export default {
this.listLoading = false this.listLoading = false
this.pd = data.pd // 参数map this.pd = data.pd // 参数map
this.imgList = data.imgList this.imgList = data.imgList
this.imgList1 = data.imgList this.imgList1 = data.imgList1
this.measuresList = data.measuresList // 参数map this.measuresList = data.measuresList // 参数map
this.pd.APPLY_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0] this.pd.APPLY_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
this.pd.CONSTRUCTION_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1] this.pd.CONSTRUCTION_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]

2
src/views/dangerousWork/limitspace/components/detail.vue
View File

@ -279,7 +279,7 @@ export default {
data.measuresList[i].PROTECTIVE_MEASURES = PROTECTIVE_MEASURES.join('') data.measuresList[i].PROTECTIVE_MEASURES = PROTECTIVE_MEASURES.join('')
} }
this.imgList = data.imgList this.imgList = data.imgList
this.imgList1 = data.imgList this.imgList1 = data.imgList1
this.measuresList = data.measuresList // 参数map this.measuresList = data.measuresList // 参数map
this.gasList = data.gasList // 参数map this.gasList = data.gasList // 参数map
this.gas = data.gas || {} // 参数map this.gas = data.gas || {} // 参数map

9
src/views/map/index.vue
View File

@ -43,13 +43,8 @@
v-if="gangkouActive && gangkouActive === '00002' && (bottomOptionsIndex === '' || bottomOptionsIndex === 5) && CORP_INFO_ID" v-if="gangkouActive && gangkouActive === '00002' && (bottomOptionsIndex === '' || bottomOptionsIndex === 5) && CORP_INFO_ID"
:corp-info-id="CORP_INFO_ID" :corp-info-id="CORP_INFO_ID"
:gangkou="gangkouActive"/> :gangkou="gangkouActive"/>
<menjinOld
v-if="CORP_INFO_ID =='035958e685cf4850bc40151c5e0617a6' && gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00005' && gangkouActive !== '00002' && bottomOptionsIndex === 0"
:corp-info-id="CORP_INFO_ID"
:area="area"
:gangkou="gangkouActive"/>
<menjin <menjin
v-if="CORP_INFO_ID !='035958e685cf4850bc40151c5e0617a6' && gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00005' && gangkouActive !== '00002' && bottomOptionsIndex === 0" v-if="gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00005' && gangkouActive !== '00002' && bottomOptionsIndex === 0"
:corp-info-id="CORP_INFO_ID" :corp-info-id="CORP_INFO_ID"
:area="area" :area="area"
:gangkou="gangkouActive"/> :gangkou="gangkouActive"/>
@ -280,7 +275,6 @@ import cmtIndex from './components/cmt_index.vue'
import menjinCzks from './components/menjinCzks.vue' import menjinCzks from './components/menjinCzks.vue'
import renyuanCzks from './components/renyuanCzks.vue' import renyuanCzks from './components/renyuanCzks.vue'
import renyuanCmt from './components/renyuanCmt.vue' import renyuanCmt from './components/renyuanCmt.vue'
import menjinOld from './components/menjin_old.vue'
import menjin from './components/menjin.vue' import menjin from './components/menjin.vue'
import menjinCfd from './components/menjinCfd.vue' import menjinCfd from './components/menjinCfd.vue'
import menjinCmt from './components/menjinCmt.vue' import menjinCmt from './components/menjinCmt.vue'
@ -338,7 +332,6 @@ export default {
fengongsiIndex, fengongsiIndex,
caofeidianIndex, caofeidianIndex,
layoutMenu, layoutMenu,
menjinOld,
menjin, menjin,
menjinCfd, menjinCfd,
menjinCmt, menjinCmt,