Prechádzať zdrojové kódy

万载三中 完成数据交换菜单栏

hzj18279462576@163.com 2 rokov pred
rodič
commit
2be255a7c2

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 1 - 1
src/assets/icons/caller.svg


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 1 - 1
src/assets/icons/caller_s.svg


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 1 - 0
src/assets/icons/data.svg


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 1 - 0
src/assets/icons/data_s.svg


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 1 - 1
src/assets/icons/user.svg


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 1 - 1
src/assets/icons/user_s.svg


+ 0 - 1
src/layout/index.vue

@@ -48,7 +48,6 @@ onBeforeMount(async () => {
     width: 100%;
     height: calc(100vh);
     background-color: rgba(238, 238, 238, 1);
-
     :deep(.el-dialog__header .el-dialog__headerbtn) {
       outline: none;
     }

+ 0 - 289
src/layout/sidebar/SidevarItem copy.vue

@@ -1,289 +0,0 @@
-<template>
-  <div class="box-item">
-    <el-menu class="el-menu-vertical-demo" text-color="#fff" active-color="rgba(9, 101, 98, 1)"
-      :default-active="activeIndex" :collapse="menuClose" @select="handleSelect" :router="true">
-      <!-- :default-openeds="[34]" -->
-      <div class="logo el-menu-item">
-        <el-icon :size="20"><img src="@/assets/logo.png" style="width: 30px; height: 24px" /></el-icon>
-      </div>
-      <!-- 订单管理 -->
-      <el-sub-menu :index="12">
-        <template #title>
-          <img v-if="activeIndex == '/seniorCelebrity/order' ||
-            activeIndex == '/seniorCelebrity/orderEvaluate'
-            " src="@/assets/orderS.png" alt="" style="width: 22px; height: 22px; margin: 0 18px" />
-          <img v-else src="@/assets/order.png" alt="" style="width: 22px; height: 22px; margin: 0 18px" />
-          <span>订单管理</span>
-        </template>
-        <el-menu-item index="/seniorCelebrity/order">
-          <template #title>
-            <span>订单管理</span>
-          </template>
-        </el-menu-item>
-        <el-menu-item index="/seniorCelebrity/orderEvaluate">
-          <template #title>
-            <span>订单评价</span>
-          </template>
-        </el-menu-item>
-      </el-sub-menu>
-      <!-- 房态管理 -->
-      <el-sub-menu :index="34">
-        <template #title>
-          <img v-if="activeIndex == '/seniorCelebrity/houseState' ||
-            activeIndex == '/seniorCelebrity/housePrice'
-            " src="@/assets/roomStateC.png" alt="" style="width: 22px; height: 22px; margin: 0 18px" />
-          <img v-else src="@/assets/roomState.png" alt="" style="width: 22px; height: 22px; margin: 0 18px" />
-          <span>房态管理</span>
-        </template>
-        <el-menu-item index="/seniorCelebrity/houseState">
-          <template #title>
-            <span>房态管理</span>
-          </template>
-        </el-menu-item>
-        <el-menu-item index="/seniorCelebrity/housePrice">
-          <template #title>
-            <span>房价管理</span>
-          </template>
-        </el-menu-item>
-      </el-sub-menu>
-      <!-- 台账管理 -->
-      <el-menu-item index="/seniorCelebrity/ledger">
-        <img v-if="activeIndex == '/seniorCelebrity/ledger'" src="@/assets/ledgerS.png" alt=""
-          style="width: 22px; height: 22px; margin: 0 18px" />
-        <img v-else src="@/assets/ledger.png" alt="" style="width: 22px; height: 22px; margin: 0 18px" />
-        <span>台账管理</span>
-      </el-menu-item>
-      <!-- 民宿管理 -->
-      <el-sub-menu :index="56">
-        <template #title>
-          <img v-if="activeIndex == '/seniorCelebrity/houseInfo' ||
-            activeIndex == '/seniorCelebrity/houseType' ||
-            activeIndex == '/seniorCelebrity/houseList'
-            " src="@/assets/houseS.png" style="width: 22px; height: 22px; margin: 0 20px 0 18px" alt="" />
-          <img v-else src="@/assets/house.png" style="width: 22px; height: 22px; margin: 0 20px 0 18px" alt="" />
-          <span>民宿管理</span>
-        </template>
-        <el-menu-item index="/seniorCelebrity/houseInfo">
-          <template #title>
-            <!-- <img src="@/assets/home.png" alt="" /> -->
-            <span>民宿信息</span>
-          </template>
-        </el-menu-item>
-        <el-menu-item index="/seniorCelebrity/houseType">
-          <template #title>
-            <!-- <img src="@/assets/home.png" alt="" /> -->
-            <span>房型管理</span>
-          </template>
-        </el-menu-item>
-        <el-menu-item index="/seniorCelebrity/houseList">
-          <template #title>
-            <!-- <img src="@/assets/home.png" alt="" /> -->
-            <span>房源信息</span>
-          </template>
-        </el-menu-item>
-      </el-sub-menu>
-      <!-- 流程管理 -->
-      <el-sub-menu :index="78">
-        <template #title>
-          <img v-if="activeIndex == '/seniorCelebrity/roomFlow'" src="@/assets/roomFlowC.png" alt=""
-            style="width: 22px; height: 22px; margin: 0 18px" />
-          <img v-else src="@/assets/roomFlow.png" alt="" style="width: 22px; height: 22px; margin: 0 18px" />
-          <span>流程管理</span>
-        </template>
-        <el-menu-item index="/seniorCelebrity/roomFlow">
-          <template #title>
-            <span>我发起的</span>
-          </template>
-        </el-menu-item>
-      </el-sub-menu>
-      <!-- 账号管理 -->
-      <el-menu-item index="/seniorCelebrity/account" v-if="store.state.user.level == 2">
-        <img v-if="activeIndex == '/seniorCelebrity/account'" src="@/assets/systemS.png" alt=""
-          style="width: 20px; height: 20px; margin: 0 20px" />
-        <img v-else src="@/assets/system.png" alt="" style="width: 20px; height: 20px; margin: 0 20px" />
-        <span>账号管理</span>
-      </el-menu-item>
-      <!-- 服务商城 -->
-      <el-menu-item index="/seniorCelebrity/serviceMall">
-        <img v-if="activeIndex == '/seniorCelebrity/serviceMall'" src="@/assets/shop_s.png" alt=""
-          style="width: 20px; height: 20px; margin: 0 20px" />
-        <img v-else src="@/assets/shop.png" alt="" style="width: 20px; height: 20px; margin: 0 20px" />
-        <span>服务商城</span>
-      </el-menu-item>
-    </el-menu>
-  </div>
-</template>
-
-<script setup>
-import { ref, onBeforeMount, onMounted, watch, reactive } from "vue";
-import { useStore } from "vuex";
-
-import { useRouter } from "vue-router";
-
-const store = useStore();
-const router = useRouter();
-
-const menuClose = ref(false);
-const activeIndex = ref(1);
-const acitveItems = reactive({ list: [] });
-
-watch(
-  () => store.state.user.collapse,
-  (newValue, oldValue) => {
-    menuClose.value = newValue;
-  }
-);
-watch(
-  () => store.state.user.activeIndex,
-  (newValue, oldValue) => {
-    console.log(newValue);
-    activeIndex.value = newValue;
-  }
-);
-
-const handleSelect = (key, keyPath) => {
-  // store.commit("indexUp", key);
-  // activeIndex.value = key;
-  // sessionStorage.setItem("sidevarItem", key);
-  console.log(key, keyPath);
-
-  router.push({
-    path: `${key}`,
-  });
-
-  activeIndex.value = key;
-  store.commit("indexUp", key);
-  sessionStorage.setItem("sidevarItem", key);
-  // if (activeIndex.value == 1) {
-  //   router.push({
-  //     path: `/seniorCelebrity/order`,
-  //   });
-  // }
-  // if (activeIndex.value == 2) {
-  //   router.push({
-  //     path: `/seniorCelebrity/ledger`,
-  //   });
-  // }
-
-  // if (activeIndex.value == 3) {
-  //   router.push({
-  //     path: `/seniorCelebrity/houseInfo`,
-  //   });
-  // }
-  // if (activeIndex.value == 4) {
-  //   router.push({
-  //     path: `/seniorCelebrity/houseType`,
-  //   });
-  // }
-  // if (activeIndex.value == 5) {
-  //   router.push({
-  //     path: `/seniorCelebrity/houseList`,
-  //   });
-  // }
-  // if (activeIndex.value == 6) {
-  //   router.push({
-  //     path: `/seniorCelebrity/account`,
-  //   });
-  // }
-};
-onBeforeMount(() => {
-  activeIndex.value = sessionStorage.getItem("sidevarItem");
-});
-</script>
-
-<style lang="scss" scoped>
-.el-menu-vertical-demo:not(.el-menu--collapse) {
-  width: 200px;
-  // min-height: 400px;
-}
-
-.el-menu {
-  width: 100%;
-  height: 100%;
-  // background: linear-gradient(
-  //   0deg,
-  //   rgba(134, 132, 255, 1) 0%,
-  //   rgba(60, 80, 232, 1) 100%
-  // );
-  background: rgba(24, 51, 82, 1);
-  box-shadow: 0px 0px 20px 0px rgba(0, 0, 0, 0.16);
-
-  .logo {
-    height: 65px;
-    color: rgb(255, 255, 255);
-    cursor: default;
-    display: flex;
-    justify-content: space-around;
-    align-items: center;
-  }
-
-  .logo:hover {
-    background-color: transparent !important;
-  }
-
-  .el-sub-menu {
-    .el-menu-item {
-      // background-color: rgba(255, 255, 255, 1);
-      // color: rgba(9, 101, 98, 1);
-      padding: 0 20px 0 78px;
-    }
-
-    :deep(.el-tooltip__trigger) {
-      padding: 0 20px;
-    }
-
-    :deep(.el-sub-menu__title):hover {
-      color: rgba(18, 38, 61, 1);
-      background-color: rgba(18, 38, 61, 1);
-
-      span {
-        color: #fff;
-      }
-    }
-
-    .el-menu--inline {
-      background-color: rgba(9, 101, 98, 1);
-    }
-  }
-
-  .el-menu {
-    .el-menu-item {
-      background-color: rgba(24, 51, 82, 1);
-      // padding-left: 30px;
-    }
-
-    .el-menu-item:hover {
-      color: #fff;
-      background-color: rgba(18, 38, 61, 1);
-    }
-  }
-
-  .el-sub-menu:hover {
-    color: #fff;
-  }
-
-  .el-menu-item:hover {
-    background-color: rgba(18, 38, 61, 1);
-    color: #fff;
-  }
-
-  .el-menu-item.is-active {
-    background-color: rgba(18, 38, 61, 1);
-    color: #fff;
-  }
-}
-
-// .el-menu-item.is-active {
-//   box-sizing: border-box;
-//   // background-color: #fff;
-//   background-color: rgba(111, 182, 184, 1);
-//   color: #fff;
-// }
-.el-sub-menu.is-active {
-  :deep(.el-sub-menu__title) {
-    // border: 1px solid red;
-    color: #fff !important;
-    background-color: rgba(18, 38, 61, 1);
-  }
-}
-</style>

+ 21 - 0
src/layout/sidebar/SidevarItem.vue

@@ -108,6 +108,27 @@
           <svg-icon v-else iconName="caller" class="iconClass"></svg-icon>
           <span>{{ item.meta.title }}</span>
         </el-menu-item>
+        <!-- 数据交换 -->
+        <el-sub-menu :index="item.name" v-if="item.name == 'dataExchange'">
+          <template #title>
+            <svg-icon
+              v-if="
+                activeIndex == '/wanzai/source' ||
+                activeIndex == '/wanzai/task' ||
+                activeIndex == '/wanzai/log'
+              "
+              iconName="data_s"
+              class="iconClass"
+            ></svg-icon>
+            <svg-icon v-else iconName="data" class="iconClass"></svg-icon>
+            <span>{{ item.meta.title }}</span>
+          </template>
+          <el-menu-item v-for="i in item.children" :index="`/wanzai/${i.name}`">
+            <template #title>
+              <span>{{ i.meta.title }}</span>
+            </template>
+          </el-menu-item>
+        </el-sub-menu>
         <!-- 系统通知 -->
         <el-sub-menu :index="item.name" v-if="item.name == 'system'">
           <template #title>

+ 18 - 0
src/router/index.js

@@ -80,6 +80,24 @@ const routes = [
         meta: { isAuth: true, title: "权限管理" },
         component: () => import("@/views/roles/roles.vue"),
       },
+      {
+        path: "source",
+        name: "source",
+        meta: { isAuth: true, title: "我的数据源" },
+        component: () => import("@/views/source/source.vue"),
+      },
+      {
+        path: "task",
+        name: "task",
+        meta: { isAuth: true, title: "任务管理" },
+        component: () => import("@/views/task/task.vue"),
+      },
+      {
+        path: "log",
+        name: "log",
+        meta: { isAuth: true, title: "业务日志" },
+        component: () => import("@/views/log/log.vue"),
+      },
     ],
   },
 ];

