1.增加card 里面表格的样式，

2.增加弹窗里面的输入框按钮的样式，

cpp-ui/src/assets/styles/dark.scss

@@ -23,7 +23,12 @@ $table-header-background-color: #284266;
     }
   }
 }
-
+#app,.app-container{
+  background-image: url('../images/pageBg.png');
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+}
 .app-title-bg {
   width: 100%;
   background-color: #101C38;
@@ -213,6 +218,27 @@ $table-header-background-color: #284266;
 .el-form-item__label {
   color: $white !important;
 }
+.dark-el-dialog{
+  .el-input__inner {
+    background-color: transparent;
+    border: 1px solid $default-border-color;
+    color: #cddef1;
+  }
+  .el-button{
+    background-color: transparent !important;
+    border-top: none;
+    border-bottom: none;
+    border-color: #1890ff;
+    background-image: url('../images/topRightBtuBg.png');
+    background-size: cover;
+    background-position: center;
+    background-repeat: no-repeat;
+    color: white;
+  }
+  .el-dialog.is-fullscreen {
+    background: transparent;
+  }
+}
 
 /*element-tree*/
 .el-tree {
@@ -230,6 +256,9 @@ $table-header-background-color: #284266;
   border: 0.001rem solid $default-border-color;
   background-color: transparent;
   color: #FFFFFF;
+  .el-table th.el-table__cell{
+    background: $table-header-background-color !important;
+  }
 }
 
 /*element input*/
@@ -252,6 +281,7 @@ $table-header-background-color: #284266;
     background-size: cover;
     background-position: center;
     background-repeat: no-repeat;
+    color: white;
   }
 }
 

cpp-ui/src/layout/index.vue

@@ -8,7 +8,7 @@
       </div>
     </div>
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
-    <sidebar v-if="!sidebar.hide" class="sidebar-container"/>
+    <sidebar id="sidebar" :style="isFixed ? 'top:0' : ''" v-if="!sidebar.hide" class="sidebar-container"/>
     <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">
 <!--      <div :class="{'fixed-header':fixedHeader}">-->
 <!--        <navbar/>-->
