Merge branch 'sl3' of http://61.161.152.110:10101/r/electronic-map into mw2

src/views/NewPages/iframe4.vue

@@ -2,19 +2,23 @@
   <div class="iframe4">
     <!-- <iframe src="http://10.75.17.10/doc/page/preview.asp" frameborder="0" class="iframe-2"></iframe> -->
     <div class="iframe-1">
+      <div class="iframe4-title" @click="jumpUrl('/save/personnel')">人员健康</div>
       <personnel></personnel>
     </div>
     <div class="iframe-2">
-      <div v-for="(pItem, pIndex) in videoArray" :key="pIndex" width="95%" height="48vh" @click="openVideoDialog(pItem)">
+      <div class="iframe4-title">视频监视</div>
+      <div class="videoDiv" v-for="(pItem, pIndex) in videoArray" :key="pIndex" width="95%" height="48vh" @click="openVideoDialog(pItem)">
         <div class="mask"></div>
         <iframe :src="pItem.url + pItem.token" />
       </div>
     </div>
     <div class="iframe-3">
+      <div class="iframe4-title" @click="openUrl('http://192.168.1.52/webiui/#/online')">智能安全帽</div>
       <iframe src="http://192.168.1.52/webiui/#/online" frameborder="0"></iframe>
     </div>
     <div class="iframe-4">
-      <!-- <personnel></personnel> -->
+      <div class="iframe4-title">数字孪生</div>
+      <div class="iframe-4-body"></div>
     </div>
     <el-dialog top="50px" v-model="showVideoDialog" width="80vw" :destroy-on-close="true" :custom-class="videoDialogClass">
       <iframe class="videoBoxiframe" width="100%" height="600px" :src="dialogVideoUrl" />
@@ -73,6 +77,12 @@ export default {
         this.showVideoDialog = true;
       }
     },
+    jumpUrl(url) {
+      this.$router.push(url);
+    },
+    openUrl(url) {
+      window.open(url);
+    },
   },
   created() {},
 };
