新增风机和风场页面，修改页面布局

src/router/index.js

@@ -33,12 +33,251 @@ export const asyncRoutes = [
         },
         children: [
             {
+                path: "factoryMonitor/windPowerPlant",
+                redirect: { name: "windhome" },
+                component: () =>
+                import("@/views/stateMonitor/factoryMonitor/windPowerPlant"),
+                name: "windPowerPlant",
+                meta: {
+                title: "风电场站",
+                icon: "svg-fengdian",
+                permissions: ["jn_fdcz"],
+                },
+                showChild: true,
+                children: [
+                {
+                    path: "windhome",
+                    component: () =>
+                    import(
+                        "@/views/stateMonitor/factoryMonitor/windPowerPlant/windhome"
+                    ),
+                    name: "windhome",
+                    meta: {
+                    title: "场站监视",
+                    icon: "svg-station-surveillance",
+                    permissions: ["jn_fdcz_czjs"],
+                    },
+                },
+                {
+                    path: "DataTarget",
+                    component: () =>
+                    import(
+                        "@/views/stateMonitor/factoryMonitor/windPowerPlant/DataTarget"
+                    ),
+                    name: "DataTarget",
+                    meta: {
+                    title: "数据指标",
+                    icon: "svg-s指标列表",
+                    permissions: ["jn_fdcz_sjzb"],
+                    },
+                },
+
+                {
+                    path: "matrixMonitor",
+                    component: () =>
+                    import(
+                        "@/views/stateMonitor/factoryMonitor/windPowerPlant/matrixMonitor"
+                    ),
+                    name: "matrixMonitor",
+                    meta: {
+                    title: "矩阵监视",
+                    icon: "svg-matrix",
+                    permissions: ["jn_fdcz_jzjs"],
+                    },
+                },
+                {
+                    path: "draughtFan",
+                    component: () =>
+                    import(
+                        "@/views/stateMonitor/factoryMonitor/windPowerPlant/draughtFan"
+                    ),
+                    name: "draughtFan",
+                    meta: {
+                    title: "风机设备",
+                    icon: "svg-wind-site",
+                    permissions: ["jn_fdcz_fjsb"],
+                    },
+                },
+                {
+                    path: "boosterStation",
+                    component: () =>
+                    import(
+                        "@/views/stateMonitor/factoryMonitor/windPowerPlant/boosterStation"
+                    ),
+                    name: "boosterStation",
+                    meta: {
+                    title: "升压站",
+                    icon: "svg-s升压站",
+                    permissions: ["jn_fdcz_syz"],
+                    },
+                },
+                {
+                    path: "millivolt",
+                    component: () =>
+                    import(
+                        "@/views/stateMonitor/factoryMonitor/windPowerPlant/millivolt"
+                    ),
+                    name: "millivolt",
+                    meta: {
+                    title: "电计量",
+                    icon: "svg-djl",
+                    permissions: ["jn_fdcz_syz"],
+                    },
+                },
+                {
+                    path: "windPower",
+                    component: () =>
+                    import(
+                        "@/views/stateMonitor/factoryMonitor/windPowerPlant/windPower"
+                    ),
+                    name: "windPower",
+                    meta: {
+                    title: "测风塔",
+                    permissions: ["jn_fdcz_cft"],
+                    icon: "svg-s测风塔",
+                    },
+                },
+                {
+                    path: "geomorphologicMap",
+                    component: () =>
+                    import(
+                        "@/views/stateMonitor/factoryMonitor/windPowerPlant/geomorphologicMap"
+                    ),
+                    name: "geomorphologicMap",
+                    meta: {
+                    title: "地貌图",
+                    permissions: ["jn_fdcz_dmt"],
+                    icon: "svg-s地图",
+                    },
+                },
+                ],
+            },
+            {
+                path: "factoryMonitor/photovoltaic",
+                redirect: { name: "lighthome" },
+                component: () =>
+                import("@/views/stateMonitor/factoryMonitor/photovoltaic"),
+                name: "photovoltaic",
+                meta: {
+                title: "光伏场站",
+                icon: "svg-guangfu",
+                permissions: ["jn_gfcz"],
+                },
+                showChild: true,
+                children: [
+                {
+                    path: "lighthome",
+                    component: () =>
+                    import(
+                        "@/views/stateMonitor/factoryMonitor/photovoltaic/lighthome"
+                    ),
+                    name: "lighthome",
+                    meta: {
+                    title: "场站监视",
+                    icon: "svg-station-surveillance",
+                    permissions: ["jn_gfcz_czjs"],
+                    },
+                },
+                {
+                    path: "lightDataTarget",
+                    component: () =>
+                    import(
+                        "@/views/stateMonitor/factoryMonitor/photovoltaic/lightDataTarget"
+                    ),
+                    name: "lightDataTarget",
+                    meta: {
+                    title: "数据指标",
+                    permissions: ["jn_gfcz_sjzb"],
+                    icon: "svg-s指标列表",
+                    },
+                },
+                {
+                    path: "lightMatrixMonitor",
+                    component: () =>
+                    import(
+                        "@/views/stateMonitor/factoryMonitor/photovoltaic/lightMatrixMonitor"
+                    ),
+                    name: "lightMatrixMonitor",
+                    meta: {
+                    title: "矩阵监视",
+                    permissions: ["jn_gfcz_jzjs"],
+                    icon: "svg-matrix",
+                    },
+                },
+                {
+                    path: "lightMatrix",
+                    component: () =>
+                    import(
+                        "@/views/stateMonitor/factoryMonitor/photovoltaic/lightMatrix"
+                    ),
+                    name: "lightMatrix",
+                    meta: {
+                    title: "分类矩阵",
+                    permissions: ["jn_gfcz_fljz"],
+                    icon: "svg-fljz",
+                    },
+                },
+                {
+                    path: "photovoltaicFacility",
+                    component: () =>
+                    import(
+                        "@/views/stateMonitor/factoryMonitor/photovoltaic/photovoltaicFacility"
+                    ),
+                    name: "photovoltaicFacility",
+                    meta: {
+                    title: "光伏设备",
+                    permissions: ["jn_gfcz_gfsb"],
+                    icon: "svg-photovoltaic",
+                    },
+                },
+                {
+                    path: "lightBoosterStation",
+                    component: () =>
+                    import(
+                        "@/views/stateMonitor/factoryMonitor/photovoltaic/lightBoosterStation"
+                    ),
+                    name: "lightBoosterStation",
+                    meta: {
+                    title: "升压站",
+                    permissions: ["jn_gfcz_syz"],
+                    icon: "svg-s升压站",
+                    },
+                },
+                {
+                    path: "lightMillivolt",
+                    component: () =>
+                    import(
+                        "@/views/stateMonitor/factoryMonitor/photovoltaic/lightMillivolt"
+                    ),
+                    name: "lightMillivolt",
+                    meta: {
+                    title: "电计量",
+                    icon: "svg-djl",
+                    permissions: ["jn_fdcz_syz"],
+                    },
+                },
+                {
+                    path: "lightGeomorphologicMap",
+                    component: () =>
+                    import(
+                        "@/views/stateMonitor/factoryMonitor/photovoltaic/lightGeomorphologicMap"
+                    ),
+                    name: "lightGeomorphologicMap",
+                    meta: {
+                    title: "地貌图",
+                    permissions: ["jn_gfcz_dmt"],
+                    icon: "svg-s地图",
+                    },
+                },
+                ],
+            },
+            {
                 path: "statusMatrix",
                 component: () => import("@/views/stateMonitor/Status/Status"),
                 name: "Status",
                 meta: {
                     title: "状态监视",
-                    icon: "svg-fengdian",
+                    icon: "svg-syz",
                     permissions: ["jn_fdcz_sjzb"],
                 },
             },

src/views/IntegratedAlarm/safe/temperatureMonitoring/dataJson.json

@@ -2,123 +2,150 @@
     "fdjBoxArr": [
         {
             "name": "发电机绕组U1温度",
-            "code": "U1"
+            "code": "U1",
+            "value": "52.3"
         },
         {
             "name": "发电机绕组V1温度",
-            "code": "V1"
+            "code": "V1",
+            "value": "62.3"
         },
         {
             "name": "发电机绕组W1温度",
-            "code": "W1"
+            "code": "W1",
+            "value": "51.3"
         },
         {
             "name": "发电机绕组U2温度",
-            "code": "U2"
+            "code": "U2",
+            "value": "49.3"
         },
         {
             "name": "发电机绕组V2温度",
-            "code": "V2"
+            "code": "V2",
+            "value": "62.3"
         },
         {
             "name": "发电机绕组W2温度",
-            "code": "W2"
+            "code": "W2",
+            "value": "83.3"
         },
         {
             "name": "发电机轴承a温度",
-            "code": "a"
+            "code": "a",
+            "value": "32.3"
         },
         {
             "name": "发电机轴承b温度",
-            "code": "b"
+            "code": "b",
+            "value": "92.3"
         }
     ],
     "clxBoxArr": [
         {
             "name": "油温",
-            "code": "yw"
+            "code": "yw",
+            "value": "123.3"
         },
         {
             "name": "输入轴1温度",
-            "code": "z1"
+            "code": "z1",
+            "value": "50.3"
         },
         {
             "name": "输入轴2温度",
-            "code": "z2"
+            "code": "z2",
+            "value": "60.3"
         },
         {
             "name": "入口油温",
-            "code": "rkyw"
+            "code": "rkyw",
+            "value": "69.3"
         }
     ],
     "bjxtBoxArr": [
         {
             "name": "电池柜1温度",
-            "code": "dcg1"
+            "code": "dcg1",
+            "value": "35.3"
         },
         {
             "name": "电池柜2温度",
-            "code": "dcg2"
+            "code": "dcg2",
+            "value": "42.3"
         },
         {
             "name": "电池柜3温度",
-            "code": "dcg3"
+            "code": "dcg3",
+            "value": "69.3"
         },
         {
             "name": "变桨轮毂温度",
-            "code": "bjlgwd"
+            "code": "bjlgwd",
+            "value": "92.3"
         }
     ],
     "yyzBoxArr": [
         {
             "name": "温度",
-            "code": "wd"
+            "code": "wd",
+            "value": "50.3"
         },
         {
             "name": "压力",
-            "code": "yl"
+            "code": "yl",
+            "value": "92.3"
         }
     ],
     "zzBoxArr": [
         {
             "name": "主轴齿轮箱侧温度",
-            "code": "zzclx"
+            "code": "zzclx",
+            "value": "60.3"
         },
         {
             "name": "主轴叶轮侧温度",
-            "code": "zzylx"
+            "code": "zzylx",
+            "value": "80.3"
         }
     ],
     "fjzdBoxArr": [
         {
             "name": "机舱振动有效值",
-            "code": "jczdyxz"
+            "code": "jczdyxz",
+            "value": "80.3"
         },
         {
             "name": "机舱震动X轴",
-            "code": "jczdX"
+            "code": "jczdX",
+            "value": "80.3"
         },
         {
             "name": "机舱震动Y轴",
-            "code": "jczdY"
+            "code": "jczdY",
+            "value": "80.3"
         }
     ],
     "qtBoxArr": [
         {
             "name": "环境温度",
-            "code": "hjwd"
+            "code": "hjwd",
+            "value": "113.3"
         },
         {
             "name": "机舱温度",
-            "code": "jcwd"
+            "code": "jcwd",
+            "value": "56.3"
         },
         {
             "name": "塔底柜温度",
-            "code": "tdgwd"
+            "code": "tdgwd",
+            "value": "86.3"
         },
         {
             "name": "机舱柜内温度",
-            "code": "jcgnwd"
+            "code": "jcgnwd",
+            "value": "68.3"
         }
     ],
     "data": [

src/views/IntegratedAlarm/safe/temperatureMonitoring/index.vue

@@ -42,7 +42,7 @@
                             <div class="comBox_main">
                                 <div class="comBox_main_it" v-for="it in fdjBoxArr" :key="it.code">
                                     <span>{{it.name}}</span>
-                                    <span>52.1</span>
+                                    <span :style="colorSty(it)">{{it.value}}</span>
                                 </div>
                             </div>
                         </div>
@@ -57,7 +57,7 @@
                             <div class="comBox_main">
                                 <div class="comBox_main_it" v-for="it in clxBoxArr" :key="it.code">
                                     <span>{{it.name}}</span>
-                                    <span>52.1</span>
+                                    <span :style="colorSty(it)">{{it.value}}</span>
                                 </div>
                             </div>
                         </div>
@@ -72,7 +72,7 @@
                             <div class="comBox_main">
                                 <div class="comBox_main_it" v-for="it in bjxtBoxArr" :key="it.code">
                                     <span>{{it.name}}</span>
-                                    <span>52.1</span>
+                                    <span :style="colorSty(it)">{{it.value}}</span>
                                 </div>
                             </div>
                         </div>
@@ -87,7 +87,7 @@
                             <div class="comBox_main">
                                 <div class="comBox_main_it" v-for="it in yyzBoxArr" :key="it.code">
                                     <span>{{it.name}}</span>
-                                    <span>52.1</span>
+                                    <span :style="colorSty(it)">{{it.value}}</span>
                                 </div>
                             </div>
                         </div>
@@ -102,7 +102,7 @@
                             <div class="comBox_main">
                                 <div class="comBox_main_it" v-for="it in zzBoxArr" :key="it.code">
                                     <span>{{it.name}}</span>
-                                    <span>52.1</span>
+                                    <span :style="colorSty(it)">{{it.value}}</span>
                                 </div>
                             </div>
                         </div>
@@ -117,7 +117,7 @@
                             <div class="comBox_main">
                                 <div class="comBox_main_it" v-for="it in fjzdBoxArr" :key="it.code">
                                     <span>{{it.name}}</span>
-                                    <span>52.1</span>
+                                    <span :style="colorSty(it)">{{it.value}}</span>
                                 </div>
                             </div>
                         </div>
@@ -132,7 +132,7 @@
                             <div class="comBox_main">
                                 <div class="comBox_main_it" v-for="it in qtBoxArr" :key="it.code">
                                     <span>{{it.name}}</span>
-                                    <span>52.1</span>
+                                    <span :style="colorSty(it)">{{it.value}}</span>
                                 </div>
                             </div>
                         </div>
@@ -167,7 +167,21 @@ export default {
     mounted() {
         
     },
-    methods: {},
+    methods: {
+        colorSty(data) {
+            if (data.name.indexOf('温度')>-1 || data.name.indexOf('油温')>-1) {
+                if (data.value * 1 > 60 && data.value * 1 < 80) {
+                    return "color: orange"
+                } else if (data.value * 1 > 80) {
+                    return "color: red"
+                } else {
+                    return ""
+                }
+            } else {
+                return ""
+            }
+        }
+    },
 };
 </script>
 

src/views/layout/login-page.vue

@@ -1,11 +1,11 @@
 <template>
     <div class="login-panel">
         <div class="login-title">
-            <!-- <p>
+            <p>
                 <img src="@/assets/imgs/login-icon.png" alt="" class="login-img" />发电场站
             </p>
-            <div class="login-name">生产实时运营管理平台</div> -->
-            <img src="@/assets/loginImage/logo.png" alt="" />
+            <div class="login-name">生产实时运营管理平台</div>
+            <!-- <img src="@/assets/loginImage/logo.png" alt="" /> -->
         </div>
         <el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
             <el-form-item prop="username">

src/views/stateMonitor/Status/Status.vue

@@ -1,29 +1,29 @@
 <template>
   <HeaderNav @typeFlag="typeFlag" :isAll="true" />
   <div class="status">
-      <div class="simp_content" v-if="datas.length" >
-        <div class="" v-for="(data, index) of datas" :key="index">
-          <StatusPanel :data="data"></StatusPanel>
+        <div class="statusTable">
+            <el-table
+            :data="statusData"
+            size="mini"
+            stripe
+            ref="stand_table"
+            style="width: 100%"
+            >
+                <el-table-column label="公司/区域/场站" prop="wpName" align="center" />
+                <el-table-column v-for="(it, index) in statusHeader" :key="index"
+                :label="it.label" :prop="it.prop" :align="it.align">
+                    <template #header>
+                        <div>{{it.label.split(" ")[0]}}</div>
+                        <div>{{it.label.split(" ")[1]}}</div>
+                    </template>
+            </el-table-column>
+            </el-table>
+        </div>
+        <div class="simp_content" v-if="datas.length" >
+            <div class="" v-for="(data, index) of datas" :key="index">
+            <StatusPanel :data="data"></StatusPanel>
+            </div>
         </div>
-      </div>
-      <div class="statusTable">
-        <el-table
-          :data="statusData"
-          size="mini"
-          stripe
-          ref="stand_table"
-          style="width: 100%"
-        >
-            <el-table-column label="公司/区域/场站" prop="wpName" align="center" />
-            <el-table-column v-for="(it, index) in statusHeader" :key="index"
-            :label="it.label" :prop="it.prop" :align="it.align">
-                <template #header>
-                    <div>{{it.label.split(" ")[0]}}</div>
-                    <div>{{it.label.split(" ")[1]}}</div>
-                </template>
-          </el-table-column>
-        </el-table>
-      </div>
   </div>
 </template>
 
@@ -131,7 +131,7 @@ export default {
   }
   .statusTable{
     padding: 0 20px;
-    margin-top: 20px;
+    margin-bottom: 20px;
   }
 }