cz před 2 roky
rodič
revize
700b951eb7
4 změnil soubory, kde provedl 672 přidání a 521 odebrání
  1. 2 1
      package-lock.json
  2. 309 308
      src/components/header-bar.vue
  3. 133 0
      src/components/notice-one.vue
  4. 228 212
      src/views/main.vue

+ 2 - 1
package-lock.json

@@ -7478,7 +7478,8 @@
       "version": "2.2.2",
       "resolved": "https://registry.npm.taobao.org/picomatch/download/picomatch-2.2.2.tgz",
       "integrity": "sha1-IfMz6ba46v8CRo9RRupAbTRfTa0=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "pify": {
       "version": "4.0.1",

+ 309 - 308
src/components/header-bar.vue

@@ -1,18 +1,18 @@
 <template>
-	<div id="main" class="header-bar">
-		<header>
-			<ul class="nav">
-				<div class="logo">GrandStar</div>
-				<li class="header-bar-hover-warp nav-li">
-					<div @click="isChildMenu = !isChildMenu" class="menu-modal">
-						功能导览
-						<i class="el-icon-arrow-down el-icon--right"></i>
-					</div>
-				</li>
-				<li class="nav-li" v-for="i in barData" :key="i.id">
-					<span>{{ i.name }}</span>
-				</li>
-				<!-- <li class="active nav-li">
+  <div id="main" class="header-bar">
+    <header>
+      <ul class="nav">
+        <div class="logo">GrandStar</div>
+        <li class="header-bar-hover-warp nav-li">
+          <div @click="isChildMenu = !isChildMenu" class="menu-modal">
+            功能导览
+            <i class="el-icon-arrow-down el-icon--right"></i>
+          </div>
+        </li>
+        <li class="nav-li" v-for="i in barData" :key="i.id">
+          <span>{{ i.name }}</span>
+        </li>
+        <!-- <li class="active nav-li">
             <router-link to="/main/canvas/">canvas</router-link>
           </li>
           <li class="nav-li">
@@ -21,8 +21,8 @@
           <li class="nav-li">
             <router-link to="/main/about">主服务about</router-link>
           </li> -->
-				<div class="header-bar-hover" v-if="isChildMenu">
-					<!-- <ul class="left-menu">
+        <div class="header-bar-hover" v-if="isChildMenu">
+          <!-- <ul class="left-menu">
 					<li>
 						<div class="active-warp">
 							<i class="el-icon-edit"></i>
@@ -48,8 +48,8 @@
 						</div>
 					</li>
 				</ul> -->
-					<div class="header-bar-hover-content">
-						<!-- <el-alert
+          <div class="header-bar-hover-content">
+            <!-- <el-alert
 						title="可将常用功能收纳此栏目中,帮助使用者快捷找到菜单。同时将在顶部导览栏目中生成前7个功能入口。"
 						type="warning"
 						class="el-alert"
@@ -80,34 +80,30 @@
 						</div>
 						
 					</div> -->
-						<ul class="menu-warp">
-							<li
-								v-for="i in menuData.children"
-								:key="i.id"
-								class="menu-ul"
-							>
-								<div class="menu-title">{{ i.name }}</div>
-								<ul style="background: #fff">
-									<li
-										@click="toWDLY(j)"
-										style="cursor: pointer"
-										v-for="j in i.children"
-										:key="j.id"
-									>
-										{{ j.name }}
-									</li>
-								</ul>
-							</li>
-						</ul>
-					</div>
-				</div>
-			</ul>
-			<div class="fr">
-				<!-- <el-input
+            <ul class="menu-warp">
+              <li v-for="i in menuData.children" :key="i.id" class="menu-ul">
+                <div class="menu-title">{{ i.name }}</div>
+                <ul style="background: #fff">
+                  <li
+                    @click="toWDLY(j)"
+                    style="cursor: pointer"
+                    v-for="j in i.children"
+                    :key="j.id"
+                  >
+                    {{ j.name }}
+                  </li>
+                </ul>
+              </li>
+            </ul>
+          </div>
+        </div>
+      </ul>
+      <div class="fr">
+        <!-- <el-input
             class="input-search"
             placeholder="请输入关键词"
             suffix-icon="el-icon-search"
-			size="mini"
+						size="mini"
             v-model="input1">
           </el-input>
           <el-dropdown class="dropdown-box">
@@ -119,285 +115,290 @@
               <el-dropdown-item>中文</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown> -->
