cxmo 1 سال پیش
والد
کامیت
56ab60f60b

+ 1 - 1
src/components/chart/chartListWrap.vue

@@ -8,7 +8,7 @@
     >
       <el-col
         :span="6"
-        style="margin-bottom: 20px; padding-right: 20px"
+        style="margin-bottom: 20px; padding-right: 20px;min-width: 280px;"
         v-for="chart in list"
         :key="chart.ChartInfoId"
       >

+ 1 - 1
src/views/chartRelevance_manage/components/chartCard.vue

@@ -4,7 +4,7 @@
       <div class="title text_twoLine">
          <span>{{cardTitle}}</span>
       </div>
-      <div style="flex-shrink: 0">
+      <div style="flex-shrink: 0;align-self: flex-start;">
         <template v-if="isHaveEdbHandle">
           <el-dropdown 
             v-show="isEdbAdd" 

+ 4 - 2
src/views/chartRelevance_manage/fittingEquationChartEditor.vue

@@ -416,7 +416,7 @@ export default {
 	}
   .left-cont {
     width: 400px;
-    min-width: 300px;
+    min-width: 310px;
     background: #fff;
     margin-right: 20px;
     border: 1px solid #ececec;
@@ -496,9 +496,11 @@ export default {
 			display: flex;
 			flex-wrap: wrap;
 			.card-wrapper {
-				width: 50%;
+				width: 48%;
         margin-bottom: 20px;
         min-height: 350px;
+        min-width: 410px;
+        margin-right: 15px;
 				.card-item {
 					padding: 20px;
 					.top {

+ 1 - 1
src/views/chartRelevance_manage/list.vue

@@ -189,7 +189,7 @@
             </el-col>
             <el-col
               :span="3"
-              style="position: absolute; height: 100%; right: 0"
+              style="position: absolute; height: 100%; right: 0;min-width: 115px;"
             >
               <!-- 操作 -->
               <chartHandlesWrap

+ 4 - 5
src/views/chartRelevance_manage/relevanceChartEditor.vue

@@ -283,7 +283,6 @@
     <div
       class="right-cont"
       id="right"
-      :style="isSlideLeft ? 'width:100%' : `width:80%`"
     >
       <div
         class="chart-min-cont"
@@ -867,7 +866,7 @@ export default {
     }
   }
   .right-cont {
-    width: 80%;
+    flex:1;
     /* =================== */
     .chart-min-cont {
       /* background: #fff; */
@@ -882,9 +881,9 @@ export default {
         background: #fff;
         margin-bottom: 20px;
         min-height: 350px;
-        &:nth-child(2n) {
-          margin-left: 15px;
-        } 
+        min-width:410px;
+        margin-right: 15px;
+        
         .card-item {
           padding: 20px;
           .top {

+ 2 - 3
src/views/chartRelevance_manage/statisticFeatureChartEditor.vue

@@ -739,9 +739,8 @@ export default {
         width: 48%;
         margin-bottom: 20px;
         min-height: 350px;
-        &:nth-child(2n) {
-          margin-left: 15px;
-        } 
+        min-width:410px;
+        margin-right: 15px;
         .card-item {
           padding: 20px;
           background: #fff;

+ 1 - 1
src/views/dataEntry_manage/chartSetting.vue

@@ -640,7 +640,7 @@
             <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>
+                        <div class="chartEn-mark" v-show="chart.IsEnChart">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)"