Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/assets/css/common.css

@@ -150,6 +150,9 @@
 .pdl20{
     padding-left:20px;
 }
+.pdr6{
+    padding-right:6px;
+}
 .pdr10{
     padding-right:10px;
 }

base-manager-ui/admin/src/assets/css/common.less

@@ -99,3 +99,10 @@
   align-items: center;
   margin-bottom: 20px;
 }
+// .table-header{
+//   padding-right:6px;
+//   display: flex;
+//   align-items: center;
+//   justify-content:space-between;
+//   margin-bottom: 20px;
+// }
\ No newline at end of file

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

@@ -131,6 +131,9 @@ export default {
     overflow-y: auto;
   }
 }
+/deep/.ant-tabs-extra-content {
+  padding-right: 20px;
+}
 /deep/.ant-form-item {
   align-items: flex-start;
 }

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

@@ -3,7 +3,7 @@
     <div class="left">
       <div class="header">
         <div class="titel">设备应用黑名单</div>
-        <div class="control">
+        <div class="control pdr6">
           <a-button type="danger" @click="handleDelAll"> 批量移除 </a-button>
           <div class="business-control">
             <a-space>
@@ -84,7 +84,7 @@
           <div>
             <!-- <a-button type="primary" @click="handleAddAll"> 批量加入 </a-button> -->
           </div>
-          <div class="business-control">
+          <div class="business-control pdr6">
             <a-space>
               <a-select
                 style="min-width: 120px"

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

 <template>
   <div class="data-update">
     <!-- 头部 -->
-    <div class="header flex aic jcb mb20">
+    <div class="header flex aic jcb mb20 pdr6">
       <a-button type="primary" @click="handleAdd">新增</a-button>
       <div class="search-box">
         <a-input-group compact>

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

 <template>
   <div class="field-config">
     <!-- 头部 -->
-    <div class="header flex aic jcb mb20">
+    <div class="header flex aic jcb mb20 pdr6">
       <a-button type="primary" @click="handleAdd">新增字段</a-button>
       <a-input-search
         style="width: 300px"

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

 <template>
   <div class="terminal">
-    <div class="header flex aic jcb mb20">
+    <div class="header flex aic jcb mb20 pdr6">
       <a-space>
         <a-button type="primary" @click="handleAdd"> 新增应用 </a-button>
         <a-button type="primary" @click="handleClone"> 克隆 </a-button>

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

 <template>
   <div class="terminal">
-    <div class="header flex aic jcb mb20">
+    <div class="header flex aic jcb mb20 pdr6">
       <a-space>
         <a-button type="primary" @click="handleAdd"> 新增应用 </a-button>
         <a-button type="primary" @click="handleClone"> 克隆 </a-button>

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

@@ -3,7 +3,7 @@
     <div class="left">
       <div class="header">
         <div class="titel">站点业务列表</div>
-        <div class="control">
+        <div class="control pdr6">
           <div>
             <a-space size="middle">
               <a-button type="primary" @click="showModal"> 新增业务 </a-button>
@@ -86,7 +86,7 @@
     <div class="right">
       <div class="header">
         <div class="titel">一体化业务列表</div>
-        <div class="control">
+        <div class="control pdr6">
           <div>
             <a-button type="primary" @click="handleAddAll"> 批量加入 </a-button>
           </div>

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

@@ -3,7 +3,7 @@
     <div class="left">
       <div class="header">
         <div class="titel">站点事项列表</div>
-        <div class="header-bottom">
+        <div class="header-bottom pdr6">
           <div class="left-btn">
             <a-button type="danger" @click="handleDelAll"> 批量移除 </a-button>
           </div>
@@ -109,7 +109,7 @@
     <div class="right">
       <div class="header">
         <div class="titel">基础事项列表</div>
-        <div class="control">
+        <div class="control pdr6">
           <div>
             <a-space size="middle">
               <a-button type="primary" @click="handleAddAll">

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

@@ -3,7 +3,7 @@
     <div class="left">
       <div class="header">
         <div class="titel">站点业务列表</div>
-        <div class="header-bottom">
+        <div class="header-bottom pdr6">
           <div class="left-btn">
             <a-button type="danger" @click="handleDelAll"> 批量解除 </a-button>
           </div>
