From 9832ec93e170c61246b859b8f6b71136e09e12e5 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 10 Apr 2023 13:48:06 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E8=AF=95=E8=AF=95=E7=BF=B0=E6=9E=97?=
 =?UTF-8?q?=E9=99=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                     |   3 +-
 src/js/store/index.js                |   2 +
 src/views/main-shuju/main-navbar.vue | 486 +++++++++++++++------------
 src/views/main-shuju/main.vue        | 286 ++++++++--------
 4 files changed, 417 insertions(+), 360 deletions(-)

diff --git a/.env.development b/.env.development
index d1c8a3e7c..d38c11f03 100644
--- a/.env.development
+++ b/.env.development
@@ -1,12 +1,13 @@
 NODE_ENV=development
 
-VUE_APP_API_SERVER =  http://192.168.1.140/api
+# VUE_APP_API_SERVER =  http://192.168.1.140/api
 # VUE_APP_API_SERVER =  https://epmet-yantai.elinkservice.cn/api
 # VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
 # VUE_APP_API_SERVER =   https://epmet-cloud.elinkservice.cn/api
 # VUE_APP_API_SERVER =   https://epdc-shibei.elinkservice.cn/api
 # VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn:41080/api
 # VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn/api
+VUE_APP_API_SERVER =  https://epmet-panshi.elinkservice.cn/api
 
 # VUE_APP_NODE_ENV=dev_sdtdt
 VUE_APP_NODE_ENV=dev
