Parcourir la source

姜瑞修改部分

rui.jiang il y a 1 an
Parent
commit
6c2b5f7993

+ 3 - 2
src/views/admin/cockpitManage/Index.vue

@@ -17,7 +17,7 @@
       </selecttree>
 
       <p>
-        <span class="SpText">登录用户风场数:</span>{{ totalList.fieldSumNumber }} 个
+        <span class="SpText">风场数:</span>{{ totalList.fieldSumNumber }} 个
       </p>
       <p>
         <span class="SpText">已完成分析风场:</span
@@ -32,7 +32,7 @@
         >{{ totalList.engineGroupNumber }} 个
       </p>
       <p>
-        <span class="SpText">风状态:</span>
+        <span class="SpText">风状态:</span>
         <span class="red"></span>
         <span class="yellow"></span>
         <span class="green"></span>
@@ -41,6 +41,7 @@
         v-model="value1"
         active-text="显示"
         inactive-text="隐藏"
+   
         @change="handleSwitchChange"
       >
       </el-switch>

+ 3 - 3
src/views/admin/cockpitManage/component/rightdata.vue

@@ -9,11 +9,11 @@
       <div class="BOX">
         <div style="display: flex">
           <div class="YC01">
-            <strong>4545</strong>
+            <strong>0</strong>
             <span>异常总数</span>
           </div>
           <div class="YC02">
-            <strong>20</strong>
+            <strong>0</strong>
             <span>本月异常</span>
           </div>
         </div>
@@ -24,7 +24,7 @@
             <span>未处理异常</span>
           </div>
           <div class="YC02">
-            <strong class="texyellow">20</strong>
+            <strong class="texyellow">0</strong>
             <span>异常设备数</span>
           </div>
           <div class="YC03"></div>

+ 1 - 1
src/views/home/components/Menu.vue

@@ -127,7 +127,7 @@ export default {
           children: [
             {
               id: 11,
-              iconName: "gps",
+              iconName: "",
               meta: {
                 hidden: false,
               },

+ 6 - 3
src/views/performance/components/analysisEvent.vue

@@ -576,7 +576,7 @@ export default {
         configAnalysis: null, //分析类型
         powerFarmID: null, //风场编号//通过路由获取的默认传递的
         dataBatchNum: null, //批次号
-        scada: null, //scada数类型
+        scada: "minute", //scada数类型
         turbines: [], //机组编号
         beginTime: null, //开始时间
         endTime: null, //结束时间
@@ -663,8 +663,11 @@ export default {
         this.analysisTypeList = response.data.analysisTypeList;
         this.windEngineGroupList = response.data.windEngineGroupList;
         this.engineCode = response.data.windEngineGroupList[0];
-        //获取台账机组编号
+        if(response.data.windEngineGroupList.length>0){
+ //获取台账机组编号
         this.getWindEngList();
+        }
+       
       } catch (error) {
         console.error(error);
         this.$router.go(-1);
@@ -705,7 +708,7 @@ export default {
         configAnalysis: null, //分析类型
         powerFarmID: this.$route.query.fieldEngineCode, //风场编号//通过路由获取的默认传递的
         dataBatchNum: this.$route.query.batchCode, //批次号
-        scada: null, //scada数类型
+        scada: "minute", //scada数类型
         turbines: [], //机组编号
         beginTime: null, //开始时间
         endTime: null, //结束时间

+ 2 - 2
vue.config.js

@@ -65,9 +65,9 @@ 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重写的,