xusl 6 ماه پیش
والد
کامیت
8c712e1ab4
2فایلهای تغییر یافته به همراه109 افزوده شده و 106 حذف شده
  1. 108 105
      cpp-ui/src/views/configManager/inverterinfo/index.vue
  2. 1 1
      cpp-ui/src/views/stationDataQuery/historyforecastdata/index.vue

+ 108 - 105
cpp-ui/src/views/configManager/inverterinfo/index.vue

@@ -1,60 +1,61 @@
 <template>
   <div class="app-container">
-    <el-form ref="queryForm" size="small" :inline="true">
-      <el-form-item label="场站名称">
-        <el-select v-model="stationCode" placeholder="请选择">
-          <el-option
+    <div class="dark-el-input dark-el-button">
+      <el-form ref="queryForm" size="small" :inline="true">
+        <el-form-item label="场站名称">
+          <el-select v-model="stationCode" placeholder="请选择" popper-class="cpp-popper">
+            <el-option
               v-for="item in stationList"
               :key="item.value"
               :label="item.label"
               :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" size="mini" style="margin-left: 5px" icon="el-icon-search" @click="beforeQuery">查询
-        </el-button>
-      </el-form-item>
-    </el-form>
-
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" style="margin-left: 5px" icon="el-icon-search" @click="beforeQuery">查询
+          </el-button>
+        </el-form-item>
+      </el-form>
+    </div>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-            type="primary"
-            plain
-            icon="el-icon-plus"
-            size="mini"
-            @click="handleAdd"
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
         >新增
         </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-            type="success"
-            plain
-            icon="el-icon-edit"
-            size="mini"
-            @click="handleUpdate"
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          @click="handleUpdate"
         >修改
         </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-            type="danger"
-            plain
-            icon="el-icon-delete"
-            size="mini"
-            @click="handleDelete"
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          @click="handleDelete"
         >删除
         </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            @click="exportTemplateEvent"
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="exportTemplateEvent"
         >逆变器模板下载
         </el-button>
       </el-col>
@@ -76,18 +77,17 @@
 
     <div style="padding-top: 10px">
       <vxe-table
-          ref="xTable"
-          align="center"
-          class="mytable-style"
-          auto-resize
-          border
-          resizable
-          export-config
-          highlight-current-row
-          show-overflow
-          height="528"
-          :data="tableData"
-          :radio-config="{trigger: 'row'}">
+        ref="xTable"
+        align="center"
+        class="mytable-style"
+        auto-resize
+        border
+        resizable
+        export-config
+        highlight-current-row
+        show-overflow
+        :data="tableData"
+        :radio-config="{trigger: 'row'}">
         <vxe-column type="radio" width="60"/>
         <vxe-table-column field="stationCode" title="所属场站" :formatter="stationCodeFormat"></vxe-table-column>
         <vxe-table-column field="name" title="设备名称"></vxe-table-column>
@@ -96,75 +96,79 @@
         <vxe-table-column field="sample" title="是否样板机" :formatter="yesNoFormat"></vxe-table-column>
       </vxe-table>
       <vxe-pager
-          background
-          :loading="loading"
-          :current-page="currentPage"
-          :page-size="pageSize"
-          :total="total"
-          @page-change="handlePageChange"
-          :layouts="['PrevJump', 'PrevPage', 'JumpNumber', 'NextPage', 'NextJump', 'Sizes', 'FullJump', 'Total']">
+        background
+        :loading="loading"
+        :current-page="currentPage"
+        :page-size="pageSize"
+        :total="total"
+        @page-change="handlePageChange"
+        :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="750px" height="600px">
-      <el-form ref="form" :model="form" :rules="rules" width="730px" label-width="130px">
-        <el-row class="mb4">
-          <el-col :span="12">
-            <el-form-item label="所属场站" prop="stationCode">
-              <el-select
+      <div class="dark-el-input dark-el-button">
+        <el-form ref="form" :model="form" :rules="rules" width="730px" label-width="130px">
+          <el-row class="mb4">
+            <el-col :span="12">
+              <el-form-item label="所属场站" prop="stationCode">
+                <el-select
                   v-model="form.stationCode"
                   placeholder="请选择"
                   style="width: 100%"
