Merge remote-tracking branch 'origin/master'

src/App.vue

@@ -25,4 +25,9 @@ export default {
   text-align: center;
   color: #2c3e50;
 }
+
+@font-face {
+  font-family: AliMaMa;
+  src: url(./assets/font/AlimamaDaoLiTi.ttf)
+}
 </style>

src/views/Articles/index.vue

@@ -181,10 +181,7 @@ export default {
 
 <style lang="less" scoped>
 
-@font-face {
-  font-family: AliMaMa;//自定义字体名称
-  src: url("./font/AlimamaDaoLiTi.ttf")
-}
+
 
 body {
   border: 0;

src/views/rqdd/rqdd.vue

@@ -1,76 +1,170 @@
 <template>
-  <div class="page">
-    <iframe class="image_2 pos_2">
-      <img src="./img/fdjh-left.png">
-    </iframe>
-    <div id="iframe1" class="image_3 pos_3" style="">
-    <iframe  style="width: 100%;height: 100%" src="/#/table1">
-    </iframe>
+  <div class="container">
+    <div class="head">
+      <div style="position: absolute;left: 0">
+        <img src="./img/Slice 311.png" alt="">
+      </div>
+      <div style="position: absolute;right: 377px;top: 18px">
+        <img src="./img/返回首页.png" alt="">
+      </div>
+      <div class="topButton1">
+        <div class="buttonWord">
+          <span>离线运行</span>
+        </div>
+      </div>
+      <div class="topButton2">
+        <div class="buttonWord">
+          <span>发电端计划监控</span>
+        </div>
+      </div>
+    </div>
+    <div class="zs1">
+      <div class="littleHeadWord">
+        <span>信息总览</span>
+      </div>
+    </div>
+    <div class="zs2">
+      <div class="littleHeadWord">
+        <span>告警信息</span>
+      </div>
+    </div>
+    <div class="ys1">
+      <div class="littleHeadWord">
+        <span>联络线信息</span>
+      </div>
+    </div>
+    <div class="yx1">
+      <div class="littleHeadWord">
+        <span>断面信息</span>
+      </div>
+    </div>
+    <div class="zx">
+      <div class="littleHeadWord">
+        <span>日前调度计划</span>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
 export default {
-  name: 'fdjh-name'
+  name: 'rqdd-name'
 }
 </script>
 
 <style scoped lang="css">
-.page {
-  background-image: url('./img/fdjh-bj.png');
-  position: absolute;
+
+
+.container {
   width: 1920px;
   height: 1080px;
-  left: 0;
-  right: 0;
+  background: url(./img/beijing.png) no-repeat
+}
+
+.head {
+  width: 1920px;
+  height: 85px;
+  position: absolute;
   top: 0;
-  bottom: 0;
+  background: url(./img/装饰.png) no-repeat
 }
-.image {
-  width: 100vw;
-  height: 4.5833vw;
+
+.zs1 {
+  width: 629px;
+  height: 312px;
+  position: absolute;
+  top: 87px;
+  left: 2px;
+  background: url(./img/1.png) no-repeat
+
 }
-iframe{
-  border: 0;
+
+.topButton1 {
+  background: url(./img/4灰大素材.png);
+  height: 42px;
+  width: 179px;
+  position: absolute;
+  top: 16px;
+  left: 379px
 }
-#iframe1{
-  background-image: url(./img/img.png);
+
+.topButton2 {
+  background: url(./img/色相饱和度4.png);
+  height: 42px;
+  width: 182px;
+  position: absolute;
+  top: 16px;
+  left: 608px
 }
+.topButton1 .buttonWord{
+  position: absolute;
+  top: 9px;
+  left: 45px;
+  color: white;
+  font-size: 19px;
+  font-weight: 1000;
+  font-family: AliMaMa;
+}
+
 
-.pos {
+.topButton2 .buttonWord{
   position: absolute;
-  width: 1920px;
-  height: 88px;
-  left: 0;
-  right: 0;
-  top: 0;
-  bottom: 992px;
+  top: 9px;
+  left: 25px;
+  color: white;
+  font-size: 19px;
+  font-weight: 1000;
+  font-family: AliMaMa;
 }
-.image_2 {
-  width: 23.56rem;
-  height: 56.88rem;
+.zs2 {
+  width: 629px;
+  height: 312px;
+  position: absolute;
+  top: 87px;
+  left: 629px;
+  background: url(./img/1.png) no-repeat
+
+}
+
+.ys1 {
+  width: 629px;
+  height: 474px;
+  position: absolute;
+  top: 87px;
+  left: 1260px;
+  background: url(./img/1.j.png) no-repeat
+
 }
-.pos_2 {
+
+.yx1 {
+  width: 629px;
+  height: 474px;
   position: absolute;
-  width: 377px;
-  height: 910px;
-  left: 30px;
-  right: 1513px;
-  top: 142px;
-  bottom: 28px;
+  top: 561px;
+  left: 1260px;
+  background: url(./img/1.j.png) no-repeat
 }
-.image_3 {
-  width: 91.19rem;
-  height: 56.88rem;
+
+.zx {
+  width: 1254px;
+  height: 636px;
+  position: absolute;
+  top: 399px;
+  left: 2px;
+  background: url(./img/2.png) no-repeat
 }
-.pos_3 {
+
+.littleHeadWord {
+  text-align: left;
   position: absolute;
-  width: 1479px;
-  height: 910px;
-  left: 408px;
-  right: 33px;
-  top: 142px;
-  bottom: 28px;
+  left: 70px;
+
+}
+
+.littleHeadWord span {
+  color: white;
+  font-size: 19px;
+  font-weight: 1000;
+  font-family: AliMaMa;
 }
 </style>