@@ -80,8 +90,6 @@ export default {
 
 <style lang="less">
 .iframe4 {
-  // width: 98.5vw;
-  // height: 98.5vh;
   background: url(../../assets/background-iframe4.png) no-repeat;
   background-size: 100% 100%;
   background-position-y: -5.1vh;
@@ -92,12 +100,19 @@ export default {
   .iframe-2,
   .iframe-3,
   .iframe-4 {
-    // position: fixed;
-    // z-index: 1;
     width: 36.8vw;
     height: 37.31vh;
   }
-
+  .iframe4-title {
+    position: absolute;
+    text-align: center;
+    width: 36.8vw;
+    margin-top: -3.3vh;
+    text-align: center;
+    font-size: 14pt;
+    color: #b3bdc0;
+    cursor: pointer;
+  }
   .iframe-1 {
     margin-left: 6.5vw;
     margin-top: 5.3vh;
@@ -113,7 +128,7 @@ export default {
     margin-left: 11.9vw;
     margin-top: 5.5vh;
     position: relative;
-    div {
+    .videoDiv {
       display: flex;
       height: 18.2vh;
       width: 12.2vw;
@@ -125,6 +140,7 @@ export default {
         // float: left;
       }
       .mask {
+        cursor: pointer;
         flex: 0 0 100%;
         position: absolute;
         left: 0;
@@ -135,18 +151,32 @@ export default {
       }
     }
   }
+  .iframe-3,
+  .iframe-4 {
+    margin-top: -2.2vh;
+    height: calc(36.5vh);
+    width: 36.77vw;
+  }
   .iframe-3 {
-    height: calc(36.6vh);
     margin-left: 6.5vw;
-    margin-top: -0.7vh;
-    background-color:seashell;
+    // background-color: seashell;
     iframe {
       height: 100%;
       width: 100%;
     }
   }
-  .modal.el-dialog {
+  .el-dialog {
     background: rgba(18, 29, 28, 0.95);
+  }
+  .iframe-4 {
+    margin-left: 11.9vw;
+    .iframe-4-body {
+      background-image: url("../../assets/3D.png");
+      // background-color: aqua;
+      background-size: cover;
+      height: 100%;
+      width: 100%;
     }
+  }
 }
 </style>

src/views/NewPages/power-benchmarking.vue

@@ -147,9 +147,9 @@
           <div class="header-left">
             <div class="selecttion">
               <div class="item" :class="{ active: selecttionIndex == 0 }" @click="selectionClick(0)">日</div>
-              <div class="item" :class="{ active: selecttionIndex == 1 }" @click="selectionClick(1)">周</div>
+              <!-- <div class="item" :class="{ active: selecttionIndex == 1 }" @click="selectionClick(1)">周</div> -->
               <div class="item" :class="{ active: selecttionIndex == 2 }" @click="selectionClick(2)">月</div>
-              <div class="item" :class="{ active: selecttionIndex == 3 }" @click="selectionClick(3)">季</div>
+              <!-- <div class="item" :class="{ active: selecttionIndex == 3 }" @click="selectionClick(3)">季</div> -->
               <div class="item" :class="{ active: selecttionIndex == 4 }" @click="selectionClick(4)">年</div>
             </div>
             <!-- <div class="query">

src/views/Others/index.vue

@@ -2,25 +2,10 @@
   <div class="swiperBox">
     <el-carousel style="width: 100%; margin: 5vh 0" trigger="click" type="card" height="80vh" :autoplay="false" indicator-position="none" :initial-index="1" arrow="none" @change="changeSwiper">
       <!-- card-1 -->
-      <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
+            <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
         <div class="itemBox">
           <p class="itemTitle">
-            数据查询
-          </p>
-          <div class="df-table" @click="jumpUrl('/others/realSearch')">
-            <div class="sjcx-item" v-for="(value, key) in wppointColumn" :key="key">
-              <div class="sjcx-name">{{value}}</div>
-              <div class="sjcx-value">{{wppointnum[key]}}</div>
-            </div>
-          </div>
-        </div>
-      </el-carousel-item>
-
-      <!-- card-2 -->
-      <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
-        <div class="itemBox">
-          <p class="itemTitle">
-            预警记录
+            记录查询
           </p>
           <div class="df-table">
             <div class="sjcx-item" v-for="item in earlyAlarmColumn" :key="item" @click="jumpUrl(item.url)">
@@ -30,36 +15,11 @@
           </div>
         </div>
       </el-carousel-item>
+     
 
-      <!-- card-3 -->
-      <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
-        <div class="itemBox">
-          <p class="itemTitle">
-            专家知识
-            <!-- <i class="itemMoreBtn el-icon-more" @click="jumpUrl('/realSearch')"></i> -->
-          </p>
-          <div class="df-table">
-            <ComTable height="30vh" :data="tableData3" :pageSize="20">
-            </ComTable>
-          </div>
-        </div>
-      </el-carousel-item>
+      <!-- card-2 -->
 
-      <!-- card-4 -->
-      <!-- <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
-        <div class="itemBox">
-          <p class="itemTitle">
-            统计分析
-            <i class="itemMoreBtn el-icon-more" @click="jumpUrl('/realSearch')"></i>
-          </p>
-           <ComTable height="30vh" :data="tableData7" :pageSize="20">
-            </ComTable>
-            <ComTable height="30vh" :data="tableData8" :pageSize="20">
-            </ComTable>
-        </div>
-      </el-carousel-item> -->
-      <!-- card-5 -->
-      <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
+ <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
         <div class="itemBox">
           <p class="itemTitle">
             报表管理
@@ -67,45 +27,75 @@
           </p>
           <div class="imageBox1">
             <div class="imgItem1" @click="jumpUrl('/others/tjfx')">
-              <el-image class="img1" src="./static/img/oa日报.png" fit="fill" />
+              <el-image class="img1" src="./static/img/o统计分析.png" fit="fill" />
               <p class="imgTitle">统计分析</p>
             </div>
             <div class="imgItem1" @click="jumpUrl('/others/bdzcx')">
-              <el-image class="img1" src="./static/img/新能源日报.png" fit="fill" />
+              <el-image class="img1" src="./static/img/o表底值查询.png" fit="fill" />
               <p class="imgTitle">表底值查询</p>
             </div>
             <div class="imgItem1" @click="jumpUrl('/others/xnyrb')">
-              <el-image class="img1" src="./static/img/oa日报.png" fit="fill" />
+              <el-image class="img1" src="./static/img/o新能源日报.png" fit="fill" />
               <p class="imgTitle">新能源日报</p>
             </div>
             <div class="imgItem1" @click="jumpUrl('/others/xnyfdscyb')">
-              <el-image class="img1" src="./static/img/新能源日报.png" fit="fill" />
+              <el-image class="img1" src="./static/img/o新能源月报.png" fit="fill" />
               <p class="imgTitle">新能源风电生产月报</p>
             </div>
             <div class="imgItem1" @click="jumpUrl('/others/fdczzdy')">
-              <el-image class="img1" src="./static/img/新能源日报.png" fit="fill" />
+              <el-image class="img1" src="./static/img/o风场自定义.png" fit="fill" />
               <p class="imgTitle">风电场站自定义</p>
             </div>
             <div class="imgItem1" @click="jumpUrl('/others/fdxmzdy')">
-              <el-image class="img1" src="./static/img/oa日报.png" fit="fill" />
+              <el-image class="img1" src="./static/img/o风电自定义.png" fit="fill" />
               <p class="imgTitle">风电项目自定义</p>
             </div>
           </div>
         </div>
       </el-carousel-item>
-      <!-- card-6 -->
-      <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
+      <!-- card-3 -->
+        <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
         <div class="itemBox">
           <p class="itemTitle">
-            自定制报表管理
+            数据查询
+          </p>
+          <div class="df-table" @click="jumpUrl('/others/realSearch')">
+            <div class="sjcx-item" v-for="(value, key) in wppointColumn" :key="key">
+              <div class="sjcx-name">{{value}}</div>
+              <div class="sjcx-value">{{wppointnum[key]}}</div>
+            </div>
+          </div>
+        </div>
+      </el-carousel-item>
+
+
+      <!-- card-4 -->
+      <!-- <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
+        <div class="itemBox">
+          <p class="itemTitle">
+            统计分析
+            <i class="itemMoreBtn el-icon-more" @click="jumpUrl('/realSearch')"></i>
+          </p>
+           <ComTable height="30vh" :data="tableData7" :pageSize="20">
+            </ComTable>
+            <ComTable height="30vh" :data="tableData8" :pageSize="20">
+            </ComTable>
+        </div>
+      </el-carousel-item> -->
+      <!-- card-5 -->
+            <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
+        <div class="itemBox">
+          <p class="itemTitle">
+            专家知识
             <!-- <i class="itemMoreBtn el-icon-more" @click="jumpUrl('/realSearch')"></i> -->
           </p>
           <div class="df-table">
-            <ComTable height="30vh" :data="tableData4" :pageSize="20">
+            <ComTable height="30vh" :data="tableData3" >
             </ComTable>
           </div>
         </div>
       </el-carousel-item>
+      
     </el-carousel>
   </div>
 </template>
@@ -139,14 +129,14 @@ export default {
       },
       earlyAlarmData: {},
       earlyAlarmColumn: [
-        { name: "停机事件管理", key: "tj", url: "/others/alarmCenter/tjsj" },
-        { name: "限电管理", key: "xd", url: "/others/alarmCenter/xdgl" },
-        { name: "状态转换记录", key: "", url: "" },
-        { name: "操作记录", key: "", url: "" },
-        { name: "升压站动作", key: "", url: "" },
         { name: "升压站告警", key: "syzgj", url: "/others/alarmCenter/boosterAlarm" },
+        { name: "升压站动作", key: "", url: "/others/alarmCenter/boosterAlarm" },
+        { name: "限电事件", key: "xd", url: "/others/alarmCenter/xdgl" },
+        { name: "停机事件", key: "tj", url: "/others/alarmCenter/tjsj" },
+        { name: "状态转换记录", key: "", url: "" },
         { name: "风机告警", key: "fjgj", url: "/others/alarmCenter/scadaAlarm" },
         { name: "风机预警", key: "fjyj", url: "/others/alarmCenter/alarmcenter" },
+        { name: "操作记录", key: "", url: "" },
       ],
       tableData1: {
         column: [