-				<el-badge :value="12" class="badge">
-					<i class="el-icon-message-solid"></i>
-				</el-badge>
-
-				<el-dropdown class="dropdown-box">
-					<span class="el-dropdown-link">
-						{{ userData.role_name }}<i class="el-icon-arrow-down el-icon--right"></i>
-					</span>
-					<el-dropdown-menu slot="dropdown">
-						<el-dropdown-item>个人中心</el-dropdown-item>
-						<el-dropdown-item @click.native="$router.push('/')"
-							>退出</el-dropdown-item
-						>
-					</el-dropdown-menu>
-				</el-dropdown>
-			</div>
-		</header>
-	</div>
+        <!-- <el-badge :value="12" class="badge">
+        <i class="el-icon-message-solid"></i>
+      </el-badge> -->
+        <notice-one></notice-one>
+        <el-dropdown class="dropdown-box">
+          <span class="el-dropdown-link">
+            {{ userData.role_name
+            }}<i class="el-icon-arrow-down el-icon--right"></i>
+          </span>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item>个人中心</el-dropdown-item>
+            <el-dropdown-item @click.native="$router.push('/')"
+              >退出</el-dropdown-item
+            >
+          </el-dropdown-menu>
+        </el-dropdown>
+      </div>
+    </header>
+  </div>
 </template>
   
   <script>
