Jelajahi Sumber

fix: 国能2.6

ldong 4 bulan lalu
induk
melakukan
a6df616c9f

+ 13 - 4
src/views/chartRelevance_manage/components/saveChartSetting.vue

@@ -15,7 +15,7 @@
                 label-width="100px"
                 ref="settingForm">
                 <el-form-item label="图表名称">
-                    <el-input v-model="settingData.chartName"></el-input>
+                    <el-input style="width: 250px;" v-model="settingData.chartName"></el-input>
                 </el-form-item>
                 <el-form-item label="图例名称" style="margin-bottom: 0;">
                 </el-form-item>
@@ -27,13 +27,15 @@
                                 size="mini"
                                 show-alpha
                                 :predefine="predefineColors"/>
-                            <el-input v-model="data.Name"></el-input>
+                            <el-input style="width: 250px;" v-model="data.Name"></el-input>
                         </div>
                     </div>
                 </el-form-item>
                 <el-form-item label="数据来源">
-                    <el-input v-model="settingData.SourcesFrom.text"></el-input>
-                    <el-switch v-model="settingData.SourcesFrom.isShow"></el-switch>
+                    <div class="flex-align">
+                        <el-input :autosize="{ minRows: 2, maxRows: 4}" style="width: 250px;margin-right: 5px;" type="textarea" maxlength="50" show-word-limit v-model="settingData.SourcesFrom.text"></el-input>
+                        <el-switch v-model="settingData.SourcesFrom.isShow"></el-switch>
+                    </div>
                 </el-form-item>
             </el-form>
         </div>
@@ -107,5 +109,12 @@ export default {
         text-align:center;
         margin:30px 0 20px 0;
     }
+    .flex-align{
+        display: flex;
+        align-items: center;
+        .el-textarea .el-input__count{
+            background: transparent;
+        }
+    }
 }
 </style>

+ 18 - 12
src/views/dataEntry_manage/addChart.vue

@@ -549,7 +549,17 @@
 						</div>
 
 						<div class="chart-bottom-insruction-info">
-
+							
+							<!-- 图表说明 -->
+							<div 
+								class="chart-instruction" 
+								v-if="chartInfo.Instructions&&JSON.parse(chartInfo.Instructions).isShow"
+								v-text="JSON.parse(chartInfo.Instructions).text"
+								:style="`
+									color: ${JSON.parse(chartInfo.Instructions).color};
+									fontSize: ${ JSON.parse(chartInfo.Instructions).fontSize }px
+								`"
+							></div>
 							<div class="chart-source">
 								<span
 									v-if="chartInfo.SourcesFrom"
@@ -599,17 +609,6 @@
 								<el-radio-button label="公历">{{$t('Chart.calendar_gre')}}</el-radio-button>
 								<el-radio-button label="农历">{{$t('Chart.calendar_lunar_text')}}</el-radio-button>
 							</el-radio-group>
-
-							<!-- 图表说明 -->
-							<div 
-								class="chart-instruction" 
-								v-if="chartInfo.Instructions&&JSON.parse(chartInfo.Instructions).isShow"
-								v-text="JSON.parse(chartInfo.Instructions).text"
-								:style="`
-									color: ${JSON.parse(chartInfo.Instructions).color};
-									fontSize: ${ JSON.parse(chartInfo.Instructions).fontSize }px
-								`"
-							></div>
 						</div>
 
 
@@ -1342,6 +1341,13 @@ export default {
 			}
 		}
 	}
+	.chart-bottom-insruction-info{
+		display:block;
+		.chart-instruction{
+			margin-bottom:16px;
+			width:auto;
+		}
+	}
 }
 </style>
 <style lang="scss">

+ 9 - 2
src/views/dataEntry_manage/components/chartSourceEditDialog.vue

@@ -19,6 +19,9 @@
       >
         <el-form-item :label="$t('Edb.Detail.source')">
           <el-input
+            type="textarea"
+            maxlength="50"
+            show-word-limit
             v-model="chartSourceForm.text"
             :placeholder="$t('Chart.InputHolderAll.input_content')"
           />
@@ -100,6 +103,10 @@ export default {
   },
 }
 </script>
-<style scoped lang='scss'>
-
+<style lang='scss'>
+.marker-edit-dialog{
+  .el-textarea .el-input__count{
+    background: transparent;
+  }
+}
 </style>