supervision
/
supervision-vue
5
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix:1、去除详情页面禁闭数据查询

main
pengwei 9 months ago
parent
1277f95173
commit
7545d06ce5
1 changed files with 51 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 84
      src/components/negative/verify-description.vue

84
src/components/negative/verify-description.vue
Unescape View File

@ -151,21 +151,21 @@
</div> </div>
</div> </div>
<div class="row"> <!-- <div class="row">-->
<div class="col col-12" v-if="rtuenConfinementData(blame)"> <!-- <div class="col col-12" v-if="blame.ConfinementData">-->
<label>禁闭时间</label> <!-- <label>禁闭时间</label>-->
<span >{{rtuenConfinementData(blame).startTime+ " - " + rtuenConfinementData(blame).endTime}}</span> <!-- <span >{{blame.ConfinementData.startTime+ " - " + blame.ConfinementData.endTime}}</span>-->
</div> <!-- </div>-->
<div class="col col-4" v-if="rtuenConfinementData(blame)"> <!-- <div class="col col-4" v-if="blame.ConfinementData">-->
<label>禁闭时长（天）</label> <!-- <label>禁闭时长（天）</label>-->
<span >{{rtuenConfinementData(blame).confinementTime}}</span> <!-- <span >{{blame.ConfinementData.confinementTime}}</span>-->
</div> <!-- </div>-->
<div class="col col-24" v-if="rtuenConfinementData(blame)"> <!-- <div class="col col-24" v-if="blame.ConfinementData">-->
<label>禁闭措施</label> <!-- <label>禁闭措施</label>-->
<span>{{rtuenConfinementData(blame).matter}}</span> <!-- <span>{{blame.ConfinementData.matter}}</span>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div v-perms="['negative:score']"> <div v-perms="['negative:score']">
<div <div
class="row" class="row"
@ -217,20 +217,22 @@
</div> </div>
</div> </div>
<div class="row" style="background: #f5f5f5"> <!-- <div class="row" style="background: #f5f5f5" v-if="blame.leadConfinement">-->
<div class="col col-12" v-if="rtuenLeadConfinementData(blame)"> <!-- <div class="col col-12"v-if="blames.leadConfinement" >-->
<label>禁闭时间</label> <!-- <label>禁闭时间</label>-->
<span >{{rtuenLeadConfinementData(blame).startTime+ " - " + rtuenLeadConfinementData(blame).endTime}}</span> <!-- <span >{{blames.leadConfinement.startTime+ " - " + blames.leadConfinement.endTime}}</span>-->
</div> <!-- </div>-->
<div class="col col-4" v-if="rtuenLeadConfinementData(blame)"> <!-- <div class="col col-4" v-if="blames.leadConfinement">-->
<label>禁闭时长（天）</label> <!-- <label>禁闭时长（天）</label>-->
<span >{{rtuenLeadConfinementData(blame).confinementTime}}</span> <!-- <span >{{blames.leadConfinement.confinementTime}}</span>-->
</div> <!-- </div>-->
<div class="col col-24" v-if="rtuenLeadConfinementData(blame)"> <!-- <div class="col col-24" v-if="blames.leadConfinement">-->
<label>禁闭措施</label> <!-- <label>禁闭措施</label>-->
<span>{{rtuenLeadConfinementData(blame).matter}}</span> <!-- <span>{{blames.leadConfinement.matter}}</span>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="row" style="background: #f5f5f5"> <div class="row" style="background: #f5f5f5">
<div class="col col-6" v-if="blame.leadProtectRightsName"> <div class="col col-6" v-if="blame.leadProtectRightsName">
<label>维权容错</label> <label>维权容错</label>
@ -330,7 +332,7 @@ const activeNames = ref([
"completionAttachment", "completionAttachment",
"completed", "completed",
]); ]);
const negative = inject("negative"); let negative = inject("negative");
console.log(negative) console.log(negative)
let ConfinementDataList= ref([]) let ConfinementDataList= ref([])
@ -347,10 +349,10 @@ let confinementQuery = ref({
* 警员禁闭处罚 * 警员禁闭处罚
* */ * */
function rtuenConfinementData(val){ function rtuenConfinementData(val){
const data = getConfinementData(val)
const data = getConfinementData(val.confinementId)
if(Array.isArray(data)){ if(Array.isArray(data)){
data.find(s=>s.id === val.confinementId) val.ConfinementData[index]= data.find(s=>s.id === val.confinementId)
}else{ }else{
return null; return null;
} }
@ -359,13 +361,29 @@ function rtuenConfinementData(val){
* 领导禁闭处罚 * 领导禁闭处罚
* */ * */
function rtuenLeadConfinementData(val){ function rtuenLeadConfinementData(val){
const data = getConfinementData(val) const data = getConfinementData(val.leadConfinementId)
if(Array.isArray(data)){ if(Array.isArray(data)){
data.find(s=>s.id === val.leadConfinementId) val.leadConfinement[index]= data.find(s=>s.id === val.leadConfinementId)
}else{ }else{
return null; return null;
} }
} }
// watch(()=>negative,()=>{
// console.log('00001010101')
// console.log(negative)
// if(negative.value.blames){
// for (let item in negative.value.blames){
// rtuenConfinementData(item)
// }
// }
//
// if(negative.value.blames){
// for (let item in negative.value.blames){
// rtuenLeadConfinementData(item)
// }
// }
// },{immediate:true,deep:true})
/** /**
* 获取禁闭信息 * 获取禁闭信息
* */ * */

Write Preview
Loading…
Cancel
Save