-import { registerMicroApps, start } from 'qiankun'
-import { getAll } from '@/libs/micros'
-import router from '../router'
-import store from '../store'
+import noticeOne from "@/components/notice-one";
+
+import { registerMicroApps, start } from "qiankun";
+import { getAll } from "@/libs/micros";
+import router from "../router";
+import store from "../store";
 export default {
-	components: {},
-	data() {
-		return {
-			input1: null,
-			isChildMenu: false,
-			menuData: [],
-			barData: [],
-			userData:JSON.parse(window.localStorage.getItem('token'))
-		}
-	},
-	computed: {
-		commonData() {
-			return this.$store.state.commonData
-		},
-	},
-	methods: {
-		toWDLY(_i) {
-			console.log(_i)
-			this.$router.push('/main/fjhxCloudVue/#/' + _i.path)
-			this.isChildMenu = false
-		},
-		changeParentState() {
-			this.$store.commit('setCommonData', { parent: 1 })
-		},
-		getData() {
-			const v = this
-			v.$get('/api/blade-system/menu/routes').then((res) => {
-				if(res.msg == '暂无承载数据') return
-				res.data.map(item=>{
-					if(item.id === '1619633989348249601') this.menuData = item
-				})
-				
-				v.barData = res.data
-				
-			})
-		},
-	},
-	created() {
-		this.getData()
-	},
-}
+  components: { noticeOne },
+  data() {
+    return {
+      input1: null,
+      isChildMenu: false,
+      menuData: [],
+      barData: [],
+      userData: JSON.parse(window.localStorage.getItem("token")),
+    };
+  },
+  computed: {
+    commonData() {
+      return this.$store.state.commonData;
+    },
+  },
+  methods: {
+    toWDLY(_i) {
+      console.log(_i);
+      this.$router.push("/main/fjhxCloudVue/#/" + _i.path);
+      this.isChildMenu = false;
+    },
+    changeParentState() {
+      this.$store.commit("setCommonData", { parent: 1 });
+    },
+    getData() {
+      const v = this;
+      v.$get("/api/blade-system/menu/routes").then((res) => {
+        if (res.msg == "暂无承载数据") return;
+        res.data.map((item) => {
+          if (item.id === "1619633989348249601") this.menuData = item;
+        });
+
+        v.barData = res.data;
+      });
+    },
+    handleNoticeClick() {
+      console.log("as");
+    },
+  },
+  created() {
+    this.getData();
+  },
+};
 </script>
   
   <style scoped lang="less">
 .header-bar {
-	background: #20222a;
-	position: fixed;
-	top: 0;
-	left: 0;
-	right: 0;
-	z-index: 1100;
-	.menu-modal {
-		cursor: pointer;
-	}
-	.header-bar-hover {
-		position: fixed;
-		z-index: 205;
-		top: 50px;
-		left: 0px;
-		right: 0;
-		display: flex;
-		background: #fff;
-		box-shadow: 0px 3px 10px 1px rgba(0, 0, 0, 0.1);
-		height: 500px;
-		.header-bar-hover-content {
-			margin: 32px 20px;
-			text-align: left;
-			.el-alert {
-				line-height: 20px;
-				text-align: center;
-				background: #dfecff;
-				color: #666666;
-				font-weight: 400;
-				margin-bottom: 20px;
-				i {
-					color: #46a6ff;
-				}
-			}
-			.fun-lists {
-				width: 700px;
-				overflow: hidden;
-				.fun-list {
-					width: 120px;
-					height: 40px;
-					margin: 20px 20px 0 0;
-					background: #f1f1f1;
-					border-radius: 4px 4px 4px 4px;
-					line-height: 40px;
-					color: #333333;
-					font-size: 12px;
-					float: left;
-					text-align: center;
-					cursor: pointer;
-					span {
-						margin-left: 10px;
-					}
-				}
-				.fun-list.active {
-					border: 1px solid #46a6ff;
-					background: #fff;
-					color: #46a6ff;
-					box-sizing: border-box;
-					i {
-						color: #46a6ff;
-					}
-				}
-			}
-		}
+  background: #20222a;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  z-index: 1100;
+  .menu-modal {
+    cursor: pointer;
+  }
+  .header-bar-hover {
+    position: fixed;
+    z-index: 205;
+    top: 50px;
+    left: 0px;
+    right: 0;
+    display: flex;
+    background: #fff;
+    box-shadow: 0px 3px 10px 1px rgba(0, 0, 0, 0.1);
+    height: 500px;
+    .header-bar-hover-content {
+      margin: 32px 20px;
+      text-align: left;
+      .el-alert {
+        line-height: 20px;
+        text-align: center;
+        background: #dfecff;
+        color: #666666;
+        font-weight: 400;
+        margin-bottom: 20px;
+        i {
+          color: #46a6ff;
+        }
+      }
+      .fun-lists {
+        width: 700px;
+        overflow: hidden;
+        .fun-list {
+          width: 120px;
+          height: 40px;
+          margin: 20px 20px 0 0;
+          background: #f1f1f1;
+          border-radius: 4px 4px 4px 4px;
+          line-height: 40px;
+          color: #333333;
+          font-size: 12px;
+          float: left;
+          text-align: center;
+          cursor: pointer;
+          span {
+            margin-left: 10px;
+          }
+        }
+        .fun-list.active {
+          border: 1px solid #46a6ff;
+          background: #fff;
+          color: #46a6ff;
+          box-sizing: border-box;
+          i {
+            color: #46a6ff;
+          }
+        }
+      }
+    }
 
-		ul {
-			padding: 0 20px;
-			margin: 0;
-			width: 230px;
-			background: #f1f1f1;
-			text-align: left;
+    ul {
+      padding: 0 20px;
+      margin: 0;
+      width: 230px;
+      background: #f1f1f1;
+      text-align: left;
 
-			li {
-				color: #333333;
-				list-style: none;
-				margin: 0;
-				position: relative;
-				.text {
-					margin-left: 10px;
-					font-size: 14px;
-					font-weight: bold;
-				}
-				.el-icon-arrow-down {
-					position: absolute;
-					right: 0;
-					top: 20px;
-				}
-				.child-menu {
-					margin-left: 24px;
-					font-size: 12px;
-					font-weight: 400;
-				}
-			}
-			.active-warp {
-				cursor: pointer;
-			}
+      li {
+        color: #333333;
+        list-style: none;
+        margin: 0;
+        position: relative;
+        .text {
+          margin-left: 10px;
+          font-size: 14px;
+          font-weight: bold;
+        }
+        .el-icon-arrow-down {
+          position: absolute;
+          right: 0;
+          top: 20px;
+        }
+        .child-menu {
+          margin-left: 24px;
+          font-size: 12px;
+          font-weight: 400;
+        }
+      }
+      .active-warp {
+        cursor: pointer;
+      }
 
-			.active-warp:hover {
-				color: #0084ff;
-				i {
-					color: #0084ff;
-				}
-			}
-		}
-		.menu-warp {
-			width: 100vw;
-			background: #fff;
-			overflow: hidden;
-			.menu-ul {
-				float: left;
-				width: 100px;
-				margin-right: 80px;
-				.menu-title {
-					font-weight: bold;
-					color: #333333;
-					height: 40px;
-					line-height: 40px;
-					border-bottom: 1px solid #ddd;
-				}
-				ul {
-					li {
-						list-style: none;
-						margin: 0;
-						padding: 0;
-						height: 34px;
-						line-height: 34px;
-						font-size: 12px;
-						font-weight: 400;
-						cursor: pointer;
-					}
-					li:hover {
-						color: #0084ff;
-					}
-				}
-			}
-		}
-	}
-	.nav {
-		display: flex;
-		padding: 0;
-		margin: 0;
-		height: 50px;
-		overflow: hidden;
-		.logo {
-			color: #fff;
-			font-size: 20px;
-			font-weight: bold;
-			line-height: 50px;
-			margin: 0 20px;
-		}
-		.nav-li {
-			width: 130px;
-			height: 50px;
-			font-size: 16px;
-			font-weight: 700;
-			text-align: center;
-			line-height: 50px;
-			list-style: none;
-			color: #fff;
-			a {
-				color: #fff;
-			}
-		}
-		.nav-li.active {
-			background: #0084ff;
-			color: #fff;
-			a {
-				color: #fff;
-			}
-		}
-	}
-	header {
-		z-index: 11205;
-		left: 0;
-		right: 0;
-		top: 0;
-		height: 50px;
-		display: flex;
-		justify-content: space-between;
-		.fr {
-			display: flex;
-			.input-search {
-				margin: 12px 40px 12px 0;
-				width: 240px;
-				input {
-					height: 30px;
-				}
-			}
-			.dropdown-box {
-				margin: 0 24px 0 0px;
-				line-height: 50px;
-			}
-			.badge {
-				margin: 15px 24px 15px 0;
-				height: 20px;
-				width: 20px;
-				i {
-					color: #bbbbbb;
-				}
-			}
-			.user-img {
-				margin: 12px 12px 12px 0;
-			}
-		}
-	}
+      .active-warp:hover {
+        color: #0084ff;
+        i {
+          color: #0084ff;
+        }
+      }
+    }
+    .menu-warp {
+      width: 100vw;
+      background: #fff;
+      overflow: hidden;
+      .menu-ul {
+        float: left;
+        width: 100px;
+        margin-right: 80px;
+        .menu-title {
+          font-weight: bold;
+          color: #333333;
+          height: 40px;
+          line-height: 40px;
+          border-bottom: 1px solid #ddd;
+        }
+        ul {
+          li {
+            list-style: none;
+            margin: 0;
+            padding: 0;
+            height: 34px;
+            line-height: 34px;
+            font-size: 12px;
+            font-weight: 400;
+            cursor: pointer;
+          }
+          li:hover {
+            color: #0084ff;
+          }
+        }
+      }
+    }
+  }
+  .nav {
+    display: flex;
+    padding: 0;
+    margin: 0;
+    height: 50px;
+    overflow: hidden;
+    .logo {
+      color: #fff;
+      font-size: 20px;
+      font-weight: bold;
+      line-height: 50px;
+      margin: 0 20px;
+    }
+    .nav-li {
+      width: 130px;
+      height: 50px;
+      font-size: 16px;
+      font-weight: 700;
+      text-align: center;
+      line-height: 50px;
+      list-style: none;
+      color: #fff;
+      a {
+        color: #fff;
+      }
+    }
+    .nav-li.active {
+      background: #0084ff;
+      color: #fff;
+      a {
+        color: #fff;
+      }
+    }
+  }
+  header {
+    z-index: 11205;
+    left: 0;
+    right: 0;
+    top: 0;
+    height: 50px;
+    display: flex;
+    justify-content: space-between;
+    .fr {
+      display: flex;
+      .input-search {
+        margin: 12px 40px 12px 0;
+        width: 240px;
+        input {
+          height: 30px;
+        }
+      }
+      .dropdown-box {
+        margin: 0 24px 0 0px;
+        line-height: 50px;
+      }
+      .badge {
+        margin: 15px 24px 15px 0;
+        height: 20px;
+        width: 20px;
+        i {
+          color: #bbbbbb;
+        }
+      }
+      .user-img {
+        margin: 12px 12px 12px 0;
+      }
+    }
+  }
 }
 
 header > a {
-	margin: 0 20px;
+  margin: 0 20px;
 }
 </style>
 

