Merge remote-tracking branch 'origin/master'

portal-manager-ui/admin/src/views/dataAdmin/components/AIEfficiency/reportForm.vue

@@ -27,7 +27,7 @@
   </div>
 </template>
 
-  <script>
+<script>
 import { mapState } from "vuex";
 import storage from "@/utils/js/Storage";
 import { export2Excel } from "@/utils/js/exportExcel";
@@ -293,11 +293,10 @@ export default {
     },
     // 格式化时间
     dateFormat(val) {
-      return this.$moment(val).format("YYYY-MM-DD HH:mm:ss");
+      return this.$moment.unix(val).format("YYYY-MM-DD HH:mm:ss");
     },
   },
 };
 </script>
 
-<style lang="less" scoped>
-</style>
\ No newline at end of file
+<style lang="less" scoped></style>

portal-manager-ui/admin/src/views/dataAdmin/components/pickUp/otherRecord.vue

@@ -31,12 +31,20 @@
   </div>
 </template>
 
-  <script>
+<script>
 import { mapState } from "vuex";
 import storage from "@/utils/js/Storage";
 import { export2Excel } from "@/utils/js/exportExcel";
 import { getOtherList } from "@/api/dataAdmin";
 const tHeader = ["操作人身份", "操作类型", "箱号", "取件柜名称", "操作时间"]; // 导出的表头名信息
+const operationTypeList = {
+  1: "存件",
+  2: "取件",
+  3: "锁定",
+  4: "开箱",
+  5: "清箱",
+  6: "解锁",
+};
 const filterVal = [
   "userType",
   "operationType",
@@ -95,6 +103,7 @@ export default {
       },
     ];
     return {
+      operationTypeList,
       baseurl: process.env.VUE_APP_API_PHP_URL,
       siteId: storage.get(2, "siteId"),
       columns,
@@ -279,5 +288,4 @@ export default {
 };
 </script>
 
-  <style lang="less" scoped>
-</style>
\ No newline at end of file
+<style lang="less" scoped></style>