@@ -64,11 +64,18 @@ export default {
   },
   data(){
     return{
+      isFixed: false,
+      offsetTop: 0,
       sysTime:'',
       sysInterval: null
     }
   },
   mounted() {
+    window.addEventListener("scroll", this.initHeight);
+    this.$nextTick(() => {
+      //获取对象相对于版面或由 offsetTop 属性指定的父坐标的计算顶端位置
+      this.offsetTop = document.querySelector("#sidebar").offsetTop;
+    });
     const _this = this
     this.sysInterval = setInterval(function (){
       _this.sysTime = formatToDateTime(new Date())
@@ -80,7 +87,16 @@ export default {
   methods: {
     handleClickOutside() {
       this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
-    }
+    },
+    initHeight() {
+      // 设置或获取位于对象最顶端和窗口中可见内容的最顶端之间的距离 (被卷曲的高度)
+      var scrollTop =
+        window.pageYOffset ||
+        document.documentElement.scrollTop ||
+        document.body.scrollTop;
+      //如果被卷曲的高度大于吸顶元素到顶端位置 的距离
+      this.isFixed = scrollTop > this.offsetTop ? true : false;
+    },
   }
 }
 </script>

cpp-ui/src/main.js

@@ -53,7 +53,7 @@ Vue.prototype.$axios = request
 import 'xe-utils'
 import VXETable from 'vxe-table'
 import 'vxe-table/lib/style.css'
-import echarts from 'echarts'
+import  * as echarts from 'echarts'
 import './assets/echarts_theme/dark'
 Vue.prototype.$echarts = echarts
 // 全局方法挂载

cpp-ui/src/views/configManager/electricField/index.vue

@@ -91,9 +91,8 @@
         :layouts="['PrevJump', 'PrevPage', 'JumpNumber', 'NextPage', 'NextJump', 'Sizes', 'FullJump', 'Total']">
       </vxe-pager>
     </div>
-
-    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="850px" height="600px">
-      <div class="dark-el-input dark-el-button">
+    <div class="dark-el-dialog">
+      <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="850px" height="600px">
         <el-form ref="form" :model="form" :rules="rules" width="830px" label-width="150px">
           <el-row class="mb4">
             <el-col :span="12">
@@ -110,7 +109,8 @@
           <el-row class="mb4">
             <el-col :span="12">
               <el-form-item label="类型" prop="electricFieldTypeEnum">
-                <el-select v-model="form.electricFieldTypeEnum" placeholder="请选择" style="width: 100%" popper-class="cpp-popper">
+                <el-select v-model="form.electricFieldTypeEnum" placeholder="请选择" style="width: 100%"
+                           popper-class="cpp-popper">
                   <el-option
                     v-for="item in this.electricFieldTypeList"
                     :key="item.value"
@@ -141,7 +141,8 @@
           <el-row class="mb4">
             <el-col :span="12">
               <el-form-item label="省份" prop="provinceEnum">
-                <el-select v-model="form.provinceEnum" placeholder="请选择" style="width: 100%" popper-class="cpp-popper">
+                <el-select v-model="form.provinceEnum" placeholder="请选择" style="width: 100%"
+                           popper-class="cpp-popper">
                   <el-option
                     v-for="item in this.provinceEnumList"
                     :key="item.value"
@@ -177,8 +178,8 @@
           <el-button type="primary" @click="commitChannel">确 定</el-button>
           <el-button @click="cancelChannel">取 消</el-button>
         </div>
-      </div>
-    </el-dialog>
+      </el-dialog>
+    </div>
   </div>
 </template>
 

cpp-ui/src/views/configManager/parsingConf/cdqparsing.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="app-container">
-    <el-button type="primary" icon="el-icon-plus" plain @click="handleAdd" class="myButton">新增</el-button>
+    <div class="dark-el-button">
+      <el-button type="primary" icon="el-icon-plus"  @click="handleAdd" class="myButton">新增</el-button>
+    </div>
+
     <!--上报对象表格-->
     <el-table
       :data="tableData"
@@ -31,158 +34,161 @@
       </el-pagination>
     </div>
     <!--编辑框-->
-    <el-dialog :title="saveFlag==1?'新增':'编辑'" :visible.sync="visible" width="100%">
+    <div class="dark-el-dialog">
+      <el-dialog :title="saveFlag==1?'新增':'编辑'" :visible.sync="visible" width="100%">
 
-      <el-row :gutter="20">
-        <el-col :span="16">
-          <div>
+        <el-row :gutter="20">
+          <el-col :span="16">
+            <div>
                     <span style="color: red">
             <font size="4px">灰色文本框需要点击后，在右侧进行编辑录入！</font>
                     </span>
-          </div>
-          &nbsp;
-          <div class="grid-content bg-purple">
-            <el-form v-model="form" ref="form" :key="timer">
-              <el-row :gutter="16">
-<!--                <el-col :span="12">-->
-<!--                  <el-form-item prop="fileName" label-width="110px">-->
-<!--                    <span slot="label">-->
-<!--                      <font color="red">*</font>文件名关键字-->
-<!--                    </span>-->
-<!--                    <el-input v-model="form.fileName" @focus="clearformula"></el-input>-->
-<!--                  </el-form-item>-->
-<!--                </el-col>-->
-                <el-col :span="12">
-                  <el-form-item prop="dataType" label-width="110px">
+            </div>
+            &nbsp;
+            <div class="grid-content bg-purple">
+              <el-form v-model="form" ref="form" :key="timer">
+                <el-row :gutter="16">
+                  <!--                <el-col :span="12">-->
+                  <!--                  <el-form-item prop="fileName" label-width="110px">-->
+                  <!--                    <span slot="label">-->
+                  <!--                      <font color="red">*</font>文件名关键字-->
+                  <!--                    </span>-->
+                  <!--                    <el-input v-model="form.fileName" @focus="clearformula"></el-input>-->
+                  <!--                  </el-form-item>-->
+                  <!--                </el-col>-->
+                  <el-col :span="12">
+                    <el-form-item prop="dataType" label-width="110px">
                     <span slot="label">
                       <font color="red">*</font>数据类型
                     </span>
-                     <el-select popper-class="cpp-popper" v-model="form.dataType" clearable @focus="clearformula">
-                      <el-option
-                        v-for="item in this.dataType"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"/>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
+                      <el-select popper-class="cpp-popper" v-model="form.dataType" clearable @focus="clearformula">
+                        <el-option
+                          v-for="item in this.dataType"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value"/>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
 
-                <el-col :span="12">
-                  <el-form-item prop="forecastTime" label-width="110px"
-                                class="formulaColor">
+                  <el-col :span="12">
+                    <el-form-item prop="forecastTime" label-width="110px"
+                                  class="formulaColor">
                     <span slot="label">
                       <font color="red">*</font>预测时间公式
                     </span>
-                    <el-input v-model="form.forecastTime" readonly
-                              @click.native="ftck(form.forecastTime,'form.forecastTime','(预测时间)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="12">
-                  <el-form-item prop="fpValue" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.forecastTime" readonly
+                                @click.native="ftck(form.forecastTime,'form.forecastTime','(预测时间)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="12">
+                    <el-form-item prop="fpValue" label-width="110px" class="formulaColor">
                     <span slot="label">
                       <font color="red">*</font>预测数据公式
                     </span>
-                    <el-input v-model="form.fpValue" readonly
-                              @click.native="ftck(form.fpValue,'form.fpValue','(预测数据)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item prop="openCapacity" label-width="110px"
-                                class="formulaColor">
+                      <el-input v-model="form.fpValue" readonly
+                                @click.native="ftck(form.fpValue,'form.fpValue','(预测数据)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item prop="openCapacity" label-width="110px"
+                                  class="formulaColor">
                     <span slot="label">
                       <font color="red">*</font>实时开机容量公式
                     </span>
-                    <el-input v-model="form.openCapacity" readonly
-                              @click.native="ftck(form.openCapacity,'form.openCapacity','(实时开机容量数据)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-<!--              <el-row>-->
-<!--                <el-col :span="24">-->
-<!--                  <el-form-item prop="stationCode" label-width="110px">-->
-<!--                    <span slot="label">-->
-<!--                      <font color="red">*</font>场站编号-->
-<!--                    </span>-->
-<!--                     <el-select popper-class="cpp-popper" v-model="form.stationCode" multiple clearable @focus="clearformula" style="width: 100%">-->
-<!--                      <el-option-->
-<!--                        v-for="item in this.stationCodeList"-->
-<!--                        :key="item.stationCode"-->
-<!--                        :label="item.stationCode"-->
-<!--                        :value="item.stationCode"/>-->
-<!--                    </el-select>-->
-<!--                  </el-form-item>-->
-<!--                </el-col>-->
-<!--              </el-row>-->
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="handleSave('form')">
-                <span v-if="saveFlag == 1">保 存</span>
-                <span v-else>修 改</span>
-              </el-button>
-              <el-button @click="visible = false">取 消</el-button>
+                      <el-input v-model="form.openCapacity" readonly
+                                @click.native="ftck(form.openCapacity,'form.openCapacity','(实时开机容量数据)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <!--              <el-row>-->
+                <!--                <el-col :span="24">-->
+                <!--                  <el-form-item prop="stationCode" label-width="110px">-->
+                <!--                    <span slot="label">-->
+                <!--                      <font color="red">*</font>场站编号-->
+                <!--                    </span>-->
+                <!--                     <el-select popper-class="cpp-popper" v-model="form.stationCode" multiple clearable @focus="clearformula" style="width: 100%">-->
+                <!--                      <el-option-->
+                <!--                        v-for="item in this.stationCodeList"-->
+                <!--                        :key="item.stationCode"-->
+                <!--                        :label="item.stationCode"-->
+                <!--                        :value="item.stationCode"/>-->
+                <!--                    </el-select>-->
+                <!--                  </el-form-item>-->
+                <!--                </el-col>-->
+                <!--              </el-row>-->
+              </el-form>
+              <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="handleSave('form')">
+                  <span v-if="saveFlag == 1">保 存</span>
+                  <span v-else>修 改</span>
+                </el-button>
+                <el-button @click="visible = false">取 消</el-button>
+              </div>
             </div>
-          </div>
-        </el-col>
-        <el-col :span="1">
-          <el-divider direction="vertical"></el-divider>
-        </el-col>
-        <el-col :span="6">
-          <h2>公式编辑区{{ this.editinfo }}</h2>
-          <el-form>
-            <el-row>
-              <el-col>
-                <el-form-item prop="rownumber" label-width="110px">
+          </el-col>
+          <el-col :span="1">
+            <el-divider direction="vertical"></el-divider>
+          </el-col>
+          <el-col :span="6">
+            <h2>公式编辑区{{ this.editinfo }}</h2>
+            <el-form>
+              <el-row>
+                <el-col>
+                  <el-form-item prop="rownumber" label-width="110px">
                   <span slot="label">
                       <font color="red">*</font>解析行
                   </span>
-                  <el-input v-model="pfform.rownumber"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col>
-                <el-form-item prop="columnumber" label-width="110px">
+                    <el-input v-model="pfform.rownumber"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col>
+                  <el-form-item prop="columnumber" label-width="110px">
                   <span slot="label">
                       <font color="red">*</font>解析列
                   </span>
-                  <el-input v-model="pfform.columnumber"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col>
-                <el-form-item label="标签名" prop="signname" label-width="110px">
-                  <el-input v-model="pfform.signname"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col>
-                <el-form-item label="时间格式" prop="timeformat" label-width="110px">
-                   <el-select popper-class="cpp-popper" v-model="pfform.timeformat" clearable>
-                    <el-option
-                      v-for="item in this.timeFormat"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"/>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-button type="primary" @click="genformula">
-                <span>生成公式</span>
-              </el-button>
-              <el-button type="primary" @click="destoryformula">
-                <span>清除录入</span>
-              </el-button>
-            </el-row>
-          </el-form>
-        </el-col>
-      </el-row>
-    </el-dialog>
+                    <el-input v-model="pfform.columnumber"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col>
+                  <el-form-item label="标签名" prop="signname" label-width="110px">
+                    <el-input v-model="pfform.signname"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col>
+                  <el-form-item label="时间格式" prop="timeformat" label-width="110px">
+                    <el-select popper-class="cpp-popper" v-model="pfform.timeformat" clearable>
+                      <el-option
+                        v-for="item in this.timeFormat"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-button type="primary" @click="genformula">
+                  <span>生成公式</span>
+                </el-button>
+                <el-button type="primary" @click="destoryformula">
+                  <span>清除录入</span>
+                </el-button>
+              </el-row>
+            </el-form>
+          </el-col>
+        </el-row>
+      </el-dialog>
+    </div>
+
   </div>
 </template>
 

cpp-ui/src/views/configManager/parsingConf/cftparsing.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="app-container">
-    <el-button type="primary" icon="el-icon-plus" plain @click="handleAdd" class="myButton">新增</el-button>
+    <div class="dark-el-button">
+      <el-button type="primary" icon="el-icon-plus" @click="handleAdd" class="myButton">新增</el-button>
+    </div>
+
     <!--上报对象表格-->
     <el-table
       :data="tableData"
@@ -80,378 +83,381 @@
       </el-pagination>
     </div>
     <!--编辑框-->
-    <el-dialog :title="saveFlag==1?'新增':'编辑'" :visible.sync="visible" width="100%" :fullscreen="true">
+    <div class="dark-el-dialog">
+      <el-dialog :title="saveFlag==1?'新增':'编辑'" :visible.sync="visible" width="100%" :fullscreen="true">
 
-      <el-row :gutter="20">
-        <el-col :span="17">
-          <div>
+        <el-row :gutter="20">
+          <el-col :span="17">
+            <div>
                     <span style="color: red">
             <font size="4px">灰色文本框需要点击后，在右侧进行编辑录入！</font>
                     </span>
-          </div>
-          &nbsp;
-          <div class="grid-content bg-purple">
-            <el-form v-model="form" ref="form" :key="timer">
-              <el-row :gutter="16">
-<!--                <el-col :span="8">-->
-<!--                  <el-form-item prop="fileName" label-width="150px">-->
-<!--                    <span slot="label">-->
-<!--                      <font color="red">*</font>文件名关键字-->
-<!--                    </span>-->
-<!--                    <el-input v-model="form.fileName" @focus="clearformula"></el-input>-->
-<!--                  </el-form-item>-->
-<!--                </el-col>-->
-                <el-col :span="8">
-                  <el-form-item prop="dataType" label-width="150px">
+            </div>
+            &nbsp;
+            <div class="grid-content bg-purple">
+              <el-form v-model="form" ref="form" :key="timer">
+                <el-row :gutter="16">
+                  <!--                <el-col :span="8">-->
+                  <!--                  <el-form-item prop="fileName" label-width="150px">-->
+                  <!--                    <span slot="label">-->
+                  <!--                      <font color="red">*</font>文件名关键字-->
+                  <!--                    </span>-->
+                  <!--                    <el-input v-model="form.fileName" @focus="clearformula"></el-input>-->
+                  <!--                  </el-form-item>-->
+                  <!--                </el-col>-->
+                  <el-col :span="8">
+                    <el-form-item prop="dataType" label-width="150px">
                     <span slot="label">
                       <font color="red">*</font>数据类型
                     </span>
-                     <el-select popper-class="cpp-popper" v-model="form.dataType" clearable @focus="clearformula">
-                      <el-option
-                        v-for="item in this.dataType"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"/>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-<!--              <el-row>-->
-<!--                <el-col :span="24">-->
-<!--                  <el-form-item prop="stationCode" label-width="150px">-->
-<!--                    <span slot="label">-->
-<!--                      <font color="red">*</font>场站编号-->
-<!--                    </span>-->
-<!--                     <el-select popper-class="cpp-popper" v-model="form.stationCode" multiple clearable @focus="clearformula" style="width: 100%">-->
-<!--                      <el-option-->
-<!--                        v-for="item in this.stationCodeList"-->
-<!--                        :key="item.stationCode"-->
-<!--                        :label="item.stationCode"-->
-<!--                        :value="item.stationCode"/>-->
-<!--                    </el-select>-->
-<!--                  </el-form-item>-->
-<!--                </el-col>-->
-<!--              </el-row>-->
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="time" label-width="150px" class="formulaColor">
+                      <el-select popper-class="cpp-popper" v-model="form.dataType" clearable @focus="clearformula">
+                        <el-option
+                          v-for="item in this.dataType"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value"/>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <!--              <el-row>-->
+                <!--                <el-col :span="24">-->
+                <!--                  <el-form-item prop="stationCode" label-width="150px">-->
+                <!--                    <span slot="label">-->
+                <!--                      <font color="red">*</font>场站编号-->
+                <!--                    </span>-->
+                <!--                     <el-select popper-class="cpp-popper" v-model="form.stationCode" multiple clearable @focus="clearformula" style="width: 100%">-->
+                <!--                      <el-option-->
+                <!--                        v-for="item in this.stationCodeList"-->
+                <!--                        :key="item.stationCode"-->
+                <!--                        :label="item.stationCode"-->
+                <!--                        :value="item.stationCode"/>-->
+                <!--                    </el-select>-->
+                <!--                  </el-form-item>-->
+                <!--                </el-col>-->
+                <!--              </el-row>-->
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="time" label-width="150px" class="formulaColor">
                     <span slot="label">
                      <font color="red">*</font>时间公式
                     </span>
-                    <el-input v-model="form.time" readonly
-                              @click.native="ftck(form.time,'form.time','(时间)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="t" label-width="150px" class="formulaColor">
+                      <el-input v-model="form.time" readonly
+                                @click.native="ftck(form.time,'form.time','(时间)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="t" label-width="150px" class="formulaColor">
                     <span slot="label">
                       温度公式
                     </span>
-                    <el-input v-model="form.t" readonly
-                              @click.native="ftck(form.t,'form.t','(温度)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="rh" label-width="150px" class="formulaColor">
+                      <el-input v-model="form.t" readonly
+                                @click.native="ftck(form.t,'form.t','(温度)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="rh" label-width="150px" class="formulaColor">
                     <span slot="label">
                       湿度公式
                     </span>
-                    <el-input v-model="form.rh" readonly
-                              @click.native="ftck(form.rh,'form.rh','(湿度)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="pa" label-width="150px" class="formulaColor">
+                      <el-input v-model="form.rh" readonly
+                                @click.native="ftck(form.rh,'form.rh','(湿度)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="pa" label-width="150px" class="formulaColor">
                     <span slot="label">
                      气压公式
                     </span>
-                    <el-input v-model="form.pa" readonly
-                              @click.native="ftck(form.pa,'form.pa','(气压)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="ws10" label-width="150px" class="formulaColor">
+                      <el-input v-model="form.pa" readonly
+                                @click.native="ftck(form.pa,'form.pa','(气压)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="ws10" label-width="150px" class="formulaColor">
                     <span slot="label">
                       10米风速公式
                     </span>
-                    <el-input v-model="form.ws10" readonly
-                              @click.native="ftck(form.ws10,'form.ws10','(10米风速)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="wd10" label-width="150px" class="formulaColor">
+                      <el-input v-model="form.ws10" readonly
+                                @click.native="ftck(form.ws10,'form.ws10','(10米风速)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="wd10" label-width="150px" class="formulaColor">
                     <span slot="label">
                       10米风向公式
                     </span>
-                    <el-input v-model="form.wd10" readonly
-                              @click.native="ftck(form.wd10,'form.wd10','(10米风向)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="ws30" label-width="150px" class="formulaColor">
+                      <el-input v-model="form.wd10" readonly
+                                @click.native="ftck(form.wd10,'form.wd10','(10米风向)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="ws30" label-width="150px" class="formulaColor">
                     <span slot="label">
                      30米风速公式
                     </span>
-                    <el-input v-model="form.ws30" readonly
-                              @click.native="ftck(form.ws30,'form.ws30','(30米风速)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="wd30" label-width="150px" class="formulaColor">
+                      <el-input v-model="form.ws30" readonly
+                                @click.native="ftck(form.ws30,'form.ws30','(30米风速)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="wd30" label-width="150px" class="formulaColor">
                     <span slot="label">
                       30米风向公式
                     </span>
-                    <el-input v-model="form.wd30" readonly
-                              @click.native="ftck(form.wd30,'form.wd30','(30米风向)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="ws50" label-width="150px" class="formulaColor">
+                      <el-input v-model="form.wd30" readonly
+                                @click.native="ftck(form.wd30,'form.wd30','(30米风向)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="ws50" label-width="150px" class="formulaColor">
                     <span slot="label">
                       50米风速公式
                     </span>
-                    <el-input v-model="form.ws50" readonly
-                              @click.native="ftck(form.ws50,'form.ws50','(50米风速)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="wd50" label-width="150px" class="formulaColor">
+                      <el-input v-model="form.ws50" readonly
+                                @click.native="ftck(form.ws50,'form.ws50','(50米风速)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="wd50" label-width="150px" class="formulaColor">
                     <span slot="label">
                       50米风向公式
                     </span>
-                    <el-input v-model="form.wd50" readonly
-                              @click.native="ftck(form.wd50,'form.wd50','(50米风向)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="ws60" label-width="150px" class="formulaColor">
+                      <el-input v-model="form.wd50" readonly
+                                @click.native="ftck(form.wd50,'form.wd50','(50米风向)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="ws60" label-width="150px" class="formulaColor">
                     <span slot="label">
                       60米风速公式
                     </span>
-                    <el-input v-model="form.ws60" readonly
-                              @click.native="ftck(form.ws60,'form.ws60','(60米风速)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="wd60" label-width="150px" class="formulaColor">
+                      <el-input v-model="form.ws60" readonly
+                                @click.native="ftck(form.ws60,'form.ws60','(60米风速)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="wd60" label-width="150px" class="formulaColor">
                     <span slot="label">
                       60米风向公式
                     </span>
-                    <el-input v-model="form.wd60" readonly
-                              @click.native="ftck(form.wd60,'form.wd60','(60米风向)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="ws70" label-width="150px" class="formulaColor">
+                      <el-input v-model="form.wd60" readonly
+                                @click.native="ftck(form.wd60,'form.wd60','(60米风向)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="ws70" label-width="150px" class="formulaColor">
                     <span slot="label">
                       70米风速公式
                     </span>
-                    <el-input v-model="form.ws70" readonly
-                              @click.native="ftck(form.ws70,'form.ws70','(70米风速)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="wd70" label-width="150px" class="formulaColor">
+                      <el-input v-model="form.ws70" readonly
+                                @click.native="ftck(form.ws70,'form.ws70','(70米风速)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="wd70" label-width="150px" class="formulaColor">
                     <span slot="label">
                       70米风向公式
                     </span>
-                    <el-input v-model="form.wd70" readonly
-                              @click.native="ftck(form.wd70,'form.wd70','(70米风向)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="ws80" label-width="150px" class="formulaColor">
+                      <el-input v-model="form.wd70" readonly
+                                @click.native="ftck(form.wd70,'form.wd70','(70米风向)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="ws80" label-width="150px" class="formulaColor">
                     <span slot="label">
                       80米风速公式
                     </span>
-                    <el-input v-model="form.ws80" readonly
-                              @click.native="ftck(form.ws80,'form.ws80','(80米风速)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="wd80" label-width="150px" class="formulaColor">
+                      <el-input v-model="form.ws80" readonly
+                                @click.native="ftck(form.ws80,'form.ws80','(80米风速)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="wd80" label-width="150px" class="formulaColor">
                     <span slot="label">
                       80米风向公式
                     </span>
-                    <el-input v-model="form.wd80" readonly
-                              @click.native="ftck(form.wd80,'form.wd80','(80米风向)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="ws90" label-width="150px" class="formulaColor">
+                      <el-input v-model="form.wd80" readonly
+                                @click.native="ftck(form.wd80,'form.wd80','(80米风向)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="ws90" label-width="150px" class="formulaColor">
                     <span slot="label">
                       90米风速公式
                     </span>
-                    <el-input v-model="form.ws90" readonly
-                              @click.native="ftck(form.ws90,'form.ws90','(90米风速)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="wd90" label-width="150px" class="formulaColor">
+                      <el-input v-model="form.ws90" readonly
+                                @click.native="ftck(form.ws90,'form.ws90','(90米风速)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="wd90" label-width="150px" class="formulaColor">
                     <span slot="label">
                       90米风向公式
                     </span>
-                    <el-input v-model="form.wd90" readonly
-                              @click.native="ftck(form.wd90,'form.wd90','(90米风向)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="ws100" label-width="150px" class="formulaColor">
+                      <el-input v-model="form.wd90" readonly
+                                @click.native="ftck(form.wd90,'form.wd90','(90米风向)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="ws100" label-width="150px" class="formulaColor">
                     <span slot="label">
                       100米风速公式
                     </span>
-                    <el-input v-model="form.ws100" readonly
-                              @click.native="ftck(form.ws100,'form.ws100','(100米风速)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="wd100" label-width="150px" class="formulaColor">
+                      <el-input v-model="form.ws100" readonly
+                                @click.native="ftck(form.ws100,'form.ws100','(100米风速)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="wd100" label-width="150px" class="formulaColor">
                     <span slot="label">
                       100米风向公式
                     </span>
-                    <el-input v-model="form.wd100" readonly
-                              @click.native="ftck(form.wd100,'form.wd100','(100米风向)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="ws110" label-width="150px" class="formulaColor">
+                      <el-input v-model="form.wd100" readonly
+                                @click.native="ftck(form.wd100,'form.wd100','(100米风向)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="ws110" label-width="150px" class="formulaColor">
                     <span slot="label">
                       110米风速公式
                     </span>
-                    <el-input v-model="form.ws110" readonly
-                              @click.native="ftck(form.ws110,'form.ws110','(110米风速)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="wd110" label-width="150px" class="formulaColor">
+                      <el-input v-model="form.ws110" readonly
+                                @click.native="ftck(form.ws110,'form.ws110','(110米风速)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="wd110" label-width="150px" class="formulaColor">
                     <span slot="label">
                       110米风向公式
                     </span>
-                    <el-input v-model="form.wd110" readonly
-                              @click.native="ftck(form.wd110,'form.wd110','(110米风向)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="ws120" label-width="150px" class="formulaColor">
+                      <el-input v-model="form.wd110" readonly
+                                @click.native="ftck(form.wd110,'form.wd110','(110米风向)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="ws120" label-width="150px" class="formulaColor">
                     <span slot="label">
                       120米风速公式
                     </span>
-                    <el-input v-model="form.ws120" readonly
-                              @click.native="ftck(form.ws120,'form.ws120','(120米风速)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="wd120" label-width="150px" class="formulaColor">
+                      <el-input v-model="form.ws120" readonly
+                                @click.native="ftck(form.ws120,'form.ws120','(120米风速)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="wd120" label-width="150px" class="formulaColor">
                     <span slot="label">
                       120米风向公式
                     </span>
-                    <el-input v-model="form.wd120" readonly
-                              @click.native="ftck(form.wd120,'form.wd120','(120米风向)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="wsHubHeight" label-width="150px" class="formulaColor">
+                      <el-input v-model="form.wd120" readonly
+                                @click.native="ftck(form.wd120,'form.wd120','(120米风向)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="wsHubHeight" label-width="150px" class="formulaColor">
                     <span slot="label">
                       轮毂风速公式
                     </span>
-                    <el-input v-model="form.wsHubHeight" readonly
-                              @click.native="ftck(form.wsHubHeight,'form.wsHubHeight','(轮毂风速)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="wdHubHeight" label-width="150px" class="formulaColor">
+                      <el-input v-model="form.wsHubHeight" readonly
+                                @click.native="ftck(form.wsHubHeight,'form.wsHubHeight','(轮毂风速)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="wdHubHeight" label-width="150px" class="formulaColor">
                     <span slot="label">
                       轮毂风向公式
                     </span>
-                    <el-input v-model="form.wdHubHeight" readonly
-                              @click.native="ftck(form.wdHubHeight,'form.wdHubHeight','(轮毂风向)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="handleSave('form')">
-                <span v-if="saveFlag == 1">保 存</span>
-                <span v-else>修 改</span>
-              </el-button>
-              <el-button @click="visible = false">取 消</el-button>
+                      <el-input v-model="form.wdHubHeight" readonly
+                                @click.native="ftck(form.wdHubHeight,'form.wdHubHeight','(轮毂风向)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </el-form>
+              <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="handleSave('form')">
+                  <span v-if="saveFlag == 1">保 存</span>
+                  <span v-else>修 改</span>
+                </el-button>
+                <el-button @click="visible = false">取 消</el-button>
+              </div>
             </div>
-          </div>
-        </el-col>
-        <el-col :span="1">
-          <el-divider direction="vertical" style="height: 200px"></el-divider>
-        </el-col>
-        <el-col :span="5">
-          <h2>公式编辑区{{ this.editinfo }}</h2>
-          <el-form>
-            <el-row>
-              <el-col>
-                <el-form-item prop="rownumber" label-width="150px">
+          </el-col>
+          <el-col :span="1">
+            <el-divider direction="vertical" style="height: 200px"></el-divider>
+          </el-col>
+          <el-col :span="5">
+            <h2>公式编辑区{{ this.editinfo }}</h2>
+            <el-form>
+              <el-row>
+                <el-col>
+                  <el-form-item prop="rownumber" label-width="150px">
                   <span slot="label">
                       <font color="red">*</font>解析行
                   </span>
-                  <el-input v-model="pfform.rownumber"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col>
-                <el-form-item prop="columnumber" label-width="150px">
+                    <el-input v-model="pfform.rownumber"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col>
+                  <el-form-item prop="columnumber" label-width="150px">
                   <span slot="label">
                       <font color="red">*</font>解析列
                   </span>
-                  <el-input v-model="pfform.columnumber"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col>
-                <el-form-item label="标签名" prop="signname" label-width="150px">
-                  <el-input v-model="pfform.signname"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col>
-                <el-form-item label="时间格式" prop="timeformat" label-width="150px">
-                   <el-select popper-class="cpp-popper" v-model="pfform.timeformat" clearable>
-                    <el-option
-                      v-for="item in this.timeFormat"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"/>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-button type="primary" @click="genformula">
-                <span>生成公式</span>
-              </el-button>
-              <el-button type="primary" @click="destoryformula">
-                <span>清除录入</span>
-              </el-button>
-            </el-row>
-          </el-form>
-        </el-col>
-      </el-row>
-    </el-dialog>
+                    <el-input v-model="pfform.columnumber"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col>
+                  <el-form-item label="标签名" prop="signname" label-width="150px">
+                    <el-input v-model="pfform.signname"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col>
+                  <el-form-item label="时间格式" prop="timeformat" label-width="150px">
+                    <el-select popper-class="cpp-popper" v-model="pfform.timeformat" clearable>
+                      <el-option
+                        v-for="item in this.timeFormat"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-button type="primary" @click="genformula">
+                  <span>生成公式</span>
+                </el-button>
+                <el-button type="primary" @click="destoryformula">
+                  <span>清除录入</span>
+                </el-button>
+              </el-row>
+            </el-form>
+          </el-col>
+        </el-row>
+      </el-dialog>
+    </div>
+
   </div>
 </template>
 

cpp-ui/src/views/configManager/parsingConf/dqparsing.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="app-container">
-    <el-button type="primary" icon="el-icon-plus" plain @click="handleAdd" class="myButton">新增</el-button>
+    <div class="dark-el-button">
+      <el-button type="primary" icon="el-icon-plus" @click="handleAdd" class="myButton">新增</el-button>
+    </div>
+
     <!--上报对象表格-->
     <el-table
       :data="tableData"
@@ -32,168 +35,171 @@
       </el-pagination>
     </div>
     <!--编辑框-->
-    <el-dialog :title="saveFlag==1?'新增':'编辑'" :visible.sync="visible" width="100%">
+    <div class="dark-el-dialog">
+      <el-dialog :title="saveFlag==1?'新增':'编辑'" :visible.sync="visible" width="100%">
 
-      <el-row :gutter="20">
-        <el-col :span="16">
-          <div>
+        <el-row :gutter="20">
+          <el-col :span="16">
+            <div>
                     <span style="color: red">
             <font size="4px">灰色文本框需要点击后，在右侧进行编辑录入！</font>
                     </span>
-          </div>
-          &nbsp;
-          <div class="grid-content bg-purple">
-            <el-form v-model="form" ref="form" :key="timer">
-              <el-row :gutter="16">
-<!--                <el-col :span="12">-->
-<!--                  <el-form-item prop="fileName" label-width="110px">-->
-<!--                    <span slot="label">-->
-<!--                      <font color="red">*</font>文件名关键字-->
-<!--                    </span>-->
-<!--                    <el-input v-model="form.fileName" @focus="clearformula"></el-input>-->
-<!--                  </el-form-item>-->
-<!--                </el-col>-->
-                <el-col :span="12">
-                  <el-form-item prop="dataType" label-width="110px">
+            </div>
+            &nbsp;
+            <div class="grid-content bg-purple">
+              <el-form v-model="form" ref="form" :key="timer">
+                <el-row :gutter="16">
+                  <!--                <el-col :span="12">-->
+                  <!--                  <el-form-item prop="fileName" label-width="110px">-->
+                  <!--                    <span slot="label">-->
+                  <!--                      <font color="red">*</font>文件名关键字-->
+                  <!--                    </span>-->
+                  <!--                    <el-input v-model="form.fileName" @focus="clearformula"></el-input>-->
+                  <!--                  </el-form-item>-->
+                  <!--                </el-col>-->
+                  <el-col :span="12">
+                    <el-form-item prop="dataType" label-width="110px">
                     <span slot="label">
                       <font color="red">*</font>数据类型
                     </span>
-                     <el-select popper-class="cpp-popper" v-model="form.dataType" clearable @focus="clearformula">
-                      <el-option
-                        v-for="item in this.dataType"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"/>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="12">
-                  <el-form-item prop="fpValue" label-width="110px" class="formulaColor">
+                      <el-select popper-class="cpp-popper" v-model="form.dataType" clearable @focus="clearformula">
+                        <el-option
+                          v-for="item in this.dataType"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value"/>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="12">
+                    <el-form-item prop="fpValue" label-width="110px" class="formulaColor">
                     <span slot="label">
                       <font color="red">*</font>预测数据公式
                     </span>
-                    <el-input v-model="form.fpValue" readonly
-                              @click.native="ftck(form.fpValue,'form.fpValue','(预测数据)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item prop="forecastTime" label-width="110px"
-                                class="formulaColor">
+                      <el-input v-model="form.fpValue" readonly
+                                @click.native="ftck(form.fpValue,'form.fpValue','(预测数据)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item prop="forecastTime" label-width="110px"
+                                  class="formulaColor">
                     <span slot="label">
                       <font color="red">*</font>预测时间公式
                     </span>
-                    <el-input v-model="form.forecastTime" readonly
-                              @click.native="ftck(form.forecastTime,'form.forecastTime','(预测时间)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="12">
-                  <el-form-item prop="openCapacity" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.forecastTime" readonly
+                                @click.native="ftck(form.forecastTime,'form.forecastTime','(预测时间)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="12">
+                    <el-form-item prop="openCapacity" label-width="110px" class="formulaColor">
                     <span slot="label">
                       <font color="red">*</font>预计开机容量公式
                     </span>
-                    <el-input v-model="form.openCapacity" readonly
-                              @click.native="ftck(form.openCapacity,'form.openCapacity','(预计开机容量)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item prop="capacity" label-width="110px"
-                                class="formulaColor">
+                      <el-input v-model="form.openCapacity" readonly
+                                @click.native="ftck(form.openCapacity,'form.openCapacity','(预计开机容量)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item prop="capacity" label-width="110px"
+                                  class="formulaColor">
                     <span slot="label">
                       <font color="red">*</font>装机容量公式
                     </span>
-                    <el-input v-model="form.capacity" readonly
-                              @click.native="ftck(form.capacity,'form.capacity','(装机容量)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-<!--              <el-row>-->
-<!--                <el-col :span="24">-->
-<!--                  <el-form-item prop="stationCode" label-width="110px">-->
-<!--                    <span slot="label">-->
-<!--                      <font color="red">*</font>场站编号-->
-<!--                    </span>-->
-<!--                     <el-select popper-class="cpp-popper" v-model="form.stationCode" multiple clearable @focus="clearformula" style="width: 100%">-->
-<!--                      <el-option-->
-<!--                        v-for="item in this.stationCodeList"-->
-<!--                        :key="item.stationCode"-->
-<!--                        :label="item.stationCode"-->
-<!--                        :value="item.stationCode"/>-->
-<!--                    </el-select>-->
-<!--                  </el-form-item>-->
-<!--                </el-col>-->
-<!--              </el-row>-->
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="handleSave('form')">
-                <span v-if="saveFlag == 1">保 存</span>
-                <span v-else>修 改</span>
-              </el-button>
-              <el-button @click="visible = false">取 消</el-button>
+                      <el-input v-model="form.capacity" readonly
+                                @click.native="ftck(form.capacity,'form.capacity','(装机容量)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <!--              <el-row>-->
+                <!--                <el-col :span="24">-->
+                <!--                  <el-form-item prop="stationCode" label-width="110px">-->
+                <!--                    <span slot="label">-->
+                <!--                      <font color="red">*</font>场站编号-->
+                <!--                    </span>-->
+                <!--                     <el-select popper-class="cpp-popper" v-model="form.stationCode" multiple clearable @focus="clearformula" style="width: 100%">-->
+                <!--                      <el-option-->
+                <!--                        v-for="item in this.stationCodeList"-->
+                <!--                        :key="item.stationCode"-->
+                <!--                        :label="item.stationCode"-->
+                <!--                        :value="item.stationCode"/>-->
+                <!--                    </el-select>-->
+                <!--                  </el-form-item>-->
+                <!--                </el-col>-->
+                <!--              </el-row>-->
+              </el-form>
+              <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="handleSave('form')">
+                  <span v-if="saveFlag == 1">保 存</span>
+                  <span v-else>修 改</span>
+                </el-button>
+                <el-button @click="visible = false">取 消</el-button>
+              </div>
             </div>
-          </div>
-        </el-col>
-        <el-col :span="1">
-          <el-divider direction="vertical"></el-divider>
-        </el-col>
-        <el-col :span="6">
-          <h2>公式编辑区{{ this.editinfo }}</h2>
-          <el-form>
-            <el-row>
-              <el-col>
-                <el-form-item prop="rownumber" label-width="110px">
+          </el-col>
+          <el-col :span="1">
+            <el-divider direction="vertical"></el-divider>
+          </el-col>
+          <el-col :span="6">
+            <h2>公式编辑区{{ this.editinfo }}</h2>
+            <el-form>
+              <el-row>
+                <el-col>
+                  <el-form-item prop="rownumber" label-width="110px">
                   <span slot="label">
                       <font color="red">*</font>解析行
                   </span>
-                  <el-input v-model="pfform.rownumber"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col>
-                <el-form-item prop="columnumber" label-width="110px">
+                    <el-input v-model="pfform.rownumber"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col>
+                  <el-form-item prop="columnumber" label-width="110px">
                   <span slot="label">
                       <font color="red">*</font>解析列
                   </span>
-                  <el-input v-model="pfform.columnumber"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col>
-                <el-form-item label="标签名" prop="signname" label-width="110px">
-                  <el-input v-model="pfform.signname"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col>
-                <el-form-item label="时间格式" prop="timeformat" label-width="110px">
-                   <el-select popper-class="cpp-popper" v-model="pfform.timeformat" clearable>
-                    <el-option
-                      v-for="item in this.timeFormat"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"/>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-button type="primary" @click="genformula">
-                <span>生成公式</span>
-              </el-button>
-              <el-button type="primary" @click="destoryformula">
-                <span>清除录入</span>
-              </el-button>
-            </el-row>
-          </el-form>
-        </el-col>
-      </el-row>
-    </el-dialog>
+                    <el-input v-model="pfform.columnumber"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col>
+                  <el-form-item label="标签名" prop="signname" label-width="110px">
+                    <el-input v-model="pfform.signname"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col>
+                  <el-form-item label="时间格式" prop="timeformat" label-width="110px">
+                    <el-select popper-class="cpp-popper" v-model="pfform.timeformat" clearable>
+                      <el-option
+                        v-for="item in this.timeFormat"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-button type="primary" @click="genformula">
+                  <span>生成公式</span>
+                </el-button>
+                <el-button type="primary" @click="destoryformula">
+                  <span>清除录入</span>
+                </el-button>
+              </el-row>
+            </el-form>
+          </el-col>
+        </el-row>
+      </el-dialog>
+    </div>
+
   </div>
 </template>
 

cpp-ui/src/views/configManager/parsingConf/fjparsing.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="app-container">
-    <el-button type="primary" icon="el-icon-plus" plain @click="handleAdd" class="myButton">新增</el-button>
+    <div class="dark-el-button">
+      <el-button type="primary" icon="el-icon-plus"  @click="handleAdd" class="myButton">新增</el-button>
+    </div>
+
     <!--上报对象表格-->
     <el-table
       :data="tableData"
@@ -62,293 +65,296 @@
       </el-pagination>
     </div>
     <!--编辑框-->
-    <el-dialog :title="saveFlag==1?'新增':'编辑'" :visible.sync="visible" width="100%" :fullscreen="true">
+    <div class="dark-el-dialog">
+      <el-dialog :title="saveFlag==1?'新增':'编辑'" :visible.sync="visible" width="100%" :fullscreen="true">
 
-      <el-row :gutter="20">
-        <el-col :span="16">
+        <el-row :gutter="20">
+          <el-col :span="16">
 
 
-          <div>
+            <div>
                     <span style="color: red">
             <font size="4px">灰色文本框需要点击后，在右侧进行编辑录入！</font>
                     </span>
-          </div>
-          &nbsp;
-          <div class="grid-content bg-purple">
-            <el-form v-model="form" ref="form" :key="timer">
-              <el-row :gutter="16">
-<!--                <el-col :span="8">-->
-<!--                  <el-form-item prop="fileName" label-width="110px">-->
-<!--                    <span slot="label">-->
-<!--                      <font color="red">*</font>文件名关键字-->
-<!--                    </span>-->
-<!--                    <el-input v-model="form.fileName" @focus="clearformula"></el-input>-->
-<!--                  </el-form-item>-->
-<!--                </el-col>-->
-                <el-col :span="8">
-                  <el-form-item prop="dataType" label-width="110px">
+            </div>
+            &nbsp;
+            <div class="grid-content bg-purple">
+              <el-form v-model="form" ref="form" :key="timer">
+                <el-row :gutter="16">
+                  <!--                <el-col :span="8">-->
+                  <!--                  <el-form-item prop="fileName" label-width="110px">-->
+                  <!--                    <span slot="label">-->
+                  <!--                      <font color="red">*</font>文件名关键字-->
+                  <!--                    </span>-->
+                  <!--                    <el-input v-model="form.fileName" @focus="clearformula"></el-input>-->
+                  <!--                  </el-form-item>-->
+                  <!--                </el-col>-->
+                  <el-col :span="8">
+                    <el-form-item prop="dataType" label-width="110px">
                     <span slot="label">
                       <font color="red">*</font>数据类型
                     </span>
-                     <el-select popper-class="cpp-popper" v-model="form.dataType" clearable @focus="clearformula">
-                      <el-option
-                        v-for="item in this.dataType"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"/>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="time" label-width="110px" class="formulaColor">
+                      <el-select popper-class="cpp-popper" v-model="form.dataType" clearable @focus="clearformula">
+                        <el-option
+                          v-for="item in this.dataType"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value"/>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="time" label-width="110px" class="formulaColor">
                     <span slot="label">
                       <font color="red">*</font>时间公式
                     </span>
-                    <el-input v-model="form.time" readonly
-                              @click.native="ftck(form.time,'form.time','(时间)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="equipmentName" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.time" readonly
+                                @click.native="ftck(form.time,'form.time','(时间)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="equipmentName" label-width="110px" class="formulaColor">
                     <span slot="label">
                       <font color="red">*</font>设备名称公式
                     </span>
-                    <el-input v-model="form.equipmentName" readonly
-                              @click.native="ftck(form.equipmentName,'form.equipmentName','(设备名称)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="isSample" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.equipmentName" readonly
+                                @click.native="ftck(form.equipmentName,'form.equipmentName','(设备名称)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="isSample" label-width="110px" class="formulaColor">
                     <span slot="label">
                       是否样板机公式
                     </span>
-                    <el-input v-model="form.isSample" readonly
-                              @click.native="ftck(form.isSample,'form.isSample','(是否样板机)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-<!--              <el-row>-->
-<!--                <el-col :span="24">-->
-<!--                  <el-form-item prop="stationCode" label-width="110px">-->
-<!--                    <span slot="label">-->
-<!--                      <font color="red">*</font>场站编号-->
-<!--                    </span>-->
-<!--                     <el-select popper-class="cpp-popper" v-model="form.stationCode" multiple clearable @focus="clearformula" style="width: 100%">-->
-<!--                      <el-option-->
-<!--                        v-for="item in this.stationCodeList"-->
-<!--                        :key="item.stationCode"-->
-<!--                        :label="item.stationCode"-->
-<!--                        :value="item.stationCode"/>-->
-<!--                    </el-select>-->
-<!--                  </el-form-item>-->
-<!--                </el-col>-->
-<!--              </el-row>-->
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="status" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.isSample" readonly
+                                @click.native="ftck(form.isSample,'form.isSample','(是否样板机)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <!--              <el-row>-->
+                <!--                <el-col :span="24">-->
+                <!--                  <el-form-item prop="stationCode" label-width="110px">-->
+                <!--                    <span slot="label">-->
+                <!--                      <font color="red">*</font>场站编号-->
+                <!--                    </span>-->
+                <!--                     <el-select popper-class="cpp-popper" v-model="form.stationCode" multiple clearable @focus="clearformula" style="width: 100%">-->
+                <!--                      <el-option-->
+                <!--                        v-for="item in this.stationCodeList"-->
+                <!--                        :key="item.stationCode"-->
+                <!--                        :label="item.stationCode"-->
+                <!--                        :value="item.stationCode"/>-->
+                <!--                    </el-select>-->
+                <!--                  </el-form-item>-->
+                <!--                </el-col>-->
+                <!--              </el-row>-->
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="status" label-width="110px" class="formulaColor">
                     <span slot="label">
                      状态公式
                     </span>
-                    <el-input v-model="form.status" readonly
-                              @click.native="ftck(form.status,'form.status','(状态)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="activePower" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.status" readonly
+                                @click.native="ftck(form.status,'form.status','(状态)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="activePower" label-width="110px" class="formulaColor">
                     <span slot="label">
                       有功公式
                     </span>
-                    <el-input v-model="form.activePower" readonly
-                              @click.native="ftck(form.activePower,'form.activePower','(有功)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="reactivePower" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.activePower" readonly
+                                @click.native="ftck(form.activePower,'form.activePower','(有功)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="reactivePower" label-width="110px" class="formulaColor">
                     <span slot="label">
                       无功公式
                     </span>
-                    <el-input v-model="form.reactivePower" readonly
-                              @click.native="ftck(form.reactivePower,'form.reactivePower','(无功)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="powerFactor" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.reactivePower" readonly
+                                @click.native="ftck(form.reactivePower,'form.reactivePower','(无功)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="powerFactor" label-width="110px" class="formulaColor">
                     <span slot="label">
                      功率因数公式
                     </span>
-                    <el-input v-model="form.powerFactor" readonly
-                              @click.native="ftck(form.powerFactor,'form.powerFactor','(功率因数)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="voltage" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.powerFactor" readonly
+                                @click.native="ftck(form.powerFactor,'form.powerFactor','(功率因数)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="voltage" label-width="110px" class="formulaColor">
                     <span slot="label">
                       电压公式
                     </span>
-                    <el-input v-model="form.voltage" readonly
-                              @click.native="ftck(form.voltage,'form.voltage','(电压)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="electricalCurrent" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.voltage" readonly
+                                @click.native="ftck(form.voltage,'form.voltage','(电压)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="electricalCurrent" label-width="110px" class="formulaColor">
                     <span slot="label">
                       电流公式
                     </span>
-                    <el-input v-model="form.electricalCurrent" readonly
-                              @click.native="ftck(form.electricalCurrent,'form.electricalCurrent','(电流)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="dayElectricQuantity" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.electricalCurrent" readonly
+                                @click.native="ftck(form.electricalCurrent,'form.electricalCurrent','(电流)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="dayElectricQuantity" label-width="110px" class="formulaColor">
                     <span slot="label">
                      当日发电量公式
                     </span>
-                    <el-input v-model="form.dayElectricQuantity" readonly
-                              @click.native="ftck(form.dayElectricQuantity,'form.dayElectricQuantity','(当日发电量)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="cumulativeGeneratedEnergy" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.dayElectricQuantity" readonly
+                                @click.native="ftck(form.dayElectricQuantity,'form.dayElectricQuantity','(当日发电量)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="cumulativeGeneratedEnergy" label-width="110px" class="formulaColor">
                     <span slot="label">
                       累积发电量公式
                     </span>
-                    <el-input v-model="form.cumulativeGeneratedEnergy" readonly
-                              @click.native="ftck(form.cumulativeGeneratedEnergy,'form.cumulativeGeneratedEnergy','(累积发电量)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="dayGridConnectedHours" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.cumulativeGeneratedEnergy" readonly
+                                @click.native="ftck(form.cumulativeGeneratedEnergy,'form.cumulativeGeneratedEnergy','(累积发电量)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="dayGridConnectedHours" label-width="110px" class="formulaColor">
                     <span slot="label">
                       并网小时数公式
                     </span>
-                    <el-input v-model="form.dayGridConnectedHours" readonly
-                              @click.native="ftck(form.dayGridConnectedHours,'form.dayGridConnectedHours','(并网小时数)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="windWheelRatedSpeed" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.dayGridConnectedHours" readonly
+                                @click.native="ftck(form.dayGridConnectedHours,'form.dayGridConnectedHours','(并网小时数)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="windWheelRatedSpeed" label-width="110px" class="formulaColor">
                     <span slot="label">
                      转速公式
                     </span>
-                    <el-input v-model="form.windWheelRatedSpeed" readonly
-                              @click.native="ftck(form.windWheelRatedSpeed,'form.windWheelRatedSpeed','(转速)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="ws" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.windWheelRatedSpeed" readonly
+                                @click.native="ftck(form.windWheelRatedSpeed,'form.windWheelRatedSpeed','(转速)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="ws" label-width="110px" class="formulaColor">
                     <span slot="label">
                       风速公式
                     </span>
-                    <el-input v-model="form.ws" readonly
-                              @click.native="ftck(form.ws,'form.ws','(风速)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="wd" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.ws" readonly
+                                @click.native="ftck(form.ws,'form.ws','(风速)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="wd" label-width="110px" class="formulaColor">
                     <span slot="label">
                       风向公式
                     </span>
-                    <el-input v-model="form.wd" readonly
-                              @click.native="ftck(form.wd,'form.wd','(风向)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="t" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.wd" readonly
+                                @click.native="ftck(form.wd,'form.wd','(风向)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="t" label-width="110px" class="formulaColor">
                     <span slot="label">
                      温度公式
                     </span>
-                    <el-input v-model="form.t" readonly
-                              @click.native="ftck(form.t,'form.t','(温度)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="pitchAngle" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.t" readonly
+                                @click.native="ftck(form.t,'form.t','(温度)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="pitchAngle" label-width="110px" class="formulaColor">
                     <span slot="label">
                       桨距角公式
                     </span>
-                    <el-input v-model="form.pitchAngle" readonly
-                              @click.native="ftck(form.pitchAngle,'form.pitchAngle','(桨距角)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="handleSave('form')">
-                <span v-if="saveFlag == 1">保 存</span>
-                <span v-else>修 改</span>
-              </el-button>
-              <el-button @click="visible = false">取 消</el-button>
+                      <el-input v-model="form.pitchAngle" readonly
+                                @click.native="ftck(form.pitchAngle,'form.pitchAngle','(桨距角)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </el-form>
+              <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="handleSave('form')">
+                  <span v-if="saveFlag == 1">保 存</span>
+                  <span v-else>修 改</span>
+                </el-button>
+                <el-button @click="visible = false">取 消</el-button>
+              </div>
             </div>
-          </div>
-        </el-col>
-        <el-col :span="1">
-          <el-divider direction="vertical" style="height: 200px"></el-divider>
-        </el-col>
-        <el-col :span="5">
-          <h2>公式编辑区{{ this.editinfo }}</h2>
-          <el-form>
-            <el-row>
-              <el-col>
-                <el-form-item prop="rownumber" label-width="110px">
+          </el-col>
+          <el-col :span="1">
+            <el-divider direction="vertical" style="height: 200px"></el-divider>
+          </el-col>
+          <el-col :span="5">
+            <h2>公式编辑区{{ this.editinfo }}</h2>
+            <el-form>
+              <el-row>
+                <el-col>
+                  <el-form-item prop="rownumber" label-width="110px">
                   <span slot="label">
                       <font color="red">*</font>解析行
                   </span>
-                  <el-input v-model="pfform.rownumber"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col>
-                <el-form-item prop="columnumber" label-width="110px">
+                    <el-input v-model="pfform.rownumber"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col>
+                  <el-form-item prop="columnumber" label-width="110px">
                   <span slot="label">
                       <font color="red">*</font>解析列
                   </span>
-                  <el-input v-model="pfform.columnumber"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col>
-                <el-form-item label="标签名" prop="signname" label-width="110px">
-                  <el-input v-model="pfform.signname"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col>
-                <el-form-item label="时间格式" prop="timeformat" label-width="110px">
-                   <el-select popper-class="cpp-popper" v-model="pfform.timeformat" clearable>
-                    <el-option
-                      v-for="item in this.timeFormat"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"/>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-button type="primary" @click="genformula">
-                <span>生成公式</span>
-              </el-button>
-              <el-button type="primary" @click="destoryformula">
-                <span>清除录入</span>
-              </el-button>
-            </el-row>
-          </el-form>
-        </el-col>
-      </el-row>
-    </el-dialog>
+                    <el-input v-model="pfform.columnumber"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col>
+                  <el-form-item label="标签名" prop="signname" label-width="110px">
+                    <el-input v-model="pfform.signname"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col>
+                  <el-form-item label="时间格式" prop="timeformat" label-width="110px">
+                    <el-select popper-class="cpp-popper" v-model="pfform.timeformat" clearable>
+                      <el-option
+                        v-for="item in this.timeFormat"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-button type="primary" @click="genformula">
+                  <span>生成公式</span>
+                </el-button>
+                <el-button type="primary" @click="destoryformula">
+                  <span>清除录入</span>
+                </el-button>
+              </el-row>
+            </el-form>
+          </el-col>
+        </el-row>
+      </el-dialog>
+    </div>
+
   </div>
 </template>
 

cpp-ui/src/views/configManager/parsingConf/index.vue

@@ -1,37 +1,35 @@
 <template>
   <div class="app-container">
-    <div class="dark-el-input dark-el-button">
-      <basic-container>
-        <el-tabs v-model="activeName" @tab-click="handleClick">
-          <el-tab-pane label="短期" name="dq">
-            <dqparsing v-if="isDq"/>
-          </el-tab-pane>
-          <el-tab-pane label="超短期" name="cdq">
-            <cdqparsing v-if="isCdq"/>
-          </el-tab-pane>
-          <el-tab-pane label="nwp" name="nwp">
-            <nwpparsing v-if="isNwp"/>
-          </el-tab-pane>
-          <el-tab-pane label="实际功率" name="rp">
-            <rpparsing v-if="isRp"/>
-          </el-tab-pane>
-          <el-tab-pane label="测风塔" name="cft">
-            <cftparsing v-if="isCft"/>
-          </el-tab-pane>
-          <el-tab-pane label="风机" name="fj">
-            <fjparsing v-if="isFj"/>
-          </el-tab-pane>
-          <el-tab-pane label="气象站" name="qxz">
-            <qxzparsing v-if="isQxz"/>
-          </el-tab-pane>
-          <el-tab-pane label="逆变器" name="nbq">
-            <nbqparsing v-if="isNbq"/>
-          </el-tab-pane>
-        </el-tabs>
-        <!--通道配置的编辑框-->
-        <!--文件类型配置的编辑框-->
-      </basic-container>
-    </div>
+    <basic-container>
+      <el-tabs v-model="activeName" @tab-click="handleClick">
+        <el-tab-pane label="短期" name="dq">
+          <dqparsing v-if="isDq"/>
+        </el-tab-pane>
+        <el-tab-pane label="超短期" name="cdq">
+          <cdqparsing v-if="isCdq"/>
+        </el-tab-pane>
+        <el-tab-pane label="nwp" name="nwp">
+          <nwpparsing v-if="isNwp"/>
+        </el-tab-pane>
+        <el-tab-pane label="实际功率" name="rp">
+          <rpparsing v-if="isRp"/>
+        </el-tab-pane>
+        <el-tab-pane label="测风塔" name="cft">
+          <cftparsing v-if="isCft"/>
+        </el-tab-pane>
+        <el-tab-pane label="风机" name="fj">
+          <fjparsing v-if="isFj"/>
+        </el-tab-pane>
+        <el-tab-pane label="气象站" name="qxz">
+          <qxzparsing v-if="isQxz"/>
+        </el-tab-pane>
+        <el-tab-pane label="逆变器" name="nbq">
+          <nbqparsing v-if="isNbq"/>
+        </el-tab-pane>
+      </el-tabs>
+      <!--通道配置的编辑框-->
+      <!--文件类型配置的编辑框-->
+    </basic-container>
   </div>
 </template>
 <script>

cpp-ui/src/views/configManager/parsingConf/nbqparsing.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="app-container">
-    <el-button type="primary" icon="el-icon-plus" plain @click="handleAdd" class="myButton">新增</el-button>
+    <div class="dark-el-button">
+      <el-button type="primary" icon="el-icon-plus" @click="handleAdd" class="myButton">新增</el-button>
+    </div>
+
     <!--上报对象表格-->
     <el-table
       :data="tableData"
@@ -57,245 +60,248 @@
       </el-pagination>
     </div>
     <!--编辑框-->
-    <el-dialog :title="saveFlag==1?'新增':'编辑'" :visible.sync="visible" width="100%" :fullscreen="true">
+    <div class="dark-el-dialog">
+      <el-dialog :title="saveFlag==1?'新增':'编辑'" :visible.sync="visible" width="100%" :fullscreen="true">
 
-      <el-row :gutter="20">
-        <el-col :span="16">
+        <el-row :gutter="20">
+          <el-col :span="16">
 
 
-          <div>
+            <div>
                     <span style="color: red">
             <font size="4px">灰色文本框需要点击后，在右侧进行编辑录入！</font>
                     </span>
-          </div>
-          &nbsp;
-          <div class="grid-content bg-purple">
-            <el-form v-model="form" ref="form" :key="timer">
-              <el-row :gutter="16">
-<!--                <el-col :span="8">-->
-<!--                  <el-form-item prop="fileName" label-width="110px">-->
-<!--                    <span slot="label">-->
-<!--                      <font color="red">*</font>文件名关键字-->
-<!--                    </span>-->
-<!--                    <el-input v-model="form.fileName" @focus="clearformula"></el-input>-->
-<!--                  </el-form-item>-->
-<!--                </el-col>-->
-                <el-col :span="8">
-                  <el-form-item prop="dataType" label-width="110px">
+            </div>
+            &nbsp;
+            <div class="grid-content bg-purple">
+              <el-form v-model="form" ref="form" :key="timer">
+                <el-row :gutter="16">
+                  <!--                <el-col :span="8">-->
+                  <!--                  <el-form-item prop="fileName" label-width="110px">-->
+                  <!--                    <span slot="label">-->
+                  <!--                      <font color="red">*</font>文件名关键字-->
+                  <!--                    </span>-->
+                  <!--                    <el-input v-model="form.fileName" @focus="clearformula"></el-input>-->
+                  <!--                  </el-form-item>-->
+                  <!--                </el-col>-->
+                  <el-col :span="8">
+                    <el-form-item prop="dataType" label-width="110px">
                     <span slot="label">
                       <font color="red">*</font>数据类型
                     </span>
-                     <el-select popper-class="cpp-popper" v-model="form.dataType" clearable @focus="clearformula">
-                      <el-option
-                        v-for="item in this.dataType"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"/>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="time" label-width="110px" class="formulaColor">
+                      <el-select popper-class="cpp-popper" v-model="form.dataType" clearable @focus="clearformula">
+                        <el-option
+                          v-for="item in this.dataType"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value"/>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="time" label-width="110px" class="formulaColor">
                     <span slot="label">
                       <font color="red">*</font>时间公式
                     </span>
-                    <el-input v-model="form.time" readonly
-                              @click.native="ftck(form.time,'form.time','(时间)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="equipmentName" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.time" readonly
+                                @click.native="ftck(form.time,'form.time','(时间)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="equipmentName" label-width="110px" class="formulaColor">
                     <span slot="label">
                       <font color="red">*</font>设备名称公式
                     </span>
-                    <el-input v-model="form.equipmentName" readonly
-                              @click.native="ftck(form.equipmentName,'form.equipmentName','(设备名称)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="isSample" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.equipmentName" readonly
+                                @click.native="ftck(form.equipmentName,'form.equipmentName','(设备名称)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="isSample" label-width="110px" class="formulaColor">
                     <span slot="label">
                       <font color="red">*</font>是否样板机公式
                     </span>
-                    <el-input v-model="form.isSample" readonly
-                              @click.native="ftck(form.isSample,'form.isSample','(是否样板机)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-<!--              <el-row>-->
-<!--                <el-col :span="24">-->
-<!--                  <el-form-item prop="stationCode" label-width="110px">-->
-<!--                    <span slot="label">-->
-<!--                      <font color="red">*</font>场站编号-->
-<!--                    </span>-->
-<!--                     <el-select popper-class="cpp-popper" v-model="form.stationCode" multiple clearable @focus="clearformula" style="width: 100%">-->
-<!--                      <el-option-->
-<!--                        v-for="item in this.stationCodeList"-->
-<!--                        :key="item.stationCode"-->
-<!--                        :label="item.stationCode"-->
-<!--                        :value="item.stationCode"/>-->
-<!--                    </el-select>-->
-<!--                  </el-form-item>-->
-<!--                </el-col>-->
-<!--              </el-row>-->
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="status" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.isSample" readonly
+                                @click.native="ftck(form.isSample,'form.isSample','(是否样板机)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <!--              <el-row>-->
+                <!--                <el-col :span="24">-->
+                <!--                  <el-form-item prop="stationCode" label-width="110px">-->
+                <!--                    <span slot="label">-->
+                <!--                      <font color="red">*</font>场站编号-->
+                <!--                    </span>-->
+                <!--                     <el-select popper-class="cpp-popper" v-model="form.stationCode" multiple clearable @focus="clearformula" style="width: 100%">-->
+                <!--                      <el-option-->
+                <!--                        v-for="item in this.stationCodeList"-->
+                <!--                        :key="item.stationCode"-->
+                <!--                        :label="item.stationCode"-->
+                <!--                        :value="item.stationCode"/>-->
+                <!--                    </el-select>-->
+                <!--                  </el-form-item>-->
+                <!--                </el-col>-->
+                <!--              </el-row>-->
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="status" label-width="110px" class="formulaColor">
                     <span slot="label">
                      状态公式
                     </span>
-                    <el-input v-model="form.status" readonly
-                              @click.native="ftck(form.status,'form.status','(状态)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="activePower" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.status" readonly
+                                @click.native="ftck(form.status,'form.status','(状态)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="activePower" label-width="110px" class="formulaColor">
                     <span slot="label">
                       有功公式
                     </span>
-                    <el-input v-model="form.activePower" readonly
-                              @click.native="ftck(form.activePower,'form.activePower','(有功)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="reactivePower" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.activePower" readonly
+                                @click.native="ftck(form.activePower,'form.activePower','(有功)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="reactivePower" label-width="110px" class="formulaColor">
                     <span slot="label">
                       无功公式
                     </span>
-                    <el-input v-model="form.reactivePower" readonly
-                              @click.native="ftck(form.reactivePower,'form.reactivePower','(无功)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="powerFactor" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.reactivePower" readonly
+                                @click.native="ftck(form.reactivePower,'form.reactivePower','(无功)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="powerFactor" label-width="110px" class="formulaColor">
                     <span slot="label">
                      功率因数公式
                     </span>
-                    <el-input v-model="form.powerFactor" readonly
-                              @click.native="ftck(form.powerFactor,'form.powerFactor','(功率因数)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="voltage" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.powerFactor" readonly
+                                @click.native="ftck(form.powerFactor,'form.powerFactor','(功率因数)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="voltage" label-width="110px" class="formulaColor">
                     <span slot="label">
                       电压公式
                     </span>
-                    <el-input v-model="form.voltage" readonly
-                              @click.native="ftck(form.voltage,'form.voltage','(电压)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="electricalCurrent" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.voltage" readonly
+                                @click.native="ftck(form.voltage,'form.voltage','(电压)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="electricalCurrent" label-width="110px" class="formulaColor">
                     <span slot="label">
                       电流公式
                     </span>
-                    <el-input v-model="form.electricalCurrent" readonly
-                              @click.native="ftck(form.electricalCurrent,'form.electricalCurrent','(电流)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="dayElectricQuantity" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.electricalCurrent" readonly
+                                @click.native="ftck(form.electricalCurrent,'form.electricalCurrent','(电流)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="dayElectricQuantity" label-width="110px" class="formulaColor">
                     <span slot="label">
                      当日发电量公式
                     </span>
-                    <el-input v-model="form.dayElectricQuantity" readonly
-                              @click.native="ftck(form.dayElectricQuantity,'form.dayElectricQuantity','(当日发电量)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="cumulativeGeneratedEnergy" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.dayElectricQuantity" readonly
+                                @click.native="ftck(form.dayElectricQuantity,'form.dayElectricQuantity','(当日发电量)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="cumulativeGeneratedEnergy" label-width="110px" class="formulaColor">
                     <span slot="label">
                       累计发电量公式
                     </span>
-                    <el-input v-model="form.cumulativeGeneratedEnergy" readonly
-                              @click.native="ftck(form.cumulativeGeneratedEnergy,'form.cumulativeGeneratedEnergy','(累积发电量)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="dayGridConnectedHours" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.cumulativeGeneratedEnergy" readonly
+                                @click.native="ftck(form.cumulativeGeneratedEnergy,'form.cumulativeGeneratedEnergy','(累积发电量)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="dayGridConnectedHours" label-width="110px" class="formulaColor">
                     <span slot="label">
                       并网小时数公式
                     </span>
-                    <el-input v-model="form.dayGridConnectedHours" readonly
-                              @click.native="ftck(form.dayGridConnectedHours,'form.dayGridConnectedHours','(并网小时数)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="handleSave('form')">
-                <span v-if="saveFlag == 1">保 存</span>
-                <span v-else>修 改</span>
-              </el-button>
-              <el-button @click="visible = false">取 消</el-button>
+                      <el-input v-model="form.dayGridConnectedHours" readonly
+                                @click.native="ftck(form.dayGridConnectedHours,'form.dayGridConnectedHours','(并网小时数)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </el-form>
+              <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="handleSave('form')">
+                  <span v-if="saveFlag == 1">保 存</span>
+                  <span v-else>修 改</span>
+                </el-button>
+                <el-button @click="visible = false">取 消</el-button>
+              </div>
             </div>
-          </div>
 
-        </el-col>
-        <el-col :span="1">
-          <el-divider direction="vertical" style="height: 200px"></el-divider>
-        </el-col>
-        <el-col :span="5">
-          <h2>公式编辑区{{ this.editinfo }}</h2>
-          <el-form>
-            <el-row>
-              <el-col>
-                <el-form-item prop="rownumber" label-width="110px">
+          </el-col>
+          <el-col :span="1">
+            <el-divider direction="vertical" style="height: 200px"></el-divider>
+          </el-col>
+          <el-col :span="5">
+            <h2>公式编辑区{{ this.editinfo }}</h2>
+            <el-form>
+              <el-row>
+                <el-col>
+                  <el-form-item prop="rownumber" label-width="110px">
                   <span slot="label">
                       <font color="red">*</font>解析行
                   </span>
-                  <el-input v-model="pfform.rownumber"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col>
-                <el-form-item prop="columnumber" label-width="110px">
+                    <el-input v-model="pfform.rownumber"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col>
+                  <el-form-item prop="columnumber" label-width="110px">
                   <span slot="label">
                       <font color="red">*</font>解析列
                   </span>
-                  <el-input v-model="pfform.columnumber"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col>
-                <el-form-item label="标签名" prop="signname" label-width="110px">
-                  <el-input v-model="pfform.signname"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col>
-                <el-form-item label="时间格式" prop="timeformat" label-width="110px">
-                   <el-select popper-class="cpp-popper" v-model="pfform.timeformat" clearable>
-                    <el-option
-                      v-for="item in this.timeFormat"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"/>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-button type="primary" @click="genformula">
-                <span>生成公式</span>
-              </el-button>
-              <el-button type="primary" @click="destoryformula">
-                <span>清除录入</span>
-              </el-button>
-            </el-row>
-          </el-form>
-        </el-col>
-      </el-row>
-    </el-dialog>
+                    <el-input v-model="pfform.columnumber"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col>
+                  <el-form-item label="标签名" prop="signname" label-width="110px">
+                    <el-input v-model="pfform.signname"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col>
+                  <el-form-item label="时间格式" prop="timeformat" label-width="110px">
+                    <el-select popper-class="cpp-popper" v-model="pfform.timeformat" clearable>
+                      <el-option
+                        v-for="item in this.timeFormat"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-button type="primary" @click="genformula">
+                  <span>生成公式</span>
+                </el-button>
+                <el-button type="primary" @click="destoryformula">
+                  <span>清除录入</span>
+                </el-button>
+              </el-row>
+            </el-form>
+          </el-col>
+        </el-row>
+      </el-dialog>
+    </div>
+
   </div>
 </template>
 

cpp-ui/src/views/configManager/parsingConf/nwpparsing.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="app-container">
-    <el-button type="primary" icon="el-icon-plus" plain @click="handleAdd" class="myButton">新增</el-button>
+    <div class="dark-el-button">
+      <el-button type="primary" icon="el-icon-plus" @click="handleAdd" class="myButton">新增</el-button>
+    </div>
+
     <!--上报对象表格-->
     <el-table
       :data="tableData"
@@ -68,345 +71,348 @@
       </el-pagination>
     </div>
     <!--编辑框-->
-    <el-dialog :title="saveFlag==1?'新增':'编辑'" :visible.sync="visible" width="100%" :fullscreen="true">
+    <div class="dark-el-dialog">
+      <el-dialog :title="saveFlag==1?'新增':'编辑'" :visible.sync="visible" width="100%" :fullscreen="true">
 
-      <el-row :gutter="20">
-        <el-col :span="16">
+        <el-row :gutter="20">
+          <el-col :span="16">
 
 
-          <div>
+            <div>
                     <span style="color: red">
             <font size="4px">灰色文本框需要点击后，在右侧进行编辑录入！</font>
                     </span>
-          </div>
-          &nbsp;
-          <div class="grid-content bg-purple">
-            <el-form v-model="form" ref="form" :key="timer">
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="dataType" label-width="110px">
+            </div>
+            &nbsp;
+            <div class="grid-content bg-purple">
+              <el-form v-model="form" ref="form" :key="timer">
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="dataType" label-width="110px">
                     <span slot="label">
                       <font color="red">*</font>数据类型
                     </span>
-                     <el-select popper-class="cpp-popper" v-model="form.dataType" clearable @focus="clearformula">
-                      <el-option
-                        v-for="item in this.dataTypes"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"/>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
+                      <el-select popper-class="cpp-popper" v-model="form.dataType" clearable @focus="clearformula">
+                        <el-option
+                          v-for="item in this.dataTypes"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value"/>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
 
-              </el-row>
-<!--              <el-row>-->
-<!--                <el-col :span="24">-->
-<!--                  <el-form-item prop="stationCode" label-width="110px">-->
-<!--                    <span slot="label">-->
-<!--                      <font color="red">*</font>场站编号-->
-<!--                    </span>-->
-<!--                     <el-select popper-class="cpp-popper" v-model="form.stationCode" multiple clearable @focus="clearformula" style="width: 100%">-->
-<!--                      <el-option-->
-<!--                        v-for="item in this.stationCodeList"-->
-<!--                        :key="item.stationCode"-->
-<!--                        :label="item.stationCode"-->
-<!--                        :value="item.stationCode"/>-->
-<!--                    </el-select>-->
-<!--                  </el-form-item>-->
-<!--                </el-col>-->
-<!--              </el-row>-->
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="time" label-width="110px" class="formulaColor">
+                </el-row>
+                <!--              <el-row>-->
+                <!--                <el-col :span="24">-->
+                <!--                  <el-form-item prop="stationCode" label-width="110px">-->
+                <!--                    <span slot="label">-->
+                <!--                      <font color="red">*</font>场站编号-->
+                <!--                    </span>-->
+                <!--                     <el-select popper-class="cpp-popper" v-model="form.stationCode" multiple clearable @focus="clearformula" style="width: 100%">-->
+                <!--                      <el-option-->
+                <!--                        v-for="item in this.stationCodeList"-->
+                <!--                        :key="item.stationCode"-->
+                <!--                        :label="item.stationCode"-->
+                <!--                        :value="item.stationCode"/>-->
+                <!--                    </el-select>-->
+                <!--                  </el-form-item>-->
+                <!--                </el-col>-->
+                <!--              </el-row>-->
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="time" label-width="110px" class="formulaColor">
                     <span slot="label">
                       <font color="red">*</font>预测时间公式
                     </span>
-                    <el-input v-model="form.time" readonly
-                              @click.native="ftck(form.time,'form.time','(预测时间)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="globalRadiation" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.time" readonly
+                                @click.native="ftck(form.time,'form.time','(预测时间)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="globalRadiation" label-width="110px" class="formulaColor">
                     <span slot="label">
                       总辐射公式
                     </span>
-                    <el-input v-model="form.globalRadiation" readonly
-                              @click.native="ftck(form.globalRadiation,'form.globalRadiation','(总辐射)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="directRadiation" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.globalRadiation" readonly
+                                @click.native="ftck(form.globalRadiation,'form.globalRadiation','(总辐射)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="directRadiation" label-width="110px" class="formulaColor">
                     <span slot="label">
                       直辐射公式
                     </span>
-                    <el-input v-model="form.directRadiation" readonly
-                              @click.native="ftck(form.directRadiation,'form.directRadiation','(直辐射)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="diffuseRadiation" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.directRadiation" readonly
+                                @click.native="ftck(form.directRadiation,'form.directRadiation','(直辐射)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="diffuseRadiation" label-width="110px" class="formulaColor">
                     <span slot="label">
                      散辐射公式
                     </span>
-                    <el-input v-model="form.diffuseRadiation" readonly
-                              @click.native="ftck(form.diffuseRadiation,'form.diffuseRadiation','(散辐射)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="ws10" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.diffuseRadiation" readonly
+                                @click.native="ftck(form.diffuseRadiation,'form.diffuseRadiation','(散辐射)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="ws10" label-width="110px" class="formulaColor">
                     <span slot="label">
                       10米风速
                     </span>
-                    <el-input v-model="form.ws10" readonly
-                              @click.native="ftck(form.ws10,'form.ws10','(10米风速)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="wd10" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.ws10" readonly
+                                @click.native="ftck(form.ws10,'form.ws10','(10米风速)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="wd10" label-width="110px" class="formulaColor">
                     <span slot="label">
                       10米风向
                     </span>
-                    <el-input v-model="form.wd10" readonly
-                              @click.native="ftck(form.wd10,'form.wd10','(10米风向)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="ws30" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.wd10" readonly
+                                @click.native="ftck(form.wd10,'form.wd10','(10米风向)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="ws30" label-width="110px" class="formulaColor">
                     <span slot="label">
                      30米风速
                     </span>
-                    <el-input v-model="form.ws30" readonly
-                              @click.native="ftck(form.ws30,'form.ws30','(30米风速)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="wd30" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.ws30" readonly
+                                @click.native="ftck(form.ws30,'form.ws30','(30米风速)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="wd30" label-width="110px" class="formulaColor">
                     <span slot="label">
                       30米风向
                     </span>
-                    <el-input v-model="form.wd30" readonly
-                              @click.native="ftck(form.wd30,'form.wd30','(30米风向)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="ws50" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.wd30" readonly
+                                @click.native="ftck(form.wd30,'form.wd30','(30米风向)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="ws50" label-width="110px" class="formulaColor">
                     <span slot="label">
                       50米风速
                     </span>
-                    <el-input v-model="form.ws50" readonly
-                              @click.native="ftck(form.ws50,'form.ws50','(50米风速)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="wd50" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.ws50" readonly
+                                @click.native="ftck(form.ws50,'form.ws50','(50米风速)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="wd50" label-width="110px" class="formulaColor">
                     <span slot="label">
                      50米风向
                     </span>
-                    <el-input v-model="form.wd50" readonly
-                              @click.native="ftck(form.wd50,'form.wd50','(50米风向)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="ws70" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.wd50" readonly
+                                @click.native="ftck(form.wd50,'form.wd50','(50米风向)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="ws70" label-width="110px" class="formulaColor">
                     <span slot="label">
                       70米风速
                     </span>
-                    <el-input v-model="form.ws70" readonly
-                              @click.native="ftck(form.ws70,'form.ws70','(70米风速)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="wd70" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.ws70" readonly
+                                @click.native="ftck(form.ws70,'form.ws70','(70米风速)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="wd70" label-width="110px" class="formulaColor">
                     <span slot="label">
                       70米风向
                     </span>
-                    <el-input v-model="form.wd70" readonly
-                              @click.native="ftck(form.wd70,'form.wd70','(70米风向)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="ws80" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.wd70" readonly
+                                @click.native="ftck(form.wd70,'form.wd70','(70米风向)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="ws80" label-width="110px" class="formulaColor">
                     <span slot="label">
                      80米风速
                     </span>
-                    <el-input v-model="form.ws80" readonly
-                              @click.native="ftck(form.ws80,'form.ws80','(80米风速)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="wd80" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.ws80" readonly
+                                @click.native="ftck(form.ws80,'form.ws80','(80米风速)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="wd80" label-width="110px" class="formulaColor">
                     <span slot="label">
                       80米风向
                     </span>
-                    <el-input v-model="form.wd80" readonly
-                              @click.native="ftck(form.wd80,'form.wd80','(80米风向)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="ws90" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.wd80" readonly
+                                @click.native="ftck(form.wd80,'form.wd80','(80米风向)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="ws90" label-width="110px" class="formulaColor">
                     <span slot="label">
                       90米风速
                     </span>
-                    <el-input v-model="form.ws90" readonly
-                              @click.native="ftck(form.ws90,'form.ws90','(90米风速)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="wd90" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.ws90" readonly
+                                @click.native="ftck(form.ws90,'form.ws90','(90米风速)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="wd90" label-width="110px" class="formulaColor">
                     <span slot="label">
                      90米风向
                     </span>
-                    <el-input v-model="form.wd90" readonly
-                              @click.native="ftck(form.wd90,'form.wd90','(90米风向)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="ws100" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.wd90" readonly
+                                @click.native="ftck(form.wd90,'form.wd90','(90米风向)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="ws100" label-width="110px" class="formulaColor">
                     <span slot="label">
                       100米风速
                     </span>
-                    <el-input v-model="form.ws100" readonly
-                              @click.native="ftck(form.ws100,'form.ws100','(100米风速)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="wd100" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.ws100" readonly
+                                @click.native="ftck(form.ws100,'form.ws100','(100米风速)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="wd100" label-width="110px" class="formulaColor">
                     <span slot="label">
                       100米风向
                     </span>
-                    <el-input v-model="form.wd100" readonly
-                              @click.native="ftck(form.wd100,'form.wd100','(100米风向)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="wsHubHeight" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.wd100" readonly
+                                @click.native="ftck(form.wd100,'form.wd100','(100米风向)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="wsHubHeight" label-width="110px" class="formulaColor">
                     <span slot="label">
                       100米风速
                     </span>
-                    <el-input v-model="form.wsHubHeight" readonly
-                              @click.native="ftck(form.wsHubHeight,'form.wsHubHeight','(轮毂高风速)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="wdHubHeight" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.wsHubHeight" readonly
+                                @click.native="ftck(form.wsHubHeight,'form.wsHubHeight','(轮毂高风速)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="wdHubHeight" label-width="110px" class="formulaColor">
                     <span slot="label">
                       100米风向
                     </span>
-                    <el-input v-model="form.wdHubHeight" readonly
-                              @click.native="ftck(form.wdHubHeight,'form.wdHubHeight','(轮毂高风向)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="t" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.wdHubHeight" readonly
+                                @click.native="ftck(form.wdHubHeight,'form.wdHubHeight','(轮毂高风向)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="t" label-width="110px" class="formulaColor">
                     <span slot="label">
                      温度公式
                     </span>
-                    <el-input v-model="form.t" readonly
-                              @click.native="ftck(form.t,'form.t','(温度)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="rh" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.t" readonly
+                                @click.native="ftck(form.t,'form.t','(温度)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="rh" label-width="110px" class="formulaColor">
                     <span slot="label">
                       湿度公式
                     </span>
-                    <el-input v-model="form.rh" readonly
-                              @click.native="ftck(form.rh,'form.rh','(湿度)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="pressure" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.rh" readonly
+                                @click.native="ftck(form.rh,'form.rh','(湿度)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="pressure" label-width="110px" class="formulaColor">
                     <span slot="label">
                       气压公式
                     </span>
-                    <el-input v-model="form.pressure" readonly
-                              @click.native="ftck(form.pressure,'form.pressure','(气压)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="handleSave('form')">
-                <span v-if="saveFlag == 1">保 存</span>
-                <span v-else>修 改</span>
-              </el-button>
-              <el-button @click="visible = false">取 消</el-button>
+                      <el-input v-model="form.pressure" readonly
+                                @click.native="ftck(form.pressure,'form.pressure','(气压)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </el-form>
+              <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="handleSave('form')">
+                  <span v-if="saveFlag == 1">保 存</span>
+                  <span v-else>修 改</span>
+                </el-button>
+                <el-button @click="visible = false">取 消</el-button>
+              </div>
             </div>
-          </div>
 
-        </el-col>
-        <el-col :span="1">
-          <el-divider direction="vertical" style="height: 200px"></el-divider>
-        </el-col>
-        <el-col :span="5">
-          <h2>公式编辑区{{ this.editinfo }}</h2>
-          <el-form>
-            <el-row>
-              <el-col>
-                <el-form-item prop="rownumber" label-width="110px">
+          </el-col>
+          <el-col :span="1">
+            <el-divider direction="vertical" style="height: 200px"></el-divider>
+          </el-col>
+          <el-col :span="5">
+            <h2>公式编辑区{{ this.editinfo }}</h2>
+            <el-form>
+              <el-row>
+                <el-col>
+                  <el-form-item prop="rownumber" label-width="110px">
                   <span slot="label">
                       <font color="red">*</font>解析行
                   </span>
-                  <el-input v-model="pfform.rownumber"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col>
-                <el-form-item prop="columnumber" label-width="110px">
+                    <el-input v-model="pfform.rownumber"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col>
+                  <el-form-item prop="columnumber" label-width="110px">
                   <span slot="label">
                       <font color="red">*</font>解析列
                   </span>
-                  <el-input v-model="pfform.columnumber"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col>
-                <el-form-item label="标签名" prop="signname" label-width="110px">
-                  <el-input v-model="pfform.signname"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col>
-                <el-form-item label="时间格式" prop="timeformat" label-width="110px">
-                   <el-select popper-class="cpp-popper" v-model="pfform.timeformat" clearable>
-                    <el-option
-                      v-for="item in this.timeFormat"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"/>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-button type="primary" @click="genformula">
-                <span>生成公式</span>
-              </el-button>
-              <el-button type="primary" @click="destoryformula">
-                <span>清除录入</span>
-              </el-button>
-            </el-row>
-          </el-form>
-        </el-col>
-      </el-row>
-    </el-dialog>
+                    <el-input v-model="pfform.columnumber"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col>
+                  <el-form-item label="标签名" prop="signname" label-width="110px">
+                    <el-input v-model="pfform.signname"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col>
+                  <el-form-item label="时间格式" prop="timeformat" label-width="110px">
+                    <el-select popper-class="cpp-popper" v-model="pfform.timeformat" clearable>
+                      <el-option
+                        v-for="item in this.timeFormat"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-button type="primary" @click="genformula">
+                  <span>生成公式</span>
+                </el-button>
+                <el-button type="primary" @click="destoryformula">
+                  <span>清除录入</span>
+                </el-button>
+              </el-row>
+            </el-form>
+          </el-col>
+        </el-row>
+      </el-dialog>
+    </div>
+
   </div>
 </template>
 

cpp-ui/src/views/configManager/parsingConf/qxzparsing.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="app-container">
-    <el-button type="primary" icon="el-icon-plus" plain @click="handleAdd" class="myButton">新增</el-button>
+    <div class="dark-el-button">
+      <el-button type="primary" icon="el-icon-plus" @click="handleAdd" class="myButton">新增</el-button>
+    </div>
+
     <!--上报对象表格-->
     <el-table
       :data="tableData"
@@ -52,224 +55,227 @@
       </el-pagination>
     </div>
     <!--编辑框-->
-    <el-dialog :title="saveFlag==1?'新增':'编辑'" :visible.sync="visible" width="100%">
+    <div class="dark-el-dialog">
+      <el-dialog :title="saveFlag==1?'新增':'编辑'" :visible.sync="visible" width="100%">
 
-      <el-row :gutter="20">
-        <el-col :span="17">
-          <div>
+        <el-row :gutter="20">
+          <el-col :span="17">
+            <div>
                     <span style="color: red">
             <font size="4px">灰色文本框需要点击后，在右侧进行编辑录入！</font>
                     </span>
-          </div>
-          &nbsp;
-          <div class="grid-content bg-purple">
-            <el-form v-model="form" ref="form" :key="timer">
-              <el-row :gutter="16">
-<!--                <el-col :span="8">-->
-<!--                  <el-form-item prop="fileName" label-width="115px">-->
-<!--                    <span slot="label">-->
-<!--                      <font color="red">*</font>文件名关键字-->
-<!--                    </span>-->
-<!--                    <el-input v-model="form.fileName" @focus="clearformula"></el-input>-->
-<!--                  </el-form-item>-->
-<!--                </el-col>-->
-                <el-col :span="8">
-                  <el-form-item prop="dataType" label-width="115px">
+            </div>
+            &nbsp;
+            <div class="grid-content bg-purple">
+              <el-form v-model="form" ref="form" :key="timer">
+                <el-row :gutter="16">
+                  <!--                <el-col :span="8">-->
+                  <!--                  <el-form-item prop="fileName" label-width="115px">-->
+                  <!--                    <span slot="label">-->
+                  <!--                      <font color="red">*</font>文件名关键字-->
+                  <!--                    </span>-->
+                  <!--                    <el-input v-model="form.fileName" @focus="clearformula"></el-input>-->
+                  <!--                  </el-form-item>-->
+                  <!--                </el-col>-->
+                  <el-col :span="8">
+                    <el-form-item prop="dataType" label-width="115px">
                     <span slot="label">
                       <font color="red">*</font>数据类型
                     </span>
-                     <el-select popper-class="cpp-popper" v-model="form.dataType" clearable @focus="clearformula">
-                      <el-option
-                        v-for="item in this.dataType"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"/>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-<!--              <el-row>-->
-<!--                <el-col :span="24">-->
-<!--                  <el-form-item prop="stationCode" label-width="115px">-->
-<!--                    <span slot="label">-->
-<!--                      <font color="red">*</font>场站编号-->
-<!--                    </span>-->
-<!--                     <el-select popper-class="cpp-popper" v-model="form.stationCode" multiple clearable @focus="clearformula" style="width: 100%">-->
-<!--                      <el-option-->
-<!--                        v-for="item in this.stationCodeList"-->
-<!--                        :key="item.stationCode"-->
-<!--                        :label="item.stationCode"-->
-<!--                        :value="item.stationCode"/>-->
-<!--                    </el-select>-->
-<!--                  </el-form-item>-->
-<!--                </el-col>-->
-<!--              </el-row>-->
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="time" label-width="115px" class="formulaColor">
+                      <el-select popper-class="cpp-popper" v-model="form.dataType" clearable @focus="clearformula">
+                        <el-option
+                          v-for="item in this.dataType"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value"/>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <!--              <el-row>-->
+                <!--                <el-col :span="24">-->
+                <!--                  <el-form-item prop="stationCode" label-width="115px">-->
+                <!--                    <span slot="label">-->
+                <!--                      <font color="red">*</font>场站编号-->
+                <!--                    </span>-->
+                <!--                     <el-select popper-class="cpp-popper" v-model="form.stationCode" multiple clearable @focus="clearformula" style="width: 100%">-->
+                <!--                      <el-option-->
+                <!--                        v-for="item in this.stationCodeList"-->
+                <!--                        :key="item.stationCode"-->
+                <!--                        :label="item.stationCode"-->
+                <!--                        :value="item.stationCode"/>-->
+                <!--                    </el-select>-->
+                <!--                  </el-form-item>-->
+                <!--                </el-col>-->
+                <!--              </el-row>-->
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="time" label-width="115px" class="formulaColor">
                     <span slot="label">
                      <font color="red">*</font>预测时间公式
                     </span>
-                    <el-input v-model="form.time" readonly
-                              @click.native="ftck(form.time,'form.time','(预测时间)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="globalR" label-width="115px" class="formulaColor">
+                      <el-input v-model="form.time" readonly
+                                @click.native="ftck(form.time,'form.time','(预测时间)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="globalR" label-width="115px" class="formulaColor">
                     <span slot="label">
                       <font color="red">*</font>总辐射公式
                     </span>
-                    <el-input v-model="form.globalR" readonly
-                              @click.native="ftck(form.globalR,'form.globalR','(总辐射)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="directR" label-width="115px" class="formulaColor">
+                      <el-input v-model="form.globalR" readonly
+                                @click.native="ftck(form.globalR,'form.globalR','(总辐射)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="directR" label-width="115px" class="formulaColor">
                     <span slot="label">
                       <font color="red">*</font>直辐射公式
                     </span>
-                    <el-input v-model="form.directR" readonly
-                              @click.native="ftck(form.directR,'form.directR','(直辐射)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="diffuseR" label-width="115px" class="formulaColor">
+                      <el-input v-model="form.directR" readonly
+                                @click.native="ftck(form.directR,'form.directR','(直辐射)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="diffuseR" label-width="115px" class="formulaColor">
                     <span slot="label">
                      <font color="red">*</font>散辐射公式
                     </span>
-                    <el-input v-model="form.diffuseR" readonly
-                              @click.native="ftck(form.diffuseR,'form.diffuseR','(散辐射)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="airT" label-width="115px" class="formulaColor">
+                      <el-input v-model="form.diffuseR" readonly
+                                @click.native="ftck(form.diffuseR,'form.diffuseR','(散辐射)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="airT" label-width="115px" class="formulaColor">
                     <span slot="label">
                       <font color="red">*</font>环境温度公式
                     </span>
-                    <el-input v-model="form.airT" readonly
-                              @click.native="ftck(form.airT,'form.airT','(环境温度)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="cellT" label-width="115px" class="formulaColor">
+                      <el-input v-model="form.airT" readonly
+                                @click.native="ftck(form.airT,'form.airT','(环境温度)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="cellT" label-width="115px" class="formulaColor">
                     <span slot="label">
                       <font color="red">*</font>电池板温度公式
                     </span>
-                    <el-input v-model="form.cellT" readonly
-                              @click.native="ftck(form.cellT,'form.cellT','(电池板温度)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="ws" label-width="115px" class="formulaColor">
+                      <el-input v-model="form.cellT" readonly
+                                @click.native="ftck(form.cellT,'form.cellT','(电池板温度)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="ws" label-width="115px" class="formulaColor">
                     <span slot="label">
                      <font color="red">*</font>风速公式
                     </span>
-                    <el-input v-model="form.ws" readonly
-                              @click.native="ftck(form.ws,'form.ws','(风速)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="wd" label-width="115px" class="formulaColor">
+                      <el-input v-model="form.ws" readonly
+                                @click.native="ftck(form.ws,'form.ws','(风速)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="wd" label-width="115px" class="formulaColor">
                     <span slot="label">
                       <font color="red">*</font>风向公式
                     </span>
-                    <el-input v-model="form.wd" readonly
-                              @click.native="ftck(form.wd,'form.wd','(风向)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item prop="p" label-width="115px" class="formulaColor">
+                      <el-input v-model="form.wd" readonly
+                                @click.native="ftck(form.wd,'form.wd','(风向)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item prop="p" label-width="115px" class="formulaColor">
                     <span slot="label">
                       <font color="red">*</font>气压公式
                     </span>
-                    <el-input v-model="form.p" readonly
-                              @click.native="ftck(form.p,'form.p','(气压)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="8">
-                  <el-form-item prop="rh" label-width="115px" class="formulaColor">
+                      <el-input v-model="form.p" readonly
+                                @click.native="ftck(form.p,'form.p','(气压)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="8">
+                    <el-form-item prop="rh" label-width="115px" class="formulaColor">
                     <span slot="label">
                       <font color="red">*</font>湿度公式
                     </span>
-                    <el-input v-model="form.rh" readonly
-                              @click.native="ftck(form.rh,'form.rh','(湿度)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="handleSave('form')">
-                <span v-if="saveFlag == 1">保 存</span>
-                <span v-else>修 改</span>
-              </el-button>
-              <el-button @click="visible = false">取 消</el-button>
+                      <el-input v-model="form.rh" readonly
+                                @click.native="ftck(form.rh,'form.rh','(湿度)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </el-form>
+              <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="handleSave('form')">
+                  <span v-if="saveFlag == 1">保 存</span>
+                  <span v-else>修 改</span>
+                </el-button>
+                <el-button @click="visible = false">取 消</el-button>
+              </div>
             </div>
-          </div>
-        </el-col>
-        <el-col :span="1">
-          <el-divider direction="vertical" style="height: 200px"></el-divider>
-        </el-col>
-        <el-col :span="5">
-          <h2>公式编辑区{{ this.editinfo }}</h2>
-          <el-form>
-            <el-row>
-              <el-col>
-                <el-form-item prop="rownumber" label-width="115px">
+          </el-col>
+          <el-col :span="1">
+            <el-divider direction="vertical" style="height: 200px"></el-divider>
+          </el-col>
+          <el-col :span="5">
+            <h2>公式编辑区{{ this.editinfo }}</h2>
+            <el-form>
+              <el-row>
+                <el-col>
+                  <el-form-item prop="rownumber" label-width="115px">
                   <span slot="label">
                       <font color="red">*</font>解析行
                   </span>
-                  <el-input v-model="pfform.rownumber"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col>
-                <el-form-item prop="columnumber" label-width="115px">
+                    <el-input v-model="pfform.rownumber"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col>
+                  <el-form-item prop="columnumber" label-width="115px">
                   <span slot="label">
                       <font color="red">*</font>解析列
                   </span>
-                  <el-input v-model="pfform.columnumber"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col>
-                <el-form-item label="标签名" prop="signname" label-width="115px">
-                  <el-input v-model="pfform.signname"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col>
-                <el-form-item label="时间格式" prop="timeformat" label-width="115px">
-                   <el-select popper-class="cpp-popper" v-model="pfform.timeformat" clearable>
-                    <el-option
-                      v-for="item in this.timeFormat"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"/>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-button type="primary" @click="genformula">
-                <span>生成公式</span>
-              </el-button>
-              <el-button type="primary" @click="destoryformula">
-                <span>清除录入</span>
-              </el-button>
-            </el-row>
-          </el-form>
-        </el-col>
-      </el-row>
-    </el-dialog>
+                    <el-input v-model="pfform.columnumber"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col>
+                  <el-form-item label="标签名" prop="signname" label-width="115px">
+                    <el-input v-model="pfform.signname"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col>
+                  <el-form-item label="时间格式" prop="timeformat" label-width="115px">
+                    <el-select popper-class="cpp-popper" v-model="pfform.timeformat" clearable>
+                      <el-option
+                        v-for="item in this.timeFormat"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-button type="primary" @click="genformula">
+                  <span>生成公式</span>
+                </el-button>
+                <el-button type="primary" @click="destoryformula">
+                  <span>清除录入</span>
+                </el-button>
+              </el-row>
+            </el-form>
+          </el-col>
+        </el-row>
+      </el-dialog>
+    </div>
+
   </div>
 </template>
 

cpp-ui/src/views/configManager/parsingConf/rpparsing.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="app-container">
-    <el-button type="primary" icon="el-icon-plus" plain @click="handleAdd" class="myButton">新增</el-button>
+    <div class="dark-el-dialog">
+      <el-button type="primary" icon="el-icon-plus" @click="handleAdd" class="myButton">新增</el-button>
+    </div>
+
     <!--上报对象表格-->
     <el-table
       :data="tableData"
@@ -36,222 +39,225 @@
       </el-pagination>
     </div>
     <!--编辑框-->
-    <el-dialog :title="saveFlag==1?'新增':'编辑'" :visible.sync="visible" width="100%">
+    <div class="dark-el-dialog">
+      <el-dialog :title="saveFlag==1?'新增':'编辑'" :visible.sync="visible" width="100%">
 
-      <el-row :gutter="20">
-        <el-col :span="16">
-          <div>
+        <el-row :gutter="20">
+          <el-col :span="16">
+            <div>
                     <span style="color: red">
             <font size="4px">灰色文本框需要点击后，在右侧进行编辑录入！</font>
                     </span>
-          </div>
-          &nbsp;
-          <div class="grid-content bg-purple">
-            <el-form v-model="form" ref="form" :key="timer">
-              <el-row :gutter="16">
-<!--                <el-col :span="12">-->
-<!--                  <el-form-item prop="fileName" label-width="110px">-->
-<!--                    <span slot="label">-->
-<!--                      <font color="red">*</font>文件名关键字-->
-<!--                    </span>-->
+            </div>
+            &nbsp;
+            <div class="grid-content bg-purple">
+              <el-form v-model="form" ref="form" :key="timer">
+                <el-row :gutter="16">
+                  <!--                <el-col :span="12">-->
+                  <!--                  <el-form-item prop="fileName" label-width="110px">-->
+                  <!--                    <span slot="label">-->
+                  <!--                      <font color="red">*</font>文件名关键字-->
+                  <!--                    </span>-->
 
-                、
+                  、
 
 
-<!--                    <el-input v-model="form.fileName" @focus="clearformula"></el-input>-->
-<!--                  </el-form-item>-->
-<!--                </el-col>-->
-                <el-col :span="12">
-                  <el-form-item prop="dataType" label-width="110px">
+                  <!--                    <el-input v-model="form.fileName" @focus="clearformula"></el-input>-->
+                  <!--                  </el-form-item>-->
+                  <!--                </el-col>-->
+                  <el-col :span="12">
+                    <el-form-item prop="dataType" label-width="110px">
                     <span slot="label">
                       <font color="red">*</font>数据类型
                     </span>
-                     <el-select popper-class="cpp-popper" v-model="form.dataType" clearable @focus="clearformula">
-                      <el-option
-                        v-for="item in this.dataType"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"/>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-table-column prop="time" align="center" label="时间公式"></el-table-column>
-              <el-table-column prop="realValue" align="center" label="实际功率公式"></el-table-column>
-              <el-table-column prop="ableValue" align="center" label="可用功率公式"></el-table-column>
-              <el-table-column prop="theoryValue" align="center" label="理论功率公式"></el-table-column>
-              <el-table-column prop="openCapacity" align="center" label="开机容量公式"></el-table-column>
-              <el-table-column prop="capacity" align="center" label="装机容量公式"></el-table-column>
-              <el-table-column prop="blockedCapacity" align="center" label="站内受阻容量(故障/检修)公式"></el-table-column>
-              <el-table-column prop="powerRationing" align="center" label="限电标记公式"></el-table-column>
-              <el-row :gutter="16">
-                <el-col :span="12">
-                  <el-form-item prop="time" label-width="110px"
-                                class="formulaColor">
+                      <el-select popper-class="cpp-popper" v-model="form.dataType" clearable @focus="clearformula">
+                        <el-option
+                          v-for="item in this.dataType"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value"/>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-table-column prop="time" align="center" label="时间公式"></el-table-column>
+                <el-table-column prop="realValue" align="center" label="实际功率公式"></el-table-column>
+                <el-table-column prop="ableValue" align="center" label="可用功率公式"></el-table-column>
+                <el-table-column prop="theoryValue" align="center" label="理论功率公式"></el-table-column>
+                <el-table-column prop="openCapacity" align="center" label="开机容量公式"></el-table-column>
+                <el-table-column prop="capacity" align="center" label="装机容量公式"></el-table-column>
+                <el-table-column prop="blockedCapacity" align="center" label="站内受阻容量(故障/检修)公式"></el-table-column>
+                <el-table-column prop="powerRationing" align="center" label="限电标记公式"></el-table-column>
+                <el-row :gutter="16">
+                  <el-col :span="12">
+                    <el-form-item prop="time" label-width="110px"
+                                  class="formulaColor">
                     <span slot="label">
                       <font color="red">*</font>时间公式
                     </span>
-                    <el-input v-model="form.time" readonly
-                              @click.native="ftck(form.time,'form.time','(时间)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item prop="realValue" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.time" readonly
+                                @click.native="ftck(form.time,'form.time','(时间)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item prop="realValue" label-width="110px" class="formulaColor">
                     <span slot="label">
                       <font color="red">*</font>实际功率公式
                     </span>
-                    <el-input v-model="form.realValue" readonly
-                              @click.native="ftck(form.realValue,'form.realValue','(实际功率数据)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="12">
-                  <el-form-item prop="ableValue" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.realValue" readonly
+                                @click.native="ftck(form.realValue,'form.realValue','(实际功率数据)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="12">
+                    <el-form-item prop="ableValue" label-width="110px" class="formulaColor">
                     <span slot="label">
                       <font color="red">*</font>可用功率公式
                     </span>
-                    <el-input v-model="form.ableValue" readonly
-                              @click.native="ftck(form.ableValue,'form.ableValue','(可用功率数据)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item prop="theoryValue" label-width="110px"
-                                class="formulaColor">
+                      <el-input v-model="form.ableValue" readonly
+                                @click.native="ftck(form.ableValue,'form.ableValue','(可用功率数据)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item prop="theoryValue" label-width="110px"
+                                  class="formulaColor">
                     <span slot="label">
                       <font color="red">*</font>理论功率公式
                     </span>
-                    <el-input v-model="form.theoryValue" readonly
-                              @click.native="ftck(form.theoryValue,'form.theoryValue','(理论功率数据)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="12">
-                  <el-form-item prop="openCapacity" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.theoryValue" readonly
+                                @click.native="ftck(form.theoryValue,'form.theoryValue','(理论功率数据)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="12">
+                    <el-form-item prop="openCapacity" label-width="110px" class="formulaColor">
                     <span slot="label">
                       <font color="red">*</font>开机容量公式
                     </span>
-                    <el-input v-model="form.openCapacity" readonly
-                              @click.native="ftck(form.openCapacity,'form.openCapacity','(开机容量数据)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item prop="capacity" label-width="110px"
-                                class="formulaColor">
+                      <el-input v-model="form.openCapacity" readonly
+                                @click.native="ftck(form.openCapacity,'form.openCapacity','(开机容量数据)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item prop="capacity" label-width="110px"
+                                  class="formulaColor">
                     <span slot="label">
                       <font color="red">*</font>装机容量公式
                     </span>
-                    <el-input v-model="form.capacity" readonly
-                              @click.native="ftck(form.capacity,'form.capacity','(装机容量数据)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="16">
-                <el-col :span="12">
-                  <el-form-item prop="blockedCapacity" label-width="110px" class="formulaColor">
+                      <el-input v-model="form.capacity" readonly
+                                @click.native="ftck(form.capacity,'form.capacity','(装机容量数据)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="16">
+                  <el-col :span="12">
+                    <el-form-item prop="blockedCapacity" label-width="110px" class="formulaColor">
                     <span slot="label">
                       <font color="red">*</font>站内受阻容量(故障/检修)公式
                     </span>
-                    <el-input v-model="form.blockedCapacity" readonly
-                              @click.native="ftck(form.blockedCapacity,'form.blockedCapacity','(站内受阻容量(故障/检修)数据)')"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item prop="powerRationing" label-width="110px"
-                                class="formulaColor">
+                      <el-input v-model="form.blockedCapacity" readonly
+                                @click.native="ftck(form.blockedCapacity,'form.blockedCapacity','(站内受阻容量(故障/检修)数据)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item prop="powerRationing" label-width="110px"
+                                  class="formulaColor">
                     <span slot="label">
                       <font color="red">*</font>限电标记公式
                     </span>
-                    <el-input v-model="form.powerRationing" readonly
-                              @click.native="ftck(form.powerRationing,'form.powerRationing','(限电标记)')"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-<!--              <el-row>-->
-<!--                <el-col :span="24">-->
-<!--                  <el-form-item prop="stationCode" label-width="110px">-->
-<!--                    <span slot="label">-->
-<!--                      <font color="red">*</font>场站编号-->
-<!--                    </span>-->
-<!--                     <el-select popper-class="cpp-popper" v-model="form.stationCode" multiple clearable @focus="clearformula" style="width: 100%">-->
-<!--                      <el-option-->
-<!--                        v-for="item in this.stationCodeList"-->
-<!--                        :key="item.stationCode"-->
-<!--                        :label="item.stationCode"-->
-<!--                        :value="item.stationCode"/>-->
-<!--                    </el-select>-->
-<!--                  </el-form-item>-->
-<!--                </el-col>-->
-<!--              </el-row>-->
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="handleSave('form')">
-                <span v-if="saveFlag == 1">保 存</span>
-                <span v-else>修 改</span>
-              </el-button>
-              <el-button @click="visible = false">取 消</el-button>
+                      <el-input v-model="form.powerRationing" readonly
+                                @click.native="ftck(form.powerRationing,'form.powerRationing','(限电标记)')"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <!--              <el-row>-->
+                <!--                <el-col :span="24">-->
+                <!--                  <el-form-item prop="stationCode" label-width="110px">-->
+                <!--                    <span slot="label">-->
+                <!--                      <font color="red">*</font>场站编号-->
+                <!--                    </span>-->
+                <!--                     <el-select popper-class="cpp-popper" v-model="form.stationCode" multiple clearable @focus="clearformula" style="width: 100%">-->
+                <!--                      <el-option-->
+                <!--                        v-for="item in this.stationCodeList"-->
+                <!--                        :key="item.stationCode"-->
+                <!--                        :label="item.stationCode"-->
+                <!--                        :value="item.stationCode"/>-->
+                <!--                    </el-select>-->
+                <!--                  </el-form-item>-->
+                <!--                </el-col>-->
+                <!--              </el-row>-->
+              </el-form>
+              <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="handleSave('form')">
+                  <span v-if="saveFlag == 1">保 存</span>
+                  <span v-else>修 改</span>
+                </el-button>
+                <el-button @click="visible = false">取 消</el-button>
+              </div>
             </div>
-          </div>
-        </el-col>
-        <el-col :span="1">
-          <el-divider direction="vertical"></el-divider>
-        </el-col>
-        <el-col :span="6">
-          <h2>公式编辑区{{ this.editinfo }}</h2>
-          <el-form>
-            <el-row>
-              <el-col>
-                <el-form-item prop="rownumber" label-width="110px">
+          </el-col>
+          <el-col :span="1">
+            <el-divider direction="vertical"></el-divider>
+          </el-col>
+          <el-col :span="6">
+            <h2>公式编辑区{{ this.editinfo }}</h2>
+            <el-form>
+              <el-row>
+                <el-col>
+                  <el-form-item prop="rownumber" label-width="110px">
                   <span slot="label">
                       <font color="red">*</font>解析行
                   </span>
-                  <el-input v-model="pfform.rownumber"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col>
-                <el-form-item prop="columnumber" label-width="110px">
+                    <el-input v-model="pfform.rownumber"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col>
+                  <el-form-item prop="columnumber" label-width="110px">
                   <span slot="label">
                       <font color="red">*</font>解析列
                   </span>
-                  <el-input v-model="pfform.columnumber"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col>
-                <el-form-item label="标签名" prop="signname" label-width="110px">
-                  <el-input v-model="pfform.signname"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col>
-                <el-form-item label="时间格式" prop="timeformat" label-width="110px">
-                   <el-select popper-class="cpp-popper" v-model="pfform.timeformat" clearable>
-                    <el-option
-                      v-for="item in this.timeFormat"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"/>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-button type="primary" @click="genformula">
-                <span>生成公式</span>
-              </el-button>
-              <el-button type="primary" @click="destoryformula">
-                <span>清除录入</span>
-              </el-button>
-            </el-row>
-          </el-form>
-        </el-col>
-      </el-row>
-    </el-dialog>
+                    <el-input v-model="pfform.columnumber"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col>
+                  <el-form-item label="标签名" prop="signname" label-width="110px">
+                    <el-input v-model="pfform.signname"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col>
+                  <el-form-item label="时间格式" prop="timeformat" label-width="110px">
+                    <el-select popper-class="cpp-popper" v-model="pfform.timeformat" clearable>
+                      <el-option
+                        v-for="item in this.timeFormat"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-button type="primary" @click="genformula">
+                  <span>生成公式</span>
+                </el-button>
+                <el-button type="primary" @click="destoryformula">
+                  <span>清除录入</span>
+                </el-button>
+              </el-row>
+            </el-form>
+          </el-col>
+        </el-row>
+      </el-dialog>
+    </div>
+
   </div>
 </template>
 

cpp-ui/src/views/configManager/parsingType/index.vue

@@ -52,8 +52,7 @@
         :close-on-click-modal="false"
         width="30%"
         :before-close="handleClose">
-        <div class="dark-el-input dark-el-button">
-
+        <div class="dark-el-dialog">
           <el-form ref="elform" :model="form" :rules="rules" label-width="120px">
             <el-form-item prop="fileType" label="解析文件类型">
                <el-select popper-class="cpp-popper" v-model="form.fileType" clearable>

cpp-ui/src/views/configManager/sftpChannel/index.vue

@@ -56,7 +56,7 @@
         :close-on-click-modal="false"
         width="30%"
         :before-close="handleClose">
-        <div class="dark-el-input dark-el-button">
+        <div class="dark-el-dialog">
           <el-form ref="elform" :model="form" :rules="rules" label-width="80px">
             <el-form-item prop="name" label="通道名称">
               <el-input v-model="form.name"></el-input>

cpp-ui/样式开发规则.md

@@ -2,13 +2,16 @@
 
 ```bash
 单页面最外部class为：app-container
-搜索栏的最外层class为：dark-el-input dark-el-button
+搜索栏的最外层class为：dark-el-input（控制输入框样式） dark-el-button（控制按钮样式 不可与 plain 属性用 ）
+element-ui 弹出框的 class dark-el-dialog （参考场站管理页面）
+注意：如何弹出框设置属性 :append-to-body="true" 请将 dark-el-dialog 设置在弹框内容内(可参考configManager/parsingType 解析文件类型配置)
+
+
 element-ui 下拉框 日期选择器等有下拉的组件 添加 popper-class="cpp-popper"
     eg:<el-select  popper-class="cpp-popper">.....</el-select>
 element-ui 搜索栏按钮大小为 small
 element-ui 新增 修改 删除 按钮大小为 mini
 
-
 echarts 初始化应用 dark 主题
 echarts.init(document.getElementById(id),'dark')
 ```