diff --git a/src/js/store/index.js b/src/js/store/index.js
index 7ebb31e94..eb25c128e 100644
--- a/src/js/store/index.js
+++ b/src/js/store/index.js
@@ -45,6 +45,8 @@ export default new Vuex.Store({
     fixed1920: {
       height: document.documentElement.clientHeight,
     },
+
+    fullscreen: false, //是否全屏状态
   },
   modules: {
     user,
diff --git a/src/views/main-shuju/main-navbar.vue b/src/views/main-shuju/main-navbar.vue
index 12346a8a6..aa2c272a3 100644
--- a/src/views/main-shuju/main-navbar.vue
+++ b/src/views/main-shuju/main-navbar.vue
@@ -1,86 +1,100 @@
 <template>
-  <div>
-    <nav v-if="showHeader" class="m-navbar">
-      <div class="navbar__header">
-        <h1 class="navbar__brand">
-          <a class="navbar__brand-lg" href="javascript:;">{{ customerName }}</a>
-          <a class="navbar__brand-mini" href="javascript:;">{{
-            customerName.slice(0, 2)
-          }}</a>
-        </h1>
-      </div>
-      <div class="navbar__body">
-        <el-menu class="navbar__menu mr-auto" mode="horizontal">
-          <el-menu-item
-            index="1"
-            @click="$store.state.sidebarFold = !$store.state.sidebarFold"
-          >
-            <svg
-              class="icon-svg navbar__icon-menu navbar__icon-menu--switch"
-              aria-hidden="true"
-            >
-              <use xlink:href="#icon-outdent"></use>
-            </svg>
-          </el-menu-item>
+	<div>
+		<nav v-if="showHeader" class="m-navbar">
+			<div class="navbar__header">
+				<h1 class="navbar__brand">
+					<a class="navbar__brand-lg" href="javascript:;">{{
+						customerName
+					}}</a>
+					<a class="navbar__brand-mini" href="javascript:;">{{
+						customerName.slice(0, 2)
+					}}</a>
+				</h1>
+			</div>
+			<div class="navbar__body">
+				<el-menu class="navbar__menu mr-auto" mode="horizontal">
+					<el-menu-item
+						index="1"
+						@click="
+							$store.state.sidebarFold = !$store.state.sidebarFold
+						"
+					>
+						<svg
+							class="icon-svg navbar__icon-menu navbar__icon-menu--switch"
+							aria-hidden="true"
+						>
+							<use xlink:href="#icon-outdent"></use>
+						</svg>
+					</el-menu-item>
 
-          <el-menu-item index="2" @click="refresh()">
-            <svg class="icon-svg navbar__icon-menu" aria-hidden="true">
-              <use xlink:href="#icon-sync"></use>
-            </svg>
-          </el-menu-item>
-        </el-menu>
+					<el-menu-item index="2" @click="refresh()">
+						<svg
+							class="icon-svg navbar__icon-menu"
+							aria-hidden="true"
+						>
+							<use xlink:href="#icon-sync"></use>
+						</svg>
+					</el-menu-item>
+				</el-menu>
 
-        <el-menu
-          :default-active="$store.state.mainShuju.activeName"
-          :unique-opened="true"
-          :collapseTransition="false"
-          mode="horizontal"
-          class="navbar__menu mr-auto z-div"
-        >
-          <el-menu-item index="index" @click="toIndexPage">
-            <span>首页</span>
-          </el-menu-item>
+				<el-menu
+					:default-active="$store.state.mainShuju.activeName"
+					:unique-opened="true"
+					:collapseTransition="false"
+					mode="horizontal"
+					class="navbar__menu mr-auto z-div"
+				>
+					<el-menu-item index="index" @click="toIndexPage">
+						<span>首页</span>
+					</el-menu-item>
 
-          <template v-for="(menu, idx) in $store.state.mainShuju.menuList">
-            <li
-              class="sub-menu"
-              :class="
-                $store.state.mainShuju.activeName == menu.id ? 'z-on' : ''
-              "
-              v-if="menu.children"
-              :key="menu.id"
-              @click="gotoRouteHandle(menu.id, idx)"
-            >
-              <span>{{ menu.name }}</span>
-              <div class="sub-menu-list">
-                <div
-                  :class="
-                    $store.state.mainShuju.activeName == subMenu.id
-                      ? 'z-on'
-                      : ''
-                  "
-                  :key="subMenu.id"
-                  @click="gotoRouteHandle(subMenu.id, subIndex)"
-                  v-for="(subMenu, subIndex) in menu.children"
-                >
-                  {{ subMenu.name }}
-                </div>
-              </div>
-            </li>
-            <el-menu-item
-              v-else
-              :key="menu.id"
-              :menu="menu"
-              :index="menu.id"
-              @click="gotoRouteHandle(menu.id, idx)"
-            >
-              <span>{{ menu.name }}</span>
-            </el-menu-item>
-          </template>
-        </el-menu>
+					<template
+						v-for="(menu, idx) in $store.state.mainShuju.menuList"
+					>
+						<li
+							class="sub-menu"
+							:class="
+								$store.state.mainShuju.activeName == menu.id
+									? 'z-on'
+									: ''
+							"
+							v-if="menu.children"
+							:key="menu.id"
+							@click="gotoRouteHandle(menu.id, idx)"
+						>
+							<span>{{ menu.name }}</span>
+							<div class="sub-menu-list">
+								<div
+									:class="
+										$store.state.mainShuju.activeName ==
+										subMenu.id
+											? 'z-on'
+											: ''
+									"
+									:key="subMenu.id"
+									@click="
+										gotoRouteHandle(subMenu.id, subIndex)
+									"
+									v-for="(subMenu, subIndex) in menu.children"
+								>
+									{{ subMenu.name }}
+								</div>
+							</div>
+						</li>
+						<el-menu-item
+							v-else
+							:key="menu.id"
+							:menu="menu"
+							:index="menu.id"
+							@click="gotoRouteHandle(menu.id, idx)"
+						>
+							<span>{{ menu.name }}</span>
+						</el-menu-item>
+					</template>
+				</el-menu>
 
-        <el-menu class="navbar__menu" mode="horizontal">
-          <!-- <el-menu-item index="1">
+				<el-menu class="navbar__menu" mode="horizontal">
+					<!-- <el-menu-item index="1">
             <el-dropdown placement="bottom"
                          :show-timeout="0">
               <el-button size="mini">{{ $t('_lang') }}</el-button>
@@ -91,7 +105,7 @@
               </el-dropdown-menu>
             </el-dropdown>
           </el-menu-item> -->
-          <!-- <el-menu-item index="2">
+					<!-- <el-menu-item index="2">
             <a href="//www.renren.io/"
                target="_blank">
               <svg class="icon-svg navbar__icon-menu"
@@ -100,39 +114,48 @@
               </svg>
             </a>
           </el-menu-item> -->
-          <el-menu-item index="3" @click="fullscreenHandle()">
-            <svg class="icon-svg navbar__icon-menu" aria-hidden="true">
-              <use xlink:href="#icon-fullscreen"></use>
-            </svg>
-          </el-menu-item>
+					<el-menu-item index="3" @click="fullscreenHandle()">
+						<svg
+							class="icon-svg navbar__icon-menu"
+							aria-hidden="true"
+						>
+							<use xlink:href="#icon-fullscreen"></use>
+						</svg>
+					</el-menu-item>
 
-          <el-menu-item index="4" class="navbar__avatar">
-            <el-dropdown placement="bottom" :show-timeout="0">
-              <span class="el-dropdown-link">
-                <img src="~@/assets/img/staff-default-avatar.png" />
-                <span>{{ $store.state.user.realName }}</span>
-                <i class="el-icon-arrow-down"></i>
-              </span>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item @click.native="updatePasswordHandle()">{{
-                  $t("updatePassword.title")
-                }}</el-dropdown-item>
-                <el-dropdown-item @click.native="logoutHandle()">{{
-                  $t("logout")
-                }}</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </el-menu-item>
-        </el-menu>
-      </div>
-      <!-- 弹窗, 修改密码 -->
-      <update-password-work
-        v-if="updatePassowrdVisible"
-        ref="updatePassowrd"
-      ></update-password-work>
-    </nav>
-    <nav v-else class="navbar main-line"></nav>
-  </div>
+					<el-menu-item index="4" class="navbar__avatar">
+						<el-dropdown placement="bottom" :show-timeout="0">
+							<span class="el-dropdown-link">
+								<img
+									src="~@/assets/img/staff-default-avatar.png"
+								/>
+								<span>{{ $store.state.user.realName }}</span>
+								<i class="el-icon-arrow-down"></i>
+							</span>
+							<el-dropdown-menu slot="dropdown">
+								<el-dropdown-item
+									@click.native="updatePasswordHandle()"
+									>{{
+										$t("updatePassword.title")
+									}}</el-dropdown-item
+								>
+								<el-dropdown-item
+									@click.native="logoutHandle()"
+									>{{ $t("logout") }}</el-dropdown-item
+								>
+							</el-dropdown-menu>
+						</el-dropdown>
+					</el-menu-item>
+				</el-menu>
+			</div>
+			<!-- 弹窗, 修改密码 -->
+			<update-password-work
+				v-if="updatePassowrdVisible"
+				ref="updatePassowrd"
+			></update-password-work>
+		</nav>
+		<nav v-else class="navbar main-line"></nav>
+	</div>
 </template>
 
 <script>
@@ -142,122 +165,147 @@ import screenfull from "screenfull";
 import UpdatePasswordWork from "@/views/main-navbar-update-password-work";
 import { clearLoginInfo } from "@/utils";
 export default {
-  inject: ["refresh"],
-  data() {
-    return {
-      showHeader: true,
-      i18nMessages: messages,
-      updatePassowrdVisible: false,
-      customerName: "",
-    };
-  },
-  components: {
-    UpdatePasswordWork,
-  },
-  created() {
-    // let platformToken = localStorage.getItem("showHeader") || "";
-    // if (
-    //   typeof platformToken !== "undefined" &&
-    //   platformToken !== "undefined" &&
-    //   platformToken !== ""
-    // ) {
-    //   this.showHeader = false;
-    // }
-    this.changeCustomerName();
-    const customerId = localStorage.getItem("customerId");
-    let siteconfigElement = window.SITE_CONFIG["menuShujuList"];
-    //暂时 亿联街道和 微笑崂山显示 社区治理-》多元化菜单
-    if ("04c0d396e298f13e57aa5904a657eaa6" != customerId && "3fdd0380deff5b30f45376cdf995d1c1" != customerId){
-      for (let index in siteconfigElement){
-        if (siteconfigElement[index].id == '6'){
-          let newMenuArr =  siteconfigElement[index].children.filter(item =>item.id !== 'duoyuanfuwufenxi');
-          siteconfigElement[index].children = newMenuArr;
-        }
-      }
-    }
-    this.$store.state.mainShuju.menuList = siteconfigElement;
-  },
-  computed: {},
-  methods: {
-    toIndexPage() {
-      this.$router.replace("/indexWork");
-    },
-    // 通过menuId与动态(菜单)路由进行匹配跳转至指定路由
-    gotoRouteHandle(menuId, idx) {
-      var route = window.SITE_CONFIG["dynamicMenuRoutesShuju"].filter(
-        (item) => item.meta.menuId === menuId
-      )[0];
-      if (route) {
-        this.$router.push({ name: route.name });
-        this.$store.state.mainShuju.activeName = menuId;
-      }
-    },
-    changeCustomerName() {
-      this.customerName =
-        localStorage.getItem("customerName") || "数据分析可视化平台";
-    },
-    // 全屏
-    fullscreenHandle() {
-      if (!screenfull.enabled) {
-        return this.$message({
-          message: this.$t("fullscreen.prompt"),
-          type: "warning",
-          duration: 500,
-        });
-      }
-      screenfull.toggle();
-    },
-    // 修改密码
-    updatePasswordHandle() {
-      this.updatePassowrdVisible = true;
-      this.$nextTick(() => {
-        this.$refs.updatePassowrd.init();
-      });
-    },
-    // 退出
-    logoutHandle() {
-      this.$confirm(
-        this.$t("prompt.info", { handle: this.$t("logout") }),
-        this.$t("prompt.title"),
-        {
-          confirmButtonText: this.$t("confirm"),
-          cancelButtonText: this.$t("cancel"),
-          type: "warning",
-        }
-      )
-        .then(() => {
-          //关闭所有标签页
-          // tabs, 关闭全部
-          this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
-            (item) => item.name === "home2"
-          );
+	inject: ["refresh"],
+	data() {
+		return {
+			showHeader: true,
+			i18nMessages: messages,
+			updatePassowrdVisible: false,
+			customerName: "",
+		};
+	},
+	components: {
+		UpdatePasswordWork,
+	},
+	created() {
+		// let platformToken = localStorage.getItem("showHeader") || "";
+		// if (
+		//   typeof platformToken !== "undefined" &&
+		//   platformToken !== "undefined" &&
+		//   platformToken !== ""
+		// ) {
+		//   this.showHeader = false;
+		// }
+		this.changeCustomerName();
+		const customerId = localStorage.getItem("customerId");
+		let siteconfigElement = window.SITE_CONFIG["menuShujuList"];
+		//暂时 亿联街道和 微笑崂山显示 社区治理-》多元化菜单
+		if (
+			"04c0d396e298f13e57aa5904a657eaa6" != customerId &&
+			"3fdd0380deff5b30f45376cdf995d1c1" != customerId
+		) {
+			for (let index in siteconfigElement) {
+				if (siteconfigElement[index].id == "6") {
+					let newMenuArr = siteconfigElement[index].children.filter(
+						(item) => item.id !== "duoyuanfuwufenxi"
+					);
+					siteconfigElement[index].children = newMenuArr;
+				}
+			}
+		}
+		this.$store.state.mainShuju.menuList = siteconfigElement;
+
+		// 监听全屏事件
+		this.checkFullscreen();
+	},
+	computed: {},
+	methods: {
+		// 监听全屏事件
+		checkFullscreen() {
+			const fn = () => {
+				if (document.fullscreenElement === null) {
+					console.log("Exited fullscreen");
+					this.$store.state.fullscreen = false;
+				} else {
+					console.log("Entered fullscreen");
+					this.$store.state.fullscreen = true;
+				}
+			};
+			// 监听全屏
+			document.addEventListener("fullscreenchange", fn);
+			fn();
+		},
+
+		toIndexPage() {
+			this.$router.replace("/indexWork");
+		},
+		// 通过menuId与动态(菜单)路由进行匹配跳转至指定路由
+		gotoRouteHandle(menuId, idx) {
+			var route = window.SITE_CONFIG["dynamicMenuRoutesShuju"].filter(
+				(item) => item.meta.menuId === menuId
+			)[0];
+			if (route) {
+				this.$router.push({ name: route.name });
+				this.$store.state.mainShuju.activeName = menuId;
+			}
+		},
+		changeCustomerName() {
+			this.customerName =
+				localStorage.getItem("customerName") || "数据分析可视化平台";
+		},
+		// 全屏
+		fullscreenHandle() {
+			if (!screenfull.enabled) {
+				return this.$message({
+					message: this.$t("fullscreen.prompt"),
+					type: "warning",
+					duration: 500,
+				});
+			}
+			screenfull.toggle();
+		},
+		// 修改密码
+		updatePasswordHandle() {
+			this.updatePassowrdVisible = true;
+			this.$nextTick(() => {
+				this.$refs.updatePassowrd.init();
+			});
+		},
+		// 退出
+		logoutHandle() {
+			this.$confirm(
+				this.$t("prompt.info", { handle: this.$t("logout") }),
+				this.$t("prompt.title"),
+				{
+					confirmButtonText: this.$t("confirm"),
+					cancelButtonText: this.$t("cancel"),
+					type: "warning",
+				}
+			)
+				.then(() => {
+					//关闭所有标签页
+					// tabs, 关闭全部
+					this.$store.state.contentTabs =
+						this.$store.state.contentTabs.filter(
+							(item) => item.name === "home2"
+						);
 
-          this.$http
-            .post("/auth/login/logout")
-            .then(({ data: res }) => {
-              if (res.code !== 0) {
-                //别处登陆时 退出不提示 直接跳登陆页即可
-                if (res.code !== 10007) {
-                  this.$message.error(res.msg);
-                }
-              }
+					this.$http
+						.post("/auth/login/logout")
+						.then(({ data: res }) => {
+							if (res.code !== 0) {
+								//别处登陆时 退出不提示 直接跳登陆页即可
+								if (res.code !== 10007) {
+									this.$message.error(res.msg);
+								}
+							}
 
-              clearLoginInfo();
+							clearLoginInfo();
 
-              this.$router.push({ name: "login" });
-            })
-            .catch(() => {});
-        })
-        .catch(() => {});
-    },
-  },
+							this.$router.push({ name: "login" });
+						})
+						.catch(() => {});
+				})
+				.catch(() => {});
+		},
+	},
 };
 </script>
 
 <style lang="scss" scoped>
 .main-line {
-  height: 50px;
-  background: #eeeeee;
+	height: 50px;
+	background: #eeeeee;
 }
 </style>
 
diff --git a/src/views/main-shuju/main.vue b/src/views/main-shuju/main.vue
index e1026e6fd..06839ba0e 100644
--- a/src/views/main-shuju/main.vue
+++ b/src/views/main-shuju/main.vue
@@ -1,30 +1,33 @@
 <template>
-  <fixed1920>
-    <div
-      v-loading.fullscreen.lock="loading"
-      :element-loading-text="$t('loading')"
-      :class="[
-        'g-bd',
-        { 'z-sidebar--fold': $store.state.sidebarFold },
-        {
-          'z-sidebar--noside': true,
-        },
-        { 'z-iframe': $store.state.inIframe },
-      ]"
-    >
-      <template v-if="!loading">
-        <main-navbar ref="ref_navbar" v-if="!$store.state.inIframe" />
+	<fixed1920>
+		<div
+			v-loading.fullscreen.lock="loading"
+			:element-loading-text="$t('loading')"
+			:class="[
+				'g-bd',
+				{ 'z-sidebar--fold': $store.state.sidebarFold },
+				{
+					'z-sidebar--noside': true,
+				},
+				{ 'z-iframe': $store.state.inIframe || ($store.state.fullscreen && $route.name=='i-1642710158240174082') },
+			]"
+		>
+			<template v-if="!loading">
+				<main-navbar
+					ref="ref_navbar"
+					v-if="!$store.state.inIframe && !($store.state.fullscreen && $route.name=='i-1642710158240174082')"
+				/>
 
