Merge remote-tracking branch 'origin/master'

portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/components/userInfo.vue

 <template>
   <div class="userModal" ref="userModal">
-    <a-modal :title="modalInfo.title" :width="modalInfo.width" :visible="modalInfo.visible"
-      :confirmLoading="modalInfo.confirmLoading" @cancel="modalClose" :centered="true" :destroyOnClose="true"
-      :getContainer="() => $refs.userModal">
+    <a-modal
+      :title="modalInfo.title"
+      :width="modalInfo.width"
+      :visible="modalInfo.visible"
+      :confirmLoading="modalInfo.confirmLoading"
+      @cancel="modalClose"
+      :centered="true"
+      :destroyOnClose="true"
+      :getContainer="() => $refs.userModal"
+    >
       <div class="content">
         <h1>{{ dataList.people_name }}</h1>
         <p>
           <span>{{ dataList.people_sex }}</span>
-          <span>{{ dataList.age }}</span>
+          <span>{{ dataList.age }} 岁</span>
           <span>{{ dataList.people_phone }}</span>
         </p>
         <h2>
-          <span>预约次数<br /><i>{{ dataList.ordernum }}</i></span>
-          <span>排队次数<br /><i>{{ dataList.quenum }}</i></span>
-          <span>关联业务<br /><i>{{ dataList.bus_num }}</i></span>
+          <span
+            >预约次数<br /><i>{{ dataList.ordernum }}</i></span
+          >
+          <span
+            >排队次数<br /><i>{{ dataList.quenum }}</i></span
+          >
+          <span
+            >关联业务<br /><i>{{ dataList.bus_num }}</i></span
+          >
         </h2>
       </div>
       <template slot="footer">
-        <a-button type="primary" class="addclass"  ghost @click="openBlockchain">查看TA的数据画像</a-button>
-        <a-button type="primary" class="addclass"  ghost @click="openBlockchain">区块链信息</a-button>
+        <a-button type="primary" class="addclass" ghost @click="openBlockchain"
+          >查看TA的数据画像</a-button
+        >
+        <a-button type="primary" class="addclass" ghost @click="openBlockchain"
+          >区块链信息</a-button
+        >
       </template>
     </a-modal>
     <Blockchain ref="Blockchain" />
@@ -40,11 +57,11 @@ export default {
     Blockchain,
   },
 
-  mounted() { },
+  mounted() {},
   methods: {
     openBlockchain() {
       // this.$refs.Blockchain.modalInfo.visible = true;
-      this.$message.warning('暂未开放')
+      this.$message.warning("暂未开放");
     },
   },
 };
@@ -66,7 +83,7 @@ export default {
       align-items: center;
 
       span {
-        &+span {
+        & + span {
           margin-left: 30px;
         }
       }
@@ -99,5 +116,3 @@ export default {
   }
 }
 </style>
-
-

portal-manager-ui/admin/src/views/siteArrange/siteArrange.vue

@@ -104,6 +104,7 @@ export default {
       });
       let { modelUrl, modelName, modelIcon } = row;
       let path = this.$route.path;
+      modelName = encodeURI(modelName);
       window.open(
         `${modelUrl}?token=${token}&siteid=${siteid}&siteName=${siteName}&userInfo=${userInfo}&sysName=${modelName}&sysLogo=${modelIcon}&path=${path}`,
         "_blank"

portal-manager/src/main/java/com/mortals/xhx/module/page/web/PageInfoController.java

@@ -3,6 +3,8 @@ package com.mortals.xhx.module.page.web;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.Context;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.Result;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.common.pdu.RespData;
 import com.mortals.xhx.common.pdu.product.ProductPdu;
@@ -10,12 +12,14 @@ import com.mortals.xhx.feign.product.IProductFeign;
 import com.mortals.xhx.module.page.model.PageInfoEntity;
 import com.mortals.xhx.module.page.service.PageInfoService;
 import com.mortals.xhx.module.param.service.ParamService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -77,4 +81,51 @@ public class PageInfoController extends BaseCRUDJsonBodyMappingController<PageIn
         ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
         return ret;
     }
+
+    @Override
+    @PostMapping({"list"})
+    @UnAuth
+    public Rest<Object> list(@RequestBody PageInfoEntity query) {
+        Rest<Object> ret = new Rest();
+        Map<String, Object> model = new HashMap();
+        Context context = this.getContext();
+        String busiDesc = "查询" + this.getModuleDesc();
+
+        int code;
+        try {
+            this.doListBefore(query, model, context);
+            PageInfo pageInfo = this.buildPageInfo(query);
+            Result<PageInfoEntity> result = this.getService().find(query, pageInfo, context);
+            this.doListAfter(query, result.getList(), context);
+            if(CollectionUtils.isNotEmpty(result.getList())){
+                List<PageInfoEntity> newList = new ArrayList<>();
+                Map<String,String> pageCode = new HashMap<>();
+                for (PageInfoEntity item:result.getList()){
+                    if(pageCode.containsKey(item.getPageCode())){
+                        continue;
+                    }else {
+                        pageCode.put(item.getPageCode(),item.getPageCode());
+                        newList.add(item);
+                    }
+                }
+                result.setList(newList);
+            }
+            model.put("data", result.getList());
+            model.put("pageInfo", result.getPageInfo());
+            this.parsePageInfo(model, result.getPageInfo());
+            code = this.doListAfter(query, (Map)model, context);
+            model.put("message_info", busiDesc + "成功");
+            this.recordSysLog(this.request, busiDesc + " 【成功】");
+        } catch (Exception var9) {
+            code = -1;
+            this.doException(this.request, busiDesc, model, var9);
+        }
+
+        this.init(model, context);
+        ret.setCode(code);
+        ret.setData(model);
+        ret.setDict(model.get("dict"));
+        ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+        return ret;
+    }
 }
\ No newline at end of file