@@ -64,7 +64,7 @@
     <div class="right">
       <div class="header">
         <div class="titel">站点事项列表</div>
-        <div class="control">
+        <div class="control pdr6">
           <div>
             <a-button type="primary" @click="handleAddAll"> 批量关联 </a-button>
           </div>

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

@@ -3,7 +3,7 @@
     <div class="left">
       <div class="header">
         <div class="titel">站点事项列表</div>
-        <div class="header-bottom flex aic jcb">
+        <div class="header-bottom flex aic jcb pdr6">
           <div class="left-btn"></div>
           <div>
             <a-space>

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

@@ -2,7 +2,7 @@
   <div class="deploy">
     <a-tabs activeKey="model">
       <a-tab-pane key="model" tab="部署板块管理">
-        <div class="control">
+        <div class="control pdr6">
           <div>
             <a-button
               type="primary"

base-manager-ui/admin/src/pages/basicset/dept/addWindowMatter.vue

@@ -10,7 +10,7 @@
       </template>
       <div class="header">
         <span class="title">窗口事项列表</span>
-        <div class="control">
+        <div class="control pdr6">
           <div class="btn">
             <a-button
               type="primary"

base-manager-ui/admin/src/pages/basicset/dept/department.vue

@@ -76,7 +76,7 @@
     <div class="ff window-box">
       <div class="department_right_add">
         <div class="department_manage">窗口管理</div>
-        <div class="flex aic jcb">
+        <div class="flex aic jcb pdr6">
           <a-button type="primary" @click="addModal">新增窗口</a-button>
           <a-input-search
             placeholder="请输入窗口编号搜索"

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

 <template>
   <div class="hall-manage">
-    <div class="control flex aic jcb mb20">
+    <div class="control flex aic jcb mb20 pdr6">
       <a-space size="middle">
         <a-button type="primary" @click="handleAdd">新增大厅</a-button>
         <a-button type="danger" @click="handleDelAll">批量删除</a-button>

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

@@ -3,7 +3,7 @@
     <div class="left">
       <div class="header">
         <div class="titel">大厅窗口</div>
-        <div class="control">
+        <div class="control pdr6">
           <a-button type="danger" @click="handleDelAll"> 批量移除 </a-button>
           <div class="business-control">
             <a-space>
@@ -82,7 +82,7 @@
     <div class="right">
       <div class="header">
         <div class="titel">站点窗口</div>
-        <div class="control">
+        <div class="control pdr6">
           <div>
             <a-button type="primary" @click="handleAddAll"> 批量加入 </a-button>
           </div>

base-manager-ui/admin/src/pages/basicset/holiday/festival.vue

 <template>
   <div class="festival festival">
-    <div class="skins_bnt btn-box">
+    <div class="skins_bnt btn-box pdr6">
       <!-- 新增按钮 -->
       <a-button type="primary" @click="showModal" class="skins_btn_1"
         >新增节日</a-button

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

@@ -11,7 +11,7 @@
             </a-tooltip>
             <span>皮肤模板</span>
           </div>
-          <div class="header">
+          <div class="header pdr6">
             <a-space>
               <a-button type="primary" @click="handleAddTemplate"
                 >新增皮肤模板</a-button
@@ -78,26 +78,12 @@
               </template>
             </a-table>
           </div>
-          <!-- 翻页 -->
-          <!-- <div class="pagination" v-if="leftTotal">
-            <a-pagination
-              v-model="leftCurrent"
-              :show-total="(total) => `共 ${total} 条`"
-              :total="leftTotal"
-              @change="changeLeft"
-              show-less-items
-              show-size-changer
-              show-quick-jumper
-              :pageSizeOptions="pageSizeOptions"
-              @showSizeChange="showSizeChange"
-            />
-          </div> -->
         </a-card>
       </div>
       <!-- 右 -->
       <div class="right">
         <a-card title="模板属性" :bodyStyle="{ height: '79vh' }">
-          <div class="header">
+          <div class="header pdr6">
             <div>
               <a-space>
                 <a-button type="primary" @click="handleAddField"
@@ -188,20 +174,6 @@
               </template>
             </a-table>
           </div>