+ 22 - 2
src/store/modules/user.js

@@ -31,7 +31,7 @@ const state = {
     // 授权管理
     {
       name: "apply",
-      meta: { isAuth: true, title: "应用管理"},
+      meta: { isAuth: true, title: "应用管理" },
     },
     {
       name: "energy",
@@ -45,8 +45,28 @@ const state = {
     // 组织架构
     {
       name: "caller",
-      meta: { isAuth: true, title: "访客预约"},
+      meta: { isAuth: true, title: "访客预约" },
     },
+    // 数据交换
+    {
+      name: "dataExchange",
+      meta: { isAuth: true, title: "数据交换" },
+      children: [
+        {
+          name: "source",
+          meta: { isAuth: true, title: "我的数据源" },
+        },
+        {
+          name: "task",
+          meta: { isAuth: true, title: "任务管理" },
+        },
+        {
+          name: "log",
+          meta: { isAuth: true, title: "业务日志" },
+        },
+      ],
+    },
+    // 系统设置
     {
       name: "system",
       meta: { isAuth: true, title: "系统通知" },

+ 9 - 4
src/views/apply/apply.vue

@@ -531,17 +531,22 @@ onUnmounted(() => {
 
       :deep(.el-table__header-wrapper) {
         background-color: #000;
-        font-size: 16px;
+        font-size: 14px;
 
         tr {
-          color: #000;
+          // color: #000;
         }
       }
 
       :deep(.el-table__row) {
         height: 50px;
-        font-size: 16px;
-        color: #000;
+        font-size: 14px;
+        // color: #000;
+        &:hover {
+          td {
+            background-color: rgba(223, 236, 254, 1);
+          }
+        }
       }
 
       :deep(.el-table__row):nth-child(2n) {

+ 322 - 286
src/views/caller/caller.vue

@@ -22,7 +22,7 @@
             class="search condition"
             @click="searchBtn"
           >
-            <span>查询</span></el-button
+            查询</el-button
           >
           <div class="condition">
             <span>状态&nbsp;&nbsp;</span>
@@ -72,7 +72,7 @@
             type="primary"
             plain
             color="rgba(0, 97, 255, 1)"
-            @click="addlist"
+            @click="selDel"
             ><span>删除访客</span></el-button
           >
         </div>
@@ -89,20 +89,72 @@
             border: 0,
           }"
         >
-          <el-table-column align="center" type="selection" width="80" />
-          <el-table-column align="center" prop="hName" label="姓名" />
-          <el-table-column align="center" prop="price" label="联系电话" />
-          <el-table-column align="center" prop="number" label="证件号" />
-          <el-table-column align="center" prop="number" label="同行人数" />
-          <el-table-column align="center" prop="number" label="车牌号" />
-          <el-table-column align="center" prop="number" label="访问事由" />
-          <el-table-column align="center" prop="number" label="状态" />
-          <el-table-column align="center" prop="number" label="创建时间" />
-          <el-table-column align="center" prop="number" label="来访时间" />
-          <el-table-column align="center" prop="number" label="受访者" />
-          <el-table-column align="center" prop="number" label="接待部门" />
-          <el-table-column align="center" prop="number" label="受访者电话" />
-          <el-table-column align="center" label="操作" width="120">
+          <el-table-column align="center" fixed type="selection" />
+          <el-table-column align="center" fixed prop="name" label="姓名" />
+          <el-table-column
+            align="center"
+            prop="phone"
+            width="145"
+            label="联系电话"
+          />
+          <el-table-column
+            align="center"
+            prop="icCard"
+            width="210"
+            label="证件号"
+          />
+          <el-table-column align="center" prop="txnum" label="同行人数" />
+          <el-table-column align="center" prop="carNum" label="车牌号" />
+          <el-table-column align="center" prop="thing" label="访问事由" />
+          <el-table-column align="center" prop="status" label="状态">
+            <template #default="scope">
+              <span
+                v-if="scope.row.status == 1"
+                style="color: rgba(0, 97, 255, 1)"
+                >待审核</span
+              >
+              <span
+                v-if="scope.row.status == 2"
+                style="color: rgba(212, 48, 48, 1)"
+                >已拒绝</span
+              >
+              <span
+                v-if="scope.row.status == 3"
+                style="color: rgba(255, 87, 51, 1)"
+                >已推送</span
+              >
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="createTime"
+            width="180"
+            label="创建时间"
+          />
+          <el-table-column
+            align="center"
+            prop="comeTime"
+            width="180"
+            label="来访时间"
+          />
+          <el-table-column align="center" prop="interviewee" label="受访者" />
+          <el-table-column
+            align="center"
+            prop="intervieweeBM"
+            label="接待部门"
+          />
+          <el-table-column
+            align="center"
+            prop="intervieweePhone"
+            width="145"
+            label="受访者电话"
+          />
+          <el-table-column
+            align="center"
+            fixed="right"
+            label="操作"
+            width="120"
+          >
             <template #default="scope">
               <div class="edit">
                 <div class="look" @click="editClick(scope.row)">审核</div>
@@ -131,90 +183,60 @@
         v-model="editVisible"
         :close-on-click-modal="false"
         :close-on-press-escape="false"
-        :title="titleDialog"
+        title="审核"
         align-center
         width="600"
         :before-close="cancelEdit"
       >
-        <el-form
-          ref="editRef"
-          :model="editRuleForm"
-          :rules="editRules"
-          label-width="90px"
-          class="demo-ruleForm"
-          :size="formSize"
-          label-position="left"
-          status-icon
-        >
-          <el-form-item label="用户部门 :" prop="userDepartment">
-            <el-input
-              v-model="editRuleForm.userDepartment"
-              placeholder="请输入用户部门"
-              clearable
-              style="width: 500px"
-            />
-          </el-form-item>
-          <el-form-item label="用户名 :" prop="userName">
-            <el-input
-              v-model="editRuleForm.userName"
-              placeholder="请输入用户名"
-              clearable
-              style="width: 500px"
-            />
-          </el-form-item>
-          <el-form-item label="用户角色 :" prop="userRoles">
-            <el-select
-              v-model="editRuleForm.userRoles"
-              class="m-2"
-              placeholder="请选择用户角色"
-              style="width: 500px"
-            >
-              <el-option label="清洁工" value="1" />
-              <el-option label="洗碗工" value="2" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="微校卡号 :" prop="schoolCard">
-            <el-input
-              v-model="editRuleForm.schoolCard"
-              placeholder="请输入微校卡号"
-              clearable
-              style="width: 500px"
-            />
-          </el-form-item>
-          <el-form-item label="身份证号 :" prop="idNumber">
-            <el-input
-              v-model="editRuleForm.idNumber"
-              placeholder="请输入身份证号"
-              style="width: 500px"
-            >
-              <template #append>
-                <div @click="readCard">读卡</div>
-              </template>
-            </el-input>
-          </el-form-item>
-          <el-form-item label="指纹 :" prop="fingerprint">
-            <el-input
-              v-model="editRuleForm.fingerprint"
-              placeholder="请输入指纹"
-              style="width: 500px"
-            >
-              <template #append>
-                <div @click="entering">录入</div>
-              </template>
-            </el-input>
-          </el-form-item>
-          <el-form-item class="options">
-            <el-button
-              color="rgba(41, 109, 227, 1)"
-              class="queding"
-              type="primary"
-              @click="confirmEdit(editRef)"
-            >
-              保存
-            </el-button>
-            <el-button @click="cancelEdit(editRef)">取消</el-button>
-          </el-form-item>
-        </el-form>
+        <ul>
+          <li>访客姓名:<span>张三</span></li>
+          <li>访客手机号:<span>18956235689</span></li>
+          <li>来访时间:<span>2023/10/22 12:00</span></li>
+          <li>证件号:<span>362329200108698888</span></li>
+          <li>访问事由:<span>给小孩送棉被</span></li>
+          <li>车牌号:<span>无</span></li>
+          <li>守访学生:<span>张三(4544)</span></li>
+        </ul>
+        <div class="options">
+          <el-button
+            color="rgba(41, 109, 227, 1)"
+            class="queding"
+            type="primary"
+            @click="confirmEdit(editRef)"
+          >
+            同意,并推送
+          </el-button>
+          <el-button @click="cancelEdit(editRef)" color="rgba(212, 48, 48, 1)"
+            >拒绝</el-button
+          >
+        </div>
+      </el-dialog>
+      <!-- 勾选删除 -->
+      <el-dialog
+        class="closeAccount"
+        v-model="selDelVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        title="提示"
+        align-center
+        width="500"
+        :before-close="cancelSelDel"
+      >
+        <div class="content">
+          <img src="@/assets/images/warning.png" alt="" />
+          <span>删除后数据将无法恢复,确定对选中的访问数据进行删除吗?</span>
+        </div>
+        <div class="option">
+          <el-button
+            color="rgba(41, 109, 227, 1)"
+            class="queding"
+            type="primary"
+            @click="confirmCloseAccount"
+          >
+            确认
+          </el-button>
+          <el-button @click="cancelSelDel">取消</el-button>
+        </div>
       </el-dialog>
     </div>
   </div>
@@ -244,26 +266,62 @@ const router = useRouter();
 const loading = ref(false);
 const tableData = reactive({
   list: [
-    // {
-    //   userName: "双人房",
-    //   userPhone: 150,
-    //   teamName: 12,
-    // },
-    // {
-    //   userName: "双人房",
-    //   userPhone: 150,
-    //   teamName: 12,
-    // },
-    // {
-    //   userName: "双人房",
-    //   userPhone: 150,
-    //   teamName: 12,
-    // },
-    // {
-    //   userName: "双人房",
-    //   userPhone: 150,
-    //   teamName: 12,
-    // },
+    {
+      name: "张三",
+      phone: "15012589658",
+      icCard: "362502200202152356",
+      txnum: "5",
+      carNum: "赣K2536",
+      thing: "接人",
+      status: "1",
+      createTime: "2023-12-13 09:39:30",
+      comeTime: "2023-12-13 12:39:30",
+      interviewee: "张四",
+      intervieweeBM: "教师",
+      intervieweePhone: "13646865956",
+    },
+    {
+      name: "李明",
+      phone: "15012589658",
+      icCard: "362502200202152356",
+      txnum: "5",
+      carNum: "赣K2536",
+      thing: "接人",
+      status: "1",
+      createTime: "2023-12-13 09:39:30",
+      comeTime: "2023-12-13 12:39:30",
+      interviewee: "李小",
+      intervieweeBM: "教师",
+      intervieweePhone: "13646865956",
+    },
+    {
+      name: "王五",
+      phone: "15012589658",
+      icCard: "362502200202152356",
+      txnum: "5",
+      carNum: "赣K2536",
+      thing: "接人",
+      status: "2",
+      createTime: "2023-12-13 09:39:30",
+      comeTime: "2023-12-13 12:39:30",
+      interviewee: "王六",
+      intervieweeBM: "教师",
+      intervieweePhone: "13646865956",
+    },
+    {
+      name: "张航",
+      phone: "15012589658",
+      icCard: "362502200202152356",
+      txnum: "5",
+      carNum: "赣K2536",
+      thing: "接人",
+      status: "3",
+      createTime: "2023-12-13 09:39:30",
+      comeTime: "2023-12-13 12:39:30",
+      interviewee: "张利",
+      intervieweeBM: "教师",
+      intervieweePhone: "13646865956",
+    },
   ],
 });
 
@@ -274,7 +332,7 @@ const searchInput = reactive({
 
 const currentPage = ref(1); // 当前页
 const pageSize = ref(10);
-const total = ref(); // 当前总数
+const total = ref(4); // 当前总数
 
 // 编辑功能
 const titleDialog = ref("");
@@ -332,44 +390,47 @@ const editRules = reactive({
   ],
 });
 
+// 删除弹窗
+const selDelVisible = ref(false);
+
 // 查看房型列表
 const getList = async () => {
-  loading.value = true;
-  let data = {
-    page: currentPage.value,
-    rows: pageSize.value,
-    hName: searchInput.keyWord, // 房型名称
-    managerId: sessionStorage.getItem("token"),
-  };
-  let res = await axios({
-    method: "post",
-    url: api.value + "/mhotel/housequeryPage.action",
-    headers: {
-      // token: sessionStorage.getItem("token"),
-      // user_head: sessionStorage.getItem("userhead"),
-    },
-    params: data,
-  });
-  console.log(res, "房型管理");
-  if (res.data.code == 200) {
-    loading.value = false;
-    tableData.list = res.data.data.pageList;
-    total.value = res.data.data.total;
-    // ElMessage({
-    //   type: "success",
-    //   showClose: true,
-    //   message: res.data.message,
-    //   center: true,
-    // });
-  } else {
-    loading.value = false;
-    ElMessage({
-      type: "error",
-      showClose: true,
-      message: res.data.message,
-      center: true,
-    });
-  }
+  // loading.value = true;
+  // let data = {
+  //   page: currentPage.value,
+  //   rows: pageSize.value,
+  //   hName: searchInput.keyWord, // 房型名称
+  //   managerId: sessionStorage.getItem("token"),
+  // };
+  // let res = await axios({
+  //   method: "post",
+  //   url: api.value + "/mhotel/housequeryPage.action",
+  //   headers: {
+  //     // token: sessionStorage.getItem("token"),
+  //     // user_head: sessionStorage.getItem("userhead"),
+  //   },
+  //   params: data,
+  // });
+  // console.log(res, "房型管理");
+  // if (res.data.code == 200) {
+  //   loading.value = false;
+  //   tableData.list = res.data.data.pageList;
+  //   total.value = res.data.data.total;
+  //   // ElMessage({
+  //   //   type: "success",
+  //   //   showClose: true,
+  //   //   message: res.data.message,
+  //   //   center: true,
+  //   // });
+  // } else {
+  //   loading.value = false;
+  //   ElMessage({
+  //     type: "error",
+  //     showClose: true,
+  //     message: res.data.message,
+  //     center: true,
+  //   });
+  // }
 };
 
 // 搜索功能
@@ -424,39 +485,42 @@ const cancelEdit = () => {
 };
 
 //删除按钮
-const del = async (row) => {
-  let data = {
-    id: row.id,
-  };
-  let res = await axios({
-    method: "post",
-    url: api.value + "/mhotel/housedelHouser.action",
-    headers: {
-      // token: sessionStorage.getItem("token"),
-      // user_head: sessionStorage.getItem("userhead"),
-    },
-    params: data,
-  });
-  if (res.data.code == 200) {
-    if (tableData.list.length == 1 && currentPage.value != 1) {
-      currentPage.value = currentPage.value - 1;
-    }
-    getList();
-    ElMessage({
-      type: "success",
-      showClose: true,
-      message: res.data.message,
-      center: true,
-    });
-  } else {
-    ElMessage({
-      type: "error",
-      showClose: true,
-      message: res.data.message,
-      center: true,
-    });
-  }
-  // console.log(res);
+const selDel = async () => {
+  selDelVisible.value = true;
+  // let data = {
+  //   id: row.id,
+  // };
+  // let res = await axios({
+  //   method: "post",
+  //   url: api.value + "/mhotel/housedelHouser.action",
+  //   headers: {
+  //     // token: sessionStorage.getItem("token"),
+  //     // user_head: sessionStorage.getItem("userhead"),
+  //   },
+  //   params: data,
+  // });
+  // if (res.data.code == 200) {
+  //   if (tableData.list.length == 1 && currentPage.value != 1) {
+  //     currentPage.value = currentPage.value - 1;
+  //   }
+  //   getList();
+  //   ElMessage({
+  //     type: "success",
+  //     showClose: true,
+  //     message: res.data.message,
+  //     center: true,
+  //   });
+  // } else {
+  //   ElMessage({
+  //     type: "error",
+  //     showClose: true,
+  //     message: res.data.message,
+  //     center: true,
+  //   });
+  // }
+};
+const cancelSelDel = () => {
+  selDelVisible.value = false;
 };
 
 // 多选框功能
@@ -646,28 +710,37 @@ onUnmounted(() => {
 
       :deep(.el-table__header-wrapper) {
         background-color: #000;
-        font-size: 16px;
+        font-size: 14px;
 
         tr {
-          color: #000;
+          // color: #000;
         }
       }
-
-      :deep(.el-table__row) {
-        height: 50px;
-        font-size: 16px;
-        color: #000;
-      }
-
       :deep(.el-table__row):nth-child(2n) {
-        .el-table-fixed-column--right {
+        // .el-table-fixed-column--left {
+        //   background-color: rgba(240, 243, 247, 1);
+        // }
+        // .el-table-fixed-column--right {
+        //   background-color: rgba(240, 243, 247, 1);
+        // }
+        td {
           background-color: rgba(240, 243, 247, 1);
         }
       }
 
-      :deep(.el-table__row td) {
-        padding: 0;
-        border: 0;
+      :deep(.el-table__row) {
+        height: 50px;
+        font-size: 14px;
+        // color: #000;
+        td {
+          padding: 0;
+          border: 0;
+        }
+        &:hover {
+          td {
+            background-color: rgba(223, 236, 254, 1);
+          }
+        }
       }
 
       .el-button--primary {
@@ -680,6 +753,12 @@ onUnmounted(() => {
 
       :deep(.el-table__body .odd) {
         background-color: rgba(240, 243, 247, 1);
+        .el-table_1_column_1 {
+          background-color: rgba(240, 243, 247, 1);
+        }
+        .el-table_1_column_2 {
+          background-color: rgba(240, 243, 247, 1);
+        }
       }
 
       :deep(.edit) {
@@ -723,23 +802,26 @@ onUnmounted(() => {
       }
     }
     .el-dialog__body {
-      padding: 30px 30px 10px 30px;
-      .el-form-item__content {
-        width: 200px;
-        .el-input-group__append {
-          background-color: rgba(222, 234, 252, 1);
-          color: rgba(0, 97, 255, 1);
-          cursor: pointer;
-          user-select: none;
+      padding: 20px 30px;
+      ul {
+        margin: 0;
+        padding: 0;
+        li {
+          list-style: none;
+          color: #000;
+          font-weight: 600;
+          font-size: 17px;
+          margin-bottom: 10px;
+          span {
+            // font-weight: 600;
+          }
         }
       }
       .options {
         margin: 30px 20px 20px 0;
         width: 100%;
-        .el-form-item__content {
-          display: flex;
-          flex-direction: row-reverse;
-        }
+        display: flex;
+        flex-direction: row-reverse;
         .queding {
           color: #fff;
           margin-left: 15px;
@@ -747,97 +829,51 @@ onUnmounted(() => {
       }
     }
   }
-
-  // 指纹弹窗
-  :deep(.fingerprint) {
-    width: 611px;
-    height: 486px;
+  // 注销账号
+  :deep(.closeAccount) {
+    // height: 600px;
+    overflow: hidden;
     border-radius: 11px;
+
     .el-dialog__header {
       border-radius: 11px 11px 0 0;
-      background: rgba(237, 241, 245, 1);
+      background: rgba(245, 249, 255, 1);
       font-weight: 600;
+      height: 60px;
+      padding: 0 20px;
+      line-height: 60px;
       margin: 0;
+      border-bottom: 1px solid rgba(230, 230, 230, 1);
 
       .el-dialog__headerbtn {
         outline: none;
       }
     }
-    .el-dialog__body {
-      padding: 0;
-      .elbody {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        padding: 20px 20px;
-        font-size: 18px;
-        color: #000;
-        border-bottom: 0.5px solid #ccc;
 
-        i {
-          cursor: pointer;
-        }
-      }
-    }
-    .el-dialog__footer {
-      .el-button--primary {
-        background: rgba(41, 109, 227, 1);
-      }
-    }
-  }
-
-  // 身份证读取
-  :deep(.addIdentityCard) {
-    //   height: 420px;
-    border-radius: 11px;
-    .el-dialog__header {
-      border-radius: 11px 11px 0 0;
-      background: rgba(237, 241, 245, 1);
-      font-weight: 600;
-      margin: 0;
-      .el-dialog__headerbtn {
-        outline: none;
-      }
-    }
     .el-dialog__body {
-      padding: 30px 20px 10px 20px;
-      height: 330px;
-      font-size: 16px;
-      font-weight: 600;
-      color: #000;
-      .el-steps {
-        width: 600px;
-        transform: translateX(90px);
-        margin: 0 0 40px 0;
-      }
-      .title {
-        text-align: center;
-      }
-      .icons {
+      padding: 0px 20px 20px 20px;
+      // height: 200px;
+      // display: flex;
+      // flex-direction: column-reverse;
+      .content {
+        height: 80px;
+        font-size: 16px;
+        padding: 20px 30px;
         display: flex;
-        justify-content: center;
         img {
-          width: 70px;
-          margin: 40px 0;
-        }
-        .loading {
-          animation: move 3s linear;
-        }
-        @keyframes move {
-          0% {
-            transform: rotate(0);
-          }
-          100% {
-            transform: rotate(360deg);
-          }
+          width: 25px;
+          height: 25px;
+          margin: 0 8px 0 0;
         }
       }
-      .retry {
-        text-align: center;
-        span {
-          color: red;
-          padding: 0 8px;
-          cursor: pointer;
+      .option {
+        display: flex;
+        flex-direction: row-reverse;
+        align-items: center;
+        margin: 10px 0;
+
+        .queding {
+          margin-left: 20px;
         }
       }
     }

+ 7 - 2
src/views/energy/energy.vue

@@ -772,7 +772,7 @@ onUnmounted(() => {
 
             :deep(.el-table__header-wrapper) {
               background-color: #000;
-              font-size: 16px;
+              font-size: 14px;
 
               tr {
                 color: #000;
@@ -781,8 +781,13 @@ onUnmounted(() => {
 
             :deep(.el-table__row) {
               height: 40px;
-              font-size: 16px;
+              font-size: 14px;
               color: #000;
+              &:hover {
+                td {
+                  background-color: rgba(223, 236, 254, 1);
+                }
+              }
             }
 
             :deep(.el-table__row):nth-child(2n) {

+ 9 - 4
src/views/identity/identity.vue

@@ -935,17 +935,22 @@ onUnmounted(() => {
 
       :deep(.el-table__header-wrapper) {
         background-color: #000;
-        font-size: 16px;
+        font-size: 14px;
 
         tr {
-          color: #000;
+          // color: #000;
         }
       }
 
       :deep(.el-table__row) {
         height: 50px;
-        font-size: 16px;
-        color: #000;
+        font-size: 14px;
+        // color: #000;
+        &:hover {
+          td {
+            background-color: rgba(223, 236, 254, 1);
+          }
+        }
       }
 
       :deep(.el-table__row):nth-child(2n) {

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 1258 - 0
src/views/log/log.vue


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 1002 - 10
src/views/roles/roles.vue


+ 9 - 4
src/views/safety/safety.vue

@@ -697,17 +697,22 @@ onUnmounted(() => {
 
       :deep(.el-table__header-wrapper) {
         background-color: #000;
-        font-size: 16px;
+        font-size: 14px;
 
         tr {
-          color: #000;
+          // color: #000;
         }
       }
 
       :deep(.el-table__row) {
         height: 50px;
-        font-size: 16px;
-        color: #000;
+        font-size: 14px;
+        // color: #000;
+        &:hover {
+          td {
+            background-color: rgba(223, 236, 254, 1);
+          }
+        }
       }
 
       :deep(.el-table__row):nth-child(2n) {

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 895 - 1207
src/views/screenShot/screenShot.vue


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 1066 - 0
src/views/source/source.vue


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 1102 - 0
src/views/task/task.vue


+ 16 - 6
src/views/user/user.vue

@@ -1924,17 +1924,22 @@ onUnmounted(() => {
 
         :deep(.el-table__header-wrapper) {
           background-color: #000;
-          font-size: 16px;
+          font-size: 14px;
 
           tr {
-            color: #000;
+            // color: #000;
           }
         }
 
         :deep(.el-table__row) {
           height: 50px;
-          font-size: 16px;
-          color: #000;
+          font-size: 14px;
+          // color: #000;
+          &:hover {
+            td {
+              background-color: rgba(223, 236, 254, 1);
+            }
+          }
         }
 
         :deep(.el-table__row):nth-child(2n) {
@@ -2060,7 +2065,7 @@ onUnmounted(() => {
 
             :deep(.el-table__header-wrapper) {
               background-color: #000;
-              font-size: 16px;
+              font-size: 14px;
 
               tr {
                 color: #000;
@@ -2069,8 +2074,13 @@ onUnmounted(() => {
 
             :deep(.el-table__row) {
               height: 45px;
-              font-size: 16px;
+              font-size: 14px;
               color: #000;
+              &:hover {
+                td {
+                  background-color: rgba(223, 236, 254, 1);
+                }
+              }
             }
 
             :deep(.el-table__row):nth-child(2n) {