-              >
-                <el-option
+                  popper-class="cpp-popper"
+                >
+                  <el-option
                     v-for="item in this.stationList"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="设备名称" prop="name">
-              <el-input style="width: 100%" v-model="form.name" maxlength="50"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row class="mb4">
-          <el-col :span="12">
-            <el-form-item label="制造商" prop="manufacturer">
-              <el-input  style="width: 100%" v-model="form.manufacturer" maxlength="50"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="型号" prop="modelNumber">
-              <el-input style="width: 100%" v-model="form.modelNumber" maxlength="50"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row class="mb4">
-          <el-col :span="12">
-            <el-form-item label="是否样板机" prop="sample">
-              <el-select
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="设备名称" prop="name">
+                <el-input style="width: 100%" v-model="form.name" maxlength="50" popper-class="cpp-popper"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="mb4">
+            <el-col :span="12">
+              <el-form-item label="制造商" prop="manufacturer">
+                <el-input style="width: 100%" v-model="form.manufacturer" maxlength="50" popper-class="cpp-popper"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="型号" prop="modelNumber">
+                <el-input style="width: 100%" v-model="form.modelNumber" maxlength="50" popper-class="cpp-popper"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="mb4">
+            <el-col :span="12">
+              <el-form-item label="是否样板机" prop="sample">
+                <el-select
                   v-model="form.sample"
                   placeholder="请选择"
                   style="width: 100%"
-              >
-                <el-option
+                  popper-class="cpp-popper"
+                >
+                  <el-option
                     v-for="item in this.yesNoOptions"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="commitChannel">确 定</el-button>
-        <el-button @click="cancelChannel">取 消</el-button>
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="commitChannel">确 定</el-button>
+          <el-button @click="cancelChannel">取 消</el-button>
+        </div>
       </div>
     </el-dialog>
   </div>
@@ -231,7 +235,7 @@ export default {
   },
   computed: {},
   methods: {
-    beforeQuery(){
+    beforeQuery() {
       this.currentPage = 1
       this.pageSize = 10
       this.dataQuery()
@@ -256,11 +260,11 @@ export default {
         this.$message.error("导入失败" + error)
       })
     },
-    onError(err, file, fileList){
+    onError(err, file, fileList) {
       console.log(JSON.parse(err.message).msg)
       alert('失败')
     },
-    beforeUpload(file, fileList){
+    beforeUpload(file, fileList) {
       if (fileList.length > 1) {
         // 移除旧文件
         this.fileList = [file];
@@ -268,16 +272,15 @@ export default {
         this.fileList = fileList;
       }
       let index = file.name.lastIndexOf(".");
-      let suffixName = file.name.substr(index+1);
-      if (suffixName=='xls' || suffixName=='xlsx'){
+      let suffixName = file.name.substr(index + 1);
+      if (suffixName == 'xls' || suffixName == 'xlsx') {
         return true
-      }
-      else{
+      } else {
         this.$message({
           type: 'warning',
           message: '请导入excel模板文件!'
         })
-        this.fileList=[]
+        this.fileList = []
         return false
       }
     },
@@ -301,7 +304,7 @@ export default {
         modelNumber: undefined,
         sample: undefined,
       },
-      this.resetForm("form");
+        this.resetForm("form");
     },
     // 取消按钮
     cancelChannel() {

+ 1 - 1
cpp-ui/src/views/stationDataQuery/historyforecastdata/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="dark-el-input dark-el-button">
-      <el-form ref="queryForm" size="small" :inline="true" popper-class="cpp-popper">
+      <el-form ref="queryForm" size="small" :inline="true">
         <el-form-item label="时间">
           <el-date-picker
             :clearable="false"