-          <!-- 分页 -->
-          <!-- <div class="pagination" v-if="rightTotal">
-            <a-pagination
-              v-model="rightCurrent"
-              :show-total="(total) => `共 ${total} 条`"
-              :total="rightTotal"
-              @change="changeRight"
-              show-less-items
-              show-size-changer
-              show-quick-jumper
-              :pageSizeOptions="pageSizeOptions"
-              @showSizeChange="showSizeChangeRight"
-            />
-          </div> -->
         </a-card>
       </div>
     </div>

base-manager-ui/admin/src/pages/basicset/surface/components/RightPreview.vue

@@ -158,12 +158,16 @@ export default {
   height: 80vh;
   display: flex;
   flex-direction: column;
+  padding: 15px 0px;
+
   .preview-seach {
     height: 32px;
+    padding: 0px 15px;
     margin-bottom: 15px;
   }
   .preview-list {
-    flex: 1;
+    height: 65vh;
+    padding: 0px 15px;
     display: flex;
     flex-direction: column;
     border-bottom: 1px solid #ccc;

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

@@ -162,7 +162,6 @@ export default {
     }
     .preview-box {
       width: 15%;
-      padding: 15px;
     }
   }
 }

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

 <template>
   <div class="parameter">
-    <div class="control flex aic jcb mb15">
+    <div class="control flex aic jcb mb15 pdr6">
       <div>
         <a-button type="primary" style="margin-right: 10px" @click="handleAdd"
           >新增</a-button

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

 <template>
   <!-- 系统日志 -->
   <div class="system-logs">
-    <div class="control">
+    <div class="control pdr6">
       <div class="search-box">
         <a-input-search
           placeholder="请输入请求地址搜索"

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

 <template>
   <div class="task-set">
-    <div class="control flex aic jcb mb15">
+    <div class="control flex aic jcb mb15 pdr6">
       <div>
         <a-button type="primary" style="margin-right: 10px" @click="handleAdd"
           >新增</a-button

base-manager-ui/admin/src/pages/basicset/workman/personnel.vue

@@ -125,7 +125,7 @@
           </a-radio-group> -->
           </div>
         </div>
-        <div class="on btn">
+        <div class="on btn pdr6">
           <div>
             <a-button type="primary" @click="showModal">新增人员</a-button>
             <a-dropdown>
@@ -178,7 +178,8 @@
           </div>
           <div class="in">
             <a-input-search
-              placeholder="请输入姓名或者工号"
+              placeholder="请输入姓名或者工号搜索"
+              v-model="searchVal"
               enter-button="搜索"
               allowClear
               @search="onSearch"
