há 11 meses atrás · 0790a6e3f2
--- a/dist.zip
+++ b/dist.zip
--- a/public/index.html
+++ b/public/index.html
@@ -7,7 +7,7 @@
 
				     <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
			
 
				 
			
 
				     <title>风机运行管理系统</title>
			
 
				-    <script src="./config/config.js"></script>
			
 
				+    <!-- <script src="./config/config.js"></script> -->
			
 
				   </head>
			
 
				 
			
 
				   <body>
			
--- a/src/assets/img/loadingError.jpeg
+++ b/src/assets/img/loadingError.jpeg
--- a/src/assets/img/loadingError.webp
+++ b/src/assets/img/loadingError.webp
--- a/src/assets/img/loadingErrorFx.webp
+++ b/src/assets/img/loadingErrorFx.webp
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -168,12 +168,11 @@ export default {
 
				     },
			
 
				   },
			
 
				   mounted() {
			
 
				-
			
 
				     this.map = new Map({
			
 
				       target: "map",
			
 
				       view: new View({
			
 
				         projection: "EPSG:4326",
			
 
				-        center: fromLonLat([116.389, 39.903]), //地图中心 
			
 
				+        center: fromLonLat([116.389, 39.903]), //地图中心
			
 
				         zoom: 5, //默认缩放级别
			
 
				         minZoom: 5, //最小缩放级别
			
 
				         maxZoom: 15, //最大缩放级别
			
--- a/src/views/dataAdministration/index.vue
+++ b/src/views/dataAdministration/index.vue
@@ -132,7 +132,10 @@
 
				               size="small"
			
 
				               >编辑</el-button
			
 
				             >
			
 
				-            <el-button @click="handleClick(scope.row)" type="text" size="small"
			
 
				+            <el-button
			
 
				+              @click="handleClick(scope.row.downloadUrl)"
			
 
				+              type="text"
			
 
				+              size="small"
			
 
				               >下载</el-button
			
 
				             >
			
 
				             <el-button
			
@@ -171,10 +174,11 @@
 
				     <!-- 弹出层 -->
			
 
				     <!-- 新增 -->
			
 
				     <el-dialog
			
 
				-      title="新增"
			
 
				+      title="新增（批次列表为空时，请前往性能分析下批次管理中添加批次！）"
			
 
				       :visible.sync="nuedialog"
			
 
				       class="dialogBox"
			
 
				       width="900px"
			
 
				+      :before-close="handleCloses"
			
 
				     >
			
 
				       <div v-loading="loadingView" class="views">
			
 
				         <el-form ref="form" :model="newform" label-width="150px">
			
@@ -252,6 +256,7 @@
 
				       :visible.sync="editNuedialog"
			
 
				       class="dialogBox"
			
 
				       width="900px"
			
 
				+      :before-close="handleCloses"
			
 
				     >
			
 
				       <div v-loading="loadingViewEdit" class="views">
			
 
				         <el-form
			
@@ -352,7 +357,12 @@
 
				       </div>
			
 
				     </el-dialog>
			
 
				     <!-- 异常信息详情 -->
			
 
				-    <el-dialog title="异常详情" :visible.sync="unusualdialog" width="800px">
			
 
				+    <el-dialog
			
 
				+      title="异常详情"
			
 
				+      :visible.sync="unusualdialog"
			
 
				+      width="800px"
			
 
				+      :before-close="handleCloses"
			
 
				+    >
			
 
				       {{ errInfo }}
			
 
				     </el-dialog>
			
 
				     <!-- 转换\重新转换 -->
			
@@ -360,6 +370,7 @@
 
				       :title="editTransferStateTitle"
			
 
				       :visible.sync="editTransferStateLoading"
			
 
				       width="400px"
			
 
				+      :before-close="handleCloses"
			
 
				     >
			
 
				       <div v-loading="loadingViewEdit" class="views">
			
 
				         <el-form
			
@@ -486,6 +497,14 @@ export default {
 
				     this.getBatchCodeList();
			
 
				   },
			
 
				   methods: {
			
 
				+    handleCloses(done) {
			
 
				+      this.$confirm("确认关闭？")
			
 
				+        .then((_) => {
			
 
				+          this.getBatchCodeList();
			
 
				+          done();
			
 
				+        })
			
 
				+        .catch((_) => {});
			
 
				+    },
			
 
				     ensureMinValue(item, field) {
			
 
				       if (item[field] < 1) {
			
 
				         item[field] = 1;
			
@@ -497,6 +516,7 @@ export default {
 
				       this.editTransferStateForm.dataTransferTypePath = "";
			
 
				       this.editTransferStateLoading = false;
			
 
				       this.loadingViewEdit = false;
			
 
				+      this.getBatchCodeList();
			
 
				     },
			
 
				     editStately(formName) {
			
 
				       this.$refs[formName].validate((valid) => {
			
@@ -542,6 +562,7 @@ export default {
 
				       this.editNuedialog = false;
			
 
				       this.loadingViewEdit = false;
			
 
				       this.getTableList();
			
 
				+      this.getBatchCodeList();
			
 
				     },
			
 
				     editly(formName) {
			
 
				       this.$refs[formName].validate((valid) => {
			
@@ -655,38 +676,48 @@ export default {
 
				       this.errInfo = row.errInfo;
			
 
				     },
			
 
				     //下载
			
 
				-    async handleClick() {
			
 
				-      try {
			
 
				-        // 获取 HTML 内容
			
 
				-        const response = await axios.get("/downLoadApi", {
			
 
				-          responseType: "blob",
			
 
				-        }); // 确保响应类型为 Blob
			
 
				-        const reader = new FileReader();
			
 
				-        reader.onload = function (event) {
			
 
				-          const htmlContent = event.target.result; // 读取的 HTML 内容
			
 
				-          const newWindow = window.open("", "_blank");
			
 
				-          newWindow.document.open();
			
 
				-          newWindow.document.write(htmlContent);
			
 
				-          newWindow.document.close();
			
 
				-          // 获取当前页面的 URL
			
 
				-          const currentUrl = window.location.href;
			
 
				-          const proxyUrl = currentUrl.substring(0, currentUrl.indexOf("/", 8)); // 从第8个字符开始搜索，找到第一个 "/" 为止
			
 
				-          // 拼接代理地址和接口路径
			
 
				-          const apiEndpoint = proxyUrl + "/downLoadApi";
			
 
				-
			
 
				-          // 拼接新的路径
			
 
				-          const newUrl = apiEndpoint + "/downLoadApi";
			
 
				-          // 设置 base 元素
			
 
				-          const baseElement = newWindow.document.createElement("base");
			
 
				-          baseElement.href = newUrl; // 使用代理地址和接口路径
			
 
				-          newWindow.document.head.appendChild(baseElement);
			
 
				-        };
			
 
				-        reader.readAsText(response.data, "utf-8"); // 以 UTF-8 编码读取 Blob
			
 
				-      } catch (error) {
			
 
				-        console.error("Failed to fetch data:", error);
			
 
				-        this.$message.error("无法打开新链接");
			
 
				+    async handleClick(downloadUrl) {
			
 
				+      let newWindow = window.open(downloadUrl, "_blank");
			
 
				+      if (
			
 
				+        !newWindow ||
			
 
				+        newWindow.closed ||
			
 
				+        typeof newWindow.closed == "undefined"
			
 
				+      ) {
			
 
				+        alert("弹出窗口已被阻止！请允许弹出式窗口访问本网站。");
			
 
				       }
			
 
				     },
			
 
				+    // async handleClick() {
			
 
				+    //   try {
			
 
				+    //     // 获取 HTML 内容
			
 
				+    //     const response = await axios.get("/downLoadApi", {
			
 
				+    //       responseType: "blob",
			
 
				+    //     }); // 确保响应类型为 Blob
			
 
				+    //     const reader = new FileReader();
			
 
				+    //     reader.onload = function (event) {
			
 
				+    //       const htmlContent = event.target.result; // 读取的 HTML 内容
			
 
				+    //       const newWindow = window.open("", "_blank");
			
 
				+    //       newWindow.document.open();
			
 
				+    //       newWindow.document.write(htmlContent);
			
 
				+    //       newWindow.document.close();
			
 
				+    //       // 获取当前页面的 URL
			
 
				+    //       const currentUrl = window.location.href;
			
 
				+    //       const proxyUrl = currentUrl.substring(0, currentUrl.indexOf("/", 8)); // 从第8个字符开始搜索，找到第一个 "/" 为止
			
 
				+    //       // 拼接代理地址和接口路径
			
 
				+    //       const apiEndpoint = proxyUrl + "/downLoadApi";
			
 
				+
			
 
				+    //       // 拼接新的路径
			
 
				+    //       const newUrl = apiEndpoint + "/downLoadApi";
			
 
				+    //       // 设置 base 元素
			
 
				+    //       const baseElement = newWindow.document.createElement("base");
			
 
				+    //       baseElement.href = newUrl; // 使用代理地址和接口路径
			
 
				+    //       newWindow.document.head.appendChild(baseElement);
			
 
				+    //     };
			
 
				+    //     reader.readAsText(response.data, "utf-8"); // 以 UTF-8 编码读取 Blob
			
 
				+    //   } catch (error) {
			
 
				+    //     console.error("Failed to fetch data:", error);
			
 
				+    //     this.$message.error("无法打开新链接");
			
 
				+    //   }
			
 
				+    // },
			
 
				     async getTableList() {
			
 
				       try {
			
 
				         this.loading = true;
			
@@ -711,7 +742,32 @@ export default {
 
				     },
			
 
				     //新增按钮
			
 
				     addData() {
			
 
				-      this.nuedialog = true;
			
 
				+      if (this.batchList === null || this.batchList.length === 0) {
			
 
				+        this.$confirm(
			
 
				+          "批次列表为空，请前往性能分析菜单下的批次管理中添加批次！确认跳转到批次管理菜单吗？",
			
 
				+          "提示",
			
 
				+          {
			
 
				+            confirmButtonText: "确定",
			
 
				+            cancelButtonText: "取消",
			
 
				+            type: "warning",
			
 
				+          }
			
 
				+        )
			
 
				+          .then(() => {
			
 
				+            this.$router.push("/home/performance/batchMag?id=22");
			
 
				+            this.$message({
			
 
				+              type: "success",
			
 
				+              message: "成功!",
			
 
				+            });
			
 
				+          })
			
 
				+          .catch(() => {
			
 
				+            this.$message({
			
 
				+              type: "info",
			
 
				+              message: "已取消",
			
 
				+            });
			
 
				+          });
			
 
				+      } else {
			
 
				+        this.nuedialog = true;
			
 
				+      }
			
 
				     },
			
 
				     //获取批次编号列表接口
			
 
				     async getBatchCodeList() {
			
--- a/src/views/home/Index.vue
+++ b/src/views/home/Index.vue
@@ -5,6 +5,11 @@
 
				       <el-main>
			
 
				         <HeaderCom @setLoding="setLoding"></HeaderCom>
			
 
				         <!-- 主体内容-->
			
 
				+        <!-- <el-scrollbar>
			
 
				+          <ul>
			
 
				+            <li v-for="(item, index) in history" :key="index">{{ item }}</li>
			
 
				+          </ul>
			
 
				+        </el-scrollbar> -->
			
 
				         <transition name="slide-fade">
			
 
				           <div class="">
			
 
				             <router-view />
			
@@ -26,6 +31,7 @@ export default {
 
				   },
			
 
				   data() {
			
 
				     return {
			
 
				+      // history: ["11", "22", "33"],
			
 
				       loading: false,
			
 
				     };
			
 
				   },
			
--- a/src/views/ledger/component/windsitetower.vue
+++ b/src/views/ledger/component/windsitetower.vue
@@ -65,7 +65,11 @@
 
				           width="80"
			
 
				         >
			
 
				         </el-table-column>
			
 
				-        <el-table-column prop="ratedCapacity" align="center" label="额定容量">
			
 
				+        <el-table-column
			
 
				+          prop="ratedCapacity"
			
 
				+          align="center"
			
 
				+          label="额定容量(kW)"
			
 
				+        >
			
 
				         </el-table-column>
			
 
				       </el-table>
			
 
				 
			
@@ -193,4 +197,4 @@ export default {
 
				     color: #409eff;
			
 
				   }
			
 
				 }
			
 
				-</style>
			
 
				+</style>
			
--- a/src/views/ledger/draught.vue
+++ b/src/views/ledger/draught.vue
@@ -470,7 +470,7 @@ export default {
 
				           { required: true, message: "请输入机型编号", trigger: "blur" },
			
 
				         ],
			
 
				         ratedCapacity: [
			
 
				-          { required: true, message: "请输入额定容量", trigger: "blur" },
			
 
				+          { required: true, message: "请输入额定容量(kW)", trigger: "blur" },
			
 
				         ],
			
 
				         longitude: [
			
 
				           { required: true, message: "请输入经度", trigger: "blur" },
			
--- a/src/views/ledger/enterprise.vue
+++ b/src/views/ledger/enterprise.vue
@@ -206,7 +206,7 @@
 
				         <el-table-column
			
 
				           prop="elevationHeight"
			
 
				           align="center"
			
 
				-          label="海拔高度"
			
 
				+          label="海拔高度/米"
			
 
				           width="80"
			
 
				         >
			
 
				         </el-table-column>
			
@@ -217,7 +217,7 @@
 
				         <el-table-column
			
 
				           prop="ratedCapacityNumber"
			
 
				           align="center"
			
 
				-          label="额定容量"
			
 
				+          label="额定容量/kW"
			
 
				           width="80"
			
 
				         >
			
 
				         </el-table-column>
			
@@ -346,7 +346,6 @@ export default {
 
				           console.error(error, "error");
			
 
				           this.loading = false;
			
 
				         });
			
 
				-    
			
 
				     },
			
 
				 
			
 
				     // 重置
			
--- a/src/views/ledger/windsite
+++ b/src/views/ledger/windsite
@@ -189,7 +189,7 @@
 
				               </el-form-item>
			
 
				             </div>
			
 
				             <div class="condition">
			
 
				-              <el-form-item label="海拔高度:" prop="elevationHeight">
			
 
				+              <el-form-item label="海拔高度/米:" prop="elevationHeight">
			
 
				                 <el-input v-model="form.elevationHeight"></el-input>
			
 
				               </el-form-item>
			
 
				             </div>
			
@@ -466,10 +466,10 @@ export default {
 
				   },
			
 
				   methods: {
			
 
				     handleClose(value, dialogName) {
			
 
				-  this[dialogName] = value;
			
 
				-  this.$refs.formRef.resetFields();
			
 
				-  this.form = Object.assign({}, this.$options.data().form);
			
 
				-},
			
 
				+      this[dialogName] = value;
			
 
				+      this.$refs.formRef.resetFields();
			
 
				+      this.form = Object.assign({}, this.$options.data().form);
			
 
				+    },
			
 
				 
			
 
				     // 列表居中展示
			
 
				     rowStyle() {
			
--- a/src/views/performance/assetssDetail.vue
+++ b/src/views/performance/assetssDetail.vue
@@ -1,7 +1,7 @@
 
				 <!--
			
 
				  * @Author: your name
			
 
				  * @Date: 2024-05-27 09:25:45
			
 
				- * @LastEditTime: 2024-06-24 11:11:34
			
 
				+ * @LastEditTime: 2024-06-25 17:07:05
			
 
				  * @LastEditors: bogon
			
 
				  * @Description: In User Settings Edit
			
 
				  * @FilePath: /performance-test/src/views/performance/assetssDetail.vue
			
@@ -110,7 +110,7 @@
 
				               @error="imageError(index)"
			
 
				               v-lazy-load="{
			
 
				                 src: file.fileAddr,
			
 
				-                errorImageSrc: require('../../assets/img/loadingError.webp'),
			
 
				+                errorImageSrc: require('../../assets/img/loadingErrorFx.webp'),
			
 
				               }"
			
 
				             />
			
 
				             <el-skeleton
			
@@ -161,7 +161,7 @@
 
				               @error="imageError(index + generalFiles.length)"
			
 
				               v-lazy-load="{
			
 
				                 src: file.fileAddr,
			
 
				-                errorImageSrc: require('../../assets/img/loadingError.webp'),
			
 
				+                errorImageSrc: require('../../assets/img/loadingErrorFx.webp'),
			
 
				               }"
			
 
				             />
			
 
				             <el-skeleton
			
--- a/src/views/performance/batchMag.vue
+++ b/src/views/performance/batchMag.vue
@@ -1,7 +1,7 @@
 
				 <!--
			
 
				  * @Author: your name
			
 
				  * @Date: 2024-05-27 09:23:37
			
 
				- * @LastEditTime: 2024-06-18 16:08:24
			
 
				+ * @LastEditTime: 2024-06-25 11:16:07
			
 
				  * @LastEditors: bogon
			
 
				  * @Description: In User Settings Edit
			
 
				  * @FilePath: /performance-test/src/views/performance/batchMag.vue
			
@@ -140,7 +140,12 @@
 
				 
			
 
				     <!-- 弹出层 -->
			
 
				     <!-- 新增 /编辑-->
			
 
				-    <el-dialog :title="title" :visible.sync="nuedialog" width="500px">
			
 
				+    <el-dialog
			
 
				+      :title="title"
			
 
				+      :visible.sync="nuedialog"
			
 
				+      width="500px"
			
 
				+      :before-close="handleCloses"
			
 
				+    >
			
 
				       <div v-loading="loadingView" class="views">
			
 
				         <el-form
			
 
				           :model="ruleForm"
			
@@ -249,6 +254,13 @@ export default {
 
				   },
			
 
				 
			
 
				   methods: {
			
 
				+    handleCloses(done) {
			
 
				+      this.$confirm("确认关闭？")
			
 
				+        .then((_) => {
			
 
				+          done();
			
 
				+        })
			
 
				+        .catch((_) => {});
			
 
				+    },
			
 
				     onDateChange(date) {
			
 
				       if (Array.isArray(date)) {
			
 
				         this.startDate = this.$formatDate(date[0]);
			
--- a/src/views/performance/components/EditAnalysis.vue
+++ b/src/views/performance/components/EditAnalysis.vue
@@ -1,7 +1,7 @@
 
				 <!--
			
 
				  * @Author: your name
			
 
				  * @Date: 2024-05-29 09:14:23
			
 
				- * @LastEditTime: 2024-06-17 16:11:54
			
 
				+ * @LastEditTime: 2024-06-25 17:03:54
			
 
				  * @LastEditors: bogon
			
 
				  * @Description: In User Settings Edit
			
 
				  * @FilePath: /performance-test/src/views/performance/components/EditAnalysis.vue
			
@@ -76,27 +76,68 @@
 
				                 ></el-option>
			
 
				               </el-select>
			
 
				             </div>
			
 
				-            <div>1.额定容量：{{ windDetail.ratedCapacity }}</div>
			
 
				+            <div>
			
 
				+              1.额定容量：{{
			
 
				+                windDetail.ratedCapacity ? windDetail.ratedCapacity : 0
			
 
				+              }}
			
 
				+              <span> (kW)</span>
			
 
				+            </div>
			
 
				             <!-- <div>2.发电机类型（Generator Type）:{{}}</div> -->
			
 
				             <div>2.风机编号:{{ windDetail.engineCode }}</div>
			
 
				             <div>3.经度（Longitude）：{{ windDetail.longitude }}</div>
			
 
				             <div>4.维度（Dimensionality）：{{ windDetail.latitude }}</div>
			
 
				-            <div>5.海拔高度（Altitude）：{{ windDetail.elevationHeight }}</div>
			
 
				+            <div>
			
 
				+              5.海拔高度（Altitude）：{{
			
 
				+                windDetail.elevationHeight ? windDetail.elevationHeight : 0
			
 
				+              }}
			
 
				+              <span>(米)</span>
			
 
				+            </div>
			
 
				             <div>6.风机名称：{{ windDetail.engineName }}</div>
			
 
				             <div>
			
 
				-              7.是否标杆（Benchmarking or not）：{{ windDetail.sightcing }}
			
 
				+              7.是否标杆（Benchmarking or not）：{{
			
 
				+                windDetail.sightcing == 1 ? "是" : "否"
			
 
				+              }}
			
 
				             </div>
			
 
				             <div>8.风场编号：{{ windDetail.fieldCode }}</div>
			
 
				-            <div>9.轮毂高度：{{ windDetail.hubHeight }}</div>
			
 
				+            <div>
			
 
				+              9.轮毂高度：{{ windDetail.hubHeight ? windDetail.hubHeight : 0 }}
			
 
				+              <span>(米)</span>
			
 
				+            </div>
			
 
				             <div>10.机型编号：{{ windDetail.millTypeCode }}</div>
			
 
				-            <div>11.切入风速：{{ windDetail.ratedCutInWindspeed }}</div>
			
 
				-            <div>12.切出风速：{{ windDetail.ratedCutOutWindspeed }}</div>
			
 
				+            <div>
			
 
				+              11.切入风速：{{
			
 
				+                windDetail.ratedCutInWindspeed
			
 
				+                  ? windDetail.ratedCutInWindspeed
			
 
				+                  : 0
			
 
				+              }}<span>(m/s)</span>
			
 
				+            </div>
			
 
				+            <div>
			
 
				+              12.切出风速：{{
			
 
				+                windDetail.ratedCutOutWindspeed
			
 
				+                  ? windDetail.ratedCutOutWindspeed
			
 
				+                  : 0
			
 
				+              }}<span>(m/s)</span>
			
 
				+            </div>
			
 
				+          </div>
			
 
				+        </el-col>
			
 
				+        <el-col :span="12" v-loading="htmlLoading">
			
 
				+          <div class="right">
			
 
				+            <iframe
			
 
				+              v-if="htmlLoading"
			
 
				+              :src="windDetail.elevationHeight"
			
 
				+              frameborder="0"
			
 
				+              @load="iframeLoad"
			
 
				+              width="100%"
			
 
				+              height="100%"
			
 
				+            ></iframe>
			
 
				+            <img
			
 
				+              v-else
			
 
				+              style="width: 100%"
			
 
				+              src="../../../assets/img/loadingError.webp"
			
 
				+              alt=""
			
 
				+            />
			
 
				           </div>
			
 
				         </el-col>
			
 
				-        <el-col :span="12"
			
 
				-          ><div class="right">
			
 
				-            <img src="../../../assets/Wechat.jpg" alt="" /></div
			
 
				-        ></el-col>
			
 
				       </el-row>
			
 
				     </el-card>
			
 
				     <el-empty :image-size="200" v-if="flage"></el-empty>
			
@@ -175,6 +216,7 @@ export default {
 
				   },
			
 
				   data() {
			
 
				     return {
			
 
				+      htmlLoading: true,
			
 
				       loading: false,
			
 
				       engineCode: null, //台账机组编号
			
 
				       windDetail: {},
			
@@ -214,11 +256,13 @@ export default {
 
				     this.getWindCodeList();
			
 
				   },
			
 
				   methods: {
			
 
				+    iframeLoad() {
			
 
				+      this.htmlLoading = false;
			
 
				+    },
			
 
				     async handleComment() {
			
 
				       this.loading = true;
			
 
				-      console.log(this.editableTabs, "this.editableTabs");
			
 
				       try {
			
 
				-        const res = await analysisCommentEdit({
			
 
				+        await analysisCommentEdit({
			
 
				           batchCode: this.$route.query.batchCode,
			
 
				           analysisTypeCode: this.form.configAnalysis,
			
 
				           commentList: this.editableTabs.map((item) => {
			
--- a/src/views/performance/components/analysisEvent.vue
+++ b/src/views/performance/components/analysisEvent.vue
@@ -1,7 +1,7 @@
 
				 <!--
			
 
				  * @Author: your name
			
 
				  * @Date: 2024-05-29 09:13:51
			
 
				- * @LastEditTime: 2024-06-19 14:03:49
			
 
				+ * @LastEditTime: 2024-06-26 09:08:48
			
 
				  * @LastEditors: bogon
			
 
				  * @Description: In User Settings Edit
			
 
				  * @FilePath: /performance-test/src/views/performance/components/analysisEvent.vue
			
@@ -33,6 +33,7 @@
 
				                   v-model="form.configAnalysis"
			
 
				                   placeholder="请选择分析类型"
			
 
				                   size="small"
			
 
				+                  collapse-tags
			
 
				                   multiple
			
 
				                   clearable
			
 
				                 >
			
@@ -51,6 +52,7 @@
 
				               >
			
 
				                 <el-select
			
 
				                   multiple
			
 
				+                  collapse-tags
			
 
				                   v-model="form.turbines"
			
 
				                   placeholder="请选择机组编号"
			
 
				                   size="small"
			
@@ -522,21 +524,48 @@
 
				                 ></el-option>
			
 
				               </el-select>
			
 
				             </div>
			
 
				-            <div>1.额定容量：{{ windDetail.ratedCapacity }}</div>
			
 
				+            <div>
			
 
				+              1.额定容量：{{
			
 
				+                windDetail.ratedCapacity ? windDetail.ratedCapacity : 0
			
 
				+              }}
			
 
				+              <span> (kW)</span>
			
 
				+            </div>
			
 
				             <!-- <div>2.发电机类型（Generator Type）:{{}}</div> -->
			
 
				             <div>2.风机编号:{{ windDetail.engineCode }}</div>
			
 
				             <div>3.经度（Longitude）：{{ windDetail.longitude }}</div>
			
 
				             <div>4.维度（Dimensionality）：{{ windDetail.latitude }}</div>
			
 
				-            <div>5.海拔高度（Altitude）：{{ windDetail.elevationHeight }}</div>
			
 
				+            <div>
			
 
				+              5.海拔高度（Altitude）：{{
			
 
				+                windDetail.elevationHeight ? windDetail.elevationHeight : 0
			
 
				+              }}
			
 
				+              <span>(米)</span>
			
 
				+            </div>
			
 
				             <div>6.风机名称：{{ windDetail.engineName }}</div>
			
 
				             <div>
			
 
				-              7.是否标杆（Benchmarking or not）：{{ windDetail.sightcing }}
			
 
				+              7.是否标杆（Benchmarking or not）：{{
			
 
				+                windDetail.sightcing == 1 ? "是" : "否"
			
 
				+              }}
			
 
				             </div>
			
 
				             <div>8.风场编号：{{ windDetail.fieldCode }}</div>
			
 
				-            <div>9.轮毂高度：{{ windDetail.hubHeight }}</div>
			
 
				+            <div>
			
 
				+              9.轮毂高度：{{ windDetail.hubHeight ? windDetail.hubHeight : 0 }}
			
 
				+              <span> (米)</span>
			
 
				+            </div>
			
 
				             <div>10.机型编号：{{ windDetail.millTypeCode }}</div>
			
 
				-            <div>11.切入风速：{{ windDetail.ratedCutInWindspeed }}</div>
			
 
				-            <div>12.切出风速：{{ windDetail.ratedCutOutWindspeed }}</div>
			
 
				+            <div>
			
 
				+              11.切入风速：{{
			
 
				+                windDetail.ratedCutInWindspeed
			
 
				+                  ? windDetail.ratedCutInWindspeed
			
 
				+                  : 0
			
 
				+              }}<span> (m/s)</span>
			
 
				+            </div>
			
 
				+            <div>
			
 
				+              12.切出风速：{{
			
 
				+                windDetail.ratedCutOutWindspeed
			
 
				+                  ? windDetail.ratedCutOutWindspeed
			
 
				+                  : 0
			
 
				+              }}<span> (m/s)</span>
			
 
				+            </div>
			
 
				             <!-- <div>8.地理位置（Location）：不同地理位置的气候条件{{}}</div>
			
 
				             <div>
			
 
				               9.供应商信息（Manufacturer
			
@@ -548,9 +577,22 @@
 
				             <div>11.预期寿命（Expected Lifetime）：风力发电机组的设计寿命</div> -->
			
 
				           </div>
			
 
				         </el-col>
			
 
				-        <el-col :span="12">
			
 
				+        <el-col :span="12" v-loading="htmlLoading">
			
 
				           <div class="right">
			
 
				-            <iframe src="/html/A01.html" frameborder="0"></iframe>
			
 
				+            <iframe
			
 
				+              v-if="htmlLoading"
			
 
				+              :src="windDetail.elevationHeight"
			
 
				+              frameborder="0"
			
 
				+              @load="iframeLoad"
			
 
				+              width="100%"
			
 
				+              height="100%"
			
 
				+            ></iframe>
			
 
				+            <img
			
 
				+              v-else
			
 
				+              style="width: 100%"
			
 
				+              src="../../../assets/img/loadingError.webp"
			
 
				+              alt=""
			
 
				+            />
			
 
				           </div>
			
 
				         </el-col>
			
 
				       </el-row>
			
@@ -634,6 +676,7 @@ import { getWindEngineGroup } from "@/api/ledger";
 
				 export default {
			
 
				   data() {
			
 
				     return {
			
 
				+      htmlLoading: true,
			
 
				       engineCode: null, //台账机组编号
			
 
				       picker: [],
			
 
				       loading: false,
			
@@ -686,6 +729,9 @@ export default {
 
				     this.getWindCodeList();
			
 
				   },
			
 
				   methods: {
			
 
				+    iframeLoad() {
			
 
				+      this.htmlLoading = false;
			
 
				+    },
			
 
				     ensureMinValue(field, index) {
			
 
				       if (field[index] < 1) {
			
 
				         field[index] = 1;
			
@@ -889,6 +935,17 @@ export default {
 
				     }
			
 
				   }
			
 
				 }
			
 
				+::v-deep.el-select--small,
			
 
				+::v-deep.el-select__tags {
			
 
				+  width: 200px !important;
			
 
				+  .el-tag--light {
			
 
				+    display: flex;
			
 
				+    justify-content: space-between;
			
 
				+  }
			
 
				+  .el-tag--light:nth-child(1) {
			
 
				+    width: 125px;
			
 
				+  }
			
 
				+}
			
 
				 ::v-deep .searchFrom {
			
 
				   .el-form-item__content {
			
 
				     display: flex !important;
			
@@ -900,7 +957,10 @@ export default {
 
				     }
			
 
				   }
			
 
				 }
			
 
				-.drawerOption {
			
 
				+::v-deep.drawerOption {
			
 
				+  .el-drawer {
			
 
				+    width: 33% !important;
			
 
				+  }
			
 
				   .el-checkbox-group {
			
 
				     line-height: 40px !important;
			
 
				   }
			
--- a/src/views/performance/components/dialogCom.vue
+++ b/src/views/performance/components/dialogCom.vue
@@ -2,7 +2,7 @@
 
				   <el-dialog
			
 
				     :visible.sync="dialogVisible"
			
 
				     :title="title"
			
 
				-    :before-close="handleClose"
			
 
				+    :before-close="handleCloses"
			
 
				     :width="title === '异常详情' ? '750px' : '1120px'"
			
 
				   >
			
 
				     <!-- 根据 emptyFlag 和 title 显示不同的内容 -->
			
@@ -63,6 +63,14 @@ export default {
 
				     handleClose() {
			
 
				       this.$emit("confirm");
			
 
				     },
			
 
				+    handleCloses(done) {
			
 
				+      this.$confirm("确认关闭？")
			
 
				+        .then((_) => {
			
 
				+          done();
			
 
				+          this.$emit("confirm");
			
 
				+        })
			
 
				+        .catch((_) => {});
			
 
				+    },
			
 
				     handleConfirm() {
			
 
				       // 获取插槽内容并传递出去
			
 
				       const slotContent = this.$slots.tableEl;
			
--- a/src/views/system/menuMag/index.vue
+++ b/src/views/system/menuMag/index.vue
@@ -127,6 +127,7 @@
 
				       :visible.sync="unusualdialog"
			
 
				       width="500px"
			
 
				       @close="handleClose"
			
 
				+      :before-close="handleCloses"
			
 
				     >
			
 
				       <div v-loading="loadingView" class="views">
			
 
				         <el-tabs type="border-card" class="tabs" v-model="activeName">
			
@@ -214,6 +215,13 @@ export default {
 
				     },
			
 
				   },
			
 
				   methods: {
			
 
				+    handleCloses(done) {
			
 
				+      this.$confirm("确认关闭？")
			
 
				+        .then((_) => {
			
 
				+          done();
			
 
				+        })
			
 
				+        .catch((_) => {});
			
 
				+    },
			
 
				     selected(name) {
			
 
				       console.log(name);
			
 
				       this.piconUrl = name;
			
@@ -251,8 +259,6 @@ export default {
 
				     async getTableList() {
			
 
				       try {
			
 
				         this.loading = true;
			
 
				-        // console.log("  debugger;");
			
 
				-        // debugger;
			
 
				         const result = await getAllMenu({ ...this.formInline });
			
 
				         this.tableData = result.data;
			
 
				         this.loading = false;
			
--- a/src/views/system/roleMag/index.vue
+++ b/src/views/system/roleMag/index.vue
@@ -162,7 +162,12 @@
 
				 
			
 
				     <!-- 弹出层 -->
			
 
				     <!-- 新增 /编辑-->
			
 
				-    <el-dialog :title="title" :visible.sync="nuedialog" width="500px">
			
 
				+    <el-dialog
			
 
				+      :title="title"
			
 
				+      :visible.sync="nuedialog"
			
 
				+      width="500px"
			
 
				+      :before-close="handleClose"
			
 
				+    >
			
 
				       <div v-loading="loadingView" class="views">
			
 
				         <el-form
			
 
				           :model="ruleForm"
			
@@ -213,7 +218,12 @@
 
				       </div>
			
 
				     </el-dialog>
			
 
				     <!-- 权限设置 -->
			
 
				-    <el-dialog title="权限设置" :visible.sync="unusualdialog" width="500px">
			
 
				+    <el-dialog
			
 
				+      title="权限设置"
			
 
				+      :visible.sync="unusualdialog"
			
 
				+      width="500px"
			
 
				+      :before-close="handleClose"
			
 
				+    >
			
 
				       <div v-loading="loadingView" class="views">
			
 
				         <el-form
			
 
				           :model="editRoleAuth"
			
@@ -228,7 +238,7 @@
 
				           >
			
 
				             <el-input
			
 
				               disabled
			
 
				-              v-model.number="editRoleAuth.roleName"
			
 
				+              v-model="editRoleAuth.roleName"
			
 
				               autocomplete="off"
			
 
				             ></el-input>
			
 
				           </el-form-item>
			
@@ -239,7 +249,7 @@
 
				           >
			
 
				             <el-input
			
 
				               disabled
			
 
				-              v-model.number="editRoleAuth.roleCode"
			
 
				+              v-model="editRoleAuth.roleCode"
			
 
				               autocomplete="off"
			
 
				             ></el-input>
			
 
				           </el-form-item>
			
@@ -360,6 +370,13 @@ export default {
 
				     this.getTableList();
			
 
				   },
			
 
				   methods: {
			
 
				+    handleClose(done) {
			
 
				+      this.$confirm("确认关闭？")
			
 
				+        .then((_) => {
			
 
				+          done();
			
 
				+        })
			
 
				+        .catch((_) => {});
			
 
				+    },
			
 
				     //修改权限
			
 
				     editAuthMenu(formName) {
			
 
				       this.$refs[formName].validate((valid) => {
			
--- a/src/views/system/userMag/index.vue
+++ b/src/views/system/userMag/index.vue
@@ -74,10 +74,10 @@
 
				             <span>
			
 
				               {{
			
 
				                 scope.row.state == 0
			
 
				-                  ? "未启用"
			
 
				+                  ? "停用"
			
 
				                   : scope.row.state == 1
			
 
				                   ? "启用"
			
 
				-                  : "禁用"
			
 
				+                  : "/"
			
 
				               }}</span
			
 
				             >
			
 
				           </template>
			
@@ -141,7 +141,12 @@
 
				 
			
 
				     <!-- 弹出层 -->
			
 
				     <!-- 新增 /编辑-->
			
 
				-    <el-dialog :title="title" :visible.sync="nuedialog" width="500px">
			
 
				+    <el-dialog
			
 
				+      :title="title"
			
 
				+      :visible.sync="nuedialog"
			
 
				+      width="500px"
			
 
				+      :before-close="handleClose"
			
 
				+    >
			
 
				       <div v-loading="loadingView" class="views">
			
 
				         <el-form
			
 
				           :model="ruleForm"
			
@@ -206,7 +211,12 @@
 
				       </div>
			
 
				     </el-dialog>
			
 
				     <!-- 风场详情 -->
			
 
				-    <el-dialog title="修改密码" :visible.sync="unusualdialog" width="500px">
			
 
				+    <el-dialog
			
 
				+      title="修改密码"
			
 
				+      :visible.sync="unusualdialog"
			
 
				+      width="500px"
			
 
				+      :before-close="handleClose"
			
 
				+    >
			
 
				       <div v-loading="loadingView" class="views">
			
 
				         <el-form
			
 
				           :model="editUserPassword"
			
@@ -220,7 +230,7 @@
 
				             :rules="[{ required: true, message: '旧密码不能为空' }]"
			
 
				           >
			
 
				             <el-input
			
 
				-              v-model.number="editUserPassword.oldPWD"
			
 
				+              v-model="editUserPassword.oldPWD"
			
 
				               autocomplete="off"
			
 
				               show-password
			
 
				             ></el-input>
			
@@ -231,7 +241,7 @@
 
				             :rules="[{ required: true, message: '新密码不能为空' }]"
			
 
				           >
			
 
				             <el-input
			
 
				-              v-model.number="editUserPassword.newPWD"
			
 
				+              v-model="editUserPassword.newPWD"
			
 
				               autocomplete="off"
			
 
				               show-password
			
 
				             ></el-input>
			
@@ -352,6 +362,13 @@ export default {
 
				   },
			
 
				 
			
 
				   methods: {
			
 
				+    handleClose(done) {
			
 
				+      this.$confirm("确认关闭？")
			
 
				+        .then((_) => {
			
 
				+          done();
			
 
				+        })
			
 
				+        .catch((_) => {});
			
 
				+    },
			
 
				     //修改密码
			
 
				     editUserPwd(formName) {
			
 
				       this.$refs[formName].validate((valid) => {
			
--- a/vue.config.js
+++ b/vue.config.js
@@ -65,21 +65,21 @@ module.exports = {
 
				     proxy: {
			
 
				       "/api": {
			
 
				         // target: "http://192.168.5.4:16200", // 石月
			
 
				-        // target: "http://192.168.50.235:16200", //内网
			
 
				+        target: "http://192.168.50.235:16200", //内网
			
 
				         // target: "http://192.168.5.15:16200",
			
 
				-        target: "http://106.120.102.238:16600", //外网
			
 
				+        // target: "http://106.120.102.238:16600", //外网
			
 
				         changeOrigin: true,
			
 
				         pathRewrite: {
			
 
				           "^/api": "", // 需要regit write重写的,
			
 
				         },
			
 
				       },
			
 
				-      "/downLoadApi": {
			
 
				-        target: "http://192.168.50.241:8080", //http://192.168.50.241:8080/
			
 
				-        changeOrigin: true,
			
 
				-        pathRewrite: {
			
 
				-          "^/downLoadApi": "", // 需要rewrite重写的,z
			
 
				-        },
			
 
				-      },
			
 
				+      // "/downLoadApi": {
			
 
				+      //   target: "http://192.168.50.241:8080", //http://192.168.50.241:8080/
			
 
				+      //   changeOrigin: true,
			
 
				+      //   pathRewrite: {
			
 
				+      //     "^/downLoadApi": "", // 需要rewrite重写的,z
			
 
				+      //   },
			
 
				+      // },
			
 
				     },
			
 
				   },