ETA图库,MyETA样式修改

src/views/dataEntry_manage/chartSetting.vue

@@ -496,7 +496,7 @@
                 <!-- 异常显示 -->
                 <p class="error-tip" style="min-height: 400px;" v-if="chartInfo.WarnMsg">{{chartInfo.WarnMsg}}</p>
               </el-col>
-              <el-col :span="3" style="position: absolute;height: 100%;right: 0;">
+              <el-col :span="3" style="position: absolute;height: 100%;right: 0;min-width: 115px;">
                 <ul class="right-actions">
                     <li>操作</li>
                     <li
@@ -637,7 +637,32 @@
             ref="listChartPage"
             @scroll="loadMorePublicChart"
           >
-            <el-col
+            <div class="chart-list-item-wrap">
+                <div class="chart-list-item" v-for="chart in chartPublicList" :key="chart.ChartInfoId">
+                    <div class="chart-item-top" style="position:relative;">
+                        <div class="chartEn-mark" v-show="chart.IsEnChart" style="top: -10px;left:-10px;">En</div>
+                        <span class="text_oneLine" :style="{'padding-left':chart.IsEnChart?'24px':''}">{{ currentLang === 'en' ? (chart.ChartNameEn||chart.ChartName) : chart.ChartName }}</span>
+                    </div>
+                    <div class="chart-item-img" @click="detailShowHandle(chart)"
+                    :style="chart.ChartImage?{background: `no-repeat top/cover url('${chart.ChartImage}')`}:{}"></div>
+                    <div class="chart-item-bottom">
+                        <span>创建时间: {{ chart.CreateTime.slice(0,10) }}</span>
+                        <span v-permission="permissionBtn.chartLibPermission.chartLib_addMy"
+                            class="join_txt"
+                            @click="addMychartHandle(chart)"
+                        >
+                            <img
+                            :src="$icons.chart_join_ico"
+                            alt=""
+                            style="width: 13px; height: 12px; vertical-align: middle"
+                            />
+                            加入我的图库
+                        </span>
+                    </div>
+                </div>
+            </div>
+            
+            <!-- <el-col
               :span="6"
               style="margin-bottom: 20px; padding-right: 20px"
               v-for="chart in chartPublicList"
@@ -669,7 +694,7 @@
                   </span>
                 </div>
               </el-card>
-            </el-col>
+            </el-col> -->
           </div>
           <div v-if="!public_total" class="nodata">
             <tableNoData text="暂无图表"/>
@@ -2525,6 +2550,7 @@ export default {
       margin-bottom: 20px;
       .right-actions {
         /* max-width: 160px; */
+        min-width: 115px;
         height: 100%;
         padding: 20px 10px;
         border-left: 1px solid #DCDFE6;
@@ -2608,6 +2634,14 @@ export default {
           }
         }
       }
+      .chart-list-item{
+          width:23%;
+          min-width:230px;
+          .chart-item-top,.chart-item-bottom{
+              display: flex;
+              justify-content: space-between;
+          }
+      }
     }
   }
   .nodata {
@@ -2774,7 +2808,7 @@ export default {
         }
       }
       .main-right {
-        width: 80%;
+        flex:1;
         .mx-datepicker {
           width: 220px !important;
         }

src/views/mychart_manage/components/chooseChart.vue

@@ -53,7 +53,7 @@
             :span="5"
             v-for="chart in chartPublicList"
             :key="chart.ChartInfoId"
-            style="padding-right: 20px;margin-bottom:20px;"
+            style="padding-right: 20px;margin-bottom:20px;min-width: 260px;"
           >
             <el-card shadow class="public-chart-item">
               <div slot="header" class="item-top">
@@ -227,7 +227,9 @@ export default {
     .chart-public-list {
       display: flex;
       flex-wrap: wrap;
-      height: 650px;
+      /* height: 650px; */
+      max-height: 650px;
+      height: 65vh;
       padding: 0 0 0 20px;
       overflow: hidden;
       overflow-y: auto;

src/views/mychart_manage/index.vue

@@ -188,7 +188,7 @@
               :span="6"
               v-for="chart in chartList"
               :key="chart.ChartInfoId"
-              style="margin-bottom: 20px; padding-right: 20px"
+              style="margin-bottom: 20px; padding-right: 20px;min-width: 300px;"
             >
               <el-card class="public-chart-item">
                 <div slot="header" class="item-top">