Merge branch 'master' of http://git.jiayuepowertech.com:9022/xiuwei/vpp

# Conflicts:
#	src/router/index.js

src/router/index.js

@@ -2,27 +2,21 @@ import Vue from 'vue'
 import VueRouter from 'vue-router'
 import Login from '../views/Login/Login.vue'
 import Table1 from '../views/Articles/index.vue'
-import Rqdd from '../views/rqdd/rqdd.vue'
 import Fdjh from '../views/fdjh/fdjh.vue'
-import Gznfh1 from '@/views/ydjhdjk/gznfh/index.vue'
-import Gznfh from '@/views/ydjhdjk/gznfh/gznfh.vue'
-import Llx from '@/views/ystjjk/llx/llx.vue'
-import Llx1 from '@/views/ystjjk/llx/index.vue'
-import Dm from '@/views/ystjjk/dm/dm.vue'
-import Dm1 from '@/views/ystjjk/dm/index.vue'
-import Hd from '@/views/sjcjjk/hd/hd.vue'
-import Hd1 from '@/views/sjcjjk/hd/index.vue'
-import Fdgf from '@/views/sjcjjk/fdgf/fdgf.vue'
-import Fdgf1 from '@/views/sjcjjk/fdgf/index.vue'
-import Ptfh from '@/views/sjcjjk/ptfh/ptfh.vue'
-import Ptfh1 from '@/views/sjcjjk/ptfh/index.vue'
-import Gaoznfh from '@/views/sjcjjk/gznfh/gznfh.vue'
-import Gaoznfh1 from '@/views/sjcjjk/gznfh/index.vue'
-import Fdjhhd from '@/views/fdjh/hd/hd.vue'
-import Fdjhhd1 from '@/views/fdjh/hd/index.vue'
-import Fdjhgf from '@/views/fdjh/gf/gf.vue'
-import Fdjhgf1 from '@/views/fdjh/gf/index.vue'
+import Gznfh from '@/views/ydjhdjk/gznfh/index.vue'
+import Llx from '@/views/ystjjk/llx/index.vue'
+import Dm from '@/views/ystjjk/dm/index.vue'
+import Hd from '@/views/sjcjjk/hd/index.vue'
+import Fdgf from '@/views/sjcjjk/fdgf/index.vue'
+import Ptfh from '@/views/sjcjjk/ptfh/index.vue'
+import Gaoznfh from '@/views/sjcjjk/gznfh/index.vue'
+import Fdjhhd from '@/views/fdjh/hd/index.vue'
+import Fdjhgf from '@/views/fdjh/gf/index.vue'
+import Fdjhcn from '@/views/fdjh/cn/index.vue'
+import Jkcx from '@/views/xtrz/jkcx/index.vue'
 import Xtpz from '../views/xtpz/xtpz.vue'
+import Rqdd from '../views/rqdd/rqdd.vue'
+import fdjhnav from '../views/fdjh/LeftNav.vue'
 
 Vue.use(VueRouter)
 