+ 133 - 0
src/components/notice-one.vue

@@ -0,0 +1,133 @@
+<template>
+  <el-popover placement="top-start" width="350" trigger="click" ref="popover">
+    <el-tabs v-model="activeName" stretch>
+      <el-tab-pane :label="spellItLabel('全部', 4)" name="first"></el-tab-pane>
+      <el-tab-pane :label="spellItLabel('代办', 5)" name="second"></el-tab-pane>
+    </el-tabs>
+    <el-scrollbar>
+      <div style="height: 280px">
+        <div v-if="activeName === 'first'">全部</div>
+        <div v-if="activeName === 'second'">代办</div>
+      </div>
+    </el-scrollbar>
+    <div slot="reference">
+      <el-badge :value="messageSum" class="badge">
+        <i class="el-icon-message-solid"></i>
+      </el-badge>
+    </div>
+  </el-popover>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      userInfo: {},
+      messageSum: 0,
+      activeName: "first",
+      allList: [],
+      backlogList: [],
+      ws: null, //建立的webSocket连接
+      lockReconnect: false, //是否真正建立连接
+      timeout: 30 * 1000, //30秒一次心跳
+      timeoutObj: null, //心跳倒计时
+      timeoutnum: null, //断开 重连倒计时
+    };
+  },
+  created() {
+    const userInfo = JSON.parse(window.localStorage.getItem("saber-userInfo"));
+    this.userInfo = userInfo.content;
+    // this.initWebpack();
+  },
+  mounted() {
+    this.$refs.popover.doShow();
+  },
+  methods: {
+    initWebpack() {
+      // this.ws = new WebSocket(
+      //   `/cz/victoriatourist/webStock/userId=${this.userInfo.user_id}`
+      // );
+      // const url = `ws:${location.host}/socket/api/victoriatourist/webStock/${this.userInfo.access_token}`;
+      // const url =
+      //   "ws://36.134.91.96:10003/api/victoriatourist/webStock/eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiI4NDUyMDYiLCJ1c2VyX25hbWUiOiJhZG1pbiIsInJlYWxfbmFtZSI6ImFkbeWnk-WQjSIsImF2YXRhciI6IiIsImF1dGhvcml0aWVzIjpbImFkbWluIl0sImNsaWVudF9pZCI6InNhYmVyIiwicm9sZV9uYW1lIjoiYWRtaW4iLCJsaWNlbnNlIjoicG93ZXJlZCBieSBibGFkZXgiLCJwb3N0X2lkIjoiMTYxOTYwOTExNzE1NDg4OTczMCIsInVzZXJfaWQiOiIxNjE5NjA5MTE3NTU3NTI2NTMwIiwicm9sZV9pZCI6IjE2MTk2MDkxMTU1Nzc4MzE0MjYiLCJzY29wZSI6WyJhbGwiXSwibmlja19uYW1lIjoiYWRtaW4iLCJvYXV0aF9pZCI6IiIsImRldGFpbCI6eyJ0eXBlIjoid2ViIn0sImV4cCI6MTY3ODMyOTA1OCwiZGVwdF9pZCI6IjE2MTk2MDkxMTcxMjk3MjM5MDYiLCJqdGkiOiI2OTE0YjY2Mi02OTVjLTQxNGYtYWU1ZC1mOTAxODgyOTJmZDkiLCJhY2NvdW50IjoiYWRtaW4ifQ.dUpl71ynDH06u_tpSqZGSHMmd0maXCGXZRrLUvTMqf4";
+      // this.ws = new WebSocket(url);
+      // this.ws.onopen = this.onopen;
+      // this.ws.onmessage = this.onmessage;
+      // this.ws.onclose = this.onclose;
+      // this.ws.onerror = this.onerror;
+    },
+    onopen() {
+      this.ws.send("ping");
+      //开启心跳
+      this.start();
+    },
+    start() {
+      //开启心跳
+      var self = this;
+      self.timeoutObj && clearTimeout(self.timeoutObj);
+      self.timeoutObj = setTimeout(() => {
+        //这里发送一个心跳,后端收到后,返回一个心跳消息,
+        if (self.ws.readyState == 1) {
+          //如果连接正常
+          self.ws.send("ping");
+        } else {
+          //否则重连
+          self.reconnect();
+        }
+      }, self.timeout);
+    },
+    reconnect() {
+      //重新连接
+      if (this.lockReconnect) {
+        return;
+      }
+      this.lockReconnect = true;
+      //没连接上会一直重连,设置延迟避免请求过多
+      this.timeoutnum && clearTimeout(this.timeoutnum);
+      this.timeoutnum = setTimeout(() => {
+        //新连接
+        this.initWebpack();
+        this.lockReconnect = false;
+      }, 5000);
+    },
+    onmessage(e) {
+      var msg = JSON.parse(e.data);
+      console.log(msg, "assw");
+    },
+    onclose() {
+      console.log("close");
+      this.reconnect();
+    },
+    onerror() {
+      console.log("error");
+      this.reconnect();
+    },
+    spellItLabel(text, index) {
+      if (index > 0) {
+        return text + " (" + index + ")";
+      } else {
+        return text;
+      }
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.badge {
+  cursor: pointer;
+  margin: 15px 24px 15px 0;
+  height: 20px;
+  width: 20px;
+  i {
+    color: #bbbbbb;
+  }
+}
+.notice {
+  padding: 12px 24px;
+  border-bottom: 1px solid #e8eaec;
+  font-size: 12px;
+  cursor: pointer;
+  display: flex;
+}
+</style>

+ 228 - 212
src/views/main.vue

@@ -1,8 +1,18 @@
 <template>
   <div id="main" class="main">
-	<header-bar></header-bar>
-	<notice @more="more" @confirm="confirm" :data="[{title:'11',content:'11'},{title:'22',content:'22'},{title:'33',content:'33'},{title:'44',content:'44'}]" v-model="open"></notice>
-	<!-- <el-table
+    <header-bar></header-bar>
+    <notice
+      @more="more"
+      @confirm="confirm"
+      :data="[
+        { title: '11', content: '11' },
+        { title: '22', content: '22' },
+        { title: '33', content: '33' },
+        { title: '44', content: '44' },
+      ]"
+      v-model="open"
+    ></notice>
+    <!-- <el-table
 		:data="tableData"
 		style="width: 100%;margin;top:200px"
 		:default-sort = "{prop: 'date', order: 'descending'}"
@@ -80,233 +90,239 @@
     <!-- <span @click="changeParentState">主项目的数据:{{ commonData.parent }},点击变回1</span> -->
     <content>
       <!-- <left-mneu></left-mneu> -->
-	  <div class="router-warp">
-		<div id="appContainer"></div>
-      	<router-view></router-view>
-	  </div>
+      <div class="router-warp">
+        <div id="appContainer"></div>
+        <router-view></router-view>
+      </div>
     </content>
-    
   </div>
 </template>
 
 <script>
-import leftMneu from '@/components/left-menu'
-import { registerMicroApps, start } from 'qiankun'
-import headerBar from '@/components/header-bar'
-import notice from '@/components/notice'
-import { getAll } from '@/libs/micros'
-import router from '../router'
-import store from '../store'
-console.log(process.env.NODE_ENV)
-const state = getAll()
-state.router = router
-const isTest = window.location.host == '36.134.91.96:10003'
-const isServe = process.env.NODE_ENV === "development"
+import leftMneu from "@/components/left-menu";
+import { registerMicroApps, start } from "qiankun";
+import headerBar from "@/components/header-bar";
+import notice from "@/components/notice";
+import { getAll } from "@/libs/micros";
+import router from "../router";
+import store from "../store";
+console.log(process.env.NODE_ENV);
+const state = getAll();
+state.router = router;
+const isTest = window.location.host == "36.134.91.96:10003";
+const isServe = process.env.NODE_ENV === "development";
 registerMicroApps([
-	// {
-	// 	name: 'app-vue-hash',
-	// 	entry: 'http://localhost:8081',
-	// 	container: '#appContainer',
-	// 	activeRule: '/main/app-vue-hash',
-	// 	props:{
-			
-	// 	},
-	// },
-	{
-		name: 'fjhxCloudVue',
-		entry: isServe ?  
-			'http://192.168.1.198:1777' :  'https://wdly.bytesail.cn:10002',
-		//entry: (process.env.NODE_ENV === "development") ?  'https://wdly.bytesail.cn:10002' : 'https://wdly.bytesail.cn:10002 http://36.134.91.96:10002',
-		container: '#appContainer',
-		activeRule: '/main/fjhxCloudVue',
-		props:{
-			data:state,
-		},
-	},
-	// {
-	// 	name: 'iotPlatformRoom',
-	// 	entry: 'http://localhost:1888',
-	// 	container: '#appContainer',
-	// 	activeRule: '/main/iotPlatformRoom',
-	// 	props:{
-	// 		data:state,
-	// 	},
-	// },
-	// {
-	// 	name: 'canvas',
-	// 	entry: 'http://localhost:8080',
-	// 	container: '#appContainer',
-	// 	activeRule: '/main/canvas',
-	// 	props:{
-	// 		data:getAll()
-	// 	},
-	// },
+  // {
+  // 	name: 'app-vue-hash',
+  // 	entry: 'http://localhost:8081',
+  // 	container: '#appContainer',
+  // 	activeRule: '/main/app-vue-hash',
+  // 	props:{
+
+  // 	},
+  // },
+  {
+    name: "fjhxCloudVue",
+    entry: isServe
+      ? "http://localhost:1777/"
+      : "https://wdly.bytesail.cn:10002",
+    //entry: (process.env.NODE_ENV === "development") ?  'https://wdly.bytesail.cn:10002' : 'https://wdly.bytesail.cn:10002 http://36.134.91.96:10002',
+    container: "#appContainer",
+    activeRule: "/main/fjhxCloudVue",
+    props: {
+      data: state,
+    },
+  },
+  // {
+  // 	name: 'iotPlatformRoom',
+  // 	entry: 'http://localhost:1888',
+  // 	container: '#appContainer',
+  // 	activeRule: '/main/iotPlatformRoom',
+  // 	props:{
+  // 		data:state,
+  // 	},
+  // },
+  // {
+  // 	name: 'canvas',
+  // 	entry: 'http://localhost:8080',
+  // 	container: '#appContainer',
+  // 	activeRule: '/main/canvas',
+  // 	props:{
+  // 		data:getAll()
+  // 	},
+  // },
 ]);
 start();
 export default {
-	components:{
-		leftMneu,
-		headerBar,
-		notice
-	},
-	data() {
-		return {
-			input1: null,
-			tableData:[],
-			bankList:[],
-			open:false,
-		}
-	},
-	computed: {
-		commonData() {
-			return this.$store.state.commonData
-		},
-	},
-	methods: {
-		more(){
-			console.log('更多')
-		},
-		confirm(_obj){
-			console.log(_obj)
-		},
-		renderHeader(h, para, item) {
-		return h('div', {
-				attrs: {
-				class: 'cell',
-				},
-				domProps: {
-				innerHTML: item.name + '</br>(' + item.accountNumber + ')',
-				},
-			})
-		},
-		changeParentState() {
-			this.$store.commit('setCommonData', { parent: 1 })
-		},
-		getData(){
-			this.$get('/file/2023-02/08/17fa5541-541e-4ac2-a3d5-ff0eb88652f7.jpg')
-		},
-	},
-	created(){
-		//this.getData()
-	},
-}
+  components: {
+    leftMneu,
+    headerBar,
+    notice,
+  },
+  data() {
+    return {
+      input1: null,
+      tableData: [],
+      bankList: [],
+      open: false,
+    };
+  },
+  computed: {
+    commonData() {
+      return this.$store.state.commonData;
+    },
+  },
+  methods: {
+    more() {
+      console.log("更多");
+    },
+    confirm(_obj) {
+      console.log(_obj);
+    },
+    renderHeader(h, para, item) {
+      return h("div", {
+        attrs: {
+          class: "cell",
+        },
+        domProps: {
+          innerHTML: item.name + "</br>(" + item.accountNumber + ")",
+        },
+      });
+    },
+    changeParentState() {
+      this.$store.commit("setCommonData", { parent: 1 });
+    },
+    getData() {
+      this.$get("/file/2023-02/08/17fa5541-541e-4ac2-a3d5-ff0eb88652f7.jpg");
+    },
+  },
+  created() {
+    //this.getData()
+  },
+};
 </script>
 <style>
