monitor_v3 / anji-plus-report · Commits

Go to a project

Authored by 鲁尚清
Commit b765ae34908681ccc7c290b30bdd9ef5effc78ab 2 parents 0e3fb11c 3aeef407

Merge branch 'master-500-dev-lushangqing' into 'master-500-dev' 

基本信息优化



See merge request !80
Inline Side-by-side
Showing 2 changed files with 3 additions and 2 deletions
@@ -55,12 +55,12 @@ @@ -55,12 +55,12 @@
55 </el-col> 55 </el-col>
56 <!-- && attrKey.attrKeyVal.includes(item.nameCode)--> 56 <!-- && attrKey.attrKeyVal.includes(item.nameCode)-->
57 </el-row> 57 </el-row>
58 - <el-row class="basic-item 111" :style="[itemStyle,borderStlyeLast]" v-if="optionsSetUp.isTowColumn && informationData.length%2==0"> 58 +<!-- <el-row class="basic-item 111" :style="[itemStyle,borderStlyeLast]" v-if="optionsSetUp.isTowColumn && informationData.length%2==0">
59 <el-col class="basic-border basic-item-title basic-flex" :span="10"> 59 <el-col class="basic-border basic-item-title basic-flex" :span="10">
60 </el-col> 60 </el-col>
61 <el-col class="basic-border basic-flex basic-item-content" :span="14"><span></span> 61 <el-col class="basic-border basic-flex basic-item-content" :span="14"><span></span>
62 </el-col> 62 </el-col>
63 - </el-row> 63 + </el-row>-->
64 </div> 64 </div>
65 65
66 </div> 66 </div>
@@ -204,6 +204,7 @@ export default { @@ -204,6 +204,7 @@ export default {
204 let flagArr=[]; 204 let flagArr=[];
205 let flagStr=''; 205 let flagStr='';
206 this.progressData.map(item=>{ 206 this.progressData.map(item=>{
  207 + item.unit= item.unit.replace(/[""‘’“”]/ig, '')
207 flagArr.push(item.flag) 208 flagArr.push(item.flag)
208 item.rate=Number(item.rate) 209 item.rate=Number(item.rate)
209 }) 210 })