pref：封装大厅接口

base-manager-ui/admin/package.json

@@ -69,7 +69,6 @@
     "eslint": "^6.7.2",
     "eslint-plugin-vue": "^6.2.2",
     "fast-deep-equal": "^3.1.3",
-    "filemanager-webpack-plugin": "^8.0.0",
     "gh-pages": "^3.1.0",
     "js-export-excel": "^1.1.4",
     "less-loader": "^6.1.1",

base-manager-ui/admin/src/pages/basicset/appmarket/AppMarket.vue

@@ -129,8 +129,8 @@ export default {
 .app-market {
   width: 100%;
   height: 100%;
-  padding: 15px;
   .app-out-box {
+    padding: 0px 15px 15px 15px;
     overflow-y: auto;
   }
 }

base-manager-ui/admin/src/pages/basicset/appmarket/components/MoveApp.vue

@@ -23,7 +23,7 @@
         }"
         :loading="loading"
         bordered
-        :scroll="{ y: 550 }"
+        :scroll="{ y: 580 }"
         :columns="columns"
         :pagination="{
           showTotal: (total) => `共 ${total} 条`,

base-manager-ui/admin/src/pages/basicset/appmarket/components/TerminalApp.vue

@@ -23,7 +23,7 @@
         }"
         :loading="loading"
         bordered
-        :scroll="{ y: 550 }"
+        :scroll="{ y: 580 }"
         :columns="columns"
         :pagination="{
           showTotal: (total) => `共 ${total} 条`,

base-manager-ui/admin/src/pages/basicset/business/components/businessTabs4.vue

@@ -8,16 +8,19 @@ rrent" <template>
           <div>
             <a-space>
               <a-select
+                showSearch
                 style="min-width: 120px"
                 allowClear
                 v-model="dept"
                 class="select-department"
                 placeholder="部门搜索"
+                optionFilterProp="label"
               >
                 <a-select-option
                   v-for="v in deptList"
                   :key="v.id"
                   :value="v.deptNumber"
+                  :label="v.name"
                 >
                   {{ v.name }}
                 </a-select-option>

base-manager-ui/admin/src/pages/basicset/deploy/deploy.vue

@@ -15,6 +15,7 @@
             v-model="searchValue"
             allowClear
             @search="onSearch"
+            @pressEnter="onSearch"
           />
         </div>
       </div>
@@ -220,7 +221,7 @@
         :previewVisible.sync="previewVisible"
       ></PrevieModal>
     </a-modal>
-    <!-- 表别管理 -->
+    <!-- 报表管理 -->
     <StatementManage
       ref="StatementManage"
       :StatementVisible.sync="StatementVisible"

base-manager-ui/admin/src/pages/basicset/hall/Hall.vue

+<template>
+  <div class="hall flex flexc">
+    <a-tabs :activeKey="activeKey" @change="changeRouter">
+      <a-tab-pane key="/hall/hallmanage" tab="大厅管理"> </a-tab-pane>
+      <a-tab-pane key="/hall/hallwindow" tab="大厅窗口管理"> </a-tab-pane>
+    </a-tabs>
+    <div class="hall-out-box flex1">
+      <router-view></router-view>
+    </div>
+  </div>
+</template>
+  
+  <script>
+export default {
+  computed: {
+    activeKey() {
+      return this.$route.path;
+    },
+  },
+  methods: {
+    changeRouter(path) {
+      this.$router.push(path);
+    },
+  },
+};
+</script>
+  
+  <style lang="less" scoped>
+.hall {
+  width: 100%;
+  height: 100%;
+  .hall-out-box {
+    padding: 0px 15px 15px 15px;
+    overflow-y: auto;
+  }
+  /deep/.ant-tabs-nav-container {
+    border-bottom: 1px solid #f0f0f0 !important;
+  }
+}
+</style>
\ No newline at end of file

base-manager-ui/admin/src/pages/basicset/hall/hallmanage/HallManage.vue

