perf: 优化接口函数

sample-form-client-ui/admin/src/App.vue

@@ -13,7 +13,7 @@ import local from "@/utils/local";
 import NetworkError from "@/components/NetworkError.vue";
 import EnabledDev from "@/components/EnabledDev.vue";
 import mq from "@/mixin/mq";
-import { getHomeInfo, getSkinList, getDeviceInfo } from "@/api";
+import { homeInfo, skinList, deviceInfo } from "@/api";
 import { mapMutations } from "vuex";
 export default {
   mixins: [mq],
@@ -134,7 +134,7 @@ export default {
     },
     // 获取首页信息
     async getHomeInfo() {
-      let res = await getHomeInfo({});
+      let res = await homeInfo({});
       let { data, code } = res.data;
       if (code === 1) {
         data.hotWords = data.hotWords.map((v) => v.hotwords);
@@ -146,7 +146,7 @@ export default {
     },
     // 换肤
     async getSetinfo() {
-      let res = await getSkinList({
+      let res = await skinList({
         page: 1,
         size: -1,
         used: 1,
@@ -168,7 +168,7 @@ export default {
       }
     },
     async getDeviceInfo() {
-      let res = await getDeviceInfo();
+      let res = await deviceInfo();
       if (res.data.code == 1) {
         let { data } = res.data;
         this.enabled = data.enabled;

sample-form-client-ui/admin/src/api/index.js

@@ -4,7 +4,7 @@ import request from "@/utils/request";
 import store from "@/store";
 let PHP_URL = process.env.VUE_APP_API_PHP_URL;
 // 首页数据展示
-export const getHomeInfo = (data) => {
+export const homeInfo = (data) => {
   let baseUrl = local.getLocal("serverUrl");
   let siteId = local.getLocal("siteId");
   let deviceCode = local.getLocal("devicenum");
@@ -20,7 +20,7 @@ export const getHomeInfo = (data) => {
 };
 
 // 获取部门列表
-export const getdeptList = (data) => {
+export const deptList = (data) => {
   let baseUrl = local.getLocal("serverUrl");
   let siteId = local.getLocal("siteId");
   // let deviceCode = local.getLocal("devicenum");
@@ -36,7 +36,7 @@ export const getdeptList = (data) => {
 };
 
 // 查询事项列表
-export const getSampleformMatterList = (data) => {
+export const sampleformMatterList = (data) => {
   let baseUrl = local.getLocal("serverUrl");
   let siteId = local.getLocal("siteId");
   return request({
@@ -50,7 +50,7 @@ export const getSampleformMatterList = (data) => {
 };
 
 // 查询事项详情
-export const getSampleformMatterInfo = (params) => {
+export const sampleformMatterInfo = (params) => {
   let baseUrl = local.getLocal("serverUrl");
   return request({
     url: `${baseUrl}basics_api/sampleform/matter/interinfo`,
@@ -60,7 +60,7 @@ export const getSampleformMatterInfo = (params) => {
 };
 
 // 查询设备关联事项列表
-export const getDeviceMatterList = (data) => {
+export const deviceMatterList = (data) => {
   let baseUrl = local.getLocal("serverUrl");
   let siteId = local.getLocal("siteId");
   // let deviceCode = local.getLocal("devicenum");
@@ -76,7 +76,7 @@ export const getDeviceMatterList = (data) => {
 };
 
 //   查询材料列表
-export const getMaterialsList = (data) => {
+export const materialsList = (data) => {
   let baseUrl = local.getLocal("serverUrl");
   let siteId = local.getLocal("siteId");
   return request({
@@ -90,10 +90,10 @@ export const getMaterialsList = (data) => {
 };
 
 // 获取事项文件夹（分类）列表
-export const getMatterFolderList = (data) => {
+export const matterFolderList = (data) => {
   let baseUrl = local.getLocal("serverUrl");
   return request({
-    url: `${baseUrl}basics_api/sampleform/matter/category/list`,
+    url: `${baseUrl}basics_api/sampleform/matter/category/interlist`,
     method: "post",
     data,
   });
@@ -128,7 +128,7 @@ export const checkMaterials = (data) => {
   });
 };
 // 查询使用皮肤
-export const getSkinList = (data) => {
+export const skinList = (data) => {
   let baseUrl = local.getLocal("serverUrl");
   // let siteId = local.getLocal("siteId");
   return request({
@@ -138,7 +138,7 @@ export const getSkinList = (data) => {
   });
 };
 // 排队编号查询对应事项
-export const getMatterForFlownum = (params) => {
+export const matterForFlownum = (params) => {
   // let baseUrl = local.getLocal("serverUrl");
   return request({
     url: `${PHP_URL}api/matter/matterForFlownum`,
@@ -147,7 +147,7 @@ export const getMatterForFlownum = (params) => {
   });
 };
 //获取设备信息（按设备编码）
-export const getDeviceInfo = (data) => {
+export const deviceInfo = (data) => {
   let baseUrl = local.getLocal("serverUrl");
   let deviceCode = local.getLocal("devicenum");
   return request({

sample-form-client-ui/admin/src/mixin/mq.js

@@ -8,14 +8,14 @@ function createError() {
       return dom;
     } else {
       let createdDom = document.createElement("div");
-      createdDom.style.position = "absolute";
+      createdDom.style.position = "fixed";
       createdDom.style.left = "0";
       createdDom.style.bottom = "10px";
       createdDom.style.width = "100%";
       createdDom.style.textAlign = "center";
       createdDom.style.fontSize = "12px";
       createdDom.style.color = "red";
-      createdDom.style.zIndex = 10;
+      createdDom.style.zIndex = 999;
       createdDom.style.display = "none";
       createdDom.innerText = err || "MQ通讯异常";
       document.body.appendChild(createdDom);

sample-form-client-ui/admin/src/pages/Print/PrintEmptyMaterals.vue

@@ -79,7 +79,7 @@
 import Header from "@/components/Header.vue";
 import PageTop from "@/components/PageTop.vue";
 import SearchBox from "@/components/SearchBox.vue";
-import { getMaterialsList } from "@/api";
+import { materialsList } from "@/api";
 import PreviewModal from "@/components/PreviewModal.vue";
 import local from "@/utils/local";
 import { printFn } from "@/utils/print";
@@ -120,7 +120,7 @@ export default {
   methods: {
     // 获取材料列表
     async getMaterialsList() {
-      let res = await getMaterialsList({
+      let res = await materialsList({
         page: this.current,
         size: this.size,
         materialName: this.searchVal,
@@ -251,4 +251,4 @@ export default {
   font-family: Source Han Sans CN;
   color: #ffffff;
 }
-</style>
+</style>
\ No newline at end of file

sample-form-client-ui/admin/src/pages/home/Home.vue

@@ -122,36 +122,19 @@
               class="ranking-item flex aic"
               v-for="(v, i) in datumList"
               :key="v.id"
+              v-onEvent="{
+                eventName: '点击',
+                eventCode: 'Click',
+                businessCode: 'hot_materials',
+                businessName: '热门表单',
+                routers: $route,
+              }"
+              @click="checkMaterial(v)"
             >
               <div class="flex aic jcc item-index">
-                <span
-                  v-if="i < 3"
-                  :style="{
-                    color:
-                      i == 0
-                        ? '#FF5948'
-                        : i == 1
-                        ? '#FF6F48'
-                        : i == 2
-                        ? '#FF8D48'
-                        : '#565656',
-                  }"
-                  >{{ i + 1 }}.</span
-                >
-                <span v-else>{{ i + 1 }}.</span>
+                <span :class="`item-icon-index-${i}`">{{ i + 1 }}.</span>
               </div>
-              <p
-                class="flex1"
-                v-ellipsis
-                v-onEvent="{
-                  eventName: '点击',
-                  eventCode: 'Click',
-                  businessCode: 'hot_materials',
-                  businessName: '热门表单',
-                  routers: $route,
-                }"
-                @click="checkMaterial(v)"
-              >
+              <p class="flex1" v-ellipsis>
                 {{ v.materialName ? v.materialName : v.materiaFullName }}
               </p>
               <p v-if="i < 3" class="text_hot">热</p>
@@ -194,36 +177,19 @@
               class="hot-matter-item flex aic"
               v-for="(v, i) in matterList"
               :key="v.id"
+              v-onEvent="{
+                eventName: '点击',
+                eventCode: 'Click',
+                businessCode: 'hot_matter',
+                businessName: '热门事项',
+                routers: $route,
+              }"
+              @click="checkMatter(v)"
             >
               <div class="flex aic jcc item-index">
-                <span
-                  v-if="i < 3"
-                  :style="{
-                    color:
-                      i == 0
-                        ? '#FF5948'
-                        : i == 1
-                        ? '#FF6F48'
-                        : i == 2
-                        ? '#FF8D48'
-                        : '#565656',
-                  }"
-                  >{{ i + 1 }}.</span
-                >
-                <span v-else>{{ i + 1 }}.</span>
+                <span :class="`item-icon-index-${i}`">{{ i + 1 }}.</span>
               </div>
-              <p
-                class="flex1"
-                v-ellipsis
-                v-onEvent="{
-                  eventName: '点击',
-                  eventCode: 'Click',
-                  businessCode: 'hot_matter',
-                  businessName: '热门事项',
-                  routers: $route,
-                }"
-                @click="checkMatter(v)"
-              >
+              <p class="flex1" v-ellipsis>
                 {{ v.matterName ? v.matterName : v.matterFullName }}
               </p>
               <p v-if="i < 3" class="text_hot">热</p>
@@ -264,7 +230,7 @@
 </template>
 
 <script>
-import { getMatterFolderList } from "@/api";
+import { matterFolderList } from "@/api";
 import MateralsList from "@/components/MateralsList.vue";
 import { mapState, mapMutations } from "vuex";
 export default {
@@ -274,10 +240,6 @@ export default {
   data() {
     return {
       search: "",
-      rankingActive: 1,
-      top1: require("../../assets/img/png_no.1.png"),
-      top2: require("../../assets/img/png_no.2.png"),
-      top3: require("../../assets/img/png_no.3.png"),
       // homeInfo: {}, // 首页数据
       // datumList: [],
       // matterList: [],
@@ -297,49 +259,23 @@ export default {
     },
     ...mapState(["homeInfo", "datumList", "matterList"]),
   },
-  created() {
-    // this.getHomeInfo();
-  },
+  created() {},
   filters: {
     filterCount(val) {
-      if (val >= 1000 && val < 10000) {
+      if (val < 1000) {
+        return val + "g";
+      }
+      let unit = "kg";
+      if (val >= 1000 && val <= 999000) {
         let num = val / 1000;
-        return num.toFixed(2) + "kg";
-      } else if (val >= 10000 && val < 999000) {
-        let num = val / 10000;
-        return num.toFixed(1) + "万kg";
-      } else if (val >= 999000) {
-        return `999+万kg`;
+        return num.toFixed(1) + unit;
       } else {
-        return val + "g";
+        return `999+${unit}`;
       }
     },
   },
   methods: {
     ...mapMutations(["SET_operTime"]),
-    // 获取首页数据展示
-    // async getHomeInfo() {
-    //   let res = await getHomeInfo({});
-    //   let { data, code } = res.data;
-    //   if (code === 1) {
-    //     data.hotWords = data.hotWords.map((v) => v.hotwords);
-    //     this.homeInfo = data;
-    //     this.matterList = data.matterList;
-    //     this.datumList = data.datumList;
-    //   }
-    // },
-    checkTopImg(index) {
-      if (index === 0) {
-        return this.top1;
-      } else if (index === 1) {
-        return this.top2;
-      } else if (index === 2) {
-        return this.top3;
-      }
-    },
-    changeRanking(val) {
-      this.rankingActive = val;
-    },
     handleSearch() {
       this.$router.push({
         path: "/searchpage",
@@ -365,9 +301,10 @@ export default {
     },
     // 查看事项
     async checkMatter(row) {
+      // 设置查看事项时间
       let time = this.$moment().format("YYYY-MM-DD HH:mm:ss");
       this.SET_operTime(time);
-      let res = await getMatterFolderList({
+      let res = await matterFolderList({
         page: 1,
         size: 1,
         matterId: row.id,
@@ -636,6 +573,15 @@ export default {
         }
         .item-index {
           width: 50px;
+          .item-icon-index-0 {
+            color: #ff5948;
+          }
+          .item-icon-index-1 {
+            color: #ff6f48;
+          }
+          .item-icon-index-2 {
+            color: #ff8d48;
+          }
         }
       }
     }

sample-form-client-ui/admin/src/pages/searchpage/SearchPage.vue

@@ -47,39 +47,7 @@
               <span class="matter-fullName">事项全称</span
               ><span v-html="matter.matterFullName"></span>
             </div>
-            <!-- 材料展示 -->
-            <!-- <div
-              class="materials flex aic"
-              v-for="(item, index) in matter.matterDatumList.slice(0, 3)"
-              :key="item.id"
-            >
-              <i class="iconfont icon-dot"></i>
-              <span
-                class="material-name"
-                :class="{
-                  isMore: index === 2 && matter.matterDatumList.length > 3,
-                }"
-              >
-                {{ item.materiaFullName }}
-              </span>
-              <span v-if="index === 2 && matter.matterDatumList.length > 3">
-                等
-                <span class="count">
-                  {{
-                    `${
-                      matter.matterDatumList && matter.matterDatumList.length
-                    }份材料`
-                  }}
-                </span>
-              </span>
-            </div> -->
           </div>
-          <div
-            class="list"
-            v-for="item in row - (matterList.length % row)"
-            v-show="matterList.length % row > 0"
-            :key="'list' + item"
-          ></div>
         </div>
         <YEmpty v-else width="200" text="暂无数据"></YEmpty>
         <!-- 分页 -->
@@ -111,9 +79,9 @@ import MateralsList from "@/components/MateralsList.vue";
 import YEmpty from "@/components/YEmpty.vue";
 import YPagination from "@/components/YPagination.vue";
 import {
-  getSampleformMatterList,
-  getMatterForFlownum,
-  getMatterFolderList,
+  sampleformMatterList,
+  matterForFlownum,
+  matterFolderList,
 } from "@/api";
 import { mapMutations } from "vuex";
 export default {
@@ -165,7 +133,7 @@ export default {
     },
     // 获取事项列表
     async getSampleformMatterList(matterFullName) {
-      let res = await getSampleformMatterList({
+      let res = await sampleformMatterList({
         page: this.current,
         size: this.size,
         isTerminal: 1,
@@ -179,7 +147,7 @@ export default {
     // 排队编号获取事项
     async getMatterForFlownum(flownum) {
       let matterFullName = "";
-      let res = await getMatterForFlownum({ flownum });
+      let res = await matterForFlownum({ flownum });
       if (res.data.code == 1) {
         let { data } = res.data.data;
         if (data.length) {
@@ -202,7 +170,7 @@ export default {
     async handleCheck(row) {
       let time = this.$moment().format("YYYY-MM-DD HH:mm:ss");
       this.SET_operTime(time);
-      let res = await getMatterFolderList({
+      let res = await matterFolderList({
         page: 1,
         size: 1,
         matterId: row.id,
@@ -259,24 +227,18 @@ export default {
     bottom: 0;
   }
   .matter-list {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-between;
-  }
-  .list {
-    content: "";
-    width: 422px;
-    border: 1px solid transparent;
-    padding: 5px;
-    overflow: hidden;
+    display: grid;
+    grid-template-columns: repeat(4, 1fr);
+    gap: 30px;
+    margin-bottom: 30px;
   }
+
   .matter-item {
     width: 422px;
     // height: 210px;
     height: 150px;
     // padding: 10px 20px;
     padding: 20px;
-    margin-bottom: 30px;
     background: #edf6fe;
     border-radius: 16px;
     position: relative;

sample-form-client-ui/admin/src/pages/showpage/MatterIfy.vue

@@ -18,7 +18,7 @@
         ></SearchBox>
       </PageTop>
       <!-- 事项文件夹 -->
-      <div class="folder-box">
+      <div class="folder-box" v-loading="loading">
         <div class="folder-list" v-if="folderList.length || !isSearch">
           <div class="folder-item" @click="handleCheck({})" v-if="!isSearch">
             <div class="folder-img-box flex aic jcc">
@@ -76,11 +76,7 @@ import SearchBox from "@/components/SearchBox.vue";
 import MateralsList from "@/components/MateralsList.vue";
 import YEmpty from "@/components/YEmpty.vue";
 import YPagination from "@/components/YPagination.vue";
-import {
-  getMatterFolderList,
-  getMaterialsList,
-  getSampleformMatterInfo,
-} from "@/api";
+import { matterFolderList, materialsList, sampleformMatterInfo } from "@/api";
 export default {
   components: {
     Header,
@@ -92,7 +88,7 @@ export default {
   },
   data() {
     return {
-      row: 4,
+      loading: false,
       searchVal: "",
       isSearch: false,
       total: 0,
@@ -118,7 +114,8 @@ export default {
   methods: {
     // 获取事项分类
     async getMatterFolderList() {
-      let res = await getMatterFolderList({
+      this.loading = true;
+      let res = await matterFolderList({
         page: this.current,
         size: this.size,
         matterId: this.$route.query.matterId,
@@ -129,6 +126,7 @@ export default {
         this.total = total;
         this.folderList = data;
       }
+      this.loading = false;
     },
 
     // 搜索
@@ -146,12 +144,12 @@ export default {
     },
     // 查看
     async handleCheck(row) {
-      let res = await getSampleformMatterInfo({
+      let res = await sampleformMatterInfo({
         id: this.$route.query.matterId,
       });
       if (res.data.code == 1) {
         let { data } = res.data;
-        let result = await getMaterialsList({
+        let result = await materialsList({
           categoryId: row.id,
           matterId: this.$route.query.matterId,
           page: 1,

sample-form-client-ui/admin/src/pages/showpage/MatterList.vue

@@ -25,7 +25,7 @@
           ></SearchBox>
         </PageTop>
         <!-- 事项列表 -->
-        <div class="matter-box flex1">
+        <div class="matter-box flex1" v-loading="loading">
           <div class="matter-list" v-if="matterList.length">
             <div
               class="matter-item"
@@ -87,7 +87,7 @@ import SearchBox from "@/components/SearchBox.vue";
 import MateralsList from "../../components/MateralsList.vue";
 import YEmpty from "@/components/YEmpty.vue";
 import YPagination from "@/components/YPagination.vue";
-import { getDeviceMatterList, getMatterFolderList } from "@/api";
+import { deviceMatterList, matterFolderList } from "@/api";
 import { mapMutations } from "vuex";
 export default {
   components: {
@@ -101,6 +101,7 @@ export default {
   },
   data() {
     return {
+      loading: false,
       current: 1,
       size: 12,
       matterInfo: {},
@@ -127,16 +128,20 @@ export default {
     ...mapMutations(["SET_operTime"]),
     // 获取事项列表
     async getDeviceMatterList() {
-      let res = await getDeviceMatterList({
+      this.loading = true;
+      let res = await deviceMatterList({
         page: this.current,
         size: this.size,
         deptCode: this.deptCode,
         matterName: this.searchVal,
         isTerminal: 1,
       });
-      let { total, data } = res.data.data;
-      this.matterList = data;
-      this.matterTotal = total;
+      if (res.data.code == 1) {
+        let { total, data } = res.data.data;
+        this.matterList = data;
+        this.matterTotal = total;
+      }
+      this.loading = false;
     },
     // 切换部门
     changeDept(deptCode) {
@@ -157,7 +162,7 @@ export default {
     async handleCheck(row) {
       let time = this.$moment().format("YYYY-MM-DD HH:mm:ss");
       this.SET_operTime(time);
-      let res = await getMatterFolderList({
+      let res = await matterFolderList({
         page: 1,
         size: 1,
         matterId: row.matterId,
@@ -226,20 +231,15 @@ export default {
       bottom: 0;
     }
     .matter-list {
-      display: flex;
-      flex-wrap: wrap;
-      justify-content: space-between;
-      &::after {
-        content: "";
-        width: 474px;
-        border: 1px solid transparent;
-      }
+      display: grid;
+      grid-template-columns: repeat(3, 1fr);
+      gap: 30px;
+      margin-bottom: 30px;
     }
 
     .matter-item {
-      width: 474px;
+      width: 100%;
       height: 150px;
-      margin-bottom: 30px;
       padding: 20px;
       background: #f7fafd;
       border-radius: 16px;

sample-form-client-ui/admin/src/pages/showpage/ShowMaterials.vue

@@ -158,7 +158,7 @@
 
 <script>
 import Header from "@/components/Header.vue";
-import { getMaterialsList, checkMaterials } from "@/api";
+import { materialsList, checkMaterials } from "@/api";
 import local from "@/utils/local";
 import { mapGetters } from "vuex";
 // import Hammer from "hammerjs";
@@ -199,7 +199,7 @@ export default {
 
     // 获取材料列表
     async getMaterialsList() {
-      let res = await getMaterialsList({
+      let res = await materialsList({
         page: 1,
         size: -1,
         matterId: this.matterId,
@@ -222,7 +222,7 @@ export default {
       );
       let curInfo = this.materailsList.find((v) => v.id == this.materailsId);
       // 统计报表
-      this.checkMaterials(
+      this.handleCheckMaterials(
         curInfo.matterId,
         curInfo.matterName,
         curInfo.matterFullName,
@@ -248,7 +248,7 @@ export default {
       }
     },
     // 统计报表
-    async checkMaterials(
+    async handleCheckMaterials(
       matterId,
       matterName,
       matterFullName,
@@ -267,7 +267,7 @@ export default {
     // 切换材料
     changeIndex(row, index) {
       this.active = index;
-      this.checkMaterials(
+      this.handleCheckMaterials(
         row.matterId,
         row.matterName,
         row.materiaFullName,

sample-form-client-ui/admin/src/pages/showpage/components/LeftMenus.vue

@@ -25,7 +25,7 @@
 </template>
 
 <script>
-import { getdeptList } from "@/api";
+import { deptList } from "@/api";
 export default {
   data() {
     return {
@@ -34,13 +34,13 @@ export default {
     };
   },
   created() {
-    this.getdeptList();
+    this.getDeptList();
   },
   methods: {
     // 获取部门列表
-    async getdeptList() {
+    async getDeptList() {
       let obj = { deptCode: "", name: "全部部门" };
-      let res = await getdeptList();
+      let res = await deptList();
       if (res.data.code === 1) {
         let { deptMap } = res.data.data;
         let arr = Object.keys(deptMap).map((key) => {