-        <div class="g-cnt">
-          <main-content
-            v-if="!$store.state.contentIsNeedRefresh"
-            @changeCustomerName="changeCustomerName"
-          />
-        </div>
-        <main-theme-tools />
-      </template>
-    </div>
-  </fixed1920>
+				<div class="g-cnt">
+					<main-content
+						v-if="!$store.state.contentIsNeedRefresh"
+						@changeCustomerName="changeCustomerName"
+					/>
+				</div>
+				<main-theme-tools />
+			</template>
+		</div>
+	</fixed1920>
 </template>
 
 <script>
@@ -38,138 +41,141 @@ import fixed1920 from "@/views/components/fixed1920.vue";
 import MainThemeTools from "./main-theme-tools";
 
 export default {
-  provide() {
-    return {
-      // 刷新
-      refresh() {
-        this.$store.state.contentIsNeedRefresh = true;
-        this.$nextTick(() => {
-          this.$store.state.contentIsNeedRefresh = false;
-        });
-      },
-    };
-  },
-  data() {
-    return {
-      loading: true,
-      userType: localStorage.getItem("userType"),
-    };
-  },
-  components: {
-    MainNavbar,
-    MainContent,
-    fixed1920,
-    MainThemeTools,
-  },
+	provide() {
+		return {
+			// 刷新
+			refresh() {
+				this.$store.state.contentIsNeedRefresh = true;
+				this.$nextTick(() => {
+					this.$store.state.contentIsNeedRefresh = false;
+				});
+			},
+		};
+	},
+	data() {
+		return {
+			loading: true,
+			userType: localStorage.getItem("userType"),
+		};
+	},
+	components: {
+		MainNavbar,
+		MainContent,
+		fixed1920,
+		MainThemeTools,
+	},
 
-  watch: {
-    $route: "routeHandle",
-  },
-  async created() {
-    this.windowResizeHandle();
-    this.routeHandle(this.$route);
-    Promise.all([this.getWorkUserInfo()]).then(() => {
-      this.loading = false;
-    });
-  },
-  computed: {},
-  methods: {
-    changeCustomerName(customerName) {
-      this.$refs["ref_navbar"].changeCustomerName(customerName);
-    },
-    // 窗口改变大小
-    windowResizeHandle() {
-      this.$store.state.sidebarFold =
-        document.documentElement["clientWidth"] <= 992 || false;
-      window.addEventListener(
-        "resize",
-        debounce(() => {
-          this.$store.state.sidebarFold =
-            document.documentElement["clientWidth"] <= 992 || false;
-        }, 150)
-      );
-    },
-    // 路由, 监听
-    routeHandle(route) {
-      if (!route.meta.isTab) {
-        this.$store.state.mainShuju.activeName = "";
-        this.$store.state.mainShuju.contentTabsActiveName = "";
-        return false;
-      }
-      var tab = this.$store.state.contentTabs.filter(
-        (item) => item.name === route.name
-      )[0];
-      if (!tab) {
-        tab = {
-          ...window.SITE_CONFIG["contentTabDefault"],
-          ...route.meta,
-          name: route.name,
-          params: { ...route.params },
-          query: { ...route.query },
-        };
-        this.$store.state.contentTabs =
-          this.$store.state.contentTabs.concat(tab);
-      }
+	watch: {
+		$route: "routeHandle",
+	},
+	async created() {
+		this.windowResizeHandle();
+		this.routeHandle(this.$route);
+		Promise.all([this.getWorkUserInfo()]).then(() => {
+			this.loading = false;
+		});
+	},
+	computed: {},
+	methods: {
+		changeCustomerName(customerName) {
+			this.$refs["ref_navbar"].changeCustomerName(customerName);
+		},
+		// 窗口改变大小
+		windowResizeHandle() {
+			this.$store.state.sidebarFold =
+				document.documentElement["clientWidth"] <= 992 || false;
+			window.addEventListener(
+				"resize",
+				debounce(() => {
+					this.$store.state.sidebarFold =
+						document.documentElement["clientWidth"] <= 992 || false;
+				}, 150)
+			);
+		},
+		// 路由, 监听
+		routeHandle(route) {
+			if (!route.meta.isTab) {
+				this.$store.state.mainShuju.activeName = "";
+				this.$store.state.mainShuju.contentTabsActiveName = "";
+				return false;
+			}
+			var tab = this.$store.state.contentTabs.filter(
+				(item) => item.name === route.name
+			)[0];
+			if (!tab) {
+				tab = {
+					...window.SITE_CONFIG["contentTabDefault"],
+					...route.meta,
+					name: route.name,
+					params: { ...route.params },
+					query: { ...route.query },
+				};
+				this.$store.state.contentTabs =
+					this.$store.state.contentTabs.concat(tab);
+			}
 
-      this.$store.state.mainShuju.activeName = tab.menuId;
-      this.$store.state.mainShuju.contentTabsActiveName = tab.name;
-    },
+			this.$store.state.mainShuju.activeName = tab.menuId;
+			this.$store.state.mainShuju.contentTabsActiveName = tab.name;
+		},
 
-    // 获取当前管理员信息
-    async getWorkUserInfo() {
-      const url = "/epmetuser/customerstaff/staffbasicinfo";
-      let params = {};
-      const { data, code, msg } = await requestPost(url, params);
-      if (code === 0) {
-        this.$store.state.user = { ...data };
-        console.log("user---hahha", this.$store.state.user);
-        localStorage.setItem("roleList", data.roleList);
-        localStorage.setItem("customerId", data.customerId);
-        localStorage.setItem("staffId", data.id);
-        localStorage.setItem("agencyId", data.agencyId);
-        localStorage.setItem("level", data.level);
-        if (!localStorage.getItem("customerName")) {
-          localStorage.setItem("customerName", data.customerName || "");
-        }
-      } else {
-        this.$message.error(msg);
-      }
-    },
-  },
+		// 获取当前管理员信息
+		async getWorkUserInfo() {
+			const url = "/epmetuser/customerstaff/staffbasicinfo";
+			let params = {};
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.$store.state.user = { ...data };
+				console.log("user---hahha", this.$store.state.user);
+				localStorage.setItem("roleList", data.roleList);
+				localStorage.setItem("customerId", data.customerId);
+				localStorage.setItem("staffId", data.id);
+				localStorage.setItem("agencyId", data.agencyId);
+				localStorage.setItem("level", data.level);
+				if (!localStorage.getItem("customerName")) {
+					localStorage.setItem(
+						"customerName",
+						data.customerName || ""
+					);
+				}
+			} else {
+				this.$message.error(msg);
+			}
+		},
+	},
 };
 </script>
 
 <style lang="scss" src="@/assets/scss/main-shuju.scss" scoped></style>
 <style lang="scss">
 .info-h {
-  height: calc(100% - 320px);
-  // overflow: auto;
+	height: calc(100% - 320px);
+	// overflow: auto;
 }
 .info-scroll {
-  &::-webkit-scrollbar {
-    width: 8px;
-    // background: linear-gradient(270deg, #0063FE, #0095FF);
-  }
+	&::-webkit-scrollbar {
+		width: 8px;
+		// background: linear-gradient(270deg, #0063FE, #0095FF);
+	}
 
-  &::-webkit-scrollbar-corner,
+	&::-webkit-scrollbar-corner,
     /* 滚动条角落 */
   &::-webkit-scrollbar-thumb,
   &::-webkit-scrollbar-track {
-    /*滚动条的轨道*/
-    border-radius: 4px;
-  }
+		/*滚动条的轨道*/
+		border-radius: 4px;
+	}
 
