浏览代码

合并振动代码

liujiejie 1 月之前
父节点
当前提交
119773a0f8

二进制
dist.zip


+ 2 - 2
src/components/map/index copy.vue

@@ -235,8 +235,8 @@ export default {
         new TileLayer({
           source: new XYZ({
             // url: "http://127.0.0.1:8010/tiles/{z}/{x}/{y}.png", //本地
-            url: "http://192.168.50.235/tiles/{z}/{x}/{y}.png", //内网
-            // url: "http://106.120.102.238:18000/tiles/{z}/{x}/{y}.png", //外网
+            // url: "http://192.168.50.235/tiles/{z}/{x}/{y}.png", //内网
+            url: "http://106.120.102.238:18000/tiles/{z}/{x}/{y}.png", //外网
             // url: "http://10.96.137.5:9080/tiles/{z}/{x}/{y}.png", //大~#@唐
           }),
         }),

+ 2 - 2
src/components/map/index.vue

@@ -250,10 +250,10 @@ export default {
           source: new XYZ({
             // url: "http://106.120.102.238:18000/tiles/{z}/{x}/{y}.png", //外网
             // url: "http://127.0.0.1:8010/tiles/{z}/{x}/{y}.png", //本地
-            url: "http://192.168.50.235/tiles/{z}/{x}/{y}.png", //内网
+            // url: "http://192.168.50.235/tiles/{z}/{x}/{y}.png", //内网
             // url: "http://10.96.137.5:9080/tiles/{z}/{x}/{y}.png", //大~#@唐
             // url: "http://192.168.0.1/tiles/{z}/{x}/{y}.png", //华电
-            // url: "http://192.168.50.235/tiles/{z}/{x}/{y}.png", //中广核
+            url: "http://192.168.50.235/tiles/{z}/{x}/{y}.png", //中广核
           }),
         }),
         new VectorLayer({

+ 8 - 8
src/views/admin/cockpitManage/component/leftdata.vue

@@ -376,14 +376,14 @@ export default {
           paramValue: "SCADA报警",
           status: 1,
         },
-        {
-          id: 5,
-          type: "trans_type",
-          typeName: "转化类型",
-          paramKey: "wave",
-          paramValue: "振动",
-          status: 1,
-        },
+        // {
+        //   id: 5,
+        //   type: "trans_type",
+        //   typeName: "转化类型",
+        //   paramKey: "wave",
+        //   paramValue: "振动",
+        //   status: 1,
+        // },
       ],
       windList: [],
       YCtableColumns: [{ prop: "windFarmName" }, { prop: "createTime" }],

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

@@ -302,13 +302,13 @@
           min-width="300"
         >
           <template slot-scope="scope">
-            <el-button
+            <!-- <el-button
               @click="handleDownLoadChart(scope.row)"
               type="text"
               size="small"
             >
               下载报告
-            </el-button>
+            </el-button> -->
             <el-button
               @click="abnormalDialog(scope.row, '上传报告')"
               type="text"

+ 5 - 17
src/views/performance/components/analysisEvent.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-05-29 09:13:51
- * @LastEditTime: 2025-04-11 09:39:33
+ * @LastEditTime: 2025-05-08 10:43:34
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/components/analysisEvent.vue
@@ -121,14 +121,8 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col
-              :xs="24"
-              :sm="24"
-              :md="12"
-              :lg="8"
-              :xl="5"
-              v-hasPermi="['home:offlinedata']"
-            >
+            <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="5">
+              <!-- v-hasPermi="['home:offlinedata']" -->
               <el-form-item
                 label="开始时间"
                 v-if="checkedCities.find((item) => item === '分析时间')"
@@ -143,14 +137,8 @@
                 >
                 </el-date-picker> </el-form-item
             ></el-col>
-            <el-col
-              :xs="24"
-              :sm="24"
-              :md="12"
-              :lg="8"
-              :xl="5"
-              v-hasPermi="['home:offlinedata']"
-            >
+            <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="5">
+              <!-- v-hasPermi="['home:offlinedata']" -->
               <el-form-item
                 label="结束时间"
                 v-if="checkedCities.find((item) => item === '分析时间')"