+<template>
+  <div class="hall-manage">
+    <div class="control flex aic jcb mb20">
+      <a-button type="primary" style="margin-right: 10px" @click="handleAdd"
+        >新增大厅</a-button
+      >
+      <div class="search-box">
+        <a-input-search
+          placeholder="请输入大厅名称名搜索"
+          enter-button="搜索"
+          v-model="searchValue"
+          allowClear
+          @pressEnter="onSearch"
+          @search="onSearch"
+        />
+      </div>
+    </div>
+    <!-- 表格 -->
+    <div class="table-content">
+      <a-table
+        :row-selection="{
+          selectedRowKeys: selectedRowKeys,
+          onChange: onSelectChange,
+        }"
+        :loading="loading"
+        bordered
+        :scroll="{ y: 580 }"
+        :columns="columns"
+        :pagination="{
+          showTotal: (total) => `共 ${total} 条`,
+          current: current,
+          total: total,
+          pageSize: size,
+          showSizeChanger: true,
+          showQuickJumper: true,
+          pageSizeOptions: pageSizeOptions,
+          onChange: handleChange,
+          onShowSizeChange: showSizeChange,
+        }"
+        :data-source="dataList"
+        :rowKey="(record) => record.id"
+      >
+        <!-- 序号 -->
+        <span slot="num" slot-scope="text, record, index">{{
+          (current - 1) * size + index + 1
+        }}</span>
+        <!-- 模块地址 -->
+        <template slot="modelUrl" slot-scope="text">
+          {{ text.modelUrl ? text.modelUrl : "--" }}
+        </template>
+        <!-- 模块图标 -->
+        <template slot="modelIcon" slot-scope="text">
+          <div v-if="text.modelIcon">
+            <!-- <div class="svg-box" v-if="isSvg(text.modelIcon)">
+                <img width="30" height="30" :src="api2 + text.modelIcon" />
+              </div> -->
+            <div class="svg-box">
+              <img width="30" height="30" :src="api2 + text.modelIcon" />
+            </div>
+          </div>
+          <span v-else>--</span>
+        </template>
+        <!-- 排序 -->
+        <template slot="sort" slot-scope="text">
+          {{ text.sort ? text.sort : "--" }}
+        </template>
+        <!-- 创建时间 -->
+        <template slot="createTime" slot-scope="text">
+          {{ text.createTime | dateFormat }}
+        </template>
+        <!-- 备注 -->
+        <template slot="remark" slot-scope="text">
+          {{ text.remark ? text.remark : "--" }}
+        </template>
+        <!-- 操作 -->
+        <template slot="action" slot-scope="text">
+          <a-space>
+            <a href="javascript:;" class="edit" @click="handleEdit(text)"
+              >编辑</a
+            >
+            <a href="javascript:;" class="delete" @click="handleDel(text.id)"
+              >删除</a
+            >
+          </a-space>
+        </template>
+      </a-table>
+    </div>
+  </div>
+</template>
+
+<script>
+const columns = [
+  {
+    title: "序号",
+    dataIndex: "num",
+    width: "65px",
+    scopedSlots: {
+      customRender: "num",
+    },
+  },
+  {
+    title: "模块名称",
+    dataIndex: "modelName",
+    width: "12%",
+  },
+  {
+    title: "模块编码",
+    dataIndex: "modelCode",
+    width: "15%",
+  },
+  {
+    title: "模块地址",
+    width: "20%",
+    scopedSlots: { customRender: "modelUrl" },
+  },
+  {
+    title: "模块图标",
+    scopedSlots: { customRender: "modelIcon" },
+  },
+  {
+    title: "排序",
+    width: "5%",
+    scopedSlots: { customRender: "sort" },
+  },
+  {
+    title: "创建时间",
+    width: "12%",
+    scopedSlots: { customRender: "createTime" },
+  },
+  {
+    title: "备注",
+    scopedSlots: { customRender: "remark" },
+  },
+  {
+    title: "操作",
+    width: "180px",
+    scopedSlots: { customRender: "action" },
+  },
+];
+export default {
+  data() {
+    return {
+      columns,
+      loading: false,
+      title: "新增模块",
+      visible: false,
+      selectedRowKeys: [],
+      current: 1,
+      size: 10,
+      total: 0,
+      pageSizeOptions: ["10", "30", "50", "100"],
+      searchValue: "", // 搜索
+      dataList: [],
+    };
+  },
+  created() {},
+  methods: {
+    // 新增
+    handleAdd() {
+      console.log(11);
+    },
+    // 搜索
+    onSearch() {
+      console.log(11);
+    },
+    // 勾选表格
+    onSelectChange(keys) {
+      this.selectedRowKeys = keys;
+    },
+    // 编辑
+    handleEdit() {
+      console.log(22);
+    },
+    handleDel() {
+      let _this = this;
+      _this.$confirm({
+        title: "系统提示",
+        content: "删除不可恢复，确定要删除吗？",
+        okText: "确定",
+        okType: "danger",
+        cancelText: "取消",
+        centered: true,
+        icon: "exclamation-circle",
+        maskClosable: true,
+        async onOk() {
+          console.log(22);
+        },
+        onCancel() {
+          console.log("Cancel");
+        },
+      });
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+</style>
\ No newline at end of file

base-manager-ui/admin/src/pages/basicset/hall/hallwindow/HallWindow.vue

+<template>
+  <div>22</div>
+</template>
+
+<script>
+export default {};
+</script>
+
+<style lang="less" scoped>
+</style>
\ No newline at end of file

base-manager-ui/admin/src/pages/basicset/surface/queuingSkin/LandscapeMode.vue

@@ -58,9 +58,15 @@
             </p>
           </div>
           <div class="skin-footer-records">
-            <p :style="{ color: filterItem('9', 0) }">主办单位：信宏翔科技</p>
-            <p :style="{ color: filterItem('9', 0) }">承办单位：信宏翔科技</p>
-            <p :style="{ color: filterItem('9', 0) }">技术：信宏翔科技</p>
+            <p :style="{ color: filterItem('9', 0) }">
+              主办单位：四川省青霆科技有限公司
+            </p>
+            <p :style="{ color: filterItem('9', 0) }">
+              承办单位：四川省青霆科技有限公司
+            </p>
+            <p :style="{ color: filterItem('9', 0) }">
+              技术：四川省青霆科技有限公司
+            </p>
             <p :style="{ color: filterItem('9', 0) }">版权所有</p>
           </div>
         </div>

base-manager-ui/admin/src/pages/basicset/system/System.vue

@@ -30,8 +30,8 @@ export default {
 .system {
   width: 100%;
   height: 100%;
-  padding: 15px;
   .system-out-box {
+    padding: 0px 15px 15px 15px;
     overflow-y: auto;
   }
   /deep/.ant-tabs-nav-container {

base-manager-ui/admin/src/router/config.js

@@ -149,6 +149,35 @@ const options = {
             },
           ],
         },
+        {
+          path: "hall",
+          name: "大厅管理",
+          meta: {
+            icon: "gateway",
+          },
+          component: () => import("@/pages/basicset/hall/Hall"),
+          redirect: "/hall/hallmanage",
+          children: [
+            {
+              path: "hallmanage",
+              name: "",
+              component: () =>
+                import("@/pages/basicset/hall/hallmanage/HallManage.vue"),
+              meta: {
+                invisible: true,
+              },
+            },
+            {
+              path: "hallwindow",
+              name: "大厅窗口管理",
+              meta: {
+                invisible: true,
+              },
+              component: () =>
+                import("@/pages/basicset/hall/hallwindow/HallWindow.vue"),
+            },
+          ],
+        },
         {
           path: "personnel",
           name: "工作人员管理",

base-manager-ui/admin/src/services/basicsetApi.js

@@ -159,6 +159,7 @@ module.exports = {
     save: `${BASE_URL}/base/window/save`,
     delete: `${BASE_URL}/base/window/delete`,
     exportExcel: `${BASE_URL}/base/window/exportExcel`,
+    subList: `${BASE_URL}/base/window/subHalllist`, // 查询当前站点所有没有在大厅配置的过的窗口
   },
   // 工作人员
   workman: {
@@ -338,4 +339,19 @@ module.exports = {
       delete: `${BASE_URL}/base/task/delete`,
     },
   },
+  // 站点大厅
+  hall: {
+    list: `${BASE_URL}/base/site/hall/list`,
+    info: `${BASE_URL}/base/site/hall/info`,
+    save: `${BASE_URL}/base/site/hall/save`,
+    delete: `${BASE_URL}/base/site/hall/delete`,
+    window: `${BASE_URL}/window/hall/getBusinessByHall`, // 根据大厅查询所属业务列表
+  },
+  // 大厅窗口
+  windowHall: {
+    list: `${BASE_URL}/base/window/hall/list`,
+    info: `${BASE_URL}/base/window/hall/info`,
+    save: `${BASE_URL}/base/window/hall/save`,
+    delete: `${BASE_URL}/base/window/hall/delete`,
+  },
 };

base-manager-ui/admin/src/services/hall.js

+import { hall, windowHall } from "@/services/basicsetApi";
+
+import { request, METHOD } from "@/utils/request";
+
+// 获取站点大厅信息
+export const getHallList = () => {
+  return request(hall.list, METHOD.POST, data);
+};
+
+// 查看站点大厅信息
+export const getHallInfo = () => {
+  return request(hall.info, METHOD.get, data);
+};
+
+// 保存更新站点大厅
+export const saveHall = () => {
+  return request(hall.save, METHOD.POST, data);
+};
+
+// 删除站点大厅
+export const delHall = () => {
+  return request(hall.delete, METHOD.get, data);
+};
+
+//  根据大厅查询所属业务列表
+export const getHallWindow = () => {
+  return request(hall.window, METHOD.POST, data);
+};
+
+/**
+ *  大厅窗口
+ */
+
+// 获取大厅窗口列表
+export const getWindowHallList = () => {
+  return request(windowHall.list, METHOD.POST, data);
+};
+
+// 查看大厅窗口
+export const getWindowHallInfo = () => {
+  return request(windowHall.info, METHOD.get, data);
+};
+
+// 保存大厅窗口
+export const saveWindowHall = () => {
+  return request(windowHall.save, METHOD.POST, data);
+};
+
+// 删除大厅窗口
+export const delWindowHall = () => {
+  return request(windowHall.delete, METHOD.get, data);
+};

base-manager-ui/admin/vue.config.js

@@ -5,24 +5,7 @@ const { getThemeColors, modifyVars } = require("./src/utils/themeUtil");
 const { resolveCss } = require("./src/utils/theme-color-replacer-extend");
 const CompressionWebpackPlugin = require("compression-webpack-plugin");
 const productionGzipExtensions = ["js", "css"];
-const isDev = process.env.NODE_ENV === "development";
-const FileManagerPlugin = require("filemanager-webpack-plugin"); // 压缩文件夹
-let plugins = [];
-// 避免打本地启项目时自动打zip包
-if (!isDev) {
-  plugins.push(
-    new FileManagerPlugin({
-      events: {
-        onEnd: {
-          // mkdir: ["./dist"],
-          delete: ["./zip/"],
-          copy: [{ source: "./dist", destination: "./zip/dist" }],
-          archive: [{ source: "./zip", destination: "./zip/基础设置系统.zip" }],
-        },
-      },
-    })
-  );
-}
+
 const assetsCDN = {
   // webpack build externals
   // externals: {
@@ -82,17 +65,6 @@ module.exports = {
         "window.Quill": "quill/dist/quill.js",
         Quill: "quill/dist/quill.js",
       }),
-      ...plugins,
-      // 生产环境打包zip文件
-      // new FileManagerPlugin({
-      //   events: {
-      //     onEnd: {
-      //       mkdir: ["./dist"],
-      //       delete: ["./dist.zip"],
-      //       archive: [{ source: "./dist", destination: "./dist.zip" }],
-      //     },
-      //   },
-      // }),
     ],
   },
   css: {