-  &::-webkit-scrollbar-corner,
-  &::-webkit-scrollbar-track {
-    /* 滚动条轨道 */
+	&::-webkit-scrollbar-corner,
+	&::-webkit-scrollbar-track {
+		/* 滚动条轨道 */
 
-    background: rgba(12, 129, 254, 0.24);
-    // box-shadow: inset 0 0 1px rgba(180, 160, 120, 0.5);
-  }
+		background: rgba(12, 129, 254, 0.24);
+		// box-shadow: inset 0 0 1px rgba(180, 160, 120, 0.5);
+	}
 
-  &::-webkit-scrollbar-thumb {
-    /* 滚动条手柄 */
-    background: linear-gradient(270deg, #1257c9, #0095ff);
-  }
+	&::-webkit-scrollbar-thumb {
+		/* 滚动条手柄 */
+		background: linear-gradient(270deg, #1257c9, #0095ff);
+	}
 }
 </style>

From 71346cbe8f913a8f1e929a1d7de3597fc3a29715 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 10 Apr 2023 13:52:22 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9iframe=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/main-shuju/main-content.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/main-shuju/main-content.vue b/src/views/main-shuju/main-content.vue
index b9914005e..770032932 100644
--- a/src/views/main-shuju/main-content.vue
+++ b/src/views/main-shuju/main-content.vue
@@ -18,7 +18,7 @@
           height="100%"
           frameborder="0"
           scrolling="yes"
-          :style="{ height: $store.state.fixed1920.height - 100 + 'px' }"
+          :style="{ width: '1920px', height: $store.state.fixed1920.height+ 'px' }"
         />
       </template>
       <keep-alive v-show="!tabIsIframe($router.currentRoute.meta.iframeURL)">

From 683f7cb4ff2d00c38c83f10da331fdccf4ee00fb Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 10 Apr 2023 13:56:53 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=8A=8Aenv=E6=96=87=E4=BB=B6=E8=BF=98?=
 =?UTF-8?q?=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.development b/.env.development
index d38c11f03..ea43786c3 100644
--- a/.env.development
+++ b/.env.development
@@ -1,13 +1,13 @@
 NODE_ENV=development
 
-# VUE_APP_API_SERVER =  http://192.168.1.140/api
+VUE_APP_API_SERVER =  http://192.168.1.140/api
 # VUE_APP_API_SERVER =  https://epmet-yantai.elinkservice.cn/api
 # VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
 # VUE_APP_API_SERVER =   https://epmet-cloud.elinkservice.cn/api
 # VUE_APP_API_SERVER =   https://epdc-shibei.elinkservice.cn/api
 # VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn:41080/api
 # VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn/api
-VUE_APP_API_SERVER =  https://epmet-panshi.elinkservice.cn/api
+# VUE_APP_API_SERVER =  https://epmet-panshi.elinkservice.cn/api
 
 # VUE_APP_NODE_ENV=dev_sdtdt
 VUE_APP_NODE_ENV=dev

From 5601e60c105d76b8f6d7c0d8f0b7f9fd568e2bcd Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 17 Apr 2023 16:03:54 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=9508?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/fuwujilu/fuwuList08.vue  | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 src/views/modules/communityService/fuwujilu/fuwuList08.vue

diff --git a/src/views/modules/communityService/fuwujilu/fuwuList08.vue b/src/views/modules/communityService/fuwujilu/fuwuList08.vue
new file mode 100644
index 000000000..e7db1167e
--- /dev/null
+++ b/src/views/modules/communityService/fuwujilu/fuwuList08.vue
@@ -0,0 +1,34 @@
+<template>
+	<div>
+		<fuwu-list :serviceCategoryKey="serviceCategoryKey"></fuwu-list>
+	</div>
+</template>
+
+<script>
+import fuwuList from "./fuwuList";
+
+export default {
+	components: { fuwuList },
+
+	data() {
+		return {
+			serviceCategoryKey: "08",
+		};
+	},
+	computed: {},
+	watch: {
+		// "formData.serviceTimeEnd": function (val) {
+		//   if (val && val != '') {
+		//     let arrayTemp = val.split(' ')
+		//     this.formData.serviceTimeEnd = arrayTemp[0] + ' 23:59:59'
+		//   }
+		// },
+	},
+	mounted() {},
+	methods: {},
+
+	props: {},
+};
+</script>
+
+<style lang="scss" scoped></style>

From ffb711a34dc7a16151bf71fc79a946cd2c623e46 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 19 Apr 2023 17:07:14 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=B1=85=E6=B0=91=E9=9C=80=E6=B1=82=E4=B8=8B=E6=8B=89=E6=A1=86?=
 =?UTF-8?q?=E4=BC=A0=E5=80=BC=E5=8D=95=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiSearch.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 812de530f..3f964c6d3 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -211,6 +211,7 @@
                   clearable
                   size="small"
                   class="resi-cell-select"
+                  @change="handelChangeCascader($event,n.columnName)"
                 >
                 </el-cascader>
                 <template v-else-if="n.itemType === 'checkbox'">
@@ -512,6 +513,13 @@ export default {
       this.$emit('search', arr3)
       return arr3
     },
+    handelChangeCascader(val,name){
+      if(val.length==1){
+          this.form[name] = val[0] || ''
+        }else{
+          this.form[name] = val[1] || ''
+        }
+    },
     handleOpenSearch() {
       this.openSearch = !this.openSearch
     },

From df6c6dc25ad10353982a61939a340851c7c824c3 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 26 Apr 2023 14:27:48 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=87=87=E9=9B=86?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=A2=9E=E5=8A=A0=E6=88=B7=E4=B8=BB=E5=A7=93?=
 =?UTF-8?q?=E5=90=8D,=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81,=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=A2=9E=E5=8A=A0=E4=B8=8E=E6=88=B7=E4=B8=BB=E5=85=B3?=
 =?UTF-8?q?=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/collect.vue | 892 +++++++++++++++++------------
 1 file changed, 519 insertions(+), 373 deletions(-)

diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue
index 4ae414aa8..dfa9e969a 100644
--- a/src/views/modules/base/collect.vue
+++ b/src/views/modules/base/collect.vue
@@ -1,11 +1,12 @@
 <template>
   <div class="resi-container">
-    <el-card ref="searchCard"
-             class="search-card">
-      <el-form ref="searchForm"
-               :inline="true"
-               :model="fmData"
-               class="demo-form-inline">
+    <el-card ref="searchCard" class="search-card">
+      <el-form
+        ref="searchForm"
+        :inline="true"
+        :model="fmData"
+        class="demo-form-inline"
+      >
         <!-- <el-form-item
           v-if="communityList.length > 0"
           label="所在社区"
@@ -27,82 +28,118 @@
             </el-option>
           </el-select>
         </el-form-item> -->
-        <el-form-item label="居住地址"
-                      prop="address">
-          <el-input v-model="fmData.address"
-                    class="resi-cell-input"
-                    size="small"
-                    clearable
-                    placeholder="请输入">
+        <el-form-item label="居住地址" prop="address">
+          <el-input
+            v-model="fmData.address"
+            class="resi-cell-input"
+            size="small"
+            clearable
+            placeholder="请输入"
+          >
           </el-input>
         </el-form-item>
-        <el-form-item label="户籍地址"
-                      prop="domicilePlace">
-          <el-input v-model="fmData.domicilePlace"
-                    class="resi-cell-input"
-                    size="small"
-                    clearable
-                    placeholder="请输入">
+        <el-form-item label="户籍地址" prop="domicilePlace">
+          <el-input
+            v-model="fmData.domicilePlace"
+            class="resi-cell-input"
+            size="small"
+            clearable
+            placeholder="请输入"
+          >
           </el-input>
         </el-form-item>
-        <el-form-item label="填写时间"
-                      prop="startTime">
-          <el-date-picker v-model="timeRange"
-                          type="daterange"
-                          clearable
-                          size="small"
-                          range-separator="至"
-                          start-placeholder="开始日期"
-                          end-placeholder="结束日期"
-                          value-format="yyyy-MM-dd">
+        <el-form-item label="户主姓名" prop="houseHolderName">
+          <el-input
+            v-model="fmData.houseHolderName"
+            class="resi-cell-input"
+            size="small"
+            clearable
+            placeholder="请输入"
+          >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="审核状态" prop="checkState">
+          <el-select v-model="fmData.checkState">
+            <el-option
+              v-for="item in checkStateList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="填写时间" prop="startTime">
+          <el-date-picker
+            v-model="timeRange"
+            type="daterange"
+            clearable
+            size="small"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            value-format="yyyy-MM-dd"
+          >
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button class="diy-button--search"
-                     size="small"
-                     @click="handleSearch">查询</el-button>
-          <el-button class="diy-button--reset"
-                     size="small"
-                     @click="resetForm('searchForm')">重置</el-button>
+          <el-button
+            class="diy-button--search"
+            size="small"
+            @click="handleSearch"
+            >查询</el-button
+          >
+          <el-button
+            class="diy-button--reset"
+            size="small"
+            @click="resetForm('searchForm')"
+            >重置</el-button
+          >
         </el-form-item>
       </el-form>
     </el-card>
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
-        <el-button @click="handleChu"
-                   class="diy-button--reset"
-                   size="small">导出</el-button>
+        <el-button @click="handleChu" class="diy-button--reset" size="small"
+          >导出</el-button
+        >
       </div>
-      <el-table :data="tableData"
-                border
-                style="width: 100%"
-                class="resi-table"
-                :height="tableHeight"
-                :span-method="arraySpanMethod">
-        <el-table-column label="序号"
-                         prop="desc"
-                         align="center"
-                         width="50" />
-        <el-table-column prop="houseHolderName"
-                         width="100"
-                         label="户主姓名"
-                         align="center"
-                         :show-overflow-tooltip="true" />
-        <el-table-column prop="address"
-                         align="center"
-                         min-width="140"
-                         label="居住地址"
-                         :show-overflow-tooltip="true">
+      <el-table
+        :data="tableData"
+        border
+        style="width: 100%"
+        class="resi-table"
+        :height="tableHeight"
+        :span-method="arraySpanMethod"
+      >
+        <el-table-column label="序号" prop="desc" align="center" width="50" />
+        <el-table-column
+          prop="houseHolderName"
+          width="100"
+          label="户主姓名"
+          align="center"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          prop="address"
+          align="center"
+          min-width="140"
+          label="居住地址"
+          :show-overflow-tooltip="true"
+        >
           <template slot-scope="scope">
-            <span v-if="scope.row.homeId == 'other'"
-                  class="badge">房屋缺失</span>
-            <span>{{scope.row.address}}</span>
+            <span v-if="scope.row.homeId == 'other'" class="badge"
+              >房屋缺失</span
+            >
+            <span>{{ scope.row.address }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="houseType"
-                         align="center"
-                         width="100"
-                         label="房屋状态">
+        <el-table-column
+          prop="houseType"
+          align="center"
+          width="100"
+          label="房屋状态"
+        >
           <template slot-scope="scope">
             <span v-if="scope.row.houseType == 1">出租</span>
             <span v-if="scope.row.houseType == 2">闲置</span>
@@ -110,85 +147,110 @@
             <span v-if="scope.row.houseType == 0">自住</span>
           </template>
         </el-table-column>
-        <el-table-column prop="totalResi"
-                         width="80"
-                         align="center"
-                         label="居住人数" />
-        <el-table-column prop="memberName"
-                         width="100"
-                         label="成员姓名"
-                         align="center"
-                         :show-overflow-tooltip="true" />
-        <el-table-column prop="memberIdNum"
-                         width="180"
-                         align="center"
-                         label="成员证件号"
-                         :show-overflow-tooltip="true" />
-        <el-table-column prop="memberMobile"
-                         width="140"
-                         align="center"
-                         label="成员手机号"
-                         :show-overflow-tooltip="true" />
-        <el-table-column prop="relationship"
-                         min-width="120"
-                         align="center"
-                         label="与户主关系"
-                         :show-overflow-tooltip="true">
+        <el-table-column
+          prop="totalResi"
+          width="80"
+          align="center"
+          label="居住人数"
+        />
+        <el-table-column
+          prop="memberName"
+          width="100"
+          label="成员姓名"
+          align="center"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          prop="memberIdNum"
+          width="180"
+          align="center"
+          label="成员证件号"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          prop="memberMobile"
+          width="140"
+          align="center"
+          label="成员手机号"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          prop="relationship"
+          min-width="120"
+          align="center"
+          label="与户主关系"
+          :show-overflow-tooltip="true"
+        >
           <template slot-scope="scope">
-            <span>{{getRelationshipName(scope.row.relationship)}}</span>
+            <span>{{ getRelationshipName(scope.row.relationship) }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="heSuanCount"
-                         width="120"
-                         align="center"
-                         label="核酸检测次数" />
+        <el-table-column
+          prop="heSuanCount"
+          width="120"
+          align="center"
+          label="核酸检测次数"
+        />
 
-        <el-table-column prop="ymjz"
-                         width="140"
-                         align="center"
-                         label="疫苗接种情况">
+        <el-table-column
+          prop="ymjz"
+          width="140"
+          align="center"
+          label="疫苗接种情况"
+        >
           <template slot-scope="scope">
             <span v-if="scope.row.ymjz == 1">全程接种</span>
             <span v-if="scope.row.ymjz == 2">未全程接种</span>
             <span v-if="scope.row.ymjz == 0">未接种</span>
           </template>
         </el-table-column>
-        <el-table-column prop="domicilePlace"
-                         min-width="140"
-                         align="center"
-                         label="户籍地址"
-                         :show-overflow-tooltip="true" />
-        <el-table-column prop="workPlace"
-                         min-width="120"
-                         align="center"
-                         label="单位名称"
-                         :show-overflow-tooltip="true" />
-        <el-table-column prop="remark"
-                         align="center"
-                         label="备注"
-                         :show-overflow-tooltip="true">
+        <el-table-column
+          prop="domicilePlace"
+          min-width="140"
+          align="center"
+          label="户籍地址"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          prop="workPlace"
+          min-width="120"
+          align="center"
+          label="单位名称"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          prop="remark"
+          align="center"
+          label="备注"
+          :show-overflow-tooltip="true"
+        >
         </el-table-column>
-        <el-table-column prop="faceImg"
-                         min-width="120"
-                         align="center"
-                         label="人脸">
+        <el-table-column
+          prop="faceImg"
+          min-width="120"
+          align="center"
+          label="人脸"
+        >
           <template slot-scope="scope">
-            <el-image style="max-height: 50px; max-width: 50px;"
-                      :src="scope.row.faceImg"
-                      :preview-src-list="[scope.row.faceImg]">
-              <div slot="error"
-                   class="image-slot">
+            <el-image
+              style="max-height: 50px; max-width: 50px"
+              :src="scope.row.faceImg"
+              :preview-src-list="[scope.row.faceImg]"
+            >
+              <div slot="error" class="image-slot">
                 <!-- <i class="el-icon-picture-outline"></i> -->
               </div>
             </el-image>
           </template>
         </el-table-column>
-        <el-table-column prop="checkState"
-                         min-width="120"
-                         align="center"
-                         label="状态"
-                         :show-overflow-tooltip="true"
-                         fixed="right">
+        <el-table-column
+          prop="checkState"
+          min-width="120"
+          align="center"
+          label="状态"
+          :show-overflow-tooltip="true"
+          fixed="right"
+        >
           <template slot-scope="scope">
             <span v-if="scope.row.checkState === '0'">未审核</span>
             <span v-else-if="scope.row.checkState === '1'">未通过</span>
@@ -196,81 +258,96 @@
             <span v-else></span>
           </template>
         </el-table-column>
-        <el-table-column label="操作"
-                         align="center"
-                         width="100"
-                         fixed="right">
+        <el-table-column label="操作" align="center" width="100" fixed="right">
           <template slot-scope="scope">
-            <el-button type="text"
-                       class="div-table-button--detail"
-                       size="small"
-                       @click="handleWatch('look', scope.row)">查看</el-button>
+            <el-button
+              type="text"
+              class="div-table-button--detail"
+              size="small"
+              @click="handleWatch('look', scope.row)"
+              >查看</el-button
+            >
             <!-- <el-button type="text"
                        class="div-table-button--detail"
                        size="small"
                        @click="handleWatch('check', scope.row)">审核</el-button> -->
-            <el-button type="text"
-                       class="div-table-button--detail"
-                       size="small"
-                       v-if="scope.row.agencyId == agencyId && scope.row.checkState === '0'"
-                       @click="handleWatch('check', scope.row)">审核</el-button>
+            <el-button
+              type="text"
+              class="div-table-button--detail"
+              size="small"
+              v-if="
+                scope.row.agencyId == agencyId && scope.row.checkState === '0'
+              "
+              @click="handleWatch('check', scope.row)"
+              >审核</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
       <div>
-        <el-pagination @size-change="handleSizeChange"
-                       @current-change="handleCurrentChange"
-                       :current-page.sync="pageNo"
-                       :page-sizes="[20, 50, 100, 200]"
-                       :page-size="parseInt(pageSize)"
-                       layout="sizes, prev, pager, next, total"
-                       :total="total">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page.sync="pageNo"
+          :page-sizes="[20, 50, 100, 200]"
+          :page-size="parseInt(pageSize)"
+          layout="sizes, prev, pager, next, total"
+          :total="total"
+        >
         </el-pagination>
       </div>
     </el-card>
 
     <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="formShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               title="信息详情"
-               width="1100px"
-               top="5vh"
-               class="dialog-h"
-               @closed="handleClose">
+    <el-dialog
+      :visible.sync="formShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title="信息详情"
+      width="1100px"
+      top="5vh"
+      class="dialog-h"
+      @closed="handleClose"
+    >
       <div class="scroll-h">
-        <el-form ref="ref_form"
-                 :inline="true"
-                 :model="dataForm"
-                 :disabled="true"
-                 class="form">
-          <el-form-item label="户主姓名:"
-                        prop="houseHolderName"
-                        label-width="150px">
+        <el-form
+          ref="ref_form"
+          :inline="true"
+          :model="dataForm"
+          :disabled="true"
+          class="form"
+        >
+          <el-form-item
+            label="户主姓名:"
+            prop="houseHolderName"
+            label-width="150px"
+          >
             <!-- <el-input class="item_width_1"
                         v-model="dataForm.houseHolderName">
               </el-input> -->
             <div class="wd50">{{ dataForm.houseHolderName }}</div>
           </el-form-item>
-          <el-form-item label="居住地址:"
-                        prop="address"
-                        label-width="150px">
+          <el-form-item label="居住地址:" prop="address" label-width="150px">
             <!-- <el-input class="wd50" v-model="dataForm.address">
               </el-input> -->
             <div class="wd50">{{ dataForm.address }}</div>
           </el-form-item>
           <div>
-            <el-form-item label="房屋状态:"
-                          prop="houseType"
-                          label-width="150px">
+            <el-form-item
+              label="房屋状态:"
+              prop="houseType"
+              label-width="150px"
+            >
               <!-- <el-input class="item_width_1"
                           v-model="dataForm.houseType">
                 </el-input> -->
               <div class="wd50">{{ dataForm.houseType }}</div>
             </el-form-item>
-            <el-form-item label="居住人数:"
-                          prop="totalResi"
-                          label-width="150px">
+            <el-form-item
+              label="居住人数:"
+              prop="totalResi"
+              label-width="150px"
+            >
               <!-- <el-input class="item_width_1"
                           v-model="dataForm.totalResi">
                 </el-input> -->
@@ -278,70 +355,98 @@
             </el-form-item>
           </div>
         </el-form>
-        <el-table :data="dataForm.list"
-                  border
-                  style="width: 1060px; margin: 20px"
-                  class="resi-table"
-                  :height="dialogTableHeight">
-          <el-table-column label="序号"
-                           type="index"
-                           align="center"
-                           width="50" />
-          <el-table-column prop="memberName"
-                           width="100"
-                           label="成员姓名"
-                           align="center"
-                           :show-overflow-tooltip="true" />
-          <el-table-column prop="memberIdNum"
-                           width="180"
-                           align="center"
-                           label="成员证件号"
-                           :show-overflow-tooltip="true" />
-          <el-table-column prop="memberMobile"
-                           width="140"
-                           align="center"
-                           label="成员手机号"
-                           :show-overflow-tooltip="true" />
-          <el-table-column prop="heSuanCount"
-                           width="120"
-                           align="center"
-                           label="核酸检测次数" />
-
-          <el-table-column prop="ymjz"
-                           width="140"
-                           align="center"
-                           label="疫苗接种情况">
+        <el-table
+          :data="dataForm.list"
+          border
+          style="width: 1060px; margin: 20px"
+          class="resi-table"
+          :height="dialogTableHeight"
+        >
+          <el-table-column
+            label="序号"
+            type="index"
+            align="center"
+            width="50"
+          />
+          <el-table-column
+            prop="memberName"
+            width="100"
+            label="成员姓名"
+            align="center"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            prop="memberIdNum"
+            width="180"
+            align="center"
+            label="成员证件号"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            prop="memberMobile"
+            width="140"
+            align="center"
+            label="成员手机号"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            prop="heSuanCount"
+            width="120"
+            align="center"
+            label="核酸检测次数"
+          />
+          <el-table-column
+            prop="ymjz"
+            width="140"
+            align="center"
+            label="疫苗接种情况"
+          >
             <template slot-scope="scope">
               <span v-if="scope.row.ymjz == 1">全程接种</span>
               <span v-if="scope.row.ymjz == 2">未全程接种</span>
               <span v-if="scope.row.ymjz == 0">未接种</span>
             </template>
           </el-table-column>
-          <el-table-column prop="domicilePlace"
-                           min-width="140"
-                           align="center"
-                           label="户籍所在地 "
-                           :show-overflow-tooltip="true" />
-          <el-table-column prop="workPlace"
-                           min-width="120"
-                           align="center"
-                           label="单位或学校 "
-                           :show-overflow-tooltip="true" />
-          <el-table-column prop="remark"
-                           align="center"
-                           label="备注"
-                           :show-overflow-tooltip="true">
+          <el-table-column
+            prop="relationShipName"
+            width="120"
+            align="center"
+            label="与户主关系"
+          />
+          <el-table-column
+            prop="domicilePlace"
+            min-width="140"
+            align="center"
+            label="户籍所在地 "
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            prop="workPlace"
+            min-width="120"
+            align="center"
+            label="单位或学校 "
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            prop="remark"
+            align="center"
+            label="备注"
+            :show-overflow-tooltip="true"
+          >
           </el-table-column>
-          <el-table-column prop="faceImg"
-                           min-width="120"
-                           align="center"
-                           label="人脸">
+          <el-table-column
+            prop="faceImg"
+            min-width="120"
+            align="center"
+            label="人脸"
+          >
             <template slot-scope="scope">
-              <el-image style="max-height: 50px; max-width: 50px;"
-                        :src="scope.row.faceImg"
-                        :preview-src-list="[scope.row.faceImg]">
-                <div slot="error"
-                     class="image-slot">
+              <el-image
+                style="max-height: 50px; max-width: 50px"
+                :src="scope.row.faceImg"
+                :preview-src-list="[scope.row.faceImg]"
+              >
+                <div slot="error" class="image-slot">
                   <!-- <i class="el-icon-picture-outline"></i> -->
                 </div>
               </el-image>
@@ -349,28 +454,38 @@
           </el-table-column>
         </el-table>
         <div class="resi-btns">
-          <el-button @click="formShow = false">{{ $t('cancel') }}</el-button>
-          <el-button v-if="dialogType == 'check'"
-                     type="danger"
-                     @click="checkHandle('1')">{{ $t('checkBTGBtn') }}</el-button>
-          <el-button v-if="dialogType == 'check'"
-                     type="danger"
-                     @click="showAddHouse">{{ $t('checkTGBtn') }}</el-button>
+          <el-button @click="formShow = false">{{ $t("cancel") }}</el-button>
+          <el-button
+            v-if="dialogType == 'check'"
+            type="danger"
+            @click="checkHandle('1')"
+            >{{ $t("checkBTGBtn") }}</el-button
+          >
+          <el-button
+            v-if="dialogType == 'check'"
+            type="danger"
+            @click="showAddHouse"
+            >{{ $t("checkTGBtn") }}</el-button
+          >
         </div>
       </div>
     </el-dialog>
     <!-- 新增房屋弹出框 -->
-    <el-dialog :visible.sync="addHouseShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               title="新增房屋"
-               width="900px"
-               top="5vh"
-               class="dialog-h"
-               @closed="addHouseShow = false">
-      <room-form ref="ref_form"
-                 @dialogCancle="addHouseShow = false"
-                 @dialogOk="roomFormOk"></room-form>
+    <el-dialog
+      :visible.sync="addHouseShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title="新增房屋"
+      width="900px"
+      top="5vh"
+      class="dialog-h"
+      @closed="addHouseShow = false"
+    >
+      <room-form
+        ref="ref_form"
+        @dialogCancle="addHouseShow = false"
+        @dialogOk="roomFormOk"
+      ></room-form>
     </el-dialog>
   </div>
 </template>
@@ -380,12 +495,12 @@ import { requestPost } from "@/js/dai/request";
 import nextTick from "dai-js/tools/nextTick";
 import { mapGetters } from "vuex";
 import axios from "axios";
-import roomForm from './roomForm'
+import roomForm from "./roomForm";
 
 export default {
-  data () {
+  data() {
     return {
-      agencyId: '',
+      agencyId: "",
       openSearch: false,
 
       formShow: false,
@@ -403,6 +518,8 @@ export default {
         endTime: "",
         address: "",
         domicilePlace: "",
+        checkState: "",
+        houseHolderName: "",
       },
       dataForm: {},
       communityList: [],
@@ -410,28 +527,33 @@ export default {
       importBtnTitle: "导入",
       importLoading: false,
       addHouseShow: false,
-      dialogType: 'look', // 对话框是check审核还是look查看
-      relationshipOptions: []
-    }
+      dialogType: "look", // 对话框是check审核还是look查看
+      relationshipOptions: [],
+      checkStateList: [
+        { value: "0", label: "待审核" },
+        { value: "1", label: "审核不通过" },
+        { value: "2", label: "审核通过" },
+      ],
+    };
   },
   components: {
-    roomForm
+    roomForm,
   },
   computed: {
     ...mapGetters(["clientHeight", "iframeHeight"]),
-    tableHeight () {
+    tableHeight() {
       const h = this.clientHeight - 360 + this.iframeHeigh;
       const _h = this.clientHeight - 360;
       return this.$store.state.inIframe ? h : _h;
     },
-    dialogTableHeight () {
+    dialogTableHeight() {
       const h = this.clientHeight - 460 + this.iframeHeigh;
       const _h = this.clientHeight - 460;
       return this.$store.state.inIframe ? h : _h;
     },
   },
   watch: {
-    timeRange (val) {
+    timeRange(val) {
       if (Array.isArray(val) && val.length == 2) {
         this.fmData.startTime = val[0];
         this.fmData.endTime = val[1];
@@ -441,35 +563,37 @@ export default {
       }
     },
   },
-  created () {
-    this.agencyId = localStorage.getItem('agencyId')
+  created() {
+    this.agencyId = localStorage.getItem("agencyId");
   },
-  mounted () {
+  mounted() {
     // this.getcommunityList();
-    this.getDictList()
-    this.getTableData()
+    this.getDictList();
+    this.getTableData();
   },
   methods: {
-    async getDictList () {
-      const url = "/sys/dict/data/relationship"
-      const { data, code, msg } = await requestPost(url, { formCode: "resi_base_info" })
+    async getDictList() {
+      const url = "/sys/dict/data/relationship";
+      const { data, code, msg } = await requestPost(url, {
+        formCode: "resi_base_info",
+      });
 
       if (code === 0) {
-        this.relationshipOptions = [...data]
+        this.relationshipOptions = [...data];
       } else {
-        this.$message.success("操作失败！")
+        this.$message.success("操作失败！");
       }
     },
-    getRelationshipName (value) {
-      let label = ''
-      this.relationshipOptions.forEach(item => {
+    getRelationshipName(value) {
+      let label = "";
+      this.relationshipOptions.forEach((item) => {
         if (item.value == value) {
-          label = item.label
+          label = item.label;
         }
-      })
-      return label
+      });
+      return label;
     },
-    arraySpanMethod ({ row, column, rowIndex, columnIndex }) {
+    arraySpanMethod({ row, column, rowIndex, columnIndex }) {
       // console.log('row-----r', row)
       // console.log('column-----c', column)
       if (
@@ -497,7 +621,7 @@ export default {
         }
       }
     },
-    async handleChu () {
+    async handleChu() {
       const url = "/epmetuser/icresicollect/export";
       const { pageSize, pageNo, fmData } = this;
       axios({
@@ -531,34 +655,34 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    handleSizeChange (val) {
+    handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
       this.pageSize = val;
       window.localStorage.setItem("pageSize", val);
       this.getTableData();
     },
-    handleCurrentChange (val) {
+    handleCurrentChange(val) {
       console.log(`当前页: ${val}`);
       this.pageNo = val;
       this.getTableData();
     },
 
-    handleClose () {
+    handleClose() {
       this.formShow = false;
     },
-    handleSearch (val) {
+    handleSearch(val) {
       console.log(this.fmData);
       this.pageNo = 1;
       this.getTableData();
     },
-    resetForm (formName) {
+    resetForm(formName) {
       this.$refs[formName].resetFields();
       this.timeRange = "";
       this.handleSearch();
     },
 
-    async handleWatch (type, row) {
-      this.dialogType = type
+    async handleWatch(type, row) {
+      this.dialogType = type;
       // this.formShow = true;
       await nextTick();
       const url = "/epmetuser/icresicollect/detail";
@@ -571,7 +695,14 @@ export default {
         console.log("data----de", data);
         this.dataForm = {
           ...data,
-          houseType: data.houseType == '1' ? '出租' : data.houseType == '2' ? '闲置' : data.houseType == '3' ? '未售出' : '自住' // 1：出租 0：自住  2：闲置 3：未售出
+          houseType:
+            data.houseType == "1"
+              ? "出租"
+              : data.houseType == "2"
+              ? "闲置"
+              : data.houseType == "3"
+              ? "未售出"
+              : "自住", // 1：出租 0：自住  2：闲置 3：未售出
         };
         // this.getTableData();
         this.formShow = true;
@@ -580,17 +711,17 @@ export default {
       }
     },
 
-    async handleEdit (rowIndex) {
+    async handleEdit(rowIndex) {
       this.formShow = true;
       await nextTick();
       this.$refs.eleEditForm.initForm("edit", this.tableData[rowIndex]);
     },
-    handleEditSuccess () {
+    handleEditSuccess() {
       this.handleClose();
       this.getTableData();
     },
 
-    async handleDel (rowData, rowIndex) {
+    async handleDel(rowData, rowIndex) {
       console.log(rowData, rowIndex);
       const url =
         "/heart/iccommunityselforganization/delcommunityselforganization";
@@ -607,7 +738,7 @@ export default {
         this.$message.success("操作失败！");
       }
     },
-    async getcommunityList () {
+    async getcommunityList() {
       const url = "/gov/org/agency/community-list";
       const { data, code, msg } = await requestPost(url);
       if (code === 0) {
@@ -616,39 +747,39 @@ export default {
       } else {
       }
     },
-    async getTableData () {
-      const url = "/epmetuser/icresicollect/list"
-      const { pageSize, pageNo, fmData } = this
+    async getTableData() {
+      const url = "/epmetuser/icresicollect/list";
+      const { pageSize, pageNo, fmData } = this;
       const { data, code, msg } = await requestPost(url, {
         pageSize,
         pageNo,
         ...fmData,
-      })
+      });
       if (code === 0) {
-        console.log("列表请求成功！！！！！！！！！！！！！！")
-        this.total = data.total || 0
-        let _i = 0
-        let arr = []
+        console.log("列表请求成功！！！！！！！！！！！！！！");
+        this.total = data.total || 0;
+        let _i = 0;
+        let arr = [];
         this.spanIndex =
           data.list &&
           data.list.map((item, index) => {
-            if (index == 0) _i = 0
+            if (index == 0) _i = 0;
             else _i = _i + data.list[index - 1].list.length;
-            arr.push(_i)
+            arr.push(_i);
             // console.log("_i-----", _i, arr)
             // if (index === data.list.length - 1) firstIndex = _i - item.list.length
             return {
               firstIndex: _i,
               len: item.list.length,
-            }
-          })
-        this.tableData = data.list && this.formatArr(data.list)
-        console.log("tableData----0", this.spanIndex)
+            };
+          });
+        this.tableData = data.list && this.formatArr(data.list);
+        console.log("tableData----0", this.spanIndex);
       } else {
       }
     },
     // 数组扁平化
-    formatArr (arr) {
+    formatArr(arr) {
       let res = [];
       let arr1 = arr.map((n, index) => {
         return {
@@ -656,13 +787,13 @@ export default {
           list:
             n.list.length > 0
               ? n.list.map((i) => {
-                return {
-                  ...n,
-                  ...i,
-                  desc: index + 1,
-                  list: [],
-                };
-              })
+                  return {
+                    ...n,
+                    ...i,
+                    desc: index + 1,
+                    list: [],
+                  };
+                })
               : [],
         };
       });
@@ -673,89 +804,104 @@ export default {
       });
       return res;
     },
-    showAddHouse () {
-      if (this.dataForm.homeId == 'other') {
-        this.addHouseShow = true
+    showAddHouse() {
+      if (this.dataForm.homeId == "other") {
+        this.addHouseShow = true;
         this.$nextTick(() => {
-          this.$refs.ref_form.initForm('add', null, this.dataForm.id)
-        })
+          this.$refs.ref_form.initForm("add", null, this.dataForm.id);
+        });
       } else {
-        this.checkHandle('2')
+        this.checkHandle("2");
       }
     },
     // 审核提交方法
-    checkHandle (type) {
+    checkHandle(type) {
       const params = {
         id: this.dataForm.id,
         checkState: type, // 0-未审核 1-未通过 2-已通过
-        checkReason: '',
-        buildingUnitId: this.dataForm.buildingUnitId || '',
-        doorName: this.dataForm.doorName || ''
-      }
-      if (type == '1') {
-        const h = this.$createElement
+        checkReason: "",
+        buildingUnitId: this.dataForm.buildingUnitId || "",
+        doorName: this.dataForm.doorName || "",
+      };
+      if (type == "1") {
+        const h = this.$createElement;
         this.$prompt(
-          h('p', null, [h('i', { style: 'color: red' }, '* '),
-          h('span', null, '请输入不通过的原因：')]),
-          '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          inputPattern: /^.+$/,
-          inputErrorMessage: '请输入原因'
-        }).then(({ value }) => {
-          // if (!value) {
-          //   return this.$message.error('请填写审核不通过原因')
-          // }
-          params.checkReason = value
-          this.$http.post('/epmetuser/icresicollect/collectCheck', params).then(({ data: res }) => {
+          h("p", null, [
+            h("i", { style: "color: red" }, "* "),
+            h("span", null, "请输入不通过的原因："),
+          ]),
+          "提示",
+          {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            inputPattern: /^.+$/,
+            inputErrorMessage: "请输入原因",
+          }
+        )
+          .then(({ value }) => {
+            // if (!value) {
+            //   return this.$message.error('请填写审核不通过原因')
+            // }
+            params.checkReason = value;
+            this.$http
+              .post("/epmetuser/icresicollect/collectCheck", params)
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  return this.$message.error(res.msg);
+                }
+                this.formShow = false;
+                this.getTableData();
+                // 调用文件下发权限接口
+                // this.fileJurisdiction(params)
+              })
+              .catch(() => {});
+          })
+          .catch(() => {
+            // 取消输入原因
+          });
+      } else {
+        this.$http
+          .post("/epmetuser/icresicollect/collectCheck", params)
+          .then(({ data: res }) => {
             if (res.code !== 0) {
-              return this.$message.error(res.msg)
+              return this.$message.error(res.msg);
             }
-            this.formShow = false
-            this.getTableData()
+            this.addHouseShow = false;
+            this.formShow = false;
+            this.getTableData();
             // 调用文件下发权限接口
             // this.fileJurisdiction(params)
-          }).catch(() => { })
-        }).catch(() => {
-          // 取消输入原因
-        })
-      } else {
-        this.$http.post('/epmetuser/icresicollect/collectCheck', params).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.addHouseShow = false
-          this.formShow = false
-          this.getTableData()
-          // 调用文件下发权限接口
-          // this.fileJurisdiction(params)
-        }).catch(() => { })
+          })
+          .catch(() => {});
       }
     },
     // 文件下发权限接口
-    fileJurisdiction (params) {
-      this.$http.post('/pli/power/rentContractInfo/send', params).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.$message({
-          message: this.$t('prompt.success'),
-          type: 'success',
-          duration: 500,
-          onClose: () => {
-            this.disabledBtn = false
-            this.checkVisible = false
-            this.visible = false
-            this.$emit('refreshDataList')
+    fileJurisdiction(params) {
+      this.$http
+        .post("/pli/power/rentContractInfo/send", params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
           }
+          this.$message({
+            message: this.$t("prompt.success"),
+            type: "success",
+            duration: 500,
+            onClose: () => {
+              this.disabledBtn = false;
+              this.checkVisible = false;
+              this.visible = false;
+              this.$emit("refreshDataList");
+            },
+          });
         })
-      }).catch(() => { })
+        .catch(() => {});
+    },
+    roomFormOk(e) {
+      this.dataForm.buildingUnitId = e.buildingUnitId;
+      this.dataForm.doorName = e.doorName;
+      this.checkHandle("2");
     },
-    roomFormOk (e) {
-      this.dataForm.buildingUnitId = e.buildingUnitId
-      this.dataForm.doorName = e.doorName
-      this.checkHandle('2')
-    }
   },
 };
 </script>