@@ -400,6 +401,7 @@ export default {
       WorkmanData: [], // 工作人员列表
       deptSearch: "", //部门搜索
       windowSearch: "", // 窗口搜索
+      searchVal: "",
       visibleAll: false,
       page: 1,
       size: 10,
@@ -442,12 +444,19 @@ export default {
     // 获取工作人员列表
     async getWorkmanData(search = {}) {
       this.loading = true;
+      let obj = {};
+      if (/^[\u4e00-\u9fa5]+$/.test(this.searchVal)) {
+        obj.name = `%${this.searchVal}%`;
+      } else if (/^[a-zA-z0-9]+$/.test(this.searchVal)) {
+        obj.number = `%${this.searchVal}%`;
+      }
       let res = await getWorkmanList({
         siteId: this.siteId,
         page: this.page,
         size: this.size,
         deptId: this.deptSearch,
         windowId: this.windowSearch,
+        ...obj,
         ...search,
       });
       let { data, pageInfo, dict } = res.data.data;
@@ -513,15 +522,16 @@ export default {
       });
     },
     // 搜索
-    onSearch(val) {
+    onSearch() {
       this.page = 1;
-      if (/^[\u4e00-\u9fa5]+$/.test(val)) {
-        this.getWorkmanData({ name: `%${val}%` });
-      } else if (/^[a-zA-z0-9]+$/.test(val)) {
-        this.getWorkmanData({ number: `%${val}%` });
-      } else {
       this.getWorkmanData();
-      }
+      // if (/^[\u4e00-\u9fa5]+$/.test(val)) {
+      //   this.getWorkmanData({ name: `%${val}%` });
+      // } else if (/^[a-zA-z0-9]+$/.test(val)) {
+      //   this.getWorkmanData({ number: `%${val}%` });
+      // } else {
+      //   this.getWorkmanData();
+      // }
     },
     // 新增工作人员
     showModal() {

portal-manager-ui/admin/src/api/dataAdmin.js

@@ -10,11 +10,11 @@ export function censusListInterface(params) {
 /* 排号机部分 */
 // 大厅列表数据
 export function getDatingList(params) {
-  return http.post(`${BAS_EURL}base/site/hall/list`, params);
+  return http.post(`${baseURL}/base/site/hall/list`, params);
 }
 // 部门列表数据
 export function getBumenList(params) {
-  return http.post(`${BAS_EURL}base/dept/list`, params);
+  return http.post(`${baseURL}/base/dept/list`, params);
 }
 //排号机列表数据
 export function getTaskList(params) {

portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/departmentEvaluation.vue

@@ -13,6 +13,18 @@
       </div>
       <span>
         <a-space>
+          <a-select v-model="hallid">
+            <a-select-option value=""> 全部大厅 </a-select-option>
+            <a-select-option v-for="item in datingList" :key="item.id" :value="item.id">
+              {{ item.hallName }}
+            </a-select-option>
+          </a-select>
+          <a-select v-model="sectionid">
+            <a-select-option value=""> 全部部门 </a-select-option>
+            <a-select-option v-for="item in bumenList" :key="item.id" :value="item.id">
+              {{ item.name }}
+            </a-select-option>
+          </a-select>
           <a-select v-model="evaChoose" placeholder="全部评价" mode="multiple">
             <a-select-option v-for="item in optonList" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
           </a-select>
@@ -62,6 +74,8 @@ import table from "@/mixins/table";
 import { export2Excel } from "@/utils/js/exportExcel";
 import HandlingDetails from "./components/HandlingDetails.vue";
 import {
+  getDatingList,
+  getBumenList,
   getOptonList,
   getEvaList,
   getEvaData,
@@ -219,12 +233,20 @@ export default {
         "pjxt",
         "pj_name",
       ],
+      // 大厅列表
+      datingList:[],
+      // 部门列表
+      bumenList:[],
+      hallid:'',
+      sectionid:''
     };
   },
   components: {
     HandlingDetails,
   },
   created() {
+    this.getDatingListArr();
+    this.getBumenListArr();
     this.togetevalist();
   },
   mounted() {
@@ -235,6 +257,18 @@ export default {
     });
   },
   methods: {
+    // 获取大厅列表
+    async getDatingListArr() {
+      await getDatingList({ page: 1, size: -1 }).then((res) => {
+        this.datingList = res.data.data;
+      });
+    },
+    // // 获取部门列表
+    async getBumenListArr() {
+      await getBumenList({ page: 1, size: -1 }).then((res) => {
+        this.bumenList = res.data.data;
+      });
+    },
     // 重置
     clearnAllChoose() {
       this.evaChoose = [];
@@ -303,6 +337,8 @@ export default {
         pjxt,
         time: this.BegindAndEndTime,
         info: this.searchName,
+        hallid:this.hallid,
+        sectionid:this.sectionid,
         ...search,
       });
       if (res.code == 1) {

portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/matterEvaluation.vue

@@ -13,6 +13,18 @@
       </div>
       <span>
         <a-space>
+          <a-select v-model="hallid">
+            <a-select-option value=""> 全部大厅 </a-select-option>
+            <a-select-option v-for="item in datingList" :key="item.id" :value="item.id">
+              {{ item.hallName }}
+            </a-select-option>
+          </a-select>
+          <a-select v-model="sectionid">
+            <a-select-option value=""> 全部部门 </a-select-option>
+            <a-select-option v-for="item in bumenList" :key="item.id" :value="item.id">
+              {{ item.name }}
+            </a-select-option>
+          </a-select>
           <a-select v-model="evaChoose" placeholder="全部评价" mode="multiple">
             <a-select-option v-for="item in optonList" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
           </a-select>
@@ -62,6 +74,8 @@ import { export2Excel } from "@/utils/js/exportExcel";
 import table from "@/mixins/table";
 import HandlingDetails from "./components/HandlingDetails.vue";
 import {
+  getDatingList,
+  getBumenList,
   getOptonList,
   getEvaList,
   getEvaData,
@@ -219,17 +233,37 @@ export default {
         "pjxt",
         "pj_name",
       ],
+      // 大厅列表
+      datingList:[],
+      // 部门列表
+      bumenList:[],
+      hallid:'',
+      sectionid:''
     };
   },
   components: {
     HandlingDetails,
   },
   created() {
+    this.getDatingListArr();
+    this.getBumenListArr();
     this.togetevalist();
     this.getOptonList();
   },
 
   methods: {
+    // 获取大厅列表
+    async getDatingListArr() {
+      await getDatingList({ page: 1, size: -1 }).then((res) => {
+        this.datingList = res.data.data;
+      });
+    },
+    // // 获取部门列表
+    async getBumenListArr() {
+      await getBumenList({ page: 1, size: -1 }).then((res) => {
+        this.bumenList = res.data.data;
+      });
+    },
     // 重置
     clearnAllChoose() {
       this.evaChoose = [];
@@ -305,6 +339,8 @@ export default {
         pjxt,
         time: this.BegindAndEndTime,
         info: this.searchName,
+        hallid:this.hallid,
+        sectionid:this.sectionid,
         ...search,
       });
       if (res.code == 1) {

portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/windowEvaluation.vue

@@ -13,6 +13,18 @@
       </div>
       <span>
         <a-space>
+          <a-select v-model="hallid">
+            <a-select-option value=""> 全部大厅 </a-select-option>
+            <a-select-option v-for="item in datingList" :key="item.id" :value="item.id">
+              {{ item.hallName }}
+            </a-select-option>
+          </a-select>
+          <a-select v-model="sectionid">
+            <a-select-option value=""> 全部部门 </a-select-option>
+            <a-select-option v-for="item in bumenList" :key="item.id" :value="item.id">
+              {{ item.name }}
+            </a-select-option>
+          </a-select>
           <a-select v-model="evaChoose" placeholder="全部评价" mode="multiple">
             <a-select-option v-for="item in optonList" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
           </a-select>
@@ -63,6 +75,8 @@ import table from "@/mixins/table";
 import { export2Excel } from "@/utils/js/exportExcel";
 import HandlingDetails from "./components/HandlingDetails.vue";
 import {
+  getDatingList,
+  getBumenList,
   getOptonList,
   getEvaList,
   getEvaData,
@@ -136,7 +150,7 @@ export default {
           },
         },
         {
-          title: "评价来源",
+          title: "评价系统",
           align: "center",
           dataIndex: "pjxt",
           customRender: (text, record, index) => {
@@ -219,6 +233,10 @@ export default {
         "pjxt",
         "pj_name",
       ],
+      datingList:[],
+      bumenList:[],
+      hallid:'',
+      sectionid:''
     };
   },
   components: {
@@ -226,10 +244,24 @@ export default {
   },
 
   created() {
+    this.getDatingListArr();
+    this.getBumenListArr();
     this.getOptonList();
     this.togetevalist();
   },
   methods: {
+    // 获取大厅列表
+    async getDatingListArr() {
+      await getDatingList({ page: 1, size: -1 }).then((res) => {
+        this.datingList = res.data.data;
+      });
+    },
+    // 获取部门列表
+    async getBumenListArr() {
+      await getBumenList({ page: 1, size: -1 }).then((res) => {
+        this.bumenList = res.data.data;
+      });
+    },
     // 重置
     clearnAllChoose() {
       this.evaChoose = [];
@@ -242,6 +274,8 @@ export default {
         this.$moment(new Date()).format("YYYY-MM-DD"),
         this.$moment(new Date()).format("YYYY-MM-DD"),
       ];
+      this.sectionid = ''
+      this.hallid = ''
       this.togetevalist();
     },
     // 搜索
@@ -309,6 +343,8 @@ export default {
         pjxt,
         time: this.BegindAndEndTime,
         info: this.searchName,
+        hallid:this.hallid,
+        sectionid:this.sectionid,
         ...search,
       });
       if (res.code == 1) {