@@ -39,7 +33,7 @@ const routes = [
     },
     {
         path: '/table1',
-        name: 'Table1',
+        name: 'Table',
         component: Table1
     },
     {
@@ -48,29 +42,19 @@ const routes = [
         component: Fdjh
     },
     {
-        path: '/fdjhhd1',
-        name: '火电厂',
-        component: Fdjhhd1
-    },
-    {
         path: '/fdjhhd',
         name: '火电厂',
         component: Fdjhhd
     },
     {
-        path: '/fdjhgf1',
-        name: '光伏电站',
-        component: Fdjhgf1
-    },
-    {
         path: '/fdjhgf',
         name: '光伏电站',
         component: Fdjhgf
     },
     {
-        path: '/gznfh1',
-        name: '高载能负荷',
-        component: Gznfh1
+        path: '/fdjhcn',
+        name: '储能',
+        component: Fdjhcn
     },
     {
         path: '/gznfh',
@@ -78,76 +62,62 @@ const routes = [
         component: Gznfh
     },
     {
-        path: '/llx1',
-        name: '联络线',
-        component: Llx1
-    },
-    {
         path: '/llx',
         name: '联络线',
         component: Llx
     },
     {
-        path: '/dm1',
-        name: '断面',
-        component: Dm1
-    },
-    {
         path: '/dm',
         name: '断面',
         component: Dm
     },
     {
-        path: '/rqdd',
-        name: '日前调度',
-        component: Rqdd
-    },
-    {
-        path: '/hd1',
-        name: '火电厂',
-        component: Hd1
-    },
-    {
         path: '/hd',
         name: '火电厂',
         component: Hd
     },
     {
-        path: '/fdgf1',
-        name: '风电、光伏电站',
-        component: Fdgf1
-    },
-    {
         path: '/fdgf',
         name: '风电、光伏电站',
         component: Fdgf
     },
     {
-        path: '/ptfh1',
-        name: '普通负荷',
-        component: Ptfh1
-    },
-    {
         path: '/ptfh',
         name: '普通负荷',
         component: Ptfh
     },
     {
-        path: '/gaoznfh1',
-        name: '高载能负荷',
-        component: Gaoznfh1
-    },
-    {
         path: '/gaoznfh',
         name: '高载能负荷',
         component: Gaoznfh
     },
+    {
+        path: '/jkcx',
+        name: '接口、程序',
+        component: Jkcx
+    },
 
     {
         path: '/xtpz',
         name: '系统配置',
         component: Xtpz
-    }
+    },
+    {
+        path: '/rqdd',
+        name: '日前调度',
+        component: Rqdd
+    },
+    {
+        path: '/dailyPlanning',
+        component: () => import('@/views/xndc/index'),
+        hidden: true
+    },
+    {
+        path: '/fdjhnav',
+        name: '发电计划菜单',
+        component: fdjhnav
+    },
+
 ]
 
 const router = new VueRouter({

src/views/fdjh/LeftNav.vue

@@ -0,0 +1,190 @@
+<template>
+    <div class="sidebar">
+        <div class="title"
+             style="font-family: AliMaMa;font-size: 30px;font-weight: 1000;text-align: left;">
+            <span style="position: absolute;top:-3px;left: 70px">目录</span>
+        </div>
+
+        <el-menu
+                active-text-color="#ffd04b"
+                background-color="transparent"
+                class="sidebar-el-menu"
+                default-active="1"
+                text-color="#fff">
+            <!-- 一级菜单 -->
+            <template v-for="item in list">
+                <el-submenu v-if="item.children && item.children.length" :key="item.path" :index="item.path">
+                    <template slot="title"><img :src="require('./img/plan.png')"
+                                                width="28px"/><span>{{ item.name }}</span>
+                    </template>
+                    <!-- 二级菜单 -->
+                    <template v-for="itemChild in item.children">
+                        <el-submenu v-if="itemChild.children && itemChild.children.length" :key="itemChild.path"
+                                    :index="itemChild.path">
+                            <template slot="title"><img
+                                    :src="require('./img/pc1.png')"/><span>{{ itemChild.name }}</span></template>
+                            <!-- 三级菜单 -->
+                            <el-menu-item v-for="itemChild_Child in itemChild.children" :key="itemChild_Child.path"
+                                          :index="itemChild_Child.path" @click="changePage(itemChild_Child)">
+                                <img :src="require('./img/last1.png')"/><span
+                                    slot="title">{{ itemChild_Child.name }}</span></el-menu-item>
+                        </el-submenu>
+
+                        <el-menu-item v-else :key="itemChild.path" :index="itemChild.path"><img
+                                :src="require('./img/pc1.png')"/><span slot="title">{{ itemChild.name }}</span>
+                        </el-menu-item>
+                    </template>
+                </el-submenu>
+                <el-menu-item v-else :key="item.path" :index="item.path"><img :src="require('./img/plan.png')"
+                                                                              width="28px"/><span
+                        slot="title">{{ item.name }}</span></el-menu-item>
+            </template>
+        </el-menu>
+    </div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            list: [
+                {
+                    path: "/1",
+                    name: "日前调度计划",
+                    children: [
+                        {
+                            path: "/1/1",
+                            name: "发电端计划监控",
+                            children: [
+                                {
+                                    path: "/#/table1",
+                                    name: "风电",
+                                },
+                                {
+                                    path: "/#/fdjhgf",
+                                    name: "光伏电站",
+                                },
+                                {
+                                    path: "/#/fdjhhd",
+                                    name: "火电厂",
+                                }
+                            ]
+                        },
+                        {
+                            path: "/1/2",
+                            name: "用电端计划监控",
+                            children: [
+                                {
+                                    path: "/#/gznfh",
+                                    name: "高载能计划负荷",
+                                }
+                            ]
+                        },
+                        {
+                            path: "/1/3",
+                            name: "约束条件监控",
+                            children: [
+                                {
+                                    path: "/#/llx",
+                                    name: "联络线",
+                                },
+                                {
+                                    path: "/#/dm",
+                                    name: "断面",
+                                }
+                            ]
+                        },
+                        {
+                            path: "/1/4",
+                            name: "数据采集监控监控",
+                            children: [
+                                {
+                                    path: "/#/hd",
+                                    name: "火电厂",
+                                },
+                                {
+                                    path: "/#/fdgf",
+                                    name: "风电、光伏电站",
+                                },
+                                {
+                                    path: "/#/ptfh",
+                                    name: "普通负荷",
+                                },
+                                {
+                                    path: "/#/gaoznfh",
+                                    name: "高载能负荷",
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+        }
+    },
+    methods: {
+        changePage(obj) {
+            var parentIframe = parent.document.getElementById('showcontent');
+            parentIframe.src = obj.path;
+        }
+
+    }
+}
+</script>
+
+<style scoped>
+.title {
+    margin-bottom: 20px;
+    margin-left: 60px;
+    font-size: 18px;
+    color: #fff;
+}
+
+.sidebar {
+    display: block;
+    text-align: left;
+}
+
+.sidebar::-webkit-scrollbar {
+    width: 0;
+}
+
+.sidebar-el-menu:not(.el-menu--collapse) {
+
+    margin: 40px 0 30px 30px;
+    background-size: 100% 100%;
+}
+
+
+/deep/ .el-submenu__title:hover {
+    background-color: rgb(103, 118, 49) !important;
+
+}
+
+/deep/ .sidebar-el-menu {
+    margin-left: 23px !important;
+}
+
+.sidebar > ul {
+    height: 100%;
+}
+
+.el-menu {
+    border: 0 !important;
+}
+
+.el-menu-item {
+    height: 40px;
+    font-size: 16px;
+    font-weight: bold;
+}
+
+.el-submenu .el-menu-item:hover {
+    background-color: rgb(103, 118, 49) !important;
+}
+
+.el-sub-menu__title:hover {
+    background-color: rgb(103, 118, 49) !important;
+}
+</style>
+
+

src/views/fdjh/cn/cn.vue

@@ -0,0 +1,83 @@
+<template>
+    <div class="page">
+        <iframe class="image_2 pos_2">
+            <img src="../../fdjh/img/fdjh-left.png">
+        </iframe>
+        <div id="iframe1" class="image_3 pos_3" style="">
+            <iframe src="/public#/fdjhcn1" style="width: 100%;height: 100%">
+            </iframe>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    name: 'cn-name',
+}
+</script>
+
+<style lang="css" scoped>
+.page {
+    background-image: url('../../fdjh/img/fdjh-bj.png');
+    position: absolute;
+    width: 1920px;
+    height: 1080px;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+}
+
+.image {
+    width: 100vw;
+    height: 4.5833vw;
+}
+
+iframe {
+    border: 0;
+}
+
+#iframe1 {
+    background-image: url(../../fdjh/img/img.png);
+}
+
+.pos {
+    position: absolute;
+    width: 1920px;
+    height: 88px;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 992px;
+}
+
+.image_2 {
+    width: 23.56rem;
+    height: 56.88rem;
+}
+
+.pos_2 {
+    position: absolute;
+    width: 377px;
+    height: 910px;
+    left: 30px;
+    right: 1513px;
+    top: 142px;
+    bottom: 28px;
+}
+
+.image_3 {
+    width: 91.19rem;
+    height: 56.88rem;
+}
+
+.pos_3 {
+    position: absolute;
+    width: 1479px;
+    height: 910px;
+    left: 408px;
+    right: 33px;
+    top: 142px;
+    bottom: 28px;
+}
+</style>

src/views/fdjh/cn/index.vue

@@ -0,0 +1,314 @@
+<template>
+    <div class="table-wrapper">
+        <div class="table-box">
+            <div class="title"
+                 style="font-family: AliMaMa;font-size: 30px;font-weight: 1000;text-align: left;height: 40px">
+                <span style="position: absolute;top:-3px;left: 70px">储能</span>
+            </div>
+            <el-row :gutter="20">
+                <el-form>
+                    <el-col>
+                        <el-form-item
+                                label="场站名称:"
+                                label-width="100px"
+                                style="font-weight: 700"
+                        >
+                            <el-select v-model="form.taskNumber" placeholder="请选择" size="mini">
+                                <el-option
+                                        v-for="item in options0"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col>
+                        <el-form-item
+                                label="装机容量(MVA):"
+                                label-width="150px"
+                                style="font-weight: 700"
+                        >
+                            <el-select v-model="form.taskNumber" placeholder="请选择" size="mini">
+                                <el-option
+                                        v-for="item in options2"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col>
+                        <el-form-item
+                                label="是否受控:"
+                                label-width="100px"
+                                style="font-weight: 700"
+                        >
+                            <el-select v-model="form.taskNumber" placeholder="请选择" size="mini">
+                                <el-option
+                                        v-for="item in options"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col>
+                        <el-form-item
+                                label="下发状态:"
+                                label-width="100px"
+                                style="font-weight: 700"
+                        >
+                            <el-select v-model="form.taskNumber" placeholder="请选择" size="mini">
+                                <el-option
+                                        v-for="item in options1"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col>
+                        <el-form-item
+                                label="日期:"
+                                label-width="60px"
+                                style="font-weight: 700"
+                        >
+                            <el-date-picker
+                                    v-model="form.date"
+                                    placeholder="选择日期"
+                                    size="mini"
+                                    type="date">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                </el-form>
+            </el-row>
+            <el-table
+                    :cell-style="{border:0,color:'#fff'}"
+                    :data="tableData"
+                    :header-cell-style="{color:'#fff'}"
+                    :row-style="{backgroundColor:'rgb(4,66,115,0.3)'}"
+                    size="mini"
+                    style="width: 1429px;font-size: 17px;background: none"
+            >
+                <el-table-column
+                        align="center"
+                        label="场站名称"
+                        prop="stationName"
+                        width="270px"
+                >
+                </el-table-column>
+                <el-table-column
+                        align="center"
+                        label="是否受控"
+                        prop="control"
+                >
+                </el-table-column>
+                <el-table-column
+                        align="center"
+                        label="装机容量(MVA)"
+                        prop="capacity">
+                </el-table-column>
+                <el-table-column
+                        align="center"
+                        label="虚拟电厂计划值"
+                        prop="capacity">
+                </el-table-column>
+                <el-table-column
+                        align="center"
+                        label="现货系统计划值"
+                        prop="capacity">
+                </el-table-column>
+                <el-table-column
+                        align="center"
+                        label="计划时刻"
+                        prop="time">
+                </el-table-column>
+                <el-table-column
+                        align="center"
+                        label="执行时刻"
+                        prop="time">
+                </el-table-column>
+                <el-table-column
+                        align="center"
+                        label="下发状态"
+                        prop="status">
+                </el-table-column>
+                <el-table-column
+                        align="center"
+                        label="下发时间"
+                        prop="date">
+                </el-table-column>
+            </el-table>
+        </div>
+    </div>
+</template>
+
+<script>
+
+export default {
+    name: 'Article-Index',
+    data() {
+        return {
+            form: {
+                taskNumber: '',
+                date: '',
+                current: 1,
+                size: 10
+            },
+            options: [],
+            options0: [],
+            options1: [],
+            options2: [],
+            tableData: []
+        }
+    },
+    methods: {},
+    mounted() {
+        const tableDataList = require('../../tabledata.json');
+        this.tableData = tableDataList.windDataList
+        this.options = tableDataList.yesOrNoOption
+        this.options1 = tableDataList.status
+        this.options2 = tableDataList.capacity
+        this.options0 = tableDataList.stationOption
+    }
+}
+</script>
+
+<style lang="less" scoped>
+
+@font-face {
+  font-family: AliMaMa;//自定义字体名称
+  src: url("../../Articles/font/AlimamaDaoLiTi.ttf")
+}
+
+body {
+  border: 0;
+  background-image: url(../../Articles/img/bgc.png)
+}
+
+.table-wrapper {
+  width: 1483px;
+  padding-left: 20px;
+
+  .table-box {
+    min-height: 600px;
+    background-size: cover;
+  }
+
+  .title {
+    margin-bottom: 20px;
+    margin-left: 60px;
+    font-size: 18px;
+    color: #fff;
+  }
+
+  /deep/ .el-form-item__label {
+    color: #fff;
+    font-size: 17px;
+  }
+
+  /deep/ .el-input__inner {
+    background-color: rgba(14, 73, 131);
+    border: 1px solid rgb(64, 153, 255);
+    height: 34px;
+    font-size: 17px;
+  }
+
+  /deep/ .el-table__header {
+    background: url(../../Articles/img/bg1.png);
+  }
+
+  /deep/ .el-table--enable-row-hover .el-table__body tr:hover > td {
+    background-color: rgb(103, 118, 49) !important
+  }
+
+  /deep/ .el-col {
+    padding: 0;
+    display: inline-block;
+    position: relative;
+  }
+
+  /deep/ .el-col:nth-child(1) {
+    width: 19%;
+  }
+
+  /deep/ .el-col:nth-child(2) {
+    width: 22%;
+  }
+
+  /deep/ .el-col:nth-child(3) {
+    width: 19%;
+  }
+
+  /deep/ .el-col:nth-child(4) {
+    width: 19%;
+  }
+
+  /deep/ .el-col:nth-child(5) {
+    width: 15%;
+  }
+
+
+  /deep/ .el-input__inner:nth-child(1) {
+    width: 176px;
+  }
+
+  /deep/ .el-input__inner:nth-child(2) {
+    width: 176px;
+  }
+
+  /deep/ .el-input__inner:nth-child(2) {
+    width: 126px;
+  }
+
+  /deep/ .el-input__inner:nth-child(2) {
+    width: 175px;
+  }
+
+  /deep/ .el-icon-arrow-up {
+    transform: rotateZ(0deg);
+
+  }
+
+
+  /deep/ .el-icon-arrow-up:before {
+    content: url(../../Articles/img/xiala2.png);
+  }
+
+  /deep/ .el-input__prefix {
+    right: -60px;
+    padding-top: 3px;
+  }
+
+  /deep/ .el-icon-date:before {
+    content: url(../../Articles/img/riqi.png);
+  }
+
+  /deep/ .el-table__header tr {
+    background: url(../../Articles/img/bg1.png);
+    height: 49px;
+
+  }
+
+  /deep/ .el-table th.el-table__cell {
+    background: none;
+  }
+
+  /deep/ .el-table__body {
+    -webkit-border-vertical-spacing: 13px; // 垂直间距
+  }
+
+  /deep/ .el-form-item__content {
+    text-align: left;
+  }
+
+  /deep/ .el-table, .el-table__expanded-cell {
+    background-color: rgb(1, 40, 81);
+  }
+}
+</style>

src/views/fdjh/fdjh.vue

@@ -1,10 +1,11 @@
 <template>
   <div class="page">
-    <iframe class="image_2 pos_2">
-      <img src="./img/fdjh-left.png">
-    </iframe>
+    <div id="iframe0" class="image_2 pos_2" style="">
+      <iframe  style="width: 100%;height: 100%" src="/#/fdjhnav">
+      </iframe>
+    </div>
     <div id="iframe1" class="image_3 pos_3" style="">
-    <iframe  style="width: 100%;height: 100%" src="/#/table1">
+    <iframe id="showcontent" style="width: 100%;height: 100%" >
     </iframe>
     </div>
   </div>
@@ -34,6 +35,10 @@ export default {
 iframe{
   border: 0;
 }
+#iframe0{
+  background-image: url(./img/img.png);
+}
+
 #iframe1{
   background-image: url(./img/img.png);
 }

src/views/tabledata.json

@@ -145,6 +145,74 @@
       "date": "2023-11-28"
     }
   ],
