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

基本信息优化



See merge request !80

@@ -55,12 +55,12 @@
             </el-col>
             <!--          && attrKey.attrKeyVal.includes(item.nameCode)-->
           </el-row>
-          <el-row class="basic-item 111" :style="[itemStyle,borderStlyeLast]" v-if="optionsSetUp.isTowColumn && informationData.length%2==0">
+<!--          <el-row class="basic-item 111" :style="[itemStyle,borderStlyeLast]" v-if="optionsSetUp.isTowColumn && informationData.length%2==0">
             <el-col  class="basic-border basic-item-title basic-flex" :span="10">
             </el-col>
             <el-col  class="basic-border basic-flex  basic-item-content" :span="14"><span></span>
             </el-col>
-          </el-row>
+          </el-row>-->
         </div>
 
       </div>

@@ -204,6 +204,7 @@ export default {
           let flagArr=[];
           let flagStr='';
           this.progressData.map(item=>{
+            item.unit= item.unit.replace(/[""‘’“”]/ig, '')
             flagArr.push(item.flag)
             item.rate=Number(item.rate)
           })