bug修改，食堂页面加打卡人数

src/api/canteen/basic.js

@@ -47,4 +47,12 @@ export function delFood(ids) {
     method: 'DELETE',
     // data: data
   })
+}
+// 打卡人数数据
+export function dakaPeople(params) {
+  return request({
+    url: `/data-service-center/accessControl/getPeople`,
+    method: 'get',
+    params: params
+  })
 }

src/layout/index.vue

@@ -10,11 +10,11 @@
         class="drawer-bg"
         @click="handleClickOutside"
       />
-      <sidebar v-if="dev" class="sidebar-container" />
+      <sidebar v-if="dev || this.$store.state.user.name == 'drp'" class="sidebar-container" />
       <div
         :class="{ hasTagsView: needTagsView, sidebarHide: sidebar.hide }"
         class="main-container"
-        :style="`margin-left:${dev ? '54':'0'}px`"
+        :style="`margin-left:${(dev || this.$store.state.user.name == 'drp') ? '54':'0'}px`"
       >
         <div :class="{ 'fixed-header': fixedHeader }">
           <!-- <navbar /> -->

src/views/canteen/menuScreen.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="menuScreen">
+  <div id="menuScreen" style="position: relative;">
     <div class="title">德荣食堂</div>
     <div class="title2">
       <span>时段</span>
@@ -33,22 +33,27 @@
         </el-table>
       </div>
     </div>
+
+    <p class="people">{{nowDate}}园区打卡人数:{{ dakaNum }}人</p>
   </div>
 </template>
 
 <script>
-import { menuList } from '@/api/canteen/basic.js'
+import axios from 'axios'
+import { menuList, dakaPeople } from '@/api/canteen/basic.js'
 export default {
   data() {
     return {
       tableData: [],
       nowDate: '',
-      intervalId: null
+      intervalId: null,
+      dakaNum: ''
     }
   },
   created() {
     this.getList();
     this.dataRefreh()
+    this.getPeoples()
   },
   destroyed(){
     // 在页面销毁后，清除计时器
@@ -93,13 +98,24 @@ export default {
       this.intervalId = setInterval(() => {
         console.log("刷新" + new Date());
         this.getList(); //加载数据函数
-      }, 1000*60*10);
+        this.getPeoples() // 加载园区打卡人数
+      }, 1000*60*5);
     },
     // 停止定时器
     clear() {
       clearInterval(this.intervalId); //清除计时器
       this.intervalId = null; //设置为null
     },
+    // 获取园区打卡数据
+    getPeoples() {
+      axios.defaults.baseURL = ''
+      axios.get('/data-service-center/accessControl/getPeople ').then(res => {
+        console.log(res.data)
+        if(res.data.code === 200) {
+          this.dakaNum = res.data.data
+        }
+      })
+    }
   },
 }
 </script>
@@ -193,4 +209,11 @@ export default {
 ::v-deep .el-table .cell {
   line-height: normal;
 }
+.people {
+  position: absolute;
+  top: 0;right: 1%; 
+  font-size: 3vh;
+  font-weight: 600;
+  color: #fff;
+}
 </style>

src/views/purchase/PurchaseDemandList/index.vue

@@ -123,15 +123,18 @@
               </el-form-item>
             </el-col>
             <el-col :span="1.5">
-              <el-form-item label="备注">
-                <el-input
-                  v-model.trim="queryParams.remark"
-                  size="mini"
+              <el-form-item label="制单日期">
+                <el-date-picker
+                  v-model="queryParams.createTimeString"
+                  type="date"
                   clearable
+                  value-format="yyyy-MM-dd"
+                  size="mini"
                   style="width: 200px"
-                />
-                </el-form-item>
-              </el-col>
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
           </el-row>
 
           </div>
@@ -186,7 +189,8 @@
           <el-table-column show-overflow-tooltip type="selection" width="55" fixed="left"/>
           <el-table-column show-overflow-tooltip label="序号" type="index" align="center" width="50px" fixed="left"/>
           <el-table-column show-overflow-tooltip label="需求单号" align="center" width="170" prop="code"/>
-          <el-table-column show-overflow-tooltip label="需求日期" align="center" width="120" prop="demandDate"/>
+          <el-table-column show-overflow-tooltip label="需求日期" align="center" width="100" prop="demandDate"/>
+          <el-table-column show-overflow-tooltip label="制单日期" align="center" width="100" prop="createTime"/>
           <el-table-column show-overflow-tooltip label="需求计划" align="center" width="120" prop="planType" :formatter="formatterPlanType"/>
           <el-table-column show-overflow-tooltip label="审批结束日期" align="center" width="120" prop="approverFinishTime"/>
           <el-table-column show-overflow-tooltip label="单据状态" align="center" prop="satus" :formatter="formatterStatus"/>
@@ -379,6 +383,7 @@ export default {
         demandDept: '',
         demandDate: '',
         remark: '',
+        createTimeString: '',
         materialCode: '',
         status: '',
         pageNum: 1,
@@ -482,6 +487,7 @@ export default {
         demandDept: '',
         demandDate: '',
         remark: '',
+        createTimeString: '',
         materialCode: '',
         status: '',
         pageNum: 1,

vue.config.js

@@ -64,6 +64,12 @@ module.exports = {
         changeOrigin: true,
         pathRewrite: { [`^/sy-derom`]: "" },
       },
+      // 打卡人数跨域配置
+      "/data-service-center": {
+        target: `https://sy.derom.com`,
+        ws: true,
+        changeOrigin: true,
+      }
     },
     disableHostCheck: true,
   },