Merge remote-tracking branch 'origin/master'

sample-form-client-ui/admin/package.json

@@ -12,6 +12,7 @@
   },
   "dependencies": {
     "@babel/parser": "^7.7.4",
+    "@babel/polyfill": "^7.12.1",
     "axios": "^0.27.2",
     "beautifier": "^0.1.7",
     "clipboard": "^2.0.4",

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

@@ -18,6 +18,13 @@ export default {
       linkDom: null, // 换皮
     };
   },
+  watch: {
+    "$route.path"(newVal) {
+      if (newVal == "/" || newVal == "/home") {
+        this.getHomeInfo();
+      }
+    },
+  },
   created() {
     this.getInfo();
     // 开发环境
@@ -73,10 +80,9 @@ export default {
     getInfo() {
       let routeQuery = this.urlGet();
       if (JSON.stringify(routeQuery) !== "{}") {
-        let { devicenum, deviceInfo } = routeQuery;
+        let { devicenum } = routeQuery;
         this.devicenum = devicenum;
         local.setLocal("devicenum", devicenum);
-        local.setLocal("siteId", deviceInfo.siteId);
       }
     },
     // 获取首页信息

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

@@ -5,13 +5,11 @@ import request from "@/utils/request";
 export const getHomeInfo = (data) => {
   let baseUrl = local.getLocal("serverUrl");
   let siteId = local.getLocal("siteId");
-  let devicenum = local.getLocal("devicenum");
   return request({
     url: `${baseUrl}sampleform/home/info`,
     method: "post",
     data: {
       siteId,
-      devicenum,
       ...data,
     },
   });

sample-form-client-ui/admin/src/components/Header.vue

@@ -31,7 +31,7 @@ export default {
 .header {
   width: 100%;
   height: 100px;
-  padding: 0px 40px;
+  padding: 0px 60px;
   background: url("../assets/img/title.jpg") no-repeat center;
   background-size: 100% 100%;
   box-shadow: 0px 2px 6px 6px #ccc;

sample-form-client-ui/admin/src/components/MateralsList.vue

@@ -18,9 +18,9 @@
       >
         <div
           class="matterDatumList-item flex flexc aic"
-          v-for="(v, i) in matterInfo.matterDatumList"
+          v-for="v in matterInfo.matterDatumList"
           :key="v.id"
-          @click="handleCheck(i)"
+          @click="handleCheck(v)"
         >
           <div class="pic-box">
             <div class="pic-img-box">
@@ -84,13 +84,13 @@ export default {
     },
   },
   methods: {
-    handleCheck(index) {
+    handleCheck(row) {
       this.$router.push({
         path: "/showMaterials",
         query: {
           matterName: this.matterInfo.matterName,
           matterId: this.matterInfo.id,
-          index,
+          id: row.id,
         },
       });
     },

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

@@ -14,15 +14,17 @@
       <div class="right flex">
         <p class="flex aic mr25">
           <span class="tips-name"> 今日节约能量： </span>
-          <span class="count count1">{{
-            homeInfo.dayThrift ?? 0 | filterCount
+          <span class="count count1" v-if="homeInfo.dayThrift">{{
+            homeInfo.dayThrift | filterCount
           }}</span>
+          <span class="count count1" v-else> 0 </span>
         </p>
         <p class="flex aic">
           <span class="tips-name"> 累计节约能量： </span>
-          <span class="count count2">{{
-            homeInfo.totalThrift ?? 0 | filterCount
+          <span class="count count2" v-if="homeInfo.totalThrift">{{
+            homeInfo.totalThrift | filterCount
           }}</span>
+          <span class="count count2" v-else> 0 </span>
         </p>
       </div>
     </div>
@@ -63,12 +65,12 @@
               >
                 <span
                   :data-value="v"
-                  v-if="v?.length <= 6"
+                  v-if="v.length && v.length <= 6"
                   class="hot-search-item"
                   >{{ v }}</span
                 >
                 <span :data-value="v" v-else class="hot-search-item">{{
-                  v?.slice(0, 6) + "..."
+                  v.slice(0, 6) + "..."
                 }}</span>
                 <span class="line"></span>
               </div>
@@ -98,7 +100,7 @@
                 <img v-if="i < 3" :src="checkTopImg(i)" />
                 <span v-else>{{ i + 1 }}.</span>
               </div>
-              <p class="flex1" v-ellipsis @click="checkMaterial(i, v)">
+              <p class="flex1" v-ellipsis @click="checkMaterial(v)">
                 {{ v.materialName ? v.materialName : v.materiaFullName }}
               </p>
             </div>
@@ -130,11 +132,6 @@
             class="hot-matter-list flex1 mt10"
             v-if="matterList && matterList.length"
           >
-            <vue-seamless-scroll
-              :class-option="optionTop"
-              class="seamless-warp"
-            >
-              <div>
             <div
               class="hot-matter-item flex aic"
               v-for="(v, i) in matterList"
@@ -149,8 +146,6 @@
               </p>
             </div>
           </div>
-            </vue-seamless-scroll>
-          </div>
           <div v-else class="tac empty-text">暂无数据</div>
         </div>
       </div>
@@ -161,7 +156,7 @@
         <span class="data-name">入驻表单量：</span>
         <div class="count-box">
           <span class="data-count" v-format="'#,##0'">{{
-            homeInfo.datumCont ?? 0
+            homeInfo.datumCont ? homeInfo.datumCont : 0
           }}</span>
           <span>份</span>
         </div>
@@ -171,7 +166,7 @@
         <span class="data-name">入驻事项量：</span>
         <div class="count-box">
           <span class="data-count" v-format="'#,##0'">{{
-            homeInfo.matterCont ?? 0
+            homeInfo.matterCont ? homeInfo.matterCont : 0
           }}</span>
           <span>件</span>
         </div>
@@ -217,15 +212,6 @@ export default {
         waitTime: 2500, // 单行停顿时间(singleHeight,waitTime)
       };
     },
-    optionTop() {
-      return {
-        direction: 1, // 滚动方向
-        step: 0.5, // 数值越大速度滚动越快
-        limitMoveNum: 4, // 开启无缝滚动的数据量 设置(数值<=页面展示数据条数不滚)(超过页面展示条数滚动)
-        openWatch: true, // 开启数据实时监控刷新dom
-        waitTime: 2500, // 单行停顿时间(singleHeight,waitTime)
-      };
-    },
     ...mapState(["homeInfo", "datumList", "matterList"]),
   },
   created() {
@@ -299,12 +285,12 @@ export default {
       this.visible = true;
     },
     // 查看材料
-    checkMaterial(index, row) {
+    checkMaterial(row) {
       this.$router.push({
         path: "/showmaterials",
         query: {
           matterId: row.matterId,
-          index,
+          id: row.id,
         },
       });
     },
@@ -509,7 +495,7 @@ export default {
     .ranking-list {
       padding: 0px 14px;
       .ranking-item {
-        height: 56px;
+        height: 50px;
         margin-bottom: 10px;
         line-height: 56px;
         border-radius: 8px;

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

@@ -55,12 +55,12 @@
             </span>
           </div>
           <!-- 申请编号  -->
-          <div class="apply-num tac" v-ellipsis="'340px'">
+          <!-- <div class="apply-num tac" v-ellipsis="'340px'">
             申请编号：DX123456789
-          </div>
+          </div> -->
           <!-- 事项名称 -->
           <div class="matter-name tac" v-ellipsis="'340px'">
-            {{ matterInfo.matterName }}
+            {{ matterName }}
           </div>
           <!-- 材料列表 -->
           <div class="materails-list scroll3">
@@ -72,7 +72,7 @@
               :key="v.id"
               @click="active = i"
             >
-              {{ v.materiaFullName }}
+              {{ v.materialName ? v.materialName : v.materiaFullName }}
               <div class="line"></div>
             </div>
           </div>
@@ -110,7 +110,8 @@ export default {
   data() {
     return {
       api: local.getLocal("serverUrl") + "/",
-      matterInfo: this.$route.query,
+      matterInfo: {},
+      matterName: "", // 事项名称
       materailsList: [],
       active: 0,
       scale: 100,
@@ -134,7 +135,7 @@ export default {
       let res = await getMaterialsList({
         page: 1,
         size: -1,
-        matterId: this.matterInfo.matterId,
+        matterId: this.$route.query.matterId,
       });
       let { data } = res.data.data;
       data.forEach((v) => {
@@ -145,7 +146,11 @@ export default {
         };
       });
       this.materailsList = data;
-      this.active = +this.$route.query.index;
+      this.matterName = this.$route.query.matterName
+        ? this.$route.query.matterName
+        : data[0].matterName;
+      let id = this.$route.query.id;
+      this.active = this.materailsList.findIndex((v) => v.id == id);
     },
 
     // 放大

sample-form-client-ui/admin/src/utils/request.js

@@ -3,12 +3,12 @@
  */
 import axios from "axios";
 import { Message } from "element-ui";
-import local from "@/utils/local";
+// import local from "@/utils/local";
 // 请求超时时间
-axios.defaults.timeout = 15 * 1000;
+// axios.defaults.timeout = 15 * 1000;
 
 // 设置统一服务器地址
-axios.defaults.baseURL = local.getLocal("serverUrl");
+// axios.defaults.baseURL = local.getLocal("serverUrl");
 // 请求拦截
 axios.interceptors.request.use(
   (config) => {

sample-form-client-ui/admin/yarn.lock

@@ -832,6 +832,14 @@
     "@babel/helper-create-regexp-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
+"@babel/polyfill@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.npmmirror.com/@babel/polyfill/-/polyfill-7.12.1.tgz#1f2d6371d1261bbd961f3c5d5909150e12d0bd96"
+  integrity sha512-X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g==
+  dependencies:
+    core-js "^2.6.5"
+    regenerator-runtime "^0.13.4"
+
 "@babel/preset-env@^7.12.16":
   version "7.19.1"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.19.1.tgz#9f04c916f9c0205a48ebe5cc1be7768eb1983f67"
@@ -3036,7 +3044,7 @@ core-js-compat@^3.25.1, core-js-compat@^3.8.3:
   dependencies:
     browserslist "^4.21.4"
 
-core-js@^2.4.0:
+core-js@^2.4.0, core-js@^2.6.5:
   version "2.6.12"
   resolved "https://registry.npmmirror.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
   integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==

sample-form-manager-ui/admin/src/pages/layouts/components/Header.vue

 <template>
   <div class="header flex aic jcb">
     <div class="left flex aic">
-      <img
+      <!-- <img
         class="pointer"
         width="32"
         src="../../../assets/img/logo.png"
         alt="LOGO"
         @click="handleGoHome"
-      />
-      <h1 class="title ml10 pointer" @click="handleGoHome">
+      /> -->
+      <h1 class="title pointer" @click="handleGoHome">
         智慧政务一体化综合管理平台
       </h1>
       <HeaderSite class="mr50 ml20"></HeaderSite>