From 4db6ed4f12b5d54efcded38892f749ae0a4ce119 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=AE=8F=E6=9D=B0?= <1943105267@qq.com>
Date: Thu, 17 Aug 2023 09:33:00 +0800
Subject: [PATCH] 1

---
 src/views/privateOrder/Screen.vue             | 128 ++++++++++--------
 .../components/componentCenterLeft.vue        |   1 -
 vue.config.js                                 |   2 +-
 3 files changed, 70 insertions(+), 61 deletions(-)

diff --git a/src/views/privateOrder/Screen.vue b/src/views/privateOrder/Screen.vue
index f6d966d..90bf162 100644
--- a/src/views/privateOrder/Screen.vue
+++ b/src/views/privateOrder/Screen.vue
@@ -1,72 +1,75 @@
 <template>
-  <div class="container">
-    <div class="main-container">
-      <div class="top_nav">
-        <div class="top_left">
-          <router-link
-            v-for="item in menus.slice(0, 2)"
-            :key="item.id"
-            class="nav_item left_nav"
-            active-class="selected_nav"
-            exact
-            :to="{ path: item.path }"
-          >
-            {{ item.name }}
-          </router-link>
-        </div>
-        <div class="center_title">太仓市网络综合治理平台</div>
-        <div class="top_right">
-          <router-link
-            v-for="item in menus.slice(2, 4)"
-            :key="item.id"
-            class="nav_item right_nav"
-            active-class="selected_nav"
-            exact
-            :to="{ path: item.path }"
-          >
-            {{ item.name }}
-          </router-link>
-        </div>
-        <div class="time-wrap">
-          <div class="icon" />
-          <span class="date">{{ now.date }}</span>
-          <span class="time">
-            {{ now.hour + ":" + now.minute + ":" + now.second }}
-          </span>
+  <div class="pc">
+
+    <div class="container">
+      <div class="main-container">
+        <div class="top_nav">
+          <div class="top_left">
+            <router-link
+              v-for="item in menus.slice(0, 2)"
+              :key="item.id"
+              class="nav_item left_nav"
+              active-class="selected_nav"
+              exact
+              :to="{ path: item.path }"
+            >
+              {{ item.name }}
+            </router-link>
+          </div>
+          <div class="center_title">太仓市网络综合治理平台</div>
+          <div class="top_right">
+            <router-link
+              v-for="item in menus.slice(2, 4)"
+              :key="item.id"
+              class="nav_item right_nav"
+              active-class="selected_nav"
+              exact
+              :to="{ path: item.path }"
+            >
+              {{ item.name }}
+            </router-link>
+          </div>
+          <div class="time-wrap">
+            <div class="icon" />
+            <span class="date">{{ now.date }}</span>
+            <span class="time">
+              {{ now.hour + ":" + now.minute + ":" + now.second }}
+            </span>
+          </div>
+          <div class="year-wrap"></div>
         </div>
-        <div class="year-wrap"></div>
+        <router-view />
       </div>
-      <router-view />
-    </div>
-    <div>
-      <el-button
-        v-if="!dialogDetails && $route.name === '网络舆情'"
-        type="primary"
-        style="
+      <div>
+        <el-button
+          v-if="!dialogDetails && $route.name === '网络舆情'"
+          type="primary"
+          style="
           background-color: rgba(255, 255, 255, 0.2);
           position: absolute;
           top: 160px;
           left: 1600px;
           z-index: 9999;
         "
-        @click="dialogDetails = !dialogDetails"
-      >切换</el-button>
-    </div>
-    <el-dialog
-      v-if="dialogDetails"
-      v-el-drag-dialog
-      class="screen-dialog"
-      :visible.sync="dialogDetails"
-      width="2530px"
-      top="20px"
-      :modal-append-to-body="true"
-      center
-      :modal="false"
-    >
-      <div class="iframeBox">
-        <commandControl />
+          @click="dialogDetails = !dialogDetails"
+        >切换</el-button>
       </div>
-    </el-dialog>
+      <el-dialog
+        v-if="dialogDetails"
+        v-el-drag-dialog
+        class="screen-dialog"
+        :visible.sync="dialogDetails"
+        width="2530px"
+        top="20px"
+        :modal-append-to-body="true"
+        center
+        :modal="false"
+      >
+        <div class="iframeBox">
+          <commandControl />
+        </div>
+      </el-dialog>
+    </div>
   </div>
 </template>
 
@@ -128,6 +131,11 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.pc{
+  width: 100%;
+  height: $ScreenHeight;
+  overflow: scroll;
+}
 .iframeBox {
   position: relative;
   width: 3305px;
@@ -140,6 +148,8 @@ export default {
 .container {
   width: $ScreenWidth;
   height: $ScreenHeight;
+  width: 1920;
+  height: 1080;
   position: relative;
   background: url("~@/assets/privateOrder/topNar/line_right_left.png") no-repeat;
   background-size: 100% 100%;
diff --git a/src/views/privateOrder/positiveEnergy/components/componentCenterLeft.vue b/src/views/privateOrder/positiveEnergy/components/componentCenterLeft.vue
index eb50389..2fb2943 100644
--- a/src/views/privateOrder/positiveEnergy/components/componentCenterLeft.vue
+++ b/src/views/privateOrder/positiveEnergy/components/componentCenterLeft.vue
@@ -365,7 +365,6 @@ export default {
     openNewWindow(e) {
       const index = e.target.dataset.curdata
       this.href = this.dataList[index].url
-      console.log(this.href)
       this.dialogDetails = true
       // const data = {
       //   'newsId': e.newsId,
diff --git a/vue.config.js b/vue.config.js
index 28b8b46..e54ec89 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -26,7 +26,7 @@ module.exports = {
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
   // publicPath: './',
-  publicPath: '/demo/taicangzongzhi',
+  publicPath: '/demo/taicangzongzhi2',
   outputDir: 'dist',
   assetsDir: 'static',
   lintOnSave: process.env.NODE_ENV === 'development',