fix:bug

src/page/Layout/layout.vue

@@ -44,8 +44,6 @@ export default {
     // Applications
   },
   data() {
-    const u = localStorage.getItem("_userName");
-    const p = localStorage.getItem("_password");
     return {
       id: this.$route.params.id,
       dat: {
@@ -56,9 +54,22 @@ export default {
       p: localStorage.getItem("_password"),
       clientHeight: document.documentElement.clientHeight,
       // url: `http://101.36.160.210:31055/crk/?k_username=${u}&k_password=${p}&code=1`,
-      url: `http://59.220.179.234:80/crk/?k_username=${u}&k_password=${p}&code=1`,
+      // url: `http://59.220.179.234:80/#/welcome/?username=${u}&password=${p}&code=1`,
+      // url: `http://172.18.93.228:80/#/welcome?username=${u}&password=${p}`,
+      url: "",
     };
   },
+  created() {
+    const u = localStorage.getItem("_userName");
+    const p = localStorage.getItem("_password");
+    const isProd = process.env.NODE_ENV === "production";
+    // let url;
+    if (!isProd) {
+      this.url = `http://101.36.160.210:31055/crk/?k_username=${u}&k_password=${p}`;
+    } else {
+      this.url = `http://172.18.93.228:80/#/welcome?username=${u}&password=${p}`;
+    }
+  },
   computed: {
     wrapHeight() {
       return this.clientHeight - 70 - 40;

src/page/home.vue

@@ -1,12 +1,14 @@
 <template>
-  <div class="content-main multi-column">
+  <div class="content-main multi-column" v-if="$store.state.flag == 2">
     <div class="column aside-column full-column">
       <el-card class="box-card">
         <div slot="header" class="clearfix">
           <span>待办事项</span>
         </div>
         <div class="text item">
-          <span class="todoTips" @click="goTodo">智能粮库待办事项 <span style="color: red;">0</span> 条</span>
+          <span class="todoTips" @click="goTodo"
+            >智能粮库待办事项 <span style="color: red">0</span> 条</span
+          >
         </div>
       </el-card>
       <el-card class="box-card">
@@ -28,40 +30,50 @@
     </div>
     <div class="column main-column full-column">
       <div class="main-top">
-        <div class="left" style="height: auto;display: flex;flex-direction: column">
+        <div
+          class="left"
+          style="height: auto; display: flex; flex-direction: column"
+        >
           <div class="welcome">
             <el-card class="box-card">
-              <div class="welcome-title"> {{ welcome }} <span style="margin-left: 5px;"> {{ $dateUtils.formatNow() }} </span></div>
+              <div class="welcome-title">
+                {{ welcome }}
+                <span style="margin-left: 5px">
+                  {{ $dateUtils.formatNow() }}
+                </span>
+              </div>
             </el-card>
           </div>
           <el-image
             v-if="birdsEye"
             :src="birdsEye"
-            style="max-height:520px;flex: 1"
-            fit="fill"></el-image>
-<!--          <el-tabs type="border-card" style="min-height: 500px;">-->
-<!--            <el-tab-pane label="粮情">-->
-<!--              <div style="width: 100%; height: 100%; display: flex; justify-content: center; align-items: center;">-->
-<!--              -->
-<!--              </div>-->
-<!--            </el-tab-pane>-->
-<!--&lt;!&ndash;            <el-tab-pane label="监控"></el-tab-pane>&ndash;&gt;-->
-<!--          </el-tabs>-->
+            style="max-height: 520px; flex: 1"
+            fit="fill"
+          ></el-image>
+          <!--          <el-tabs type="border-card" style="min-height: 500px;">-->
+          <!--            <el-tab-pane label="粮情">-->
+          <!--              <div style="width: 100%; height: 100%; display: flex; justify-content: center; align-items: center;">-->
+          <!--              -->
+          <!--              </div>-->
+          <!--            </el-tab-pane>-->
+          <!--&lt;!&ndash;            <el-tab-pane label="监控"></el-tab-pane>&ndash;&gt;-->
+          <!--          </el-tabs>-->
         </div>
         <div class="right">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>当前作业</span>
             </div>
-            <div class="text item">
-            </div>
+            <div class="text item"></div>
           </el-card>
           <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>库存/库容比</span>
             </div>
             <div class="text item">
-              <el-image :src="require('@/assets/wisdom_images/chart1.png')"></el-image>
+              <el-image
+                :src="require('@/assets/wisdom_images/chart1.png')"
+              ></el-image>
             </div>
           </el-card>
           <el-card class="box-card">
@@ -69,7 +81,9 @@
               <span>储粮等级(单位: 吨)</span>
             </div>
             <div class="text item">
-              <el-image :src="require('@/assets/wisdom_images/chart2.png')"></el-image>
+              <el-image
+                :src="require('@/assets/wisdom_images/chart2.png')"
+              ></el-image>
             </div>
           </el-card>
         </div>
@@ -80,7 +94,9 @@
             <span>五温曲线图</span>
           </div>
           <div class="text item">
-            <el-image :src="require('@/assets/wisdom_images/chart3.png')"></el-image>
+            <el-image
+              :src="require('@/assets/wisdom_images/chart3.png')"
+            ></el-image>
           </div>
         </el-card>
         <el-card class="box-card">
@@ -88,32 +104,40 @@
             <span>粮食品种(单位: 吨)</span>
           </div>
           <div class="text item">
-            <el-image :src="require('@/assets/wisdom_images/chart3.png')"></el-image>
+            <el-image
+              :src="require('@/assets/wisdom_images/chart3.png')"
+            ></el-image>
           </div>
         </el-card>
       </div>
     </div>
   </div>
+  <div v-else class="content-wrap" style="width: 100vw; height: 86vh">
+    <iframe
+      id="iframeContainer"
+      :src="url"
+      style="width: 100%; height: 100%"
+    ></iframe>
+  </div>
 </template>
 
 <script>
-
-import commonSelect from "@/components/common/commonSelect"
-import { mapGetters } from 'vuex'
-import {depotImageList} from "@/api/system";
+import commonSelect from "@/components/common/commonSelect";
+import { mapGetters } from "vuex";
+import { depotImageList } from "@/api/system";
 export default {
   name: "home",
   components: {
-    commonSelect
+    commonSelect,
   },
   data() {
     return {
-      welcome: '',
-      desc: '',
+      welcome: "",
+      desc: "",
       limit: {
         page: 1,
         size: 10,
-        total: 0
+        total: 0,
       },
       depotImages: [],
       tableData: [],
@@ -125,33 +149,45 @@ export default {
       listLoading: false,
       addShow: false,
       birdsEye: null,
+      url: "",
+    };
+  },
+  created() {
+    const u = localStorage.getItem("_userName");
+    const p = localStorage.getItem("_password");
+    const isProd = process.env.NODE_ENV === "production";
+    // let url;
+    if (!isProd) {
+      this.url = `http://101.36.160.210:31055/crk/?k_username=${u}&k_password=${p}`;
+    } else {
+      this.url = `http://172.18.93.228:80/#/welcome?username=${u}&password=${p}`;
     }
   },
   computed: {
-    ...mapGetters(['orgName', 'orgId']),
+    ...mapGetters(["orgName", "orgId"]),
   },
   mounted() {
-    this.welcome = this.orgName + '欢迎您'
-    this.desc = this.$store.state.user.orgInfo.briefIntroduction
-    const orgInfo = JSON.parse(sessionStorage.getItem('orgInfo'))
-    console.log('orgInfo', orgInfo)
-    this.birdsEye = orgInfo.birdsEye
-    this.getDeopImages()
+    this.welcome = this.orgName + "欢迎您";
+    this.desc = this.$store.state.user.orgInfo.briefIntroduction;
+    const orgInfo = JSON.parse(sessionStorage.getItem("orgInfo"));
+    console.log("orgInfo", orgInfo);
+    this.birdsEye = orgInfo.birdsEye;
+    this.getDeopImages();
   },
   methods: {
     getDeopImages() {
-      depotImageList({orgId: this.orgId}).then(resp => {
-        const list = resp || []
-        this.depotImages = list
-        console.log('轮播图片', list)
-      })
+      depotImageList({ orgId: this.orgId }).then((resp) => {
+        const list = resp || [];
+        this.depotImages = list;
+        console.log("轮播图片", list);
+      });
     },
     goTodo() {
-      this.$store.commit('SET_TOP_MENU_INDEX', 1)
-      this.$router.push({ path: '/toDoNav/toDoThings' })
-    }
-  }
-}
+      this.$store.commit("SET_TOP_MENU_INDEX", 1);
+      this.$router.push({ path: "/toDoNav/toDoThings" });
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
@@ -167,7 +203,7 @@ export default {
   }
 
   .main-column {
-    margin-left:5px;
+    margin-left: 5px;
     width: 76%;
   }
 }
@@ -182,7 +218,6 @@ export default {
 }
 
 .welcome {
-
 }
 
 .welcome-title {
@@ -224,5 +259,4 @@ export default {
 //.el-carousel__item:nth-child(2n+1) {
 //  background-color: #d3dce6;
 //}
-
 </style>