+  "logDataList": [
+    {
+      "logSource": "国电龙源官村风电场",
+      "logLevel": "1",
+      "logInformation": "数据异常",
+      "logTime": "2023-11-28 00:00:00"
+    },
+    {
+      "logSource": "国电龙源官村风电场",
+      "logLevel": "1",
+      "logInformation": "数据异常",
+      "logTime": "2023-11-28 00:10:00"
+    },
+    {
+      "logSource": "国电龙源官村风电场",
+      "logLevel": "1",
+      "logInformation": "数据异常",
+      "logTime": "2023-11-28 00:20:00"
+    },
+    {
+      "logSource": "国电龙源官村风电场",
+      "logLevel": "1",
+      "logInformation": "数据异常",
+      "logTime": "2023-11-28 00:30:00"
+    },
+    {
+      "logSource": "国电龙源官村风电场",
+      "logLevel": "1",
+      "logInformation": "数据异常",
+      "logTime": "2023-11-28 00:40:00"
+    },
+    {
+      "logSource": "国电龙源官村风电场",
+      "logLevel": "1",
+      "logInformation": "数据异常",
+      "logTime": "2023-11-28 00:50:00"
+    },
+    {
+      "logSource": "国电龙源官村风电场",
+      "logLevel": "1",
+      "logInformation": "数据异常",
+      "logTime": "2023-11-28 01:00:00"
+    },
+    {
+      "logSource": "国电龙源官村风电场",
+      "logLevel": "1",
+      "logInformation": "数据异常",
+      "logTime": "2023-11-28 01:10:00"
+    },
+    {
+      "logSource": "国电龙源官村风电场",
+      "logLevel": "1",
+      "logInformation": "数据异常",
+      "logTime": "2023-11-28 01:20:00"
+    },
+    {
+      "logSource": "国电龙源官村风电场",
+      "logLevel": "1",
+      "logInformation": "数据异常",
+      "logTime": "2023-11-28 01:30:00"
+    },
+    {
+      "logSource": "国电龙源官村风电场",
+      "logLevel": "1",
+      "logInformation": "数据异常",
+      "logTime": "2023-11-28 01:40:00"
+    }
+  ],
   "xAxisData": {
     "data": [
       "00:00",

src/views/xtpz/xtpz.vue

@@ -1,172 +1,197 @@
 <template>
-    <div class="table-wrapper">
-        <div class="table-box">
-            <div class="title"
-                 style="font-family: AliMaMa;font-size: 30px;font-weight: 1000;text-align: left;height: 40px">
-                <span style="position: absolute;top:-3px;left: 70px">风电</span>
-            </div>
-            <el-row :gutter="20">
-                <el-button
-                        id="message_btn1"
-                        class="el-icon-blue-left"
-                ><span style="font-size: 25px;line-height: 0;color:aliceblue">断面</span></el-button>
-                <el-button
-                        id="message_btn2"
-                        class="el-icon-blue-left"
-                ><span style="font-size: 25px;line-height: 0;color:aliceblue">联络线</span></el-button>
-
-                <el-button
-                        id="message_btn3"
-                        class="el-icon-blue-right"
-                ><span style="font-size: 25px;line-height: 0;color:aliceblue">刷新</span>
-                </el-button>
-                <el-button
-                        id="message_btn4"
-                        class="el-icon-red-right"
-                >
-                    <span style="font-size: 25px;line-height: 0;color:aliceblue">删除</span>
-                </el-button>
-                <el-button
-                        id="message_btn4"
-                        class="el-icon-yellow-right"
-                >
-                    <span style="font-size: 25px;line-height: 0;color:aliceblue">修改</span>
-                </el-button>
-                <el-button
-                        id="message_btn4"
-                        class="el-icon-green-right"
-                >
-                    <span style="font-size: 25px;line-height: 0;color:aliceblue" @click="sendmessage()">新增</span>
-                </el-button>
-            </el-row>
-            <el-table
-                    :cell-style="{border:0,color:'#fff'}"
-                    :data="tableData"
-                    :header-cell-style="{color:'#fff'}"
-                    :row-style="{backgroundColor:'rgb(4,66,115,0.3)'}"
-                    size="mini"
-                    style="width: 1429px;font-size: 17px;background: none"
-            >
-                <el-table-column
-                        align="center"
-                        label="断面名称"
-                        prop="xtpzName"
-                        width="270px"
-                >
-                </el-table-column>
-                <el-table-column
-                        align="center"
-                        label="状态"
-                        prop="xtpzStatus"
-                >
-                </el-table-column>
-                <el-table-column
-                        align="center"
-                        label="from节点"
-                        prop="from">
-                </el-table-column>
-                <el-table-column
-                        align="center"
-                        label="to节点"
-                        prop="to">
-                </el-table-column>
-                <el-table-column
-                        align="center"
-                        label="负限"
-                        prop="low">
-                </el-table-column>
-                <el-table-column
-                        align="center"
-                        label="正限"
-                        prop="height">
-                </el-table-column>
-            </el-table>
-        </div>
-
-
-        <!-- 弹出的页面内容 -->
-        <el-dialog :visible.sync="getmessage" class="tanchuang-dialog">
-            <el-form ref="ruleForm" :model="ruleForm" label-position="center"
-                     label-width="130px"
-                     size="mini">
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="断面名称：" style="width: 100%; text-align: left;">
-                            <el-input v-model="xtpzName" placeholder="启用" style="margin-top: 10px;">启用</el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="状态" style="width: 100%; text-align: right;">
-                            <el-input v-model="xtpzStatus" placeholder="状态"
-                                      style="margin-top: 10px; text-align: center;"></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="from节点" style="width: 100%; text-align: left;">
-                            <el-input v-model="from" placeholder="汗海"
-                                      style=" margin-top: 10px;width: 50%;height: 50%">汗海
-                            </el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="to节点">
-                            <el-input v-model="to" placeholder="庆云" style="margin-top: 10px;">庆云</el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="负限" style="width: 100%; text-align: left;">
-                            <el-input v-model="low" placeholder="250" style="margin-top: 10px;">250</el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="正限">
-                            <el-input v-model="height" placeholder="200" style="margin-top: 10px;">200</el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row>
-                    <el-col :span="12">
-                        <el-button style="float:right" type="primary" @click="submitForm('ruleForm')">确定
-                        </el-button>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-button style="float:right" type="primary" @click="submitForm('ruleForm')">取消
-                        </el-button>
-                    </el-col>
-                </el-row>
-            </el-form>
-        </el-dialog>
+  <div class="table-wrapper">
+    <div class="table-box">
+      <div class="title"
+           style="font-family: AliMaMa;font-size: 30px;font-weight: 1000;text-align: left;height: 40px">
+        <span style="position: absolute;top:-3px;left: 70px">风电</span>
+      </div>
+      <el-row :gutter="20">
+        <el-button
+            id="message_btn1"
+            class="el-icon-blue-left"
+        >断面</el-button>
+        <el-button
+            id="message_btn2"
+            class="el-icon-blue-left"
+        >联络线</el-button>
+
+        <el-button
+            id="message_btn3"
+            class="el-icon-blue-right"
+        >刷新
+        </el-button>
+        <el-button
+            id="message_btn4"
+            class="el-icon-red-right"
+        >
+          删除
+        </el-button>
+        <el-button
+            id="message_btn4"
+            class="el-icon-yellow-right"
+        >
+          修改
+        </el-button>
+        <el-button
+            id="message_btn4"
+            class="el-icon-green-right"
+            @click="sendmessage()"
+        >
+          新增
+        </el-button>
+      </el-row>
+      <el-table
+          :cell-style="{border:0,color:'#fff'}"
+          :data="tableData"
+          :header-cell-style="{color:'#fff'}"
+          :row-style="{backgroundColor:'rgb(4,66,115,0.3)'}"
+          size="mini"
+          style="width: 1429px;font-size: 17px;background: none"
+      >
+        <el-table-column
+            align="center"
+            label="断面名称"
+            prop="xtpzName"
+            width="270px"
+        >
+        </el-table-column>
+        <el-table-column
+            align="center"
+            label="状态"
+            prop="xtpzStatus"
+        >
+        </el-table-column>
+        <el-table-column
+            align="center"
+            label="from节点"
+            prop="from">
+        </el-table-column>
+        <el-table-column
+            align="center"
+            label="to节点"
+            prop="to">
+        </el-table-column>
+        <el-table-column
+            align="center"
+            label="负限"
+            prop="low">
+        </el-table-column>
+        <el-table-column
+            align="center"
+            label="正限"
+            prop="height">
+        </el-table-column>
+      </el-table>
     </div>
+
+
+    <!-- 弹出的页面内容 -->
+    <el-dialog :visible.sync="getmessage" class="tanchuang-dialog" title="新增数据" :center="true" :show-close="false">
+      <div slot="title" class="header-title">
+        <span style="font-weight:bold;font-size: 20px;"> 新增数据 </span>
+      </div>
+      <el-form ref="ruleForm" :model="ruleForm" label-position="center"
+               label-width="130px"
+               size="mini">
+        <el-row>
+          <el-col :span="12" style="width: 40%; float: left;">
+            <el-form-item label="断面名称：" style="width: 100%; float: left;color: white">
+              <el-input v-model="xtpzName" placeholder="汗海-庆云断面" style="width: 100%;">启用</el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" style="width: 40%; float: left;">
+            <el-form-item label="状态：" style="width: 100%; float: right;">
+              <el-input v-model="xtpzStatus" placeholder="状态"
+                        style="width: 100%; text-align: center;"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12" style="width: 40%; float: left;">
+            <el-form-item label="from节点：" style="width: 100%; float: left;">
+              <el-input v-model="from" placeholder="汗海"
+                        style="width: 100%;float: left;">汗海
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" style="width: 40%; float: left;">
+            <el-form-item label="to节点：" style="width: 100%; float: left;">
+              <el-input v-model="to" placeholder="庆云" style="width: 100%;float: left;">庆云</el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12" style="width: 40%; float: left;">
+            <el-form-item label="负限：" style="width: 100%; float: left;">
+              <el-input v-model="low" placeholder="250" style="width: 100%;">250</el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" style="width: 40%; float: left;">
+            <el-form-item label="正限：" style="width: 100%; float: right;">
+              <el-input v-model="height" placeholder="200" style="width: 100%;">200</el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-row class="hengxianimg">
+        <el-divider/>
+      </el-row>
+
+      <el-row :gutter="20" id="tijiao_btn">
+        <el-button
+            id="form_btn1"
+            class="el-icon-blue-left2"
+            @click="cancelForm()"
+        >
+          保存
+        </el-button>
+        <el-button
+            id="form_btn2"
+            class="el-icon-yellow-right2"
+            @click="cancelForm()"
+        >取消</el-button>
+
+      </el-row>
+
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 
 export default {
-    name: 'Xtpz',
-    data() {
-        return {
-            tableData: [],
-            //弹框
-            getmessage: false
-        }
-    },
-    methods: {
-        //弹框
-        sendmessage() {
-            this.getmessage = true
-        }
+  name: 'Xtpz',
+  data() {
+    return {
+      tableData: [],
+      //弹框
+      getmessage: false,
+      ruleForm: {
+        xtpzName: '',
+        xtpzStatus: '',
+        from: '',
+        to: '',
+        low: '',
+        height: '',
+      }
+    }
+  },
+  methods: {
+    //弹框
+    sendmessage() {
+      this.getmessage = true
     },
-    mounted() {
-        const tableDataList = require('./xtpzdata.json');
-        this.tableData = tableDataList.xtpzDataList
+    //弹框
+    cancelForm() {
+      this.getmessage = false
     }
+  },
+  mounted() {
+    const tableDataList = require('./xtpzdata.json');
+    this.tableData = tableDataList.xtpzDataList
+  }
 }
 </script>
 
@@ -189,61 +214,127 @@ body {
 
 }
 
+.el-divider--horizontal {
+  margin: 8px 0;
+  background: 0 0;
+  border-top: 1px dashed #e8eaec;
+  width: 90%;
+  text-align: center;
+  left: 5%;
+}
+
 .el-icon-blue-left {
   background: url("./img/bluebtn.png");
-  width: 106px;
-  height: 57px;
+  width: 100px;
+  height: 40px;
+  padding-top: 8px;
+  font-size: 25px;
+  color: whitesmoke;
   border: 0px dashed;
-  //border-radius: 0px;
   background-repeat: no-repeat;
   float: left;
 }
 
 .el-icon-red-right {
   background: url("./img/redbtn.png");
-  width: 106px;
-  height: 57px;
+  width: 100px;
+  height: 40px;
+  padding-top: 8px;
+  font-size: 25px;
+  color: whitesmoke;
   border: 0px dashed;
-  //border-radius: 0px;
   background-repeat: no-repeat;
   float: right;
 }
 
 .el-icon-blue-right {
   background: url("./img/bluebtn.png");
-  width: 106px;
-  height: 57px;
+  width: 100px;
+  height: 40px;
+  padding-top: 8px;
+  font-size: 25px;
+  color: whitesmoke;
   border: 0px dashed;
-  //border-radius: 0px;
   background-repeat: no-repeat;
   float: right;
 }
 
 .el-icon-yellow-right {
   background: url("./img/yellowbtn.png");
-  width: 106px;
-  height: 57px;
+  width: 100px;
+  height: 40px;
+  padding-top: 8px;
+  font-size: 25px;
+  color: whitesmoke;
   border: 0px dashed;
-  //border-radius: 0px;
   background-repeat: no-repeat;
   float: right;
 }
 
 .el-icon-green-right {
   background: url("./img/greenbtn.png");
-  width: 106px;
-  height: 57px;
+  width: 100px;
+  height: 40px;
+  padding-top: 8px;
+  font-size: 25px;
+  color: whitesmoke;
   border: 0px dashed;
-  //border-radius: 0px;
+
   background-repeat: no-repeat;
   float: right;
 }
 
 
+.el-icon-blue-left2 {
+  background: url("./img/submitbtn.png");
+  width: 145px;
+  height: 42px;
+  border: 0px dashed;
+  padding-top: 8px;
+  background-repeat: no-repeat;
+  float: left;
+  text-align: center;
+  left: 10%;
+  font-size: 25px;
+  color: whitesmoke;
+
+}
+
+#tijiao_btn {
+  float: left;
+  text-align: center;
+  left: 30%;
+}
+
+.el-icon-yellow-right2 {
+  background: url("./img/cancelbtn.png");
+  width: 145px;
+  height: 42px;
+  border: 0px dashed;
+  background-repeat: no-repeat;
+  float: left;
+  margin-left: 50px;
+  font-size: 25px;
+  padding-top: 8px;
+  color: whitesmoke;
+}
+
+
+/deep/ .header-title {
+  background: url("./img/m.png");
+  background-position: 50% 20%;
+  background-repeat: no-repeat;
+  background-size: 50% 130%;
+  text-align: center;
+  height: 40px;
+  margin-top: 10px;
+}
+
 /deep/ .el-dialog {
   background-color: rgba(255, 0, 0, 0.0);
   color: #FFFFFF;
   background-image: url("./img/tanchuangbg.png");
+  background-repeat: no-repeat;
   background-size: 100% 100%;
   isplay: flex;
   flex-direction: column;
@@ -253,15 +344,26 @@ body {
   left: 50%;
   transform: translate(-50%, -50%);
   /*height:600px;*/
-  max-height: calc(100% - 200px);
-  max-width: calc(100% - 30px);
+  max-height: calc(100% - 100px);
+  max-width: calc(100% - 70px);
 }
 
 /deep/ .el-dialog .el-dialog__body {
   flex: 1;
   overflow: auto;
-  display: flex;
-  justify-content: center;
+}
+
+/deep/ .el-input__inner {
+  background-image: url("./img/inputbg.png");
+  background-color: rgba(255, 0, 0, 0.0);
+  color: white;
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+  font-weight: bold;
+}
+
+/deep/ .el-form-item__label {
+  color: white;
 }
 
 .table-wrapper {

src/views/xtrz/jkcx/index.vue

@@ -0,0 +1,199 @@
+<template>
+    <div class="table-wrapper">
+        <div class="table-box">
+            <div class="title"
+                 style="font-family: AliMaMa;font-size: 30px;font-weight: 1000;text-align: left;height: 40px">
+                <span style="position: absolute;top:-3px;left: 70px">接口、程序</span>
+            </div>
+            <el-table
+                    :cell-style="{border:0,color:'#fff'}"
+                    :data="tableData"
+                    :header-cell-style="{color:'#fff'}"
+                    :row-style="{backgroundColor:'rgb(4,66,115,0.3)'}"
+                    size="mini"
+                    style="width: 1429px;font-size: 17px;background: none"
+            >
+                <el-table-column
+                        align="center"
+                        label="日志来源"
+                        prop="logSource"
+                        width="270px"
+                >
+                </el-table-column>
+                <el-table-column
+                        align="center"
+                        label="日志级别"
+                        prop="logLevel"
+                >
+                </el-table-column>
+                <el-table-column
+                        align="center"
+                        label="日志信息"
+                        prop="logInformation">
+                </el-table-column>
+                <el-table-column
+                        align="center"
+                        label="日志时间"
+                        prop="logTime">
+                </el-table-column>
+            </el-table>
+        </div>
+    </div>
+</template>
+
+<script>
+
+export default {
+    name: 'Article-Index',
+    data() {
+        return {
+            form: {
+                taskNumber: '',
+                date: '',
+                current: 1,
+                size: 10
+            },
+            tableData: []
+        }
+    },
+    methods: {},
+    mounted() {
+        const tableDataList = require('../../tabledata.json');
+        this.tableData = tableDataList.logDataList
+    }
+}
+</script>
+
+<style lang="less" scoped>
+
+@font-face {
+  font-family: AliMaMa;//自定义字体名称
+  src: url("../../Articles/font/AlimamaDaoLiTi.ttf")
+}
+
+body {
+  border: 0;
+  background-image: url(../../Articles/img/bgc.png)
+}
+
+.table-wrapper {
+  width: 1483px;
+  padding-left: 20px;
+
+  .table-box {
+    min-height: 600px;
+    background-size: cover;
+  }
+
+  .title {
+    margin-bottom: 20px;
+    margin-left: 60px;
+    font-size: 18px;
+    color: #fff;
+  }
+
+  /deep/ .el-form-item__label {
+    color: #fff;
+    font-size: 17px;
+  }
+
+  /deep/ .el-input__inner {
+    background-color: rgba(14, 73, 131);
+    border: 1px solid rgb(64, 153, 255);
+    height: 34px;
+    font-size: 17px;
+  }
+
+  /deep/ .el-table__header {
+    background: url(../../Articles/img/bg1.png);
+  }
+
+  /deep/ .el-table--enable-row-hover .el-table__body tr:hover > td {
+    background-color: rgb(103, 118, 49) !important
+  }
+
+  /deep/ .el-col {
+    padding: 0;
+    display: inline-block;
+    position: relative;
+  }
+
+  /deep/ .el-col:nth-child(1) {
+    width: 19%;
+  }
+
+  /deep/ .el-col:nth-child(2) {
+    width: 22%;
+  }
+
+  /deep/ .el-col:nth-child(3) {
+    width: 19%;
+  }
+
+  /deep/ .el-col:nth-child(4) {
+    width: 19%;
+  }
+
+  /deep/ .el-col:nth-child(5) {
+    width: 15%;
+  }
+
+
+  /deep/ .el-input__inner:nth-child(1) {
+    width: 176px;
+  }
+
+  /deep/ .el-input__inner:nth-child(2) {
+    width: 176px;
+  }
+
+  /deep/ .el-input__inner:nth-child(2) {
+    width: 126px;
+  }
+
+  /deep/ .el-input__inner:nth-child(2) {
+    width: 175px;
+  }
+
+  /deep/ .el-icon-arrow-up {
+    transform: rotateZ(0deg);
+
+  }
+
+
+  /deep/ .el-icon-arrow-up:before {
+    content: url(../../Articles/img/xiala2.png);
+  }
+
+  /deep/ .el-input__prefix {
+    right: -60px;
+    padding-top: 3px;
+  }
+
+  /deep/ .el-icon-date:before {
+    content: url(../../Articles/img/riqi.png);
+  }
+
+  /deep/ .el-table__header tr {
+    background: url(../../Articles/img/bg1.png);
+    height: 49px;
+
+  }
+
+  /deep/ .el-table th.el-table__cell {
+    background: none;
+  }
+
+  /deep/ .el-table__body {
+    -webkit-border-vertical-spacing: 13px; // 垂直间距
+  }
+
+  /deep/ .el-form-item__content {
+    text-align: left;
+  }
+
+  /deep/ .el-table, .el-table__expanded-cell {
+    background-color: rgb(1, 40, 81);
+  }
+}
+</style>

src/views/xtrz/jkcx/jkcx.vue

@@ -0,0 +1,84 @@
+<template>
+    <div class="page">
+        <iframe class="image_2 pos_2">
+            <img src="../../fdjh/img/fdjh-left.png">
+        </iframe>
+        <div id="iframe1" class="image_3 pos_3" style="">
+            <iframe src="/public#/jkcx1" style="width: 100%;height: 100%">
+            </iframe>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    // eslint-disable-next-line vue/multi-word-component-names
+    name: '接口、程序',
+}
+</script>
+
+<style lang="css" scoped>
+.page {
+    background-image: url('../../fdjh/img/fdjh-bj.png');
+    position: absolute;
+    width: 1920px;
+    height: 1080px;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+}
+
+.image {
+    width: 100vw;
+    height: 4.5833vw;
+}
+
+iframe {
+    border: 0;
+}
+
+#iframe1 {
+    background-image: url(../../fdjh/img/img.png);
+}
+
+.pos {
+    position: absolute;
+    width: 1920px;
+    height: 88px;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 992px;
+}
+
+.image_2 {
+    width: 23.56rem;
+    height: 56.88rem;
+}
+
+.pos_2 {
+    position: absolute;
+    width: 377px;
+    height: 910px;
+    left: 30px;
+    right: 1513px;
+    top: 142px;
+    bottom: 28px;
+}
+
+.image_3 {
+    width: 91.19rem;
+    height: 56.88rem;
+}
+
+.pos_3 {
+    position: absolute;
+    width: 1479px;
+    height: 910px;
+    left: 408px;
+    right: 33px;
+    top: 142px;
+    bottom: 28px;
+}
+</style>