提交

ruoyi-ui/src/api/settlement/creditUser.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询信用人员列表
+export function listCreditUser(query) {
+  return request({
+    url: '/system/creditUser/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 地址
+export function listtrees(data) {
+  return request({
+    url: '/system/chinaArea/treeSelect',
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询信用人员详细
+export function getCreditUser(id) {
+  return request({
+    url: '/system/creditUser/' + id,
+    method: 'get'
+  })
+}
+
+// 新增信用人员
+export function addCreditUser(data) {
+  return request({
+    url: '/system/creditUser',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改信用人员
+export function updateCreditUser(data) {
+  return request({
+    url: '/system/creditUser',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除信用人员
+export function delCreditUser(id) {
+  return request({
+    url: '/system/creditUser/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/api/settlement/guide.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询政策指南列表
+export function listGuide(query) {
+  return request({
+    url: '/system/guide/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询政策指南详细
+export function getGuide(policyId) {
+  return request({
+    url: '/system/guide/' + policyId,
+    method: 'get'
+  })
+}
+
+// 新增政策指南
+export function addGuide(data) {
+  return request({
+    url: '/system/guide',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改政策指南
+export function updateGuide(data) {
+  return request({
+    url: '/system/guide',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除政策指南
+export function delGuide(policyId) {
+  return request({
+    url: '/system/guide/' + policyId,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/api/settlement/menutwo.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询政策类别列表
+export function listMenu(query) {
+  return request({
+    url: '/system/policy/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询政策类别详细
+export function getMenu(menuId) {
+  return request({
+    url: '/system/policy/' + menuId,
+    method: 'get'
+  })
+}
+
+export function listDeptExcludeChild(menuId) {
+  return request({
+    url: '/system/policy/list/exclude/' + menuId,
+    method: 'get'
+  })
+}
+
+
+
+// 新增政策类别
+export function addMenu(data) {
+  return request({
+    url: '/system/policy',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改政策类别
+export function updateMenu(data) {
+  return request({
+    url: '/system/policy',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除政策类别
+export function delMenu(menuId) {
+  return request({
+    url: '/system/policy/' + menuId,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/api/settlement/merchants.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询入驻商家列表
+export function listMerchants(query) {
+  return request({
+    url: '/system/merchants/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询入驻商家详细
+export function getMerchants(businessId) {
+  return request({
+    url: '/system/merchants/' + businessId,
+    method: 'get'
+  })
+}
+
+// 新增入驻商家
+export function addMerchants(data) {
+  return request({
+    url: '/system/merchants',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改入驻商家
+export function updateMerchants(data) {
+  return request({
+    url: '/system/merchants',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除入驻商家
+export function delMerchants(businessId) {
+  return request({
+    url: '/system/merchants/' + businessId,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/api/system/merchants.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询入驻商家列表
+export function listMerchants(query) {
+  return request({
+    url: '/system/merchants/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询入驻商家详细
+export function getMerchants(businessId) {
+  return request({
+    url: '/system/merchants/' + businessId,
+    method: 'get'
+  })
+}
+
+// 新增入驻商家
+export function addMerchants(data) {
+  return request({
+    url: '/system/merchants',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改入驻商家
+export function updateMerchants(data) {
+  return request({
+    url: '/system/merchants',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除入驻商家
+export function delMerchants(businessId) {
+  return request({
+    url: '/system/merchants/' + businessId,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/components/ImageUpload/index.vue

@@ -19,7 +19,7 @@
     >
       <i class="el-icon-plus"></i>
     </el-upload>
-    
+
     <!-- 上传提示 -->
     <div class="el-upload__tip" slot="tip" v-if="showTip">
       请上传
@@ -94,11 +94,12 @@ export default {
           this.fileList = list.map(item => {
             if (typeof item === "string") {
               if (item.indexOf(this.baseUrl) === -1) {
-                  item = { name: this.baseUrl + item, url: this.baseUrl + item };
+                  item = { name:item, url:item };
               } else {
                   item = { name: item, url: item };
               }
             }
+            console.log(item,24)
             return item;
           });
         } else {
@@ -127,11 +128,12 @@ export default {
     },
     // 上传成功回调
     handleUploadSuccess(res) {
-      this.uploadList.push({ name: res.fileName, url: res.fileName });
+      this.uploadList.push({ name: res.originalFilename, url: res.url });
       if (this.uploadList.length === this.number) {
         this.fileList = this.fileList.concat(this.uploadList);
         this.uploadList = [];
         this.number = 0;
+        console.log(this.fileList)
         this.$emit("input", this.listToString(this.fileList));
         this.$modal.closeLoading();
       }
@@ -186,8 +188,9 @@ export default {
       let strs = "";
       separator = separator || ",";
       for (let i in list) {
-        strs += list[i].url.replace(this.baseUrl, "") + separator;
+        strs += list[i].url + separator;
       }
+      console.log(strs,25)
       return strs != '' ? strs.substr(0, strs.length - 1) : '';
     }
   }
@@ -209,4 +212,3 @@ export default {
     transform: translateY(0);
 }
 </style>
-

ruoyi-ui/src/layout/components/Navbar.vue

@@ -7,21 +7,21 @@
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
-        <search id="header-search" class="right-menu-item" />
+        <!-- <search id="header-search" class="right-menu-item" /> -->
         
-        <el-tooltip content="源码地址" effect="dark" placement="bottom">
+        <!-- <el-tooltip content="源码地址" effect="dark" placement="bottom">
           <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
-        </el-tooltip>
+        </el-tooltip> -->
 
-        <el-tooltip content="文档地址" effect="dark" placement="bottom">
+        <!-- <el-tooltip content="文档地址" effect="dark" placement="bottom">
           <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip>
+        </el-tooltip> -->
 
-        <screenfull id="screenfull" class="right-menu-item hover-effect" />
+        <!-- <screenfull id="screenfull" class="right-menu-item hover-effect" /> -->
 
-        <el-tooltip content="布局大小" effect="dark" placement="bottom">
+       <!-- <el-tooltip content="布局大小" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
-        </el-tooltip>
+        </el-tooltip> -->
 
       </template>
 

ruoyi-ui/src/layout/components/Sidebar/Logo.vue

@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: '若依管理系统',
+      title: '信用平台',
       logo: logoImg
     }
   }

ruoyi-ui/src/views/index.vue

@@ -1,874 +1,98 @@
 <template>
-  <div class="app-container home">
-    <el-row :gutter="20">
-      <el-col :sm="24" :lg="24">
-        <blockquote class="text-warning" style="font-size: 14px">
-          领取阿里云通用云产品1888优惠券
-          <br />
-          <el-link
-            href="https://www.aliyun.com/minisite/goods?userCode=brki8iof"
-            type="primary"
-            target="_blank"
-            >https://www.aliyun.com/minisite/goods?userCode=brki8iof</el-link
-          >
-          <br />
-          领取腾讯云通用云产品2860优惠券
-          <br />
-          <el-link
-            href="https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console"
-            type="primary"
-            target="_blank"
-            >https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console</el-link
-          >
-          <br />
-          阿里云服务器折扣区
-          <el-link href="http://aly.ruoyi.vip" type="primary" target="_blank"
-            >>☛☛点我进入☚☚</el-link
-          >
-          &nbsp;&nbsp;&nbsp; 腾讯云服务器秒杀区
-          <el-link href="http://txy.ruoyi.vip" type="primary" target="_blank"
-            >>☛☛点我进入☚☚</el-link
-          ><br />
-          <h4 class="text-danger">
-            云产品通用红包，可叠加官网常规优惠使用。(仅限新用户)
-          </h4>
-        </blockquote>
+  <div class="dashboard-editor-container">
 
-        <hr />
-      </el-col>
-    </el-row>
-    <el-row :gutter="20">
-      <el-col :sm="24" :lg="12" style="padding-left: 20px">
-        <h2>若依后台管理框架</h2>
-        <p>
-          一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了若依管理系统，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。
-        </p>
-        <p>
-          <b>当前版本:</b> <span>v{{ version }}</span>
-        </p>
-        <p>
-          <el-tag type="danger">&yen;免费开源</el-tag>
-        </p>
-        <p>
-          <el-button
-            type="primary"
-            size="mini"
-            icon="el-icon-cloudy"
-            plain
-            @click="goTarget('https://gitee.com/y_project/RuoYi-Vue')"
-            >访问码云</el-button
-          >
-          <el-button
-            size="mini"
-            icon="el-icon-s-home"
-            plain
-            @click="goTarget('http://ruoyi.vip')"
-            >访问主页</el-button
-          >
-        </p>
-      </el-col>
+    <!-- <panel-group @handleSetLineChartData="handleSetLineChartData" /> -->
 
-      <el-col :sm="24" :lg="12" style="padding-left: 50px">
-        <el-row>
-          <el-col :span="12">
-            <h2>技术选型</h2>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="6">
-            <h4>后端技术</h4>
-            <ul>
-              <li>SpringBoot</li>
-              <li>Spring Security</li>
-              <li>JWT</li>
-              <li>MyBatis</li>
-              <li>Druid</li>
-              <li>Fastjson</li>
-              <li>...</li>
-            </ul>
-          </el-col>
-          <el-col :span="6">
-            <h4>前端技术</h4>
-            <ul>
-              <li>Vue</li>
-              <li>Vuex</li>
-              <li>Element-ui</li>
-              <li>Axios</li>
-              <li>Sass</li>
-              <li>Quill</li>
-              <li>...</li>
-            </ul>
-          </el-col>
-        </el-row>
-      </el-col>
+    <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
+      <line-chart :chart-data="lineChartData" />
     </el-row>
-    <el-divider />
-    <el-row :gutter="20">
-      <el-col :xs="24" :sm="24" :md="12" :lg="8">
-        <el-card class="update-log">
-          <div slot="header" class="clearfix">
-            <span>联系信息</span>
-          </div>
-          <div class="body">
-            <p>
-              <i class="el-icon-s-promotion"></i> 官网：<el-link
-                href="http://www.ruoyi.vip"
-                target="_blank"
-                >http://www.ruoyi.vip</el-link
-              >
-            </p>
-            <p>
-              <i class="el-icon-user-solid"></i> QQ群：<s>满937441</s>
-              <s>满887144332</s> <s>满180251782</s> <s>满104180207</s> <s>满186866453</s>
-              <s>满201396349</s> <s>满101456076</s> <s>满101539465</s> <s>满264312783</s>
-              <a href="https://jq.qq.com/?_wv=1027&k=SWCtLnMz" target="_blank">
-                167385320</a
-              >
-            </p>
-            <p>
-              <i class="el-icon-chat-dot-round"></i> 微信：<a
-                href="javascript:;"
-                >/ *若依</a
-              >
-            </p>
-            <p>
-              <i class="el-icon-money"></i> 支付宝：<a
-                href="javascript:;"
-                class="支付宝信息"
-                >/ *若依</a
-              >
-            </p>
-          </div>
-        </el-card>
-      </el-col>
-      <el-col :xs="24" :sm="24" :md="12" :lg="8">
-        <el-card class="update-log">
-          <div slot="header" class="clearfix">
-            <span>更新日志</span>
-          </div>
-          <el-collapse accordion>
-            <el-collapse-item title="v3.8.2 - 2022-04-01">
-              <ol>
-                <li>前端支持设置是否需要防止数据重复提交</li>
-                <li>开启TopNav没有子菜单情况隐藏侧边栏</li>
-                <li>侧边栏菜单名称过长悬停显示标题</li>
-                <li>用户访问控制时校验数据权限，防止越权</li>
-                <li>导出Excel时屏蔽公式，防止CSV注入风险</li>
-                <li>组件ImagePreview支持多图预览显示</li>
-                <li>组件ImageUpload支持多图同时选择上传</li>
-                <li>组件FileUpload支持多文件同时选择上传</li>
-                <li>服务监控新增运行参数信息显示</li>
-                <li>定时任务目标字符串过滤特殊字符</li>
-                <li>定时任务目标字符串验证包名白名单</li>
-                <li>代码生成列表图片支持预览</li>
-                <li>代码生成编辑修改打开新页签</li>
-                <li>代码生成新增Java类型Boolean</li>
-                <li>代码生成子表支持日期/字典配置</li>
-                <li>代码生成同步保留必填/类型选项</li>
-                <li>升级oshi到最新版本6.1.2</li>
-                <li>升级fastjson到最新版1.2.80</li>
-                <li>升级pagehelper到最新版1.4.1</li>
-                <li>升级spring-boot到最新版本2.5.11</li>
-                <li>升级spring-boot-mybatis到最新版2.2.2</li>
-                <li>添加遗漏的分页参数合理化属性</li>
-                <li>修改npm即将过期的注册源地址</li>
-                <li>修复分页组件请求两次问题</li>
-                <li>修复通用文件下载接口跨域问题</li>
-                <li>修复Xss注解字段值为空时的异常问题</li>
-                <li>修复选项卡点击右键刷新丢失参数问题</li>
-                <li>修复表单清除元素位置未垂直居中问题</li>
-                <li>修复服务监控中运行参数显示条件错误</li>
-                <li>修复导入Excel时字典字段类型为Long转义为空问题</li>
-                <li>修复登录超时刷新页面跳转登录页面还提示重新登录问题</li>
-                <li>优化加载字典缓存数据</li>
-                <li>优化IP地址获取到多个的问题</li>
-                <li>优化任务队列满时任务拒绝策略</li>
-                <li>优化文件上传兼容Weblogic环境</li>
-                <li>优化定时任务默认保存到内存中执行</li>
-                <li>优化部门修改缩放后出现的错位问题</li>
-                <li>优化Excel格式化不同类型的日期对象</li>
-                <li>优化菜单表关键字导致的插件报错问题</li>
-                <li>优化Oracle用户头像列为空时不显示问题</li>
-                <li>优化页面若未匹配到字典标签则返回原字典值</li>
-                <li>优化修复登录失效后多次请求提示多次弹窗问题</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.1 - 2022-01-01">
-              <ol>
-                <li>新增Vue3前端代码生成模板</li>
-                <li>新增图片预览组件</li>
-                <li>新增压缩插件实现打包Gzip</li>
-                <li>自定义xss校验注解实现</li>
-                <li>自定义文字复制剪贴指令</li>
-                <li>代码生成预览支持复制内容</li>
-                <li>路由支持单独配置菜单或角色权限</li>
-                <li>用户管理部门查询选择节点后分页参数初始</li>
-                <li>修复用户分配角色属性错误</li>
-                <li>修复打包后字体图标偶现的乱码问题</li>
-                <li>修复菜单管理重置表单出现的错误</li>
-                <li>修复版本差异导致的懒加载报错问题</li>
-                <li>修复Cron组件中周回显问题</li>
-                <li>修复定时任务多参数逗号分隔的问题</li>
-                <li>修复根据ID查询列表可能出现的主键溢出问题</li>
-                <li>修复tomcat配置参数已过期问题</li>
-                <li>升级clipboard到最新版本2.0.8</li>
-                <li>升级oshi到最新版本v5.8.6</li>
-                <li>升级fastjson到最新版1.2.79</li>
-                <li>升级spring-boot到最新版本2.5.8</li>
-                <li>升级log4j2到2.17.1，防止漏洞风险</li>
-                <li>优化下载解析blob异常提示</li>
-                <li>优化代码生成字典组重复问题</li>
-                <li>优化查询用户的角色组&岗位组代码</li>
-                <li>优化定时任务cron表达式小时设置24</li>
-                <li>优化用户导入提示溢出则显示滚动条</li>
-                <li>优化防重复提交标识组合为(key+url+header)</li>
-                <li>优化分页方法设置成通用方便灵活调用</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.0 - 2021-12-01">
-              <ol>
-                <li>新增配套并同步的Vue3前端版本</li>
-                <li>新增通用方法简化模态/缓存/下载/权限/页签使用</li>
-                <li>优化导出数据/使用通用下载方法</li>
-                <li>Excel注解支持自定义数据处理器</li>
-                <li>Excel注解支持导入导出标题信息</li>
-                <li>Excel导入支持@Excels注解</li>
-                <li>新增组件data-dict，简化数据字典使用</li>
-                <li>新增Jaxb依赖，防止jdk8以上出现的兼容错误</li>
-                <li>生产环境使用路由懒加载提升页面响应速度</li>
-                <li>修复五级以上菜单出现的404问题</li>
-                <li>防重提交注解支持配置间隔时间/提示消息</li>
-                <li>日志注解新增是否保存响应参数</li>
-                <li>任务屏蔽违规字符&参数忽略双引号中的逗号</li>
-                <li>升级SpringBoot到最新版本2.5.6</li>
-                <li>升级pagehelper到最新版1.4.0</li>
-                <li>升级spring-boot-mybatis到最新版2.2.0</li>
-                <li>升级oshi到最新版本v5.8.2</li>
-                <li>升级druid到最新版1.2.8</li>
-                <li>升级velocity到最新版本2.3</li>
-                <li>升级fastjson到最新版1.2.78</li>
-                <li>升级axios到最新版本0.24.0</li>
-                <li>升级dart-sass到版本1.32.13</li>
-                <li>升级core-js到最新版本3.19.1</li>
-                <li>升级jsencrypt到最新版本3.2.1</li>
-                <li>升级js-cookie到最新版本3.0.1</li>
-                <li>升级file-saver到最新版本2.0.5</li>
-                <li>升级sass-loader到最新版本10.1.1</li>
-                <li>升级element-ui到最新版本2.15.6</li>
-                <li>新增sendGet无参请求方法</li>
-                <li>禁用el-tag组件的渐变动画</li>
-                <li>代码生成点击预览重置激活tab</li>
-                <li>AjaxResult重写put方法，以方便链式调用</li>
-                <li>优化登录/验证码请求headers不设置token</li>
-                <li>优化用户个人信息接口防止修改用户名</li>
-                <li>优化Cron表达式生成器关闭时销毁避免缓存</li>
-                <li>优化注册成功提示消息类型success</li>
-                <li>优化aop语法，使用spring自动注入注解</li>
-                <li>优化记录登录信息，移除不必要的修改</li>
-                <li>优化mybatis全局默认的执行器</li>
-                <li>优化Excel导入图片可能出现的异常</li>
-                <li>修复代码生成模板主子表删除缺少事务</li>
-                <li>修复日志记录可能出现的转换异常</li>
-                <li>修复代码生成复选框字典遗漏问题</li>
-                <li>修复关闭xss功能导致可重复读RepeatableFilter失效</li>
-                <li>修复字符串无法被反转义问题</li>
-                <li>修复后端主子表代码模板方法名生成错误问题</li>
-                <li>修复xss过滤后格式出现的异常</li>
-                <li>修复swagger没有指定dataTypeClass导致启动出现warn日志</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.7.0 - 2021-09-13">
-              <ol>
-                <li>参数管理支持配置验证码开关</li>
-                <li>新增是否开启用户注册功能</li>
-                <li>定时任务支持在线生成cron表达式</li>
-                <li>菜单管理支持配置路由参数</li>
-                <li>支持自定义注解实现接口限流</li>
-                <li>Excel注解支持Image图片导入</li>
-                <li>自定义弹层溢出滚动样式</li>
-                <li>自定义可拖动弹窗宽度指令</li>
-                <li>自定义可拖动弹窗高度指令</li>
-                <li>修复任意账户越权问题</li>
-                <li>修改时检查用户数据权限范围</li>
-                <li>修复保存配置主题颜色失效问题</li>
-                <li>新增暗色菜单风格主题</li>
-                <li>菜单&部门新增展开/折叠功能</li>
-                <li>页签新增关闭左侧&添加图标</li>
-                <li>顶部菜单排除隐藏的默认路由</li>
-                <li>顶部菜单同步系统主题样式</li>
-                <li>跳转路由高亮相对应的菜单栏</li>
-                <li>代码生成主子表多选行数据</li>
-                <li>日期范围支持添加多组</li>
-                <li>升级element-ui到最新版本2.15.5</li>
-                <li>升级oshi到最新版本v5.8.0</li>
-                <li>升级commons.io到最新版本v2.11.0</li>
-                <li>定时任务屏蔽ldap远程调用</li>
-                <li>定时任务屏蔽http(s)远程调用</li>
-                <li>补充定时任务表字段注释</li>
-                <li>定时任务对检查异常进行事务回滚</li>
-                <li>启用父部门状态排除顶级节点</li>
-                <li>富文本新增上传文件大小限制</li>
-                <li>默认首页使用keep-alive缓存</li>
-                <li>修改代码生成字典回显样式</li>
-                <li>自定义分页合理化传入参数</li>
-                <li>修复字典组件值为整形不显示问题</li>
-                <li>修复定时任务日志执行状态显示</li>
-                <li>角色&菜单新增字段属性提示信息</li>
-                <li>修复角色分配用户页面参数类型错误提醒</li>
-                <li>优化布局设置动画特效</li>
-                <li>优化异常处理信息</li>
-                <li>优化错误token导致的解析异常</li>
-                <li>密码框新增显示切换密码图标</li>
-                <li>定时任务新增更多操作</li>
-                <li>更多操作按钮添加权限控制</li>
-                <li>导入用户样式优化</li>
-                <li>提取通用方法到基类控制器</li>
-                <li>优化使用权限工具获取用户信息</li>
-                <li>优化用户不能删除自己</li>
-                <li>优化XSS跨站脚本过滤</li>
-                <li>优化代码生成模板</li>
-                <li>验证码默认20s超时</li>
-                <li>BLOB下载时清除URL对象引用</li>
-                <li>代码生成导入表按创建时间排序</li>
-                <li>修复代码生成页面数据编辑保存之后总是跳转第一页的问题</li>
-                <li>修复带safari浏览器无法格式化utc日期格式yyyy-MM-dd'T'HH:mm:ss.SSS问题</li>
-                <li>多图上传组件移除多余的api地址&验证失败导致图片删除问题&无法删除相应图片修复</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.6.0 - 2021-07-12">
-              <ol>
-                <li>角色管理新增分配用户功能</li>
-                <li>用户管理新增分配角色功能</li>
-                <li>日志列表支持排序操作</li>
-                <li>优化参数&字典缓存操作</li>
-                <li>系统布局配置支持动态标题开关</li>
-                <li>菜单路由配置支持内链访问</li>
-                <li>默认访问后端首页新增提示语</li>
-                <li>富文本默认上传返回url类型</li>
-                <li>新增自定义弹窗拖拽指令</li>
-                <li>全局注册常用通用组件</li>
-                <li>全局挂载字典标签组件</li>
-                <li>ImageUpload组件支持多图片上传</li>
-                <li>FileUpload组件支持多文件上传</li>
-                <li>文件上传组件添加数量限制属性</li>
-                <li>富文本编辑组件添加类型属性</li>
-                <li>富文本组件工具栏配置视频</li>
-                <li>封装通用iframe组件</li>
-                <li>限制超级管理员不允许操作</li>
-                <li>用户信息长度校验限制</li>
-                <li>分页组件新增pagerCount属性</li>
-                <li>添加bat脚本执行应用</li>
-                <li>升级oshi到最新版本v5.7.4</li>
-                <li>升级element-ui到最新版本2.15.2</li>
-                <li>升级pagehelper到最新版1.3.1</li>
-                <li>升级commons.io到最新版本v2.10.0</li>
-                <li>升级commons.fileupload到最新版本v1.4</li>
-                <li>升级swagger到最新版本v3.0.0</li>
-                <li>修复关闭confirm提示框控制台报错问题</li>
-                <li>修复存在的SQL注入漏洞问题</li>
-                <li>定时任务屏蔽rmi远程调用</li>
-                <li>修复用户搜索分页变量错误</li>
-                <li>修复导出角色数据范围翻译缺少仅本人</li>
-                <li>修复表单构建选择下拉选择控制台报错问题</li>
-                <li>优化图片工具类读取文件</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.5.0 - 2021-05-25">
-              <ol>
-                <li>新增菜单导航显示风格TopNav（false为左侧导航菜单，true为顶部导航菜单）</li>
-                <li>布局设置支持保存&重置配置</li>
-                <li>修复树表数据显示不全&加载慢问题</li>
-                <li>新增IE浏览器版本过低提示页面</li>
-                <li>用户登录后记录最后登录IP&时间</li>
-                <li>页面导出按钮点击之后添加遮罩</li>
-                <li>富文本编辑器支持自定义上传地址</li>
-                <li>富文本编辑组件新增readOnly属性</li>
-                <li>页签TagsView新增关闭右侧功能</li>
-                <li>显隐列组件加载初始默认隐藏列</li>
-                <li>关闭头像上传窗口还原默认图片</li>
-                <li>个人信息添加手机&邮箱重复验证</li>
-                <li>代码生成模板导出按钮点击后添加遮罩</li>
-                <li>代码生成模板树表操作列添加新增按钮</li>
-                <li>代码生成模板修复主子表字段重名问题</li>
-                <li>升级fastjson到最新版1.2.76</li>
-                <li>升级druid到最新版本v1.2.6</li>
-                <li>升级mybatis到最新版3.5.6 阻止远程代码执行漏洞</li>
-                <li>升级oshi到最新版本v5.6.0</li>
-                <li>velocity剔除commons-collections版本，防止3.2.1版本的反序列化漏洞</li>
-                <li>数据监控页默认账户密码防止越权访问</li>
-                <li>修复firefox下表单构建拖拽会新打卡一个选项卡</li>
-                <li>修正后端导入表权限标识</li>
-                <li>修正前端操作日志&登录日志权限标识</li>
-                <li>设置Redis配置HashKey序列化</li>
-                <li>删除操作日志记录信息</li>
-                <li>上传媒体类型添加视频格式</li>
-                <li>修复请求形参未传值记录日志异常问题</li>
-                <li>优化xss校验json请求条件</li>
-                <li>树级结构更新子节点使用replaceFirst</li>
-                <li>优化ExcelUtil空值处理</li>
-                <li>日志记录过滤BindingResult对象，防止异常</li>
-                <li>修改主题后mini类型按钮无效问题</li>
-                <li>优化通用下载完成后删除节点</li>
-                <li>通用Controller添加响应返回消息</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.4.0 - 2021-02-22">
-              <ol>
-                <li>代码生成模板支持主子表</li>
-                <li>表格右侧工具栏组件支持显隐列</li>
-                <li>图片组件添加预览&移除功能</li>
-                <li>Excel注解支持Image图片导出</li>
-                <li>操作按钮组调整为朴素按钮样式</li>
-                <li>代码生成支持文件上传组件</li>
-                <li>代码生成日期控件区分范围</li>
-                <li>代码生成数据库文本类型生成表单文本域</li>
-                <li>用户手机邮箱&菜单组件修改允许空字符串</li>
-                <li>升级SpringBoot到最新版本2.2.13 提升启动速度</li>
-                <li>升级druid到最新版本v1.2.4</li>
-                <li>升级fastjson到最新版1.2.75</li>
-                <li>升级element-ui到最新版本2.15.0</li>
-                <li>修复IE11浏览器报错问题</li>
-                <li>优化多级菜单之间切换无法缓存的问题</li>
-                <li>修复四级菜单无法显示问题</li>
-                <li>修正侧边栏静态路由丢失问题</li>
-                <li>修复角色管理-编辑角色-功能权限显示异常</li>
-                <li>配置文件新增redis数据库索引属性</li>
-                <li>权限工具类增加admin判断</li>
-                <li>角色非自定义权限范围清空选择值</li>
-                <li>修复导入数据为负浮点数时丢失精度问题</li>
-                <li>移除path-to-regexp正则匹配插件</li>
-                <li>修复生成树表代码异常</li>
-                <li>修改ip字段长度防止ipv6地址长度不够</li>
-                <li>防止get请求参数值为false或0等特殊值会导致无法正确的传参</li>
-                <li>登录后push添加catch防止出现检查错误</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.3.0 - 2020-12-14">
-              <ol>
-                <li>新增缓存监控功能</li>
-                <li>支持主题风格配置</li>
-                <li>修复多级菜单之间切换无法缓存的问题</li>
-                <li>多级菜单自动配置组件</li>
-                <li>代码生成预览支持高亮显示</li>
-                <li>支持Get请求映射Params参数</li>
-                <li>删除用户和角色解绑关联</li>
-                <li>去除用户手机邮箱部门必填验证</li>
-                <li>Excel支持注解align对齐方式</li>
-                <li>Excel支持导入Boolean型数据</li>
-                <li>优化头像样式，鼠标移入悬停遮罩</li>
-                <li>代码生成预览提供滚动机制</li>
-                <li>代码生成删除多余的数字float类型</li>
-                <li>修正转换字符串的目标字符集属性</li>
-                <li>回显数据字典防止空值报错</li>
-                <li>日志记录增加过滤多文件场景</li>
-                <li>修改缓存Set方法可能导致嵌套的问题</li>
-                <li>移除前端一些多余的依赖</li>
-                <li>防止安全扫描YUI出现的风险提示</li>
-                <li>修改node-sass为dart-sass</li>
-                <li>升级SpringBoot到最新版本2.1.18</li>
-                <li>升级poi到最新版本4.1.2</li>
-                <li>升级oshi到最新版本v5.3.6</li>
-                <li>升级bitwalker到最新版本1.21</li>
-                <li>升级axios到最新版本0.21.0</li>
-                <li>升级element-ui到最新版本2.14.1</li>
-                <li>升级vue到最新版本2.6.12</li>
-                <li>升级vuex到最新版本3.6.0</li>
-                <li>升级vue-cli到版本4.5.9</li>
-                <li>升级vue-router到最新版本3.4.9</li>
-                <li>升级vue-cli到最新版本4.4.6</li>
-                <li>升级vue-cropper到最新版本0.5.5</li>
-                <li>升级clipboard到最新版本2.0.6</li>
-                <li>升级core-js到最新版本3.8.1</li>
-                <li>升级echarts到最新版本4.9.0</li>
-                <li>升级file-saver到最新版本2.0.4</li>
-                <li>升级fuse.js到最新版本6.4.3</li>
-                <li>升级js-beautify到最新版本1.13.0</li>
-                <li>升级js-cookie到最新版本2.2.1</li>
-                <li>升级path-to-regexp到最新版本6.2.0</li>
-                <li>升级quill到最新版本1.3.7</li>
-                <li>升级screenfull到最新版本5.0.2</li>
-                <li>升级sortablejs到最新版本1.10.2</li>
-                <li>升级vuedraggable到最新版本2.24.3</li>
-                <li>升级chalk到最新版本4.1.0</li>
-                <li>升级eslint到最新版本7.15.0</li>
-                <li>升级eslint-plugin-vue到最新版本7.2.0</li>
-                <li>升级lint-staged到最新版本10.5.3</li>
-                <li>升级runjs到最新版本4.4.2</li>
-                <li>升级sass-loader到最新版本10.1.0</li>
-                <li>升级script-ext-html-webpack-plugin到最新版本2.1.5</li>
-                <li>升级svg-sprite-loader到最新版本5.1.1</li>
-                <li>升级vue-template-compiler到最新版本2.6.12</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.2.1 - 2020-11-18">
-              <ol>
-                <li>阻止任意文件下载漏洞</li>
-                <li>代码生成支持上传控件</li>
-                <li>新增图片上传组件</li>
-                <li>调整默认首页</li>
-                <li>升级druid到最新版本v1.2.2</li>
-                <li>mapperLocations配置支持分隔符</li>
-                <li>权限信息调整</li>
-                <li>调整sql默认时间</li>
-                <li>解决代码生成没有bit类型的问题</li>
-                <li>升级pagehelper到最新版1.3.0</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.2.0 - 2020-10-10">
-              <ol>
-                <li>升级springboot版本到2.1.17 提升安全性</li>
-                <li>升级oshi到最新版本v5.2.5</li>
-                <li>升级druid到最新版本v1.2.1</li>
-                <li>升级jjwt到版本0.9.1</li>
-                <li>升级fastjson到最新版1.2.74</li>
-                <li>修改sass为node-sass，避免el-icon图标乱码</li>
-                <li>代码生成支持同步数据库</li>
-                <li>代码生成支持富文本控件</li>
-                <li>代码生成页面时不忽略remark属性</li>
-                <li>代码生成添加select必填选项</li>
-                <li>Excel导出类型NUMERIC支持精度浮点类型</li>
-                <li>Excel导出targetAttr优化获取值，防止get方法不规范</li>
-                <li>Excel注解支持自动统计数据总和</li>
-                <li>Excel注解支持设置BigDecimal精度&舍入规则</li>
-                <li>菜单&数据权限新增（展开/折叠 全选/全不选 父子联动）</li>
-                <li>允许用户分配到部门父节点</li>
-                <li>菜单新增是否缓存keep-alive</li>
-                <li>表格操作列间距调整</li>
-                <li>限制系统内置参数不允许删除</li>
-                <li>富文本组件优化，支持自定义高度&图片冲突问题</li>
-                <li>富文本工具栏样式对齐</li>
-                <li>导入excel整形值校验优化</li>
-                <li>修复页签关闭所有时固定标签路由不刷新问题</li>
-                <li>表单构建布局型组件新增按钮</li>
-                <li>左侧菜单文字过长显示省略号</li>
-                <li>修正根节点为子部门时，树状结构显示问题</li>
-                <li>修正调用目标字符串最大长度</li>
-                <li>修正菜单提示信息错误</li>
-                <li>修正定时任务执行一次权限标识</li>
-                <li>修正数据库字符串类型nvarchar</li>
-                <li>优化递归子节点</li>
-                <li>优化数据权限判断</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v3.1.0 - 2020-08-13">
-              <ol>
-                <li>表格工具栏右侧添加刷新&显隐查询组件</li>
-                <li>后端支持CORS跨域请求</li>
-                <li>代码生成支持选择上级菜单</li>
-                <li>代码生成支持自定义路径</li>
-                <li>代码生成支持复选框</li>
-                <li>Excel导出导入支持dictType字典类型</li>
-                <li>Excel支持分割字符串组内容</li>
-                <li>验证码类型支持（数组计算、字符验证）</li>
-                <li>升级vue-cli版本到4.4.4</li>
-                <li>修改 node-sass 为 dart-sass</li>
-                <li>表单类型为Integer/Long设置整形默认值</li>
-                <li>代码生成器默认mapper路径与默认mapperScan路径不一致</li>
-                <li>优化防重复提交拦截器</li>
-                <li>优化上级菜单不能选择自己</li>
-                <li>修复角色的权限分配后，未实时生效问题</li>
-                <li>修复在线用户日志记录类型</li>
-                <li>修复富文本空格和缩进保存后不生效问题</li>
-                <li>修复在线用户判断逻辑</li>
-                <li>唯一限制条件只返回单条数据</li>
-                <li>添加获取当前的环境配置方法</li>
-                <li>超时登录后页面跳转到首页</li>
-                <li>全局异常状态汉化拦截处理</li>
-                <li>HTML过滤器改为将html转义</li>
-                <li>检查字符支持小数点&降级改成异常提醒</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
 
-            <el-collapse-item title="v3.0.0 - 2020-07-20">
-              <ol>
-                <li>单应用调整为多模块项目</li>
-                <li>升级element-ui版本到2.13.2</li>
-                <li>删除babel，提高编译速度。</li>
-                <li>新增菜单默认主类目</li>
-                <li>编码文件名修改为uuid方式</li>
-                <li>定时任务cron表达式验证</li>
-                <li>角色权限修改时已有权限未自动勾选异常修复</li>
-                <li>防止切换权限用户后登录出现404</li>
-                <li>Excel支持sort导出排序</li>
-                <li>创建用户不允许选择超级管理员角色</li>
-                <li>修复代码生成导入表结构出现异常页面不提醒问题</li>
-                <li>修复代码生成点击多次表修改数据不变化的问题</li>
-                <li>修复头像上传成功二次打开无法改变裁剪框大小和位置问题</li>
-                <li>修复布局为small者mini用户表单显示错位问题</li>
-                <li>修复热部署导致的强换异常问题</li>
-                <li>修改用户管理复选框宽度，防止部分浏览器出现省略号</li>
-                <li>IpUtils工具，清除Xss特殊字符，防止Xff注入攻击</li>
-                <li>生成domain 如果是浮点型 统一用BigDecimal</li>
-                <li>定时任务调整label-width，防止部署出现错位</li>
-                <li>调整表头固定列默认样式</li>
-                <li>代码生成模板调整，字段为String并且必填则加空串条件</li>
-                <li>代码生成字典Integer/Long使用parseInt</li>
-                <li>
-                  修复dict_sort不可update为0的问题&查询返回增加dict_sort升序排序
-                </li>
-                <li>修正岗位导出权限注解</li>
-                <li>禁止加密密文返回前端</li>
-                <li>修复代码生成页面中的查询条件创建时间未生效的问题</li>
-                <li>修复首页搜索菜单外链无法点击跳转问题</li>
-                <li>修复菜单管理选择图标，backspace删除时不过滤数据</li>
-                <li>用户管理部门分支节点不可检查&显示计数</li>
-                <li>数据范围过滤属性调整</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.3.0 - 2020-06-01">
-              <ol>
-                <li>升级fastjson到最新版1.2.70 修复高危安全漏洞</li>
-                <li>dev启动默认打开浏览器</li>
-                <li>vue-cli使用默认source-map</li>
-                <li>slidebar eslint报错优化</li>
-                <li>当tags-view滚动关闭右键菜单</li>
-                <li>字典管理添加缓存读取</li>
-                <li>参数管理支持缓存操作</li>
-                <li>支持一级菜单（和主页同级）在main区域显示</li>
-                <li>限制外链地址必须以http(s)开头</li>
-                <li>tagview & sidebar 主题颜色与element ui(全局)同步</li>
-                <li>修改数据源类型优先级，先根据方法，再根据类</li>
-                <li>支持是否需要设置token属性，自定义返回码消息。</li>
-                <li>swagger请求前缀加入配置。</li>
-                <li>登录地点设置内容过长则隐藏显示</li>
-                <li>修复定时任务执行一次按钮后不提示消息问题</li>
-                <li>修改上级部门（选择项排除本身和下级）</li>
-                <li>通用http发送方法增加参数 contentType 编码类型</li>
-                <li>更换IP地址查询接口</li>
-                <li>修复页签变量undefined</li>
-                <li>添加校验部门包含未停用的子部门</li>
-                <li>修改定时任务详情下次执行时间日期显示错误</li>
-                <li>角色管理查询设置默认排序字段</li>
-                <li>swagger添加enable参数控制是否启用</li>
-                <li>只对json类型请求构建可重复读取inputStream的request</li>
-                <li>修改代码生成字典字段int类型没有自动选中问题</li>
-                <li>vuex用户名取值修正</li>
-                <li>表格树模板去掉多余的)</li>
-                <li>代码生成序号修正</li>
-                <li>全屏情况下不调整上外边距</li>
-                <li>代码生成Date字段添加默认格式</li>
-                <li>用户管理角色选择权限控制</li>
-                <li>修复路由懒加载报错问题</li>
-                <li>模板sql.vm添加菜单状态</li>
-                <li>设置用户名称不能修改</li>
-                <li>dialog添加append-to-body属性，防止ie遮罩</li>
-                <li>菜单区分状态和显示隐藏功能</li>
-                <li>升级fastjson到最新版1.2.68 修复安全加固</li>
-                <li>修复代码生成如果选择字典类型缺失逗号问题</li>
-                <li>登录请求params更换为data，防止暴露url</li>
-                <li>日志返回时间格式处理</li>
-                <li>添加handle控制允许拖动的元素</li>
-                <li>布局设置点击扩大范围</li>
-                <li>代码生成列属性排序查询</li>
-                <li>代码生成列支持拖动排序</li>
-                <li>修复时间格式不支持ios问题</li>
-                <li>表单构建添加父级class，防止冲突</li>
-                <li>定时任务并发属性修正</li>
-                <li>角色禁用&菜单隐藏不查询权限</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.2.0 - 2020-03-18">
-              <ol>
-                <li>系统监控新增定时任务功能</li>
-                <li>添加一个打包Web工程bat</li>
-                <li>修复页签鼠标滚轮按下的时候，可以关闭不可关闭的tag</li>
-                <li>修复点击退出登录有时会无提示问题</li>
-                <li>修复防重复提交注解无效问题</li>
-                <li>修复通知公告批量删除异常问题</li>
-                <li>添加菜单时路由地址必填限制</li>
-                <li>代码生成字段描述可编辑</li>
-                <li>修复用户修改个人信息导致缓存不过期问题</li>
-                <li>个人信息创建时间获取正确属性值</li>
-                <li>操作日志详细显示正确类型</li>
-                <li>导入表单击行数据时选中对应的复选框</li>
-                <li>批量替换表前缀逻辑调整</li>
-                <li>固定重定向路径表达式</li>
-                <li>升级element-ui版本到2.13.0</li>
-                <li>操作日志排序调整</li>
-                <li>修复charts切换侧边栏或者缩放窗口显示bug</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.1.0 - 2020-02-24">
-              <ol>
-                <li>新增表单构建</li>
-                <li>代码生成支持树表结构</li>
-                <li>新增用户导入</li>
-                <li>修复动态加载路由页面刷新问题</li>
-                <li>修复地址开关无效问题</li>
-                <li>汉化错误提示页面</li>
-                <li>代码生成已知问题修改</li>
-                <li>修复多数据源下配置关闭出现异常处理</li>
-                <li>添加HTML过滤器，用于去除XSS漏洞隐患</li>
-                <li>修复上传头像控制台出现异常</li>
-                <li>修改用户管理分页不正确的问题</li>
-                <li>修复验证码记录提示错误</li>
-                <li>修复request.js缺少Message引用</li>
-                <li>修复表格时间为空出现的异常</li>
-                <li>添加Jackson日期反序列化时区配置</li>
-                <li>调整根据用户权限加载菜单数据树形结构</li>
-                <li>调整成功登录不恢复按钮，防止多次点击</li>
-                <li>修改用户个人资料同步缓存信息</li>
-                <li>修复页面同时出现el-upload和Editor不显示处理</li>
-                <li>修复在角色管理页修改菜单权限偶尔未选中问题</li>
-                <li>配置文件新增redis密码属性</li>
-                <li>设置mybatis全局的配置文件</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.0.0 - 2019-12-02">
-              <ol>
-                <li>新增代码生成</li>
-                <li>新增@RepeatSubmit注解，防止重复提交</li>
-                <li>新增菜单主目录添加/删除操作</li>
-                <li>日志记录过滤特殊对象，防止转换异常</li>
-                <li>修改代码生成路由脚本错误</li>
-                <li>用户上传头像实时同步缓存，无需重新登录</li>
-                <li>调整切换页签后不重新加载数据</li>
-                <li>添加jsencrypt实现参数的前端加密</li>
-                <li>系统退出删除用户缓存记录</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v1.1.0 - 2019-11-11">
-              <ol>
-                <li>新增在线用户管理</li>
-                <li>新增按钮组功能实现（批量删除、导出、清空）</li>
-                <li>新增查询条件重置按钮</li>
-                <li>新增Swagger全局Token配置</li>
-                <li>新增后端参数校验</li>
-                <li>修复字典管理页面的日期查询异常</li>
-                <li>修改时间函数命名防止冲突</li>
-                <li>去除菜单上级校验，默认为顶级</li>
-                <li>修复用户密码无法修改问题</li>
-                <li>修复菜单类型为按钮时不显示权限标识</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v1.0.0 - 2019-10-08">
-              <ol>
-                <li>若依前后端分离系统正式发布</li>
-              </ol>
-            </el-collapse-item>
-          </el-collapse>
-        </el-card>
+    <el-row :gutter="32">
+      <el-col :xs="24" :sm="24" :lg="8">
+        <div class="chart-wrapper">
+          <raddar-chart />
+        </div>
+      </el-col>
+      <el-col :xs="24" :sm="24" :lg="8">
+        <div class="chart-wrapper">
+          <pie-chart />
+        </div>
       </el-col>
-      <el-col :xs="24" :sm="24" :md="12" :lg="8">
-        <el-card class="update-log">
-          <div slot="header" class="clearfix">
-            <span>捐赠支持</span>
-          </div>
-          <div class="body">
-            <img
-              src="https://oscimg.oschina.net/oscnet/up-d6695f82666e5018f715c41cb7ee60d3b73.png"
-              alt="donate"
-              width="100%"
-            />
-            <span style="display: inline-block; height: 30px; line-height: 30px"
-              >你可以请作者喝杯咖啡表示鼓励</span
-            >
-          </div>
-        </el-card>
+      <el-col :xs="24" :sm="24" :lg="8">
+        <div class="chart-wrapper">
+          <bar-chart />
+        </div>
       </el-col>
     </el-row>
+
+
   </div>
 </template>
 
 <script>
+import PanelGroup from './dashboard/PanelGroup'
+import LineChart from './dashboard/LineChart'
+import RaddarChart from './dashboard/RaddarChart'
+import PieChart from './dashboard/PieChart'
+import BarChart from './dashboard/BarChart'
+
+const lineChartData = {
+  newVisitis: {
+    expectedData: [100, 120, 161, 134, 105, 160, 165],
+    actualData: [120, 82, 91, 154, 162, 140, 145]
+  },
+  messages: {
+    expectedData: [200, 192, 120, 144, 160, 130, 140],
+    actualData: [180, 160, 151, 106, 145, 150, 130]
+  },
+  purchases: {
+    expectedData: [80, 100, 121, 104, 105, 90, 100],
+    actualData: [120, 90, 100, 138, 142, 130, 130]
+  },
+  shoppings: {
+    expectedData: [130, 140, 141, 142, 145, 150, 160],
+    actualData: [120, 82, 91, 154, 162, 140, 130]
+  }
+}
+
 export default {
-  name: "Index",
+  name: 'Index',
+  components: {
+    PanelGroup,
+    LineChart,
+    RaddarChart,
+    PieChart,
+    BarChart
+  },
   data() {
     return {
-      // 版本号
-      version: "3.8.2",
-    };
+      lineChartData: lineChartData.newVisitis
+    }
   },
   methods: {
-    goTarget(href) {
-      window.open(href, "_blank");
-    },
-  },
-};
-</script>
-
-<style scoped lang="scss">
-.home {
-  blockquote {
-    padding: 10px 20px;
-    margin: 0 0 20px;
-    font-size: 17.5px;
-    border-left: 5px solid #eee;
-  }
-  hr {
-    margin-top: 20px;
-    margin-bottom: 20px;
-    border: 0;
-    border-top: 1px solid #eee;
-  }
-  .col-item {
-    margin-bottom: 20px;
-  }
-
-  ul {
-    padding: 0;
-    margin: 0;
-  }
-
-  font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 13px;
-  color: #676a6c;
-  overflow-x: hidden;
-
-  ul {
-    list-style-type: none;
-  }
-
-  h4 {
-    margin-top: 0px;
-  }
-
-  h2 {
-    margin-top: 10px;
-    font-size: 26px;
-    font-weight: 100;
+    handleSetLineChartData(type) {
+      this.lineChartData = lineChartData[type]
+    }
   }
+}
+</script>
 
-  p {
-    margin-top: 10px;
+<style lang="scss" scoped>
+.dashboard-editor-container {
+  padding: 32px;
+  background-color: rgb(240, 242, 245);
+  position: relative;
 
-    b {
-      font-weight: 700;
-    }
+  .chart-wrapper {
+    background: #fff;
+    padding: 16px 16px 0;
+    margin-bottom: 32px;
   }
+}
 
-  .update-log {
-    ol {
-      display: block;
-      list-style-type: decimal;
-      margin-block-start: 1em;
-      margin-block-end: 1em;
-      margin-inline-start: 0;
-      margin-inline-end: 0;
-      padding-inline-start: 40px;
-    }
+@media (max-width:1024px) {
+  .chart-wrapper {
+    padding: 8px;
   }
 }
 </style>
-

ruoyi-ui/src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">若依后台管理系统</h3>
+      <h3 class="title">信用平台</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
@@ -56,7 +56,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>Copyright © 2018-2022 ruoyi.vip All Rights Reserved.</span>
+      <!-- <span>Copyright © 2018-2022 ruoyi.vip All Rights Reserved.</span> -->
     </div>
   </div>
 </template>

ruoyi-ui/src/views/settlement/creditUser/index.vue

@@ -0,0 +1,782 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="姓名" prop="userName">
+        <el-input
+          v-model="queryParams.userName"
+          placeholder="请输入姓名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="信用等级" prop="creditLevel">
+        <el-select v-model="queryParams.creditLevel" placeholder="请选择信用等级" clearable>
+          <el-option
+            v-for="dict in dict.type.credit_level"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="性别" prop="gender">
+        <el-select v-model="queryParams.gender" placeholder="请选择性别" clearable>
+          <el-option
+            v-for="dict in dict.type.sys_user_sex"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="年龄" prop="age">
+        <el-input
+          v-model="queryParams.age"
+          placeholder="请输入年龄"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="身份证号" prop="idCard">
+        <el-input
+          v-model="queryParams.idCard"
+          placeholder="请输入身份证号码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联系号码" prop="phoneNum">
+        <el-input
+          v-model="queryParams.phoneNum"
+          placeholder="请输入联系号码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:creditUser:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:creditUser:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:creditUser:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleImport"
+          v-hasPermi="['system:user:import']"
+        >导入</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:creditUser:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="creditUserList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
+      <el-table-column label="姓名" align="center" prop="userName" />
+      <el-table-column label="信用分数" align="center" prop="creditScore" />
+      <el-table-column label="信用等级" align="center" prop="creditLevel">
+        <template slot-scope="scope">
+          <!-- <dict-tag :options="dict.type.credit_level" :value="scope.row.creditLevel"/> -->
+          <span>{{scope.row.creditLevel}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="性别" align="center" prop="gender">
+        <template slot-scope="scope">
+          <!-- <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.gender"/> -->
+          <span>{{scope.row.gender}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="年龄" align="center" prop="age" />
+      <el-table-column label="身份证号码" align="center" prop="idCard" width="165"/>
+      <el-table-column label="联系号码" align="center" prop="phoneNum" width="120" />
+      <el-table-column label="户籍地址" align="center" prop="nowIn" width="170"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:creditUser:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:creditUser:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改信用人员对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="90px">
+        <el-row>
+          <el-col :span="12">
+           <el-form-item label="身份证号" prop="idCard">
+             <el-input v-model="form.idCard" placeholder="请输入身份证号码" />
+           </el-form-item>
+          </el-col>
+          <el-col :span="12">
+           <el-form-item label="姓名" prop="userName">
+             <el-input v-model="form.userName" placeholder="请输入姓名" />
+           </el-form-item>
+          </el-col>
+          <el-col :span="12">
+          <el-form-item label="性别" prop="gender">
+                    <el-select style="width: 100%;" v-model="form.gender" placeholder="请选择性别">
+                      <el-option
+                        v-for="dict in dict.type.sys_user_sex"
+                        :key="dict.value"
+                        :label="dict.label"
+          :value="dict.value"
+                      ></el-option>
+                    </el-select>
+                  </el-form-item>
+          </el-col>
+          <el-col :span="12">
+           <el-form-item label="年龄" prop="age">
+             <el-input v-model="form.age" type="number" placeholder="请输入年龄" />
+           </el-form-item>
+          </el-col>
+          <el-col :span="12">
+             <el-form-item label="联系号码" prop="phoneNum">
+               <el-input v-model="form.phoneNum" placeholder="请输入联系号码" />
+             </el-form-item>
+          </el-col>
+          <el-col :span="12">
+           <el-form-item label="信用分数" prop="creditScore">
+             <el-input v-model="form.creditScore" type="number" placeholder="请输入信用分数" />
+           </el-form-item>
+          </el-col>
+          <el-col :span="24">
+             <el-row>
+               <el-col :span="12" style="position: relative;">
+                  <span style="position: absolute;top:5px; color: red;left:14px;">*</span>
+                <el-form-item label="户籍地址" prop="provinceId" style="margin-bottom: 5px;">
+                  <!-- <el-input v-model="form.provinceId" placeholder="请输入户籍地的省份" /> -->
+                <el-cascader
+                	:placeholder="nhdyesfgh"
+                	:options="optionsListkl"
+                	:filterable="true"
+                	separator="/"
+                	@change="chahetwo"
+                	:props="optionPropsss"
+                 style="width: 100%;"
+                	ref="myCascader"
+                  v-model="lser"
+                   :class="[nhdyesfgh == '点击选择户籍地址' ? '' : 'placf']"
+                  @active-item-change="handleItemChangefrkl"
+                ></el-cascader>
+                                <p style="line-height: 20px; font-size: 12px;color: red;">点击小圆圈一级一级选择</p>
+
+                </el-form-item>
+
+               </el-col>
+               <el-col :span="12">
+                  <el-form-item label="详细地址" prop="nowIn">
+                    <el-input v-model="form.nowIn" placeholder="请输入详细地址" />
+                  </el-form-item>
+               </el-col>
+             </el-row>
+          </el-col>
+
+          <el-col :span="12">
+           <el-form-item label="信用等级" prop="creditLevel">
+                     <el-select style="width: 100%;" v-model="form.creditLevel" placeholder="请选择信用等级">
+                       <el-option
+                         v-for="dict in dict.type.credit_level"
+                         :key="dict.value"
+                         :label="dict.label"
+           :value="dict.value"
+                       ></el-option>
+                     </el-select>
+                   </el-form-item>
+          </el-col>
+
+
+          <!-- <el-col :span="12">
+               <el-form-item label="户籍地的省份" prop="province">
+                 <el-input v-model="form.province" placeholder="请输入户籍地的省份" />
+               </el-form-item>
+          </el-col> -->
+          <!-- <el-col :span="12">
+              <el-form-item label="户籍地的城市" prop="cityId">
+                <el-input v-model="form.cityId" placeholder="请输入户籍地的城市" />
+              </el-form-item>
+          </el-col> -->
+          <!-- <el-col :span="12">
+            <el-form-item label="户籍地的城市" prop="city">
+              <el-input v-model="form.city" placeholder="请输入户籍地的城市" />
+            </el-form-item>
+          </el-col> -->
+          <!-- <el-col :span="12">
+            <el-form-item label="户籍地的区" prop="regionId">
+              <el-input v-model="form.regionId" placeholder="请输入户籍地的区" />
+            </el-form-item>
+          </el-col> -->
+          <!-- <el-col :span="12">
+            <el-form-item label="户籍地的区" prop="region">
+              <el-input v-model="form.region" placeholder="请输入户籍地的区" />
+            </el-form-item>
+          </el-col> -->
+          <!-- <el-col :span="12">
+            <el-form-item label="户籍地的镇" prop="villageTownsId">
+              <el-input v-model="form.villageTownsId" placeholder="请输入户籍地的镇" />
+            </el-form-item>
+          </el-col> -->
+         <!-- <el-col :span="12">
+           <el-form-item label="户籍地的镇" prop="villageTowns">
+             <el-input v-model="form.villageTowns" placeholder="请输入户籍地的镇" />
+           </el-form-item>
+          </el-col> -->
+          <!-- <el-col :span="12">
+           <el-form-item label="户籍地的村" prop="villageId">
+             <el-input v-model="form.villageId" placeholder="请输入户籍地的村" />
+           </el-form-item>
+          </el-col> -->
+          <!-- <el-col :span="12">
+            <el-form-item label="户籍地的村" prop="village">
+              <el-input v-model="form.village" placeholder="请输入户籍地的村" />
+            </el-form-item>
+          </el-col> -->
+          <!-- <el-col :span="12">
+           <el-form-item label="户籍地的组" prop="villagerGroupId">
+             <el-input v-model="form.villagerGroupId" placeholder="请输入户籍地的组" />
+           </el-form-item>
+          </el-col> -->
+          <!-- <el-col :span="12">
+           <el-form-item label="户籍地的组" prop="villagerGroup">
+             <el-input v-model="form.villagerGroup" placeholder="请输入户籍地的组" />
+           </el-form-item>
+          </el-col> -->
+
+
+
+        </el-row>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <!-- <div class="el-upload__tip" slot="tip">
+            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
+          </div> -->
+          <span>仅允许导入xls、xlsx格式文件。</span>
+          <a href="http://118.31.23.65:5007/template/信用人员信息模板.xlsx" download  style="font-size:12px;vertical-align: baseline; color: red;" >下载模板</a>
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listCreditUser, getCreditUser, delCreditUser, addCreditUser, updateCreditUser,listtrees } from "@/api/settlement/creditUser";
+import { getToken } from "@/utils/auth";
+export default {
+  name: "CreditUser",
+  dicts: ['credit_level', 'sys_user_sex'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 信用人员表格数据
+      creditUserList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/system/creditUser/importCredit"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userName: null,
+        creditLevel: null,
+        gender: null,
+        age: null,
+        idCard: null,
+        phoneNum: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+         idCard: [
+                  { required: true, message: '请输入身份证号', trigger: 'blur' }
+                ],
+        phoneNum: [
+                 { required: true, message: '请输入手机号码', trigger: 'blur' },
+                 { pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/, message: '格式不正确' }
+               ],
+        userName: [
+                 { required: true, message: '请输入姓名', trigger: 'blur' }
+               ],
+        gender: [
+                 { required: true, message: '请输入性别', trigger: 'blur' }
+               ],
+        age: [
+                 { required: true, message: '请输入年龄', trigger: 'blur' }
+               ],
+        creditScore: [
+                 { required: true, message: '请输入信用分数', trigger: 'blur' }
+               ],
+        creditLevel: [
+                 { required: true, message: '请输入信用等级', trigger: 'blur' }
+               ],
+
+      },
+      nhdyesfgh:'点击选择户籍地址',
+      optionsListkl:[],
+      optionPropsss: {
+            	value: 'areaId',
+            	label: 'name',
+            	checkStrictly: true,
+            },
+      lser:[],
+      nameutaiL:0,
+    };
+  },
+  created() {
+    this.getList();
+    this.getTreew(0)
+  },
+  methods: {
+    /** 查询信用人员列表 */
+    getList() {
+      this.loading = true;
+      listCreditUser(this.queryParams).then(response => {
+        this.creditUserList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    getTreew(index){
+      this.loading = true;
+      let pids = {}
+      pids.pid = index
+      console.log(345)
+      listtrees(pids).then(response => {
+        // this.cascaderKey = this.cascaderKey + 1
+        console.log(34)
+        if(response.data.length == 0){
+          return
+        }
+        // if(val !== undefined){
+        //   this.nameutaiL = val
+        // }
+        this.optionsListkl =  this.handleData(response.data);
+        console.log(this.optionsListkl)
+      	this.loading = false;
+      });
+    },
+    handleData(data, val, level) {
+       console.log(data,val,level,7536)
+       for (let i = 0; i < data.length; i++) {
+         if(!data[i].children) {
+           this.$set(data[i], 'children', []);
+         }
+         if(data[i].areaId === val){
+           let vfer = {}
+           vfer.pid = val
+           listtrees(vfer).then(res => {
+             // this.cascaderKey = this.cascaderKey + 1
+             if(res.data.length) {
+               console.log(data[i].children,4567)
+               // data[i].children = res.data;
+               this.$set(data[i], 'children', res.data)
+               console.log(data[i].children,45678)
+                // this.nhdyesku = true
+               data[i].children.forEach(ele => {
+                 this.$set(ele, 'children', [])
+               });
+             }else {
+               data[i].children = undefined;
+             }
+           }).catch(err => {
+           });
+         }else {
+           if(data[i].children.length){
+             this.handleData(data[i].children,val,level)
+           }
+         }
+       }
+
+        return data;
+    },
+    chahetwo(data) {
+    	let nhdye = []
+    	nhdye = this.$refs['myCascader'].getCheckedNodes()[0].pathLabels
+    	console.log(nhdye)
+    	 if(data.length == 1){
+    	   this.form.provinceId = data[ data.length - 1];
+    	   this.form.province = nhdye[ data.length - 1];
+    	   this.$set(this.form, 'city', null)
+    	   this.$set(this.form, 'cityId', null)
+    	   this.$set(this.form, 'region', null)
+    	   this.$set(this.form, 'regionId', null)
+    	   this.$set(this.form, 'villageTowns', null)
+    	   this.$set(this.form, 'villageTownsId', null)
+    	   this.$set(this.form, 'villageId', null)
+    	    this.$set(this.form, 'village', null)
+    	 }else if(data.length == 2){
+    	   this.form.cityId = data[ data.length - 1];
+    	   this.form.city = nhdye[ data.length - 1];
+    	   this.$set(this.form, 'region', null)
+    	   this.$set(this.form, 'regionId', null)
+    	   this.$set(this.form, 'villageTowns', null)
+    	   this.$set(this.form, 'villageTownsId', null)
+    	   this.$set(this.form, 'villageId', null)
+    	    this.$set(this.form, 'village', null)
+    	 }else if(data.length == 3){
+    	   this.form.regionId = data[ data.length - 1];
+    	   this.form.region = nhdye[ data.length - 1];
+    	   this.$set(this.form, 'villageTowns', null)
+    	   this.$set(this.form, 'villageTownsId', null)
+    	   this.$set(this.form, 'villageId', null)
+    	    this.$set(this.form, 'village', null)
+    	 }else if(data.length == 4){
+    	   this.form.villageTownsId = data[ data.length - 1];
+    	   this.form.villageTowns = nhdye[ data.length - 1];
+    	   this.$set(this.form, 'villageId', null)
+    	    this.$set(this.form, 'village', null)
+    	 }else if(data.length == 5){
+    	   this.form.villageId = data[ data.length - 1];
+    	   this.form.village = nhdye[ data.length - 1];
+    	 }else{
+    	   // this.nhdyesfgh = '点击选择户籍地址'
+    	 }
+    },
+    handleItemChangefrkl(val) {
+      console.log(val,235)
+       let code = val ? val[val.length - 1] : '';  //需请求数据的上级地址的code值
+       let level = val.length + 1;  //需请求第几级地址
+       this.optionsListkl = this.handleData(this.optionsListkl, code, level);
+    	},
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "用户导入";
+      this.upload.open = true;
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      this.download('system/user/importTemplate', {
+      }, `user_template_${new Date().getTime()}.xlsx`)
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        userName: null,
+        creditScore: null,
+        creditLevel: null,
+        gender: null,
+        age: null,
+        idCard: null,
+        phoneNum: null,
+        provinceId: null,
+        province: null,
+        cityId: null,
+        city: null,
+        regionId: null,
+        region: null,
+        villageTownsId: null,
+        villageTowns: null,
+        villageId: null,
+        village: null,
+        villagerGroupId: null,
+        villagerGroup: null,
+        nowIn: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        isDel: null,
+        deleteReason: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.lser = []
+      this.title = "添加信用人员";
+      this.nhdyesfgh = '点击选择户籍地址'
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getCreditUser(id).then(response => {
+        this.lser = []
+        this.form = response.data;
+        if(response.data.province !== null && response.data.province !== ""){
+        				this.nhdyesfgh = response.data.province;
+                if(response.data.city !== null && response.data.city !== ""){
+                  this.nhdyesfgh = response.data.province + '/' + response.data.city;
+                  if(response.data.region !== null && response.data.region !== ""){
+                  	this.nhdyesfgh = response.data.province + '/' + response.data.city + '/' + response.data.region;
+                    if(this.form.villageTowns !==null && this.form.villageTowns !=='' && this.form.villageTowns !== undefined){
+                      this.nhdyesfgh = response.data.province + '/' + response.data.city + '/' + response.data.region + '/' + this.form.villageTowns;
+                      if(this.form.village !==null && this.form.village !=='' && this.form.village !== undefined){
+                        this.nhdyesfgh = response.data.province + '/' + response.data.city + '/' + response.data.region + '/' + this.form.villageTowns + '/' + this.form.village;
+                      }
+                    }
+                  }else{
+                  	// this.nhdyesfgh ='点击选择居住地址'
+                  }
+                }else{
+                	// this.nhdyesfgh ='点击选择居住地址'
+                }
+        			}else{
+        				this.nhdyesfgh ='点击选择户籍地址'
+        			}
+        this.nhyesfx = true
+        this.open = true;
+        this.title = "修改信用人员";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          let reg = /^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;
+          let _IDre15 =  /^([1-6][1-9]|50)\d{4}\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}$/;
+          // 护照
+           // let ncjsle = /^1[45][0-9]{7}$|(^[P|p|S|s]\d{7}$)|(^[S|s|G|g|E|e]\d{8}$)|(^[Gg|Tt|Ss|Ll|Qq|Dd|Aa|Ff]\d{8}$)|(^[H|h|M|m]\d{8,10}$)/;
+           let ncjsle = /^[a-zA-Z0-9]{5,17}$/
+           let nhyeli = /^[a-zA-Z]{5,17}$/
+          // 港澳
+          let gnse = /^([A-Z]\d{6,10}(\(\w{1}\))?)$/;
+          // 台湾
+          // let tw = /^\d{8}|^[a-zA-Z0-9]{10}|^\d{18}$/
+          var tw =  /^[0-9]{8}$/;
+           var twe = /^[0-9]{10}$/;
+          // 校验身份证：
+          console.log(reg.test(this.form.idCard),23741)
+          if ( reg.test(this.form.idCard)|| _IDre15.test(this.form.idCard)) {
+          	// this.idea();
+          	// this.go(this.form.idCard.length);
+          	// callback()
+          } else {
+            if(ncjsle.test(this.form.idCard) || nhyeli.test(this.form.idCard)){
+               console.log(3)
+            }else{
+              if(gnse.test(this.form.idCard)  ){
+                  console.log(4)
+              }else{
+                if(tw.test(this.form.idCard) || twe.test(this.form.idCard)){
+                  console.log(5)
+                }else{
+                  this.$message.error('证件格式不正确');
+                  return false
+                }
+
+                // return false
+              }
+
+            }
+          	// callback(new Error('身份证号码不正确'))
+          }
+
+
+
+          if (this.form.id != null) {
+            updateCreditUser(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCreditUser(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除信用人员编号为"' + ids + '"的数据项？').then(function() {
+        return delCreditUser(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/creditUser/export', {
+        ...this.queryParams
+      }, `信用人员表格数据.xlsx`)
+    }
+  }
+};
+</script>
+<style  lang="scss">
+  .placf {
+    .el-input {
+      .el-input__inner::placeholder{
+        color: #333;
+      }
+      /* 谷歌 */
+          .el-input__inner::-webkit-input-placeholder {
+             color: #333;
+          }
+           /* 火狐 */
+         .el-input__inner:-moz-placeholder {
+              color: #333;
+          }
+           /*ie*/
+         .el-input__inner:-ms-input-placeholder {
+              color: #333;
+          }
+    }
+
+  }
+</style>

ruoyi-ui/src/views/settlement/guide/index.vue

@@ -0,0 +1,290 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="政策标题" prop="policyTitle">
+        <el-input
+          v-model="queryParams.policyTitle"
+          placeholder="请输入政策标题"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:guide:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:guide:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:guide:remove']"
+        >删除</el-button>
+      </el-col>
+
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="guideList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="政策标题" align="center" prop="policyTitle" />
+      <el-table-column label="政策内容" align="center" prop="policyContent" :show-overflow-tooltip="true">
+      <template slot-scope="scope">
+        <!-- <el-tooltip class="item" effect="dark" :content="scope.row.businessPolicy" placement="top"> -->
+              <span v-html="scope.row.policyContent"></span>
+        <!-- </el-tooltip> -->
+      </template>
+      </el-table-column>
+      <el-table-column label="政策状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:guide:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:guide:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改政策指南对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-col :span="12">
+           <el-form-item label="政策标题" prop="policyTitle">
+             <el-input v-model="form.policyTitle" placeholder="请输入政策标题" />
+           </el-form-item>
+          </el-col>
+          <el-col :span="12">
+          <el-form-item label="政策状态" prop="status">
+                    <el-select style="width: 100%;" v-model="form.status" placeholder="请选择政策状态">
+                      <el-option
+                        v-for="dict in dict.type.sys_normal_disable"
+                        :key="dict.value"
+                        :label="dict.label"
+          :value="dict.value"
+                      ></el-option>
+                    </el-select>
+                  </el-form-item>
+          </el-col>
+          <el-col :span="24">
+          <el-form-item label="政策内容">
+            <editor v-model="form.policyContent" :min-height="192"/>
+          </el-form-item>
+          </el-col>
+          <el-col :span="24">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="form.remark" placeholder="请输入备注" />
+          </el-form-item>
+          </el-col>
+
+        </el-row>
+
+
+
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listGuide, getGuide, delGuide, addGuide, updateGuide } from "@/api/settlement/guide";
+
+export default {
+  name: "Guide",
+  dicts: ['sys_normal_disable'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 政策指南表格数据
+      guideList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        policyTitle: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        policyTitle: [
+          { required: true, message: "政策标题不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询政策指南列表 */
+    getList() {
+      this.loading = true;
+      listGuide(this.queryParams).then(response => {
+        this.guideList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        policyId: null,
+        policyTitle: null,
+        policyContent: null,
+        status: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.policyId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加政策指南";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const policyId = row.policyId || this.ids
+      getGuide(policyId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改政策指南";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.policyId != null) {
+            updateGuide(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addGuide(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const policyIds = row.policyId || this.ids;
+      this.$modal.confirm('是否确认删除政策指南编号为"' + policyIds + '"的数据项？').then(function() {
+        return delGuide(policyIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/guide/export', {
+        ...this.queryParams
+      }, `guide_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

ruoyi-ui/src/views/settlement/menutwo/index.vue

@@ -0,0 +1,457 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="类别名称" prop="menuName">
+        <el-input
+          v-model="queryParams.menuName"
+          placeholder="请输入类别名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:menu:add']"
+        >新增</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:menu:edit']"
+        >修改</el-button>
+      </el-col> -->
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:menu:remove']"
+        >删除</el-button>
+      </el-col> -->
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:menu:export']"
+        >导出</el-button>
+      </el-col> -->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+   <!-- <el-table v-loading="loading" :data="menuList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="类别ID" align="center" prop="menuId" />
+      <el-table-column label="类别名称" align="center" prop="menuName" />
+      <el-table-column label="类别简介" align="center" prop="menuIntroduce" />
+      <el-table-column label="显示顺序" align="center" prop="orderNum" />
+      <el-table-column label="类别状态" align="center" prop="visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_show_hide" :value="scope.row.visible"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="类别状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="政策图标" align="center" prop="photo" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:menu:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:menu:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table> -->
+    <el-table
+      v-if="refreshTable"
+      v-loading="loading"
+      :data="menuList"
+      row-key="menuId"
+      :default-expand-all="isExpandAll"
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+    >
+      <el-table-column label="类别名称" align="center" prop="menuName" />
+      <el-table-column label="类别简介" align="center" prop="menuIntroduce" />
+      <el-table-column label="显示顺序" align="center" prop="orderNum" />
+      <el-table-column label="类别状态" align="center" prop="visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_show_hide" :value="scope.row.visible"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="类别状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="政策图标" align="center" prop="photo" /> -->
+      <el-table-column label="政策图标" align="center" prop="photo" width="100">
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.photo" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:menu:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:menu:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+ -->
+    <!-- 添加或修改政策类别对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="12">
+<el-form-item label="类别名称" prop="menuName">
+          <el-input v-model="form.menuName" placeholder="请输入类别名称" />
+        </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="form.parentId !== 0">
+          <el-form-item label="上级类别" prop="parentId">
+            <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer"  placeholder="请选择父级类别ID" />
+          </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+          <el-form-item label="显示顺序" prop="orderNum">
+            <el-input v-model="form.orderNum" type="number" placeholder="请输入显示顺序" />
+          </el-form-item>
+          </el-col>
+          <el-col :span="12">
+          <el-form-item label="是否显示" prop="visible">
+            <!-- <el-input v-model="form.visible" placeholder="请输入类别状态" /> -->
+            <el-select v-model="form.visible" placeholder="是否显示"  style="width: 100%;">
+              <el-option
+                v-for="dict in dict.type.sys_show_hide"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+          <el-form-item label="类别简介" prop="menuIntroduce">
+            <el-input v-model="form.menuIntroduce" type="textarea" placeholder="请输入内容" />
+          </el-form-item>
+          </el-col>
+          <el-col :span="12">
+          <el-form-item label="类别状态">
+                    <el-radio-group v-model="form.status">
+                      <el-radio
+                        v-for="dict in dict.type.sys_normal_disable"
+                        :key="dict.value"
+          :label="dict.value"
+                      >{{dict.label}}</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
+          </el-col>
+
+
+          <el-col :span="24">
+          <el-form-item label="政策图标" prop="photo">
+            <image-upload v-model="form.photo"/>
+          </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+          </el-form-item>
+          </el-col>
+          <el-col :span="12">
+
+          </el-col>
+          <el-col :span="12">
+
+          </el-col>
+        </el-row>
+
+
+
+
+
+
+
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listMenu, getMenu, delMenu, addMenu, updateMenu,listDeptExcludeChild } from "@/api/settlement/menutwo";
+import { treeselect } from "@/api/system/dept";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+export default {
+  name: "Menu",
+  dicts: ['sys_normal_disable','sys_yes_no','sys_show_hide'],
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 部门树选项
+      deptOptions: undefined,
+      // 政策类别表格数据
+      menuList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        menuName: null,
+      },
+      // 表单参数
+      form: {},
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 表单校验
+      rules: {
+        menuName: [
+          { required: true, message: "类别名称不能为空", trigger: "blur" }
+        ],
+        menuIntroduce: [
+          { required: true, message: "类别简介不能为空", trigger: "blur" }
+        ],
+        orderNum: [
+          { required: true, message: "显示顺序不能为空", trigger: "blur" }
+        ],
+        photo: [
+          { required: true, message: "政策图标不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+    // this.getTreeselect()
+  },
+  methods: {
+    /** 查询政策类别列表 */
+    getList() {
+      this.loading = true;
+      listMenu(this.queryParams).then(response => {
+        // this.menuList = response.rows;
+        this.menuList = this.handleTree(response.data, "menuId");
+        // this.deptOptions = this.handleTree(response.data, "menuId")
+        console.log(this.deptOptions)
+        // this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 查询部门下拉树结构 */
+    getTreeselect() {
+      treeselect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    /** 转换部门数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.menuId,
+        label: node.menuName,
+        children: node.children
+      };
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        menuId: null,
+        menuName: null,
+        menuIntroduce: null,
+        parentId: null,
+        orderNum: null,
+        visible: '0',
+        status: "0",
+        photo: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 展开/折叠操作 */
+    toggleExpandAll() {
+      this.refreshTable = false;
+      this.isExpandAll = !this.isExpandAll;
+      this.$nextTick(() => {
+        this.refreshTable = true;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.menuId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.reset();
+      // if (row != undefined) {
+      //   this.form.parentId = row.menuId;
+      // }
+      this.open = true;
+      this.title = "添加政策类别";
+      listMenu().then(response => {
+        // this.menuList = response.rows;
+        this.deptOptions = this.handleTree(response.data, "menuId")
+        console.log(this.deptOptions)
+        // this.total = response.total;
+      });
+
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const menuId = row.menuId || this.ids
+      getMenu(row.menuId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改政策类别";
+      });
+
+      listDeptExcludeChild(row.menuId).then(response => {
+        this.deptOptions = this.handleTree(response.data, "menuId");
+        console.log(this.form.menuId,this.form.parentId)
+      });
+
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.menuId != null) {
+            updateMenu(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addMenu(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const menuIds = row.menuId || this.ids;
+      this.$modal.confirm('是否确认删除政策类别编号为"' + menuIds + '"的数据项？').then(function() {
+        return delMenu(menuIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/menu/export', {
+        ...this.queryParams
+      }, `menu_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

ruoyi-ui/src/views/settlement/merchants/index.vue

@@ -0,0 +1,386 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="商家名称" prop="businessName">
+        <el-input
+          v-model="queryParams.businessName"
+          placeholder="请输入商家名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="商家电话" prop="businessPhone">
+        <el-input
+          v-model="queryParams.businessPhone"
+          placeholder="请输入商家电话"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:merchants:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:merchants:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:merchants:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:merchants:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="merchantsList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column label="商家ID" align="center" prop="businessId" /> -->
+      <el-table-column label="商家名称" align="center" prop="businessName" />
+      <el-table-column label="商家简介" align="center" prop="businessIntroduce" />
+      <el-table-column label="商家地址" align="center" prop="businessAddress" />
+      <el-table-column label="商家电话" align="center" prop="businessPhone" width="110"/>
+      <el-table-column label="商家政策" align="center" prop="businessPolicy" width="130" :show-overflow-tooltip="true" >
+      <template slot-scope="scope">
+        <!-- <el-tooltip class="item" effect="dark" :content="scope.row.businessPolicy" placement="top"> -->
+              <span v-html="scope.row.businessPolicy"></span>
+        <!-- </el-tooltip> -->
+      </template>
+      </el-table-column>
+      <el-table-column label="显示顺序" align="center" prop="orderNum" />
+      <!-- <el-table-column label="商家状态" align="center" prop="visible" />
+      <el-table-column label="商家状态" align="center" prop="status" /> -->
+      <el-table-column label="商家商标" align="center" prop="photo" width="100">
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.photo" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:merchants:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:merchants:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改入驻商家对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="商家名称" prop="businessName">
+              <el-input v-model="form.businessName" placeholder="请输入商家名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="商家电话" prop="businessPhone">
+              <el-input v-model="form.businessPhone" placeholder="请输入商家电话" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="分类名称" prop="policyId">
+              <!-- <el-select v-model="form.policyId" placeholder="分类名称"  style="width: 100%;">
+                <el-option
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select> -->
+              <treeselect v-model="form.policyId" :options="deptOptions" :normalizer="normalizer"  placeholder="请选择父级类别ID" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="商家地址" prop="businessAddress">
+                  <el-input v-model="form.businessAddress" type="textarea" placeholder="请输入内容" />
+                </el-form-item>
+
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="商家简介" prop="businessIntroduce">
+                  <el-input v-model="form.businessIntroduce" type="textarea" placeholder="请输入内容" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="备注" prop="remark">
+                  <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+                </el-form-item>
+              </el-col>
+
+            </el-row>
+          </el-col>
+
+          <el-col :span="24">
+
+            <el-form-item label="商家政策" prop="businessPolicy">
+              <editor v-model="form.businessPolicy" :min-height="192"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="商家商标">
+              <image-upload v-model="form.photo"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
+
+
+
+
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listMerchants, getMerchants, delMerchants, addMerchants, updateMerchants } from "@/api/settlement/merchants";
+import { listMenu } from "@/api/settlement/menutwo";
+import { treeselect } from "@/api/system/dept";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+export default {
+  name: "Merchants",
+  dicts: ['sys_normal_disable','sys_yes_no'],
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 部门树选项
+      deptOptions: undefined,
+      // 入驻商家表格数据
+      merchantsList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        businessName: null,
+        businessPhone: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      // businessPhone: [{ required: true, message: '商家电话不能为空', trigger: 'blur' }],
+       // businessAddress: [{ required: true, message: '商家地址不能为空', trigger: 'blur' }],
+      rules: {
+        businessName: [{ required: true, message: '商家名称不能为空', trigger: 'blur' }],
+
+        policyId: [{ required: true, message: '请选择分类名称', trigger: 'blur' }],
+
+        businessPolicy: [{ required: true, message: '商家政策不能为空', trigger: 'blur' }]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询入驻商家列表 */
+    getList() {
+      this.loading = true;
+      listMerchants(this.queryParams).then(response => {
+        this.merchantsList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        businessId: null,
+        businessName: null,
+        businessIntroduce: null,
+        businessAddress: null,
+        businessPhone: null,
+        businessPolicy: null,
+        orderNum: null,
+        visible: null,
+        status: null,
+        photo: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.businessId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加入驻商家";
+      listMenu().then(response => {
+        // this.menuList = response.rows;
+        this.deptOptions = this.handleTree(response.data, "menuId")
+        console.log(this.deptOptions)
+        // this.total = response.total;
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const businessId = row.businessId || this.ids
+      getMerchants(businessId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改入驻商家";
+      });
+      listMenu(row.menuId).then(response => {
+        // this.menuList = response.rows;
+        this.deptOptions = this.handleTree(response.data, "menuId")
+        console.log(this.deptOptions)
+        // this.total = response.total;
+      });
+    },
+    /** 转换部门数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.menuId,
+        label: node.menuName,
+        children: node.children
+      };
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          // this.form.policyId  = this.form.menuId
+          if (this.form.businessId != null) {
+            updateMerchants(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addMerchants(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const businessIds = row.businessId || this.ids;
+      this.$modal.confirm('是否确认删除入驻商家编号为"' + businessIds + '"的数据项？').then(function() {
+        return delMerchants(businessIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/merchants/export', {
+        ...this.queryParams
+      }, `入驻商家表格数据.xlsx`)
+    }
+  }
+};
+</script>

ruoyi-ui/src/views/system/dept/index.vue

@@ -175,7 +175,7 @@ export default {
       // 表格树数据
       deptList: [],
       // 部门树选项
-      deptOptions: [],
+      deptOptions: undefined,
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -300,6 +300,7 @@ export default {
       });
       listDeptExcludeChild(row.deptId).then(response => {
         this.deptOptions = this.handleTree(response.data, "deptId");
+        console.log(this.form.parentId,this.form.deptId)
       });
     },
     /** 提交按钮 */

ruoyi-ui/src/views/system/merchants/index.vue

@@ -0,0 +1,298 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="商家名称" prop="businessName">
+        <el-input
+          v-model="queryParams.businessName"
+          placeholder="请输入商家名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="商家电话" prop="businessPhone">
+        <el-input
+          v-model="queryParams.businessPhone"
+          placeholder="请输入商家电话"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:merchants:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:merchants:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:merchants:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:merchants:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="merchantsList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="商家ID" align="center" prop="businessId" />
+      <el-table-column label="商家名称" align="center" prop="businessName" />
+      <el-table-column label="商家简介" align="center" prop="businessIntroduce" />
+      <el-table-column label="商家地址" align="center" prop="businessAddress" />
+      <el-table-column label="商家电话" align="center" prop="businessPhone" />
+      <el-table-column label="商家政策" align="center" prop="businessPolicy" />
+      <el-table-column label="显示顺序" align="center" prop="orderNum" />
+      <el-table-column label="商家状态" align="center" prop="visible" />
+      <el-table-column label="商家状态" align="center" prop="status" />
+      <el-table-column label="缩略图" align="center" prop="photo" width="100">
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.photo" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:merchants:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:merchants:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改入驻商家对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="商家名称" prop="businessName">
+          <el-input v-model="form.businessName" placeholder="请输入商家名称" />
+        </el-form-item>
+        <el-form-item label="商家简介" prop="businessIntroduce">
+          <el-input v-model="form.businessIntroduce" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="商家地址" prop="businessAddress">
+          <el-input v-model="form.businessAddress" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="商家电话" prop="businessPhone">
+          <el-input v-model="form.businessPhone" placeholder="请输入商家电话" />
+        </el-form-item>
+        <el-form-item label="商家政策">
+          <editor v-model="form.businessPolicy" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="缩略图">
+          <image-upload v-model="form.photo"/>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listMerchants, getMerchants, delMerchants, addMerchants, updateMerchants } from "@/api/settlement/merchants";
+
+export default {
+  name: "Merchants",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 入驻商家表格数据
+      merchantsList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        businessName: null,
+        businessPhone: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询入驻商家列表 */
+    getList() {
+      this.loading = true;
+      listMerchants(this.queryParams).then(response => {
+        this.merchantsList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        businessId: null,
+        businessName: null,
+        businessIntroduce: null,
+        businessAddress: null,
+        businessPhone: null,
+        businessPolicy: null,
+        orderNum: null,
+        visible: null,
+        status: null,
+        photo: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.businessId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加入驻商家";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const businessId = row.businessId || this.ids
+      getMerchants(businessId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改入驻商家";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.businessId != null) {
+            updateMerchants(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addMerchants(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const businessIds = row.businessId || this.ids;
+      this.$modal.confirm('是否确认删除入驻商家编号为"' + businessIds + '"的数据项？').then(function() {
+        return delMerchants(businessIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/merchants/export', {
+        ...this.queryParams
+      }, `merchants_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>