liujiejie 1 anno fa
parent
commit
fe6e856b9c

+ 9 - 5
src/styles/global.scss

@@ -1,10 +1,10 @@
 .el-button--primary,
-.el-button--primary:focus,
-.el-button--primary:hover {
-  background-color: var(--primary-color);
-  border-color: var(--primary-color);
+.el-button--primary:focus {
+  background-color: var(--primary-color) !important;
+  border-color: var(--primary-color) !important;
   color: var(--text-color) !important;
 }
+
 .el-dialog__header {
   background-color: var(--primary-color);
   color: var(--text-color) !important;
@@ -12,9 +12,10 @@
 .el-dialog__header .el-dialog__title {
   color: var(--text-color) !important;
 }
-.el-button--primary:focus,
+
 .el-button--primary:hover {
   opacity: 0.7;
+  // color: var(--primary-color) !important;
 }
 .el-button--text {
   color: var(--primary-color);
@@ -61,6 +62,9 @@
   border-color: var(--primary-color);
   // color: var(--text-color);
 }
+.is-checked > .el-checkbox__label {
+  color: var(--primary-color) !important;
+}
 .el-tabs__active-bar {
   background-color: var(--primary-color);
 }

+ 340 - 40
src/views/performance/components/analysisEvent.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-05-29 09:13:51
- * @LastEditTime: 2024-05-31 10:04:52
+ * @LastEditTime: 2024-05-31 13:57:21
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/components/analysisEvent.vue
@@ -9,9 +9,9 @@
 <template>
   <div>
     <el-card shadow="always" class="box-card">
-      <el-form ref="form" :model="form" label-width="80px">
-        <el-row>
-          <el-col :span="5">
+      <el-form ref="form" :model="form">
+        <el-row class="flex-wrap-row" :gutter="5">
+          <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="5">
             <el-form-item label="分析类型">
               <el-select
                 v-model="form.region"
@@ -22,19 +22,19 @@
                 <el-option label="类型二" value="beijing"></el-option>
               </el-select> </el-form-item
           ></el-col>
-          <el-col :span="9">
-            <el-form-item label="分析时间">
-              <el-date-picker
+          <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="5">
+            <el-form-item label="机组编号">
+              <el-select
+                multiple
+                v-model="form.region"
+                placeholder="请选择机组编号"
                 size="small"
-                v-model="value1"
-                type="daterange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
               >
-              </el-date-picker> </el-form-item
+                <el-option label="类型一" value="shanghai"></el-option>
+                <el-option label="类型二" value="beijing"></el-option>
+              </el-select> </el-form-item
           ></el-col>
-          <el-col :span="5">
+          <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="5">
             <el-form-item label="滤除月份">
               <el-date-picker
                 width="200"
@@ -46,6 +46,244 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="9">
+            <el-form-item label="分析时间">
+              <el-date-picker
+                size="small"
+                v-model="value1"
+                type="daterange"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker> </el-form-item
+          ></el-col>
+        </el-row>
+        <!-- <el-row>
+          <el-col style="color: #666; line-height: 40px">
+            SACAD数据测点过滤设置 :</el-col
+          >
+        </el-row> -->
+        <el-row :gutter="5">
+          <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6">
+            <el-form-item label="风速过滤">
+              <div class="demo-input-suffix">
+                <el-input
+                  type="number"
+                  size="small"
+                  placeholder="最小值"
+                  v-model="input1"
+                >
+                </el-input>
+                <el-input
+                  type="number"
+                  size="small"
+                  placeholder="最大值"
+                  v-model="input2"
+                >
+                </el-input>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6">
+            <el-form-item label="桨距角过滤">
+              <div class="demo-input-suffix">
+                <el-input
+                  type="number"
+                  size="small"
+                  placeholder="最小值"
+                  v-model="input1"
+                >
+                </el-input>
+                <el-input
+                  type="number"
+                  size="small"
+                  placeholder="最大值"
+                  v-model="input2"
+                >
+                </el-input>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6">
+            <el-form-item label="有功功率过滤">
+              <div class="demo-input-suffix">
+                <el-input
+                  type="number"
+                  size="small"
+                  placeholder="最小值"
+                  v-model="input1"
+                >
+                </el-input>
+                <el-input
+                  type="number"
+                  size="small"
+                  placeholder="最大值"
+                  v-model="input2"
+                >
+                </el-input>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6">
+            <el-form-item label="发电机转速过滤">
+              <div class="demo-input-suffix">
+                <el-input
+                  type="number"
+                  size="small"
+                  placeholder="最小值"
+                  v-model="input1"
+                >
+                </el-input>
+                <el-input
+                  type="number"
+                  size="small"
+                  placeholder="最大值"
+                  v-model="input2"
+                >
+                </el-input>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="5">
+          <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6">
+            <el-form-item label="发电机转矩">
+              <div class="demo-input-suffix">
+                <el-input
+                  type="number"
+                  size="small"
+                  placeholder="步长"
+                  v-model="input1"
+                >
+                </el-input>
+                <el-input
+                  type="number"
+                  size="small"
+                  placeholder="最小值"
+                  v-model="input2"
+                >
+                </el-input>
+                <el-input
+                  type="number"
+                  size="small"
+                  placeholder="最大值"
+                  v-model="input2"
+                >
+                </el-input>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6">
+            <el-form-item label="风能利用系数">
+              <div class="demo-input-suffix">
+                <el-input
+                  type="number"
+                  size="small"
+                  placeholder="步长"
+                  v-model="input1"
+                >
+                </el-input>
+                <el-input
+                  type="number"
+                  size="small"
+                  placeholder="最小值"
+                  v-model="input2"
+                >
+                </el-input>
+                <el-input
+                  type="number"
+                  size="small"
+                  placeholder="最大值"
+                  v-model="input2"
+                >
+                </el-input>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6">
+            <el-form-item label="叶尖转速比">
+              <div class="demo-input-suffix">
+                <el-input
+                  type="number"
+                  size="small"
+                  placeholder="步长"
+                  v-model="input1"
+                >
+                </el-input>
+                <el-input
+                  type="number"
+                  size="small"
+                  placeholder="最小值"
+                  v-model="input2"
+                >
+                </el-input>
+                <el-input
+                  type="number"
+                  size="small"
+                  placeholder="最大值"
+                  v-model="input2"
+                >
+                </el-input>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6">
+            <el-form-item label="有功功率">
+              <div class="demo-input-suffix">
+                <el-input
+                  type="number"
+                  size="small"
+                  placeholder="步长"
+                  v-model="input1"
+                >
+                </el-input>
+                <el-input
+                  type="number"
+                  size="small"
+                  placeholder="最小值"
+                  v-model="input2"
+                >
+                </el-input>
+                <el-input
+                  type="number"
+                  size="small"
+                  placeholder="最大值"
+                  v-model="input2"
+                >
+                </el-input>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6">
+            <el-form-item label="桨距角">
+              <div class="demo-input-suffix">
+                <el-input
+                  type="number"
+                  size="small"
+                  placeholder="步长"
+                  v-model="input1"
+                >
+                </el-input>
+                <el-input
+                  type="number"
+                  size="small"
+                  placeholder="最小值"
+                  v-model="input2"
+                >
+                </el-input>
+                <el-input
+                  type="number"
+                  size="small"
+                  placeholder="最大值"
+                  v-model="input2"
+                >
+                </el-input>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex" justify="end">
           <el-col :span="5">
             <el-form-item class="searchFrom">
               <el-button type="primary" @click="onSubmit" size="small"
@@ -96,32 +334,62 @@
       </el-row>
     </el-card>
     <el-drawer
-      title="我是标题"
+      title="偏好设置"
       :visible.sync="drawer"
       :direction="direction"
       :before-close="handleClose"
+      class="drawerOption"
     >
-      <div class="drawerLeft">
-        <div>常用功能设置</div>
-        <el-checkbox
-          :indeterminate="isIndeterminate"
-          v-model="checkAll"
-          @change="handleCheckAllChange"
-          >全选</el-checkbox
+      <el-row>
+        <el-col :span="12"
+          ><div class="drawerLeft">
+            <div style="text-align: center; font-size: 16px">常用功能设置</div>
+            <el-checkbox
+              :indeterminate="isIndeterminate"
+              v-model="checkAll"
+              @change="handleCheckAllChange"
+              >全选</el-checkbox
+            >
+            <div style="margin: 15px 0"></div>
+            <el-checkbox-group
+              v-model="checkedCities"
+              @change="handleCheckedCitiesChange"
+            >
+              <el-checkbox v-for="city in cities" :label="city" :key="city">{{
+                city
+              }}</el-checkbox>
+              <el-checkbox
+                label="SCADA数据过滤"
+                key="SCADA数据过滤"
+              ></el-checkbox>
+              <div class="checkFromRow">
+                <el-row>
+                  <el-col :span="12">发电机转速测点</el-col>
+                  <el-col :span="12">桨距角值测点</el-col>
+                  <el-col :span="12">有功功率测点</el-col>
+                  <el-col :span="12">风速速度测点</el-col>
+                </el-row>
+              </div>
+
+              <el-checkbox label="图像设置" key="图像设置"></el-checkbox>
+              <div class="checkFromRow">
+                <el-row>
+                  <el-col :span="12">发电机转矩轴系</el-col>
+                  <el-col :span="12">桨距角轴系</el-col>
+                  <el-col :span="12">叶尖速比轴系</el-col>
+                  <el-col :span="12">有功功率轴系</el-col>
+                  <el-col :span="12">发电机转矩轴系</el-col>
+                </el-row>
+              </div>
+            </el-checkbox-group>
+          </div></el-col
         >
-        <div style="margin: 15px 0"></div>
-        <el-checkbox-group
-          v-model="checkedCities"
-          @change="handleCheckedCitiesChange"
+        <el-col :span="12">
+          <div class="drawerRight">
+            <div style="text-align: center; font-size: 16px">已选中功能</div>
+          </div></el-col
         >
-          <el-checkbox v-for="city in cities" :label="city" :key="city">{{
-            city
-          }}</el-checkbox>
-        </el-checkbox-group>
-      </div>
-      <div class="drawerRight">
-        <div>已选中功能</div>
-      </div>
+      </el-row>
     </el-drawer>
   </div>
 </template>
@@ -135,7 +403,7 @@ export default {
     return {
       checkAll: false,
       checkedCities: [],
-      cities: ["上海", "北京", "广州", "深圳"],
+      cities: ["分析类型", "分析时间", "过滤月份", "机组编号"],
       isIndeterminate: true,
       drawer: false,
       direction: "rtl",
@@ -170,14 +438,16 @@ export default {
   },
   methods: {
     handleCheckAllChange(val) {
-      this.checkedCities = val ? cityOptions : [];
+      this.checkedCities = val
+        ? [...this.cities, "SCADA数据过滤", "图像设置"]
+        : [];
       this.isIndeterminate = false;
     },
     handleCheckedCitiesChange(value) {
       let checkedCount = value.length;
-      this.checkAll = checkedCount === this.cities.length;
+      this.checkAll = checkedCount === this.cities.length + 2;
       this.isIndeterminate =
-        checkedCount > 0 && checkedCount < this.cities.length;
+        checkedCount > 0 && checkedCount < this.cities.length + 2;
     },
     handleClose(done) {
       this.$confirm("确认关闭?")
@@ -247,7 +517,7 @@ export default {
   ::v-deep .searchFrom {
     .el-form-item__content {
       display: flex !important;
-      justify-content: space-between !important;
+      justify-content: end !important;
       align-items: center !important;
       i {
         margin-left: 10px;
@@ -256,8 +526,38 @@ export default {
     }
   }
 }
+.drawerOption {
+  .el-checkbox-group {
+    line-height: 40px !important;
+  }
+  .drawerLeft {
+    margin-left: 20px;
+  }
+  .checkFromRow {
+    .el-col-12 {
+      color: #606266 !important;
+      font-size: 14px;
+    }
+    .el-col-12:nth-child(even) {
+      text-align: end !important;
+    }
+  }
+}
+// ::v-deep.el-drawer__body {
+//   margin: 0 20px !important;
+// }
+
 ::v-deep.el-input--small .el-input__inner {
-  width: 180px !important;
+  width: 200px !important;
+}
+.demo-input-suffix {
+  display: flex !important;
+}
+::v-deep.demo-input-suffix .el-input--small {
+  width: 100px !important;
+}
+::v-deep.demo-input-suffix .el-input--small .el-input__inner {
+  width: 90px !important;
 }
 .abalysisType {
   margin-top: 30px;

+ 2 - 2
src/views/performance/editAssets.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-05-27 09:26:31
- * @LastEditTime: 2024-05-30 11:24:07
+ * @LastEditTime: 2024-05-31 10:07:56
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/editAssets.vue
@@ -28,7 +28,7 @@ export default {
   },
   data() {
     return {
-      activeName: "second",
+      activeName: "first",
     };
   },
   methods: {