能源费率优化

src/views/module_base/energyRate/modules/EnergyRateForm.vue

@@ -3,6 +3,7 @@
      <j-form-container :disabled="formDisabled">
        <!-- 主表单区域 -->
        <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+         <div class="cmms-dialog-item-title">基本信息</div>
          <a-row>
           <a-col :xs="24" :sm="12">
             <a-form-model-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
@@ -35,7 +36,7 @@
             </a-form-model-item>
           </a-col>
           <a-col :xs="24" :sm="24">
-            <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
+            <a-form-model-item label="备注" :labelCol="labelCol2" :wrapperCol="wrapperCol2" prop="remark">
               <a-textarea v-model="model.remark" placeholder="请输入备注" rows="3" ></a-textarea>
             </a-form-model-item>
           </a-col>
@@ -75,12 +76,20 @@
       return {
         labelCol: {
           xs: { span: 24 },
-          sm: { span: 5 },
+          sm: { span: 6 },
         },
         wrapperCol: {
           xs: { span: 24 },
           sm: { span: 16 },
         },
+        labelCol2: {
+          xs: { span: 24 },
+          sm: { span: 3 },
+        },
+        wrapperCol2: {
+          xs: { span: 24 },
+          sm: { span: 20 },
+        },
         model:{
         },
         validatorRules: {
@@ -120,7 +129,7 @@
               title: '分时开始时间',
               key: 'begintime',
               type: FormTypes.time,
-              width:"200px",
+              width:"190px",
               placeholder: '请输入${title}',
               defaultValue:'',
               validateRules: [{ required: true, message: '${title}不能为空' }],
@@ -129,24 +138,30 @@
               title: '分时结束时间',
               key: 'endtime',
               type: FormTypes.time,
-              width:"200px",
+              width:"190px",
               placeholder: '请输入${title}',
               defaultValue:'',
             },
             {
-              title: '峰平谷：尖、峰、谷、平',
+              title: '峰平谷',
               key: 'pandv',
-              type: FormTypes.input,
-              width:"200px",
-              placeholder: '请输入${title}',
-              defaultValue:'',
+              type: FormTypes.select,
+              width:"190px",
+              placeholder: '请选择${title}',
+              defaultValue: '',
               validateRules: [{ required: true, message: '${title}不能为空' }],
+              options: [
+                {title:'尖',value:'尖'},
+                {title:'峰',value:'峰'},
+                {title:'谷',value:'谷'},
+                {title:'平',value:'平'}
+              ]
             },
             {
               title: '价格',
               key: 'price',
               type: FormTypes.input,
-              width:"200px",
+              width:"190px",
               placeholder: '请输入${title}',
               defaultValue:'',
               validateRules: [{ required: true, message: '${title}不能为空' }],
@@ -155,7 +170,7 @@
               title: '起始量',
               key: 'beginamount',
               type: FormTypes.input,
-              width:"200px",
+              width:"190px",
               placeholder: '请输入${title}',
               defaultValue:'',
               validateRules: [{ required: true, message: '${title}不能为空' }],
@@ -164,7 +179,7 @@
               title: '结束量',
               key: 'endamount',
               type: FormTypes.input,
-              width:"200px",
+              width:"190px",
               placeholder: '请输入${title}',
               defaultValue:'',
               // validateRules: [{ required: true, message: '${title}不能为空' }],
@@ -252,4 +267,5 @@
 </script>
 
 <style scoped>
+@import "~@/assets/less/uStyle.less";
 </style>

src/views/module_base/energyRate/modules/EnergyRateModal.vue

@@ -1,15 +1,15 @@
 <template>
-  <j-modal
+  <u-modal
     :title="title"
     :width="1200"
     :visible="visible"
     :maskClosable="false"
-    switchFullscreen
+    contentFull
     @ok="handleOk"
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel">
     <energy-rate-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"/>
-  </j-modal>
+  </u-modal>
 </template>
 
 <script>