-  .loading-9 {
-		--r1: 154%;
-		--r2: 68.5%;
-		width: 60px;
-		height: 60px;
-		border-radius: 50%;
-		background:
-			radial-gradient(var(--r1) var(--r2) at top, #0000 79.5%, #269af2 80%) center left,
-			radial-gradient(var(--r1) var(--r2) at bottom, #269af2 79.5%, #0000 80%) center center,
-			radial-gradient(var(--r1) var(--r2) at top, #0000 79.5%, #269af2 80%) center right,
-			#ccc;
-		background-size: 50.5% 220%;
-		background-position: -100% 0%, 0% 0%, 100% 0%;
-		background-repeat: no-repeat;
-		animation: p9 .3s infinite linear;
-	}
+.loading-9 {
+  --r1: 154%;
+  --r2: 68.5%;
+  width: 60px;
+  height: 60px;
+  border-radius: 50%;
+  background: radial-gradient(
+        var(--r1) var(--r2) at top,
+        #0000 79.5%,
+        #269af2 80%
+      )
+      center left,
+    radial-gradient(var(--r1) var(--r2) at bottom, #269af2 79.5%, #0000 80%)
+      center center,
+    radial-gradient(var(--r1) var(--r2) at top, #0000 79.5%, #269af2 80%) center
+      right,
+    #ccc;
+  background-size: 50.5% 220%;
+  background-position: -100% 0%, 0% 0%, 100% 0%;
+  background-repeat: no-repeat;
+  animation: p9 0.3s infinite linear;
+}
 
-	@keyframes p9 {
-		33% {
-			background-position: 0% 33%, 100% 33%, 200% 33%
-		}
+@keyframes p9 {
+  33% {
+    background-position: 0% 33%, 100% 33%, 200% 33%;
+  }
 
-		66% {
-			background-position: -100% 66%, 0% 66%, 100% 66%
-		}
+  66% {
+    background-position: -100% 66%, 0% 66%, 100% 66%;
+  }
 
-		100% {
-			background-position: 0% 100%, 100% 100%, 200% 100%
-		}
-	}
+  100% {
+    background-position: 0% 100%, 100% 100%, 200% 100%;
+  }
+}
 </style>
 <style scoped lang="less">
 .main {
-	height: 100%;
-	background: #f1f1f1;
-	position: relative;
-	content{
-		display: flex;
-		min-height: 100%;
-		.left-menu{
-			width: 244px;
-		}
-		.router-warp{
-			width:100%;
-			min-height:calc(~'100vh - 64px');
-		}
-	}
-	.nav {
-		display: flex;
-		padding: 0;
-		margin: 0;
-		li {
-			width: 128px;
-			height: 64px;
-			font-size: 16px;
-			font-weight: 700;
-			text-align: center;
-			line-height: 64px;
-			list-style: none;
-		}
-		li.active {
-			background: #0084ff;
-			color: #fff;
-			a {
-				color: #fff;
-			}
-		}
-	}
-	header {
-		z-index: 10;
-		left: 0;
-		right: 0;
-		top: 0;
-		height: 64px;
-		background: #fff;
-		display: flex;
-		justify-content: space-between;
-		.logo {
-			margin: 16px 42px;
-			display: block;
-		}
-		.fr {
-			display: flex;
+  height: 100%;
+  background: #f1f1f1;
+  position: relative;
+  content {
+    display: flex;
+    min-height: 100%;
+    .left-menu {
+      width: 244px;
+    }
+    .router-warp {
+      width: 100%;
+      min-height: calc(~"100vh - 64px");
+    }
+  }
+  .nav {
+    display: flex;
+    padding: 0;
+    margin: 0;
+    li {
+      width: 128px;
+      height: 64px;
+      font-size: 16px;
+      font-weight: 700;
+      text-align: center;
+      line-height: 64px;
+      list-style: none;
+    }
+    li.active {
+      background: #0084ff;
+      color: #fff;
+      a {
+        color: #fff;
+      }
+    }
+  }
+  header {
+    z-index: 10;
+    left: 0;
+    right: 0;
+    top: 0;
+    height: 64px;
+    background: #fff;
+    display: flex;
+    justify-content: space-between;
+    .logo {
+      margin: 16px 42px;
+      display: block;
+    }
+    .fr {
+      display: flex;
 
-			.input-search {
-				margin: 12px 40px 12px 0;
-				width: 240px;
-				input {
-				}
-			}
-			.dropdown-box {
-				margin: 0 24px 0 0px;
-				line-height: 64px;
-			}
-			.badge {
-				margin: 22px 24px 22px 0;
-				height: 20px;
-				width: 20px;
-				i {
-					color: #bbbbbb;
-				}
-			}
-			.user-img {
-				margin: 12px 12px 12px 0;
-			}
-		}
-	}
+      .input-search {
+        margin: 12px 40px 12px 0;
+        width: 240px;
+        input {
+        }
+      }
+      .dropdown-box {
+        margin: 0 24px 0 0px;
+        line-height: 64px;
+      }
+      .badge {
+        margin: 22px 24px 22px 0;
+        height: 20px;
+        width: 20px;
+        i {
+          color: #bbbbbb;
+        }
+      }
+      .user-img {
+        margin: 12px 12px 12px 0;
+      }
+    }
+  }
 }
 
 header > a {
-	margin: 0 20px;
+  margin: 0 20px;
 }
 .appContainer {
-	background: #ccc;
-	padding: 20px;
+  background: #ccc;
+  padding: 20px;
 }
 </style>
 <style>
@@ -317,10 +333,10 @@ header > a {
 body,
 html,
 #appContainer,
-#appContainer div[id^='__qiankun_microapp_wrapper_'] {
-	padding: 0;
-	margin: 0;
-	height: 100%;
-	width: 100%;
+#appContainer div[id^="__qiankun_microapp_wrapper_"] {
+  padding: 0;
+  margin: 0;
+  height: 100%;
+  width: 100%;
 }
 </style>