Merge branch 'master' of http://192.168.50.233:3000/rui.jiang/performance-test

src/components/selecttree.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="selectTree">
     <el-select
-    size="small"
+
       ref="elSelect"
       v-model="newVal"
       :placeholder="placeholder"

src/styles/base.css

@@ -298,3 +298,7 @@ body {
 .el-form-item {
   margin-bottom: 10px;
 }
+
+.search-input{
+  width: 150px;
+}

src/views/ledger/anemometer.vue

@@ -7,6 +7,7 @@
             v-model="formInline.anemometerName"
             placeholder="请输入测风塔名称"
             size="small"
+            class="search-input"
           ></el-input>
         </el-form-item>
         <el-form-item label="选择日期:" size="small">
@@ -27,13 +28,16 @@
           <el-button @click="reset" size="small">重置</el-button>
         </el-form-item>
       </el-form>
-    </div>
-    <div class="list-page">
-      <div class="newly">
-        <el-button type="primary" @click="newnuedialog" size="small"
+      <div>
+        <el-button  @click="newnuedialog" size="small"
           >新增</el-button
         >
       </div>
+    </div>
+    <div class="list-page">
+      <!-- <div class="newly">
+      
+      </div> -->
 
       <el-table
         class="center-align-table"
@@ -66,21 +70,18 @@
         >
         </el-table-column>
 
-        <el-table-column
-          prop="longitude"
-          align="center"
-          label="经度"
-          min-width="150"
-        >
-        </el-table-column>
+        <el-table-column prop="longitude" align="center" label="经度" min-width="150">
+  <template v-slot="{ row }">
+    {{ row.longitude ? `${row.longitude}°` : '-' }}
+  </template>
+</el-table-column>
+
+<el-table-column prop="latitude" align="center" label="纬度" min-width="150">
+  <template v-slot="{ row }">
+    {{ row.latitude ? `${row.latitude}°` : '-' }}
+  </template>
+</el-table-column>
 
-        <el-table-column
-          prop="latitude"
-          align="center"
-          label="纬度"
-          min-width="150"
-        >
-        </el-table-column>
         <el-table-column
           prop="state"
           align="center"
@@ -459,61 +460,67 @@ export default {
 
     // 修改的
     submitForm(formName) {
-  this.$refs[formName].validate((valid) => {
-    if (!valid) {
-      this.$message.error("请填写必填项");
-      return;
-    }
-
-    // 处理经纬度格式转换
-    let latitude = this.dynamicValidateForm.latitude;
-    let longitude = this.dynamicValidateForm.longitude;
+      this.$refs[formName].validate((valid) => {
+        if (!valid) {
+          this.$message.error("请填写必填项");
+          return;
+        }
 
-    // 如果 SFMvalue 为 2（表示使用度分秒格式），则转换经纬度
-    if (this.SFMvalue === "2") {
-      latitude = this.$convertDMSToDecimal(latitude);
-      longitude = this.$convertDMSToDecimal(longitude);
-    }
+        // 处理经纬度格式转换
+        let latitude = this.dynamicValidateForm.latitude;
+        let longitude = this.dynamicValidateForm.longitude;
 
-    // 构建提交参数
-    let paramsData = {
-      anemometerName: this.dynamicValidateForm.anemometerName,
-      latitude: latitude,  // 使用转换后的纬度
-      longitude: longitude,  // 使用转换后的经度
-    };
+        // 如果 SFMvalue 为 2（表示使用度分秒格式），则转换经纬度
+        if (this.SFMvalue === "2") {
+          latitude = this.$convertDMSToDecimal(latitude);
+          longitude = this.$convertDMSToDecimal(longitude);
+        }
 
-    let API;
-    if (!this.isEdit) {
-      // 新增操作
-      paramsData.anemometerTowerHeightDtoList = this.dynamicValidateForm.anemometerTowerHeightDtoList;
-      API = createAnemometerTower(paramsData);
-    } else {
-      // 编辑操作
-      paramsData.anemometerTowerHeightListDtos = this.dynamicValidateForm.anemometerTowerHeightDtoList;
-      paramsData.anemometerCode = this.detail.anemometerCode;
-      API = updateAnemometerTower(paramsData);
-    }
+        // 构建提交参数
+        let paramsData = {
+          anemometerName: this.dynamicValidateForm.anemometerName,
+          latitude: latitude, // 使用转换后的纬度
+          longitude: longitude, // 使用转换后的经度
+        };
+
+        let API;
+        if (!this.isEdit) {
+          // 新增操作
+          paramsData.anemometerTowerHeightDtoList =
+            this.dynamicValidateForm.anemometerTowerHeightDtoList;
+          API = createAnemometerTower(paramsData);
+        } else {
+          // 编辑操作
+          paramsData.anemometerTowerHeightListDtos =
+            this.dynamicValidateForm.anemometerTowerHeightDtoList;
+          paramsData.anemometerCode = this.detail.anemometerCode;
+          API = updateAnemometerTower(paramsData);
+        }
 
-    API.then((res) => {
-      this.nuedialog = false;
-      if (this.isEdit) {
-        this.isEdit = false;
-        this.$message.success("编辑成功");
-      } else {
-        this.$message.success("新增成功");
-      }
-      this.onSubmit();
-    }).catch((error) => {
-      console.error(error); // 捕获 API 错误
-    });
-  });
-},
-    // xz
-    addDomain() {
-      this.dynamicValidateForm.anemometerTowerHeightDtoList.push({
-        anemometerHeight: "",
+        API.then((res) => {
+          this.nuedialog = false;
+          if (this.isEdit) {
+            this.isEdit = false;
+            this.$message.success("编辑成功");
+          } else {
+            this.$message.success("新增成功");
+          }
+          this.onSubmit();
+        }).catch((error) => {
+          console.error(error); // 捕获 API 错误
+        });
       });
     },
+    // xz
+    addDomain() {
+    if (this.dynamicValidateForm.anemometerTowerHeightDtoList.length >= 9) {
+      this.$message.warning("测风塔最多添加9个高度");
+      return;
+    }
+    this.dynamicValidateForm.anemometerTowerHeightDtoList.push({
+      anemometerHeight: "",
+    });
+  },
     // 删除
     removeTower(index) {
       this.dynamicValidateForm.anemometerTowerHeightDtoList.splice(index, 1);
@@ -577,7 +584,7 @@ export default {
   flex-wrap: wrap;
 
   .condition {
-    width: 50%;
+    // width: 50%;
     display: flex;
 
     p {
@@ -613,7 +620,12 @@ export default {
   }
 }
 
-.el-select{
+.el-select {
   width: 300px;
 }
+
+.condition{
+  display: flex;
+  justify-content: space-between;
+}
 </style>

src/views/ledger/draught.vue

@@ -7,6 +7,7 @@
             v-model="formInline.engineName"
             placeholder="请输入风机名称"
             size="small"
+            class="search-input"
           ></el-input>
         </el-form-item>
         <el-form-item label="选择日期:" size="small">
@@ -29,15 +30,11 @@
       </el-form>
       <div class="newly">
         <el-button @click="upfile" size="small">导入</el-button>
-        <el-button type="primary" @click="newnuedialog" size="small"
-          >新增</el-button
-        >
+        <el-button @click="newnuedialog" size="small">新增</el-button>
       </div>
     </div>
 
     <div class="list-page">
-   
-
       <el-table
         class="center-align-table"
         :data="tableData"
@@ -70,13 +67,20 @@
           label="经度"
           min-width="100"
         >
+          <template v-slot="{ row }">
+            {{ row.longitude ? `${row.longitude}°` : "-" }}
+          </template>
         </el-table-column>
+
         <el-table-column
           prop="latitude"
           align="center"
           label="纬度"
           min-width="100"
         >
+          <template v-slot="{ row }">
+            {{ row.latitude ? `${row.latitude}°` : "-" }}
+          </template>
         </el-table-column>
 
         <el-table-column
@@ -240,7 +244,7 @@
               v-model="ruleForm.fieldCode"
               filterable
               placeholder="请选择"
-              size="small"
+        
             >
               <el-option
                 v-for="item in fieldCodeOptions"
@@ -257,7 +261,8 @@
             <el-select
               v-model="ruleForm.millTypeCode"
               placeholder="请选择"
-              size="small"
+ 
+              @focus="logClick"
             >
               <el-option
                 v-for="item in millTypeCodeOptions"
@@ -269,19 +274,19 @@
             </el-select>
           </el-form-item>
           <el-form-item label="额定容量:" prop="ratedCapacity">
-            <el-input v-model="ruleForm.ratedCapacity" size="small"></el-input>
+            <el-input v-model="ruleForm.ratedCapacity" ></el-input>
           </el-form-item>
         </div>
         <div class="form-row">
           <el-form-item label="海拔高度:" prop="elevationHeight">
             <el-input
               v-model="ruleForm.elevationHeight"
-              size="small"
+             
             ></el-input>
           </el-form-item>
 
           <el-form-item label="轮毂高度:" prop="hubHeight">
-            <el-input v-model="ruleForm.hubHeight" size="small"></el-input>
+            <el-input v-model="ruleForm.hubHeight"></el-input>
           </el-form-item>
         </div>
 
@@ -290,7 +295,7 @@
             <el-select
               v-model="ruleForm.sightcing"
               placeholder="请选择"
-              size="small"
+         
             >
               <el-option
                 v-for="item in sightcingOptions"
@@ -321,19 +326,19 @@
 
         <div class="form-row">
           <el-form-item label="纬度:" prop="latitude">
-            <el-input v-model="ruleForm.latitude" size="small"></el-input>
+            <el-input v-model="ruleForm.latitude"></el-input>
           </el-form-item>
 
           <el-form-item label="经度:" prop="longitude">
-            <el-input v-model="ruleForm.longitude" size="small"></el-input>
+            <el-input v-model="ruleForm.longitude" ></el-input>
           </el-form-item>
         </div>
       </el-form>
       <div class="form-buttons">
-        <el-button type="primary" size="small"  @click="submitForm('ruleForm')"
+        <el-button size="small" @click="resetForm('ruleForm')">取消</el-button>
+        <el-button type="primary" size="small" @click="submitForm('ruleForm')"
           >确定</el-button
         >
-        <el-button size="small"  @click="resetForm('ruleForm')">取消</el-button>
         <el-button type="primary" size="small" @click="createMachine"
           >创建机型</el-button
         >
@@ -525,6 +530,9 @@ export default {
     this.getAllTemplate();
   },
   methods: {
+    logClick() {
+      this.relevancy();
+    },
     rowStyle() {
       return "text-align:center";
     },
@@ -642,7 +650,6 @@ export default {
       });
     },
 
-
     handleSFMChange(newValue) {
       this.ruleForm.longitude = "";
       this.ruleForm.latitude = "";
@@ -669,7 +676,6 @@ export default {
           sightcing: this.ruleForm.sightcing,
           engineCode: this.thisrow,
         };
-     
 
         if (valid) {
           const API = this.isEdit
@@ -853,10 +859,11 @@ export default {
       this.tolead = false;
     },
     createMachine() {
-      this.$router.push({
-        path: "/home/Ledger/milltype?id=192",
-      });
-    }
+      // this.$router.push({
+      //   path: "/home/Ledger/milltype?id=192",
+      // });
+      window.open("/home/Ledger/milltype?id=192", "_blank");
+    },
   },
 };
 </script>
@@ -969,4 +976,8 @@ export default {
   display: flex;
   justify-content: space-between;
 }
+
+.el-range-editor--small.el-input__inner {
+  width: 240px;
+}
 </style>

src/views/ledger/enterprise.vue

@@ -7,6 +7,7 @@
             v-model="formInline.companyName"
             placeholder="请输入单位名称"
             size="small"
+            class="search-input"
           ></el-input>
         </el-form-item>
         <el-form-item label="状态:">
@@ -14,6 +15,7 @@
             v-model="formInline.state"
             placeholder="选择状态"
             size="small "
+            class="search-input"
           >
             <el-option label="启用" value="1"></el-option>
             <el-option label="停用" value="0"></el-option>
@@ -27,10 +29,10 @@
         </el-form-item>
       </el-form>
       <div class="newly">
-        <el-button type="primary" @click="newnuedialog" size="small"
+        <el-button  @click="newnuedialog" size="small"
           >新增</el-button
         >
-        <el-button type="primary" @click="toggleExpandAll" size="small">{{
+        <el-button  @click="toggleExpandAll" size="small">{{
           defaultExpandAll ? "收起" : "展开"
         }}</el-button>
       </div>
@@ -142,15 +144,16 @@
         class="form-margin"
       >
         <el-form-item label="单位名称:" prop="companyName">
-          <el-input v-model="newform.companyName" size="small"></el-input>
+          <el-input v-model="newform.companyName" ></el-input>
         </el-form-item>
         <el-form-item label="所属省:" prop="province">
           <el-select
             v-model="newform.province"
             placeholder="请选择"
-            size="small"
+       
             value-key="areaId"
             @change="fetchCities"
+            style="width: 100%;"
           >
             <el-option
               v-for="item in shengdata"
@@ -164,9 +167,10 @@
           <el-select
             v-model="newform.city"
             placeholder="请选择"
-            size="small"
+      
             value-key="areaId"
             @change="$forceUpdate()"
+                   style="width: 100%;"
           >
             <el-option
               v-for="item in shidata"
@@ -619,9 +623,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.el-select {
-  width: 250px;
-}
 
 .form-margin {
   .el-form-item {
@@ -635,4 +636,6 @@ export default {
 display: flex;
 justify-content: space-between;
 }
+
+
 </style>

src/views/ledger/maintain.vue

@@ -3,7 +3,7 @@
     <div class="inquire">
       <div class="condition">
         <p>部件名称：</p>
-        <el-input v-model="nameOfparts" size="small"></el-input>
+        <el-input v-model="nameOfparts" size="small" class="search-input"></el-input>
         <el-button type="primary" @click="GETquery" size="small"
           >查询</el-button
         >
@@ -689,7 +689,7 @@ export default {
       line-height: 32px;
     }
     .el-input {
-      width: 220px;
+      width: 150px;
       margin-right: 20px;
     }
   }
@@ -730,4 +730,5 @@ export default {
     margin-left: 10px;
   }
 }
+
 </style>

src/views/ledger/milltype.vue

@@ -1,12 +1,13 @@
 <template>
   <div class="global-variable" v-loading="loading">
-    <div class="condition">
+    <div class="condition" style="display: flex;justify-content: space-between;">
       <el-form :inline="true" :model="formInline" class="demo-form-inline">
         <el-form-item label="收资机型型号:">
           <el-input
             v-model="formInline.machineTypeCode"
             placeholder="请输入机型型号"
             size="small"
+            class="search-input"
           ></el-input>
         </el-form-item>
         <el-form-item label="选择日期:" size="small">
@@ -27,14 +28,15 @@
           <el-button @click="reset" size="small">重置</el-button>
         </el-form-item>
       </el-form>
-    </div>
-    <div class="list-page">
       <div class="newly">
-        <el-button type="primary" @click="newnuedialog" size="small"
+        <el-button @click="newnuedialog" size="small"
           >新增</el-button
         >
       </div>
 
+    </div>
+    <div class="list-page">
+
       <el-table
         class="center-align-table"
         :data="tableData"
@@ -196,13 +198,13 @@
           <el-form-item label="收资机型型号:" prop="machineTypeCode">
             <el-input
               v-model="ruleForm.machineTypeCode"
-              size="small"
+      
             ></el-input>
           </el-form-item>
           <el-form-item label="厂商名称:" prop="manufacturerName">
             <el-input
               v-model="ruleForm.manufacturerName"
-              size="small"
+
             ></el-input>
           </el-form-item>
         </div>
@@ -214,7 +216,7 @@
               placeholder="请选择"
               value-key="contentsValue"
               @change="handleSelectChange"
-              size="small"
+ 
             >
               <el-option
                 v-for="item in curvedMotionTypeOptions"
@@ -225,39 +227,39 @@
             </el-select>
           </el-form-item>
           <el-form-item label="塔筒高度:" prop="towerHeight">
-            <el-input v-model="ruleForm.towerHeight" size="small"></el-input>
+            <el-input v-model="ruleForm.towerHeight" ></el-input>
           </el-form-item>
         </div>
         <div class="form-row">
           <el-form-item label="叶片长度:" prop="vaneLong">
-            <el-input v-model="ruleForm.vaneLong" size="small"></el-input>
+            <el-input v-model="ruleForm.vaneLong"></el-input>
           </el-form-item>
           <el-form-item label="叶轮直径:" prop="rotorDiameter">
-            <el-input v-model="ruleForm.rotorDiameter" size="small"></el-input>
+            <el-input v-model="ruleForm.rotorDiameter" ></el-input>
           </el-form-item>
         </div>
         <div class="form-row">
           <el-form-item label="传动比-转速比:" prop="rotationalSpeedRatio">
             <el-input
               v-model="ruleForm.rotationalSpeedRatio"
-              size="small"
+         
             ></el-input>
           </el-form-item>
           <el-form-item label="额定风速:" prop="ratedWindSpeed">
-            <el-input v-model="ruleForm.ratedWindSpeed" size="small"></el-input>
+            <el-input v-model="ruleForm.ratedWindSpeed" ></el-input>
           </el-form-item>
         </div>
         <div class="form-row">
           <el-form-item label="切入风速:" prop="ratedCutInWindspeed">
             <el-input
               v-model="ruleForm.ratedCutInWindspeed"
-              size="small"
+         
             ></el-input>
           </el-form-item>
           <el-form-item label="切出风速:" prop="ratedCutOutWindspeed">
             <el-input
               v-model="ruleForm.ratedCutOutWindspeed"
-              size="small"
+           
             ></el-input>
           </el-form-item>
         </div>
@@ -274,10 +276,11 @@
         </div>
       </el-form>
       <div class="form-actions">
+        <el-button @click="resetForm('ruleForm')" size="small">取消</el-button>
         <el-button type="primary" @click="submitForm('ruleForm')" size="small"
-          >提交</el-button
+          >确定</el-button
         >
-        <el-button @click="resetForm('ruleForm')" size="small">取消</el-button>
+ 
       </div>
     </el-dialog>
 
@@ -897,8 +900,10 @@ export default {
 
 .form-grid {
   display: flex;
-  flex-direction: column;
-  gap: 10px;
+  flex-wrap: wrap;
+  
+  // flex-direction: column;
+  // gap: 10px;
 }
 
 .form-row {
@@ -919,4 +924,5 @@ export default {
   display: flex;
   justify-content: center;
 }
+
 </style>

src/views/ledger/windsite.vue

@@ -1,12 +1,16 @@
 <template>
   <div class="global-variable" v-loading="loading">
-    <div class="condition">
+    <div
+      class="condition"
+      style="display: flex; justify-content: space-between"
+    >
       <el-form :inline="true" :model="formInline" class="demo-form-inline">
         <el-form-item label="风场名称:">
           <el-input
             v-model="formInline.fieldName"
             placeholder="请输入风场名称"
             size="small"
+            class="search-input"
           ></el-input>
         </el-form-item>
         <el-form-item label="选择日期:" size="small">
@@ -24,7 +28,8 @@
           <el-input
             v-model="formInline.windCompany"
             placeholder="所属公司"
-            size="small"
+          size="small"
+            class="search-input"
           ></el-input>
         </el-form-item>
 
@@ -34,7 +39,8 @@
             placeholder="请选择"
             value-key="areaId"
             @change="handleProvinceChange"
-              size="small"
+            size="small"
+            class="search-input"
           >
             <el-option
               v-for="item in provinceNameOptions"
@@ -53,15 +59,13 @@
           <el-button @click="reset" size="small">重置</el-button>
         </el-form-item>
       </el-form>
-    </div>
-    <div class="list-page">
+
       <div class="newly">
         <el-button @click="upfile" size="small">导入</el-button>
-        <el-button type="primary" @click="newnuedialog" size="small"
-          >新增</el-button
-        >
+        <el-button @click="newnuedialog" size="small">新增</el-button>
       </div>
-
+    </div>
+    <div class="list-page">
       <el-table
         class="center-align-table"
         :data="tableData"
@@ -246,13 +250,14 @@
                   :list="parentOpt"
                   v-model="form.companyCode"
                   @change="parentChange"
+         
                 >
                 </selecttree>
               </el-form-item>
             </div>
             <div class="condition">
               <el-form-item label="海拔高度:" prop="elevationHeight">
-                <el-input v-model="form.elevationHeight"></el-input>
+                <el-input  v-model="form.elevationHeight"></el-input>
               </el-form-item>
             </div>
           </div>
@@ -302,6 +307,7 @@
                   multiple
                   collapse-tags
                   placeholder="请选择"
+                         @focus="logClick"
                   value-key="anemometerCode"
                 >
                   <el-option
@@ -655,6 +661,9 @@ export default {
     this.getAllTemplate();
   },
   methods: {
+    logClick() {
+      this.TowerNameList();
+    },
     handleClose(value, dialogName) {
       this[dialogName] = value;
       if (this.$refs.formRef) {
@@ -800,8 +809,6 @@ export default {
       }));
     },
 
-
-
     // 新增提交
     newly(formName) {
       this.$refs[formName].validate((valid) => {
@@ -879,7 +886,7 @@ export default {
       this.shengID = "";
       this.startDate = "";
       this.endDate = "";
-      this.form.shengfeng= ""
+      this.form.shengfeng = "";
       this.onSubmit();
     },
     //导入提交
@@ -1097,7 +1104,6 @@ export default {
       }
     },
 
-  
     batch(row) {
       if (row.wegNumber != 0) {
         getWindEngineGroupListByFieldCode({ fieldCode: row.fieldCode }).then(
@@ -1132,10 +1138,11 @@ export default {
       done();
     },
     createMachine() {
-      this.$router.push({
-        path: "/home/Ledger/milltype?id=192",
-      });
-    }
+      // this.$router.push({
+      //   path: "/home/Ledger/milltype?id=192",
+      // });
+      window.open("/home/Ledger/milltype?id=192", "_blank");
+    },
   },
 };
 </script>
@@ -1206,13 +1213,13 @@ export default {
   }
 }
 
-::v-deep .el-date-editor--daterange.el-input__inner{
+::v-deep .el-date-editor--daterange.el-input__inner {
   width: 260px;
 }
-.bianji{
+.bianji {
   margin-top: 10px;
 }
-::v-deep .el-dialog__footer{
-  text-align: center
+::v-deep .el-dialog__footer {
+  text-align: center;
 }
 </style>