Merge remote-tracking branch 'origin/master'

ruoyi-ui/.editorconfig

@@ -19,4 +19,4 @@ trim_trailing_whitespace = true
 # 匹配md结尾的文件
 [*.md]
 insert_final_newline = false
-trim_trailing_whitespace = false
+trim_trailing_whitespace = false

ruoyi-ui/.env.development

@@ -1,11 +1,11 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 信用平台
 
 # 开发环境配置
 ENV = 'development'
 
-# 若依管理系统/开发环境
+# 信用平台/开发环境
 VUE_APP_BASE_API = '/dev-api'
 
 # 路由懒加载
-VUE_CLI_BABEL_TRANSPILE_MODULES = true
+VUE_CLI_BABEL_TRANSPILE_MODULES = true

ruoyi-ui/.env.production

@@ -1,8 +1,8 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 信用平台
 
 # 生产环境配置
 ENV = 'production'
 
-# 若依管理系统/生产环境
-VUE_APP_BASE_API = '/prod-api'
+# 信用平台/生产环境
+VUE_APP_BASE_API = '/prod-api'

ruoyi-ui/.env.staging

@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 信用平台
 
 NODE_ENV = production
 
 # 测试环境配置
 ENV = 'staging'
 
-# 若依管理系统/测试环境
+# 信用平台/测试环境
 VUE_APP_BASE_API = '/stage-api'

ruoyi-ui/.eslintrc.js

@@ -1,3 +1,202 @@
+
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+101
+102
+103
+104
+105
+106
+107
+108
+109
+110
+111
+112
+113
+114
+115
+116
+117
+118
+119
+120
+121
+122
+123
+124
+125
+126
+127
+128
+129
+130
+131
+132
+133
+134
+135
+136
+137
+138
+139
+140
+141
+142
+143
+144
+145
+146
+147
+148
+149
+150
+151
+152
+153
+154
+155
+156
+157
+158
+159
+160
+161
+162
+163
+164
+165
+166
+167
+168
+169
+170
+171
+172
+173
+174
+175
+176
+177
+178
+179
+180
+181
+182
+183
+184
+185
+186
+187
+188
+189
+190
+191
+192
+193
+194
+195
+196
+197
+198
+199
 // ESlint 检查配置
 module.exports = {
   root: true,
@@ -196,4 +395,4 @@ module.exports = {
     }],
     'array-bracket-spacing': [2, 'never']
   }
-}
+}

ruoyi-ui/README.md

@@ -11,7 +11,7 @@ cd ruoyi-ui
 npm install
 
 # 建议不要直接使用 cnpm 安装依赖，会有各种诡异的 bug。可以通过如下操作解决 npm 下载速度慢的问题
-npm install --registry=https://registry.npmmirror.com
+npm install --registry=https://registry.npm.taobao.org
 
 # 启动服务
 npm run dev

ruoyi-ui/babel.config.js

@@ -10,4 +10,4 @@ module.exports = {
       'plugins': ['dynamic-import-node']
     }
   }
-}
+}

ruoyi-ui/bin/build.bat

@@ -1,12 +0,0 @@
-@echo off
-echo.
-echo [信息] 打包Web工程，生成dist文件。
-echo.
-
-%~d0
-cd %~dp0
-
-cd ..
-npm run build:prod
-
-pause

ruoyi-ui/bin/package.bat

@@ -1,12 +0,0 @@
-@echo off
-echo.
-echo [信息] 安装Web工程，生成node_modules文件。
-echo.
-
-%~d0
-cd %~dp0
-
-cd ..
-npm install --registry=https://registry.npmmirror.com
-
-pause

ruoyi-ui/bin/run-web.bat

@@ -1,12 +0,0 @@
-@echo off
-echo.
-echo [信息] 使用 Vue CLI 命令运行 Web 工程。
-echo.
-
-%~d0
-cd %~dp0
-
-cd ..
-npm run dev
-
-pause

ruoyi-ui/build/index.js

@@ -1,35 +0,0 @@
-const { run } = require('runjs')
-const chalk = require('chalk')
-const config = require('../vue.config.js')
-const rawArgv = process.argv.slice(2)
-const args = rawArgv.join(' ')
-
-if (process.env.npm_config_preview || rawArgv.includes('--preview')) {
-  const report = rawArgv.includes('--report')
-
-  run(`vue-cli-service build ${args}`)
-
-  const port = 9526
-  const publicPath = config.publicPath
-
-  var connect = require('connect')
-  var serveStatic = require('serve-static')
-  const app = connect()
-
-  app.use(
-    publicPath,
-    serveStatic('./dist', {
-      index: ['index.html', '/']
-    })
-  )
-
-  app.listen(port, function () {
-    console.log(chalk.green(`> Preview at  http://localhost:${port}${publicPath}`))
-    if (report) {
-      console.log(chalk.green(`> Report at  http://localhost:${port}${publicPath}report.html`))
-    }
-
-  })
-} else {
-  run(`vue-cli-service build ${args}`)
-}

ruoyi-ui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ruoyi",
   "version": "3.8.2",
-  "description": "若依管理系统",
+  "description": "信用平台",
   "author": "若依",
   "license": "MIT",
   "scripts": {
@@ -49,6 +49,7 @@
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
     "nprogress": "0.2.0",
+    "qrcodejs2": "^0.0.2",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",

ruoyi-ui/src/api/login.js

@@ -56,4 +56,22 @@ export function getCodeImg() {
     method: 'get',
     timeout: 20000
   })
-}
+}
+
+// 获取二维码code
+export function getLoginCode() {
+  return request({
+    url: '/scanCode/getQrCode',
+    method: 'post'
+  })
+}
+
+
+
+// 二维码是否扫码
+export function getScanStatus(code) {
+  return request({
+    url: `/scanCode/getPool/${code}`,
+    method: 'get',
+  })
+}

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询使用记录列表
+export function listRecord(query) {
+  return request({
+    url: '/system/record/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询使用记录详细
+export function getRecord(recordId) {
+  return request({
+    url: '/system/record/' + recordId,
+    method: 'get'
+  })
+}
+
+// 新增使用记录
+export function addRecord(data) {
+  return request({
+    url: '/system/record',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改使用记录
+export function updateRecord(data) {
+  return request({
+    url: '/system/record',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除使用记录
+export function delRecord(recordId) {
+  return request({
+    url: '/system/record/' + recordId,
+    method: 'delete'
+  })
+}

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

@@ -0,0 +1,63 @@
+import request from '@/utils/request'
+
+// 查询商户权益记录列表
+export function listTable(query) {
+  return request({
+    url: '/system/table/list',
+    method: 'get',
+    params: query
+  })
+}
+
+
+export function mersList(query) {
+  return request({
+    url: '/system/merchants/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询商户权益记录详细
+export function getTable(id) {
+  return request({
+    url: '/system/table/' + id,
+    method: 'get'
+  })
+}
+
+// 新增商户权益记录
+export function addTable(data) {
+  return request({
+    url: '/system/table',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改商户权益记录
+export function updateTable(data) {
+  return request({
+    url: '/system/table',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除商户权益记录
+export function delTable(id) {
+  return request({
+    url: '/system/table/' + id,
+    method: 'delete'
+  })
+}
+
+
+
+// 删除商户权益记录
+export function delseeu(id) {
+  return request({
+    url: '/system/numberTable/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/assets/images/api/activiti/definition.js

@@ -0,0 +1,359 @@
+import request from '@/utils/request'
+
+// 新增关联表
+export function addGendefini(data) {
+  return request({
+    url: '/jflow/p/cs/task/relation/list',
+    method: 'post',
+    data
+  })
+}
+// 刪除
+export function addGendefinideal(data) {
+  return request({
+    url: '/jflow/p/cs/task/batch/deal',
+    method: 'post',
+    data
+  })
+}
+// 查詢
+export function addGendefiniqur(data) {
+  return request({
+    url: '/jflow/p/cs/task/backlog/list',
+    method: 'post',
+    data
+  })
+}
+
+// mesetet
+export function addGenmutipor(data) {
+  return request({
+    url: '/jflow/p/c/identity/org/treequery',
+    method: 'post',
+    data
+  })
+}
+//查找用户信息
+export function addGenmutiporuder(data) {
+  return request({
+    url: '/jflow/p/c/identity/user/list',
+    method: 'post',
+    data
+  })
+}
+// 查询用户个人信息
+ export function getUserProfiletoo() {
+   return request({
+     url: '/system/user/profile',
+     method: 'get'
+   })
+ }
+//获取树数据
+export function addGenmutiportree(data) {
+  return request({
+    url: '/jflow/p/c/identity/org/treeload',
+    method: 'post',
+    data
+  })
+}
+
+
+// 获取流程图信息  flowshow
+export function addGenflowshow(data) {
+  return request({
+    url: '/jflow/p/c/task/backlog/detail',
+    method: 'post',
+    data
+  })
+}
+
+//业务关系下拉数据   historicap
+export function addGenhistoricap(data) {
+  return request({
+    url: '/jflow/p/cs/task/relation/list',
+    method: 'post',
+    data
+  })
+}
+// history 查询列表
+export function addGenhistorihistory(data) {
+  return request({
+    url: '/jflow/p/cs/task/history/list',
+    method: 'post',
+    data
+  })
+}
+//提交
+export function addGenhistorilisr(data) {
+  return request({
+    url: "/jflow/p/cs/process/manualsubmit",
+    method: 'post',
+    data
+  })
+}
+
+// 修改关联表
+export function setGenTable(data) {
+  return request({
+    url: '/boman-gen/genTableRelation',
+    method: 'put',
+    data
+  })
+}
+// 删除关联表
+export function delGenTable(tableId) {
+  return request({
+    url: '/boman-gen/genTableRelation/' + tableId,
+    method: 'delete',
+  })
+}
+// 查看关联表
+export function qurGenTable(tableId) {
+  return request({
+    url: '/boman-gen/genTableRelation/' + tableId,
+    method: 'get',
+  })
+}
+
+// 关联表列表
+export function tabList(query) {
+  return request({
+    url: '/boman-gen/genTableRelation/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询生成表数据
+export function listTable(query) {
+  return request({
+    url: '/code/gen/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询db数据库列表
+export function listDbTable(query) {
+  return request({
+    url: '/code/gen/db/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增
+export function addMenu(data) {
+  return request({
+    url: '/boman-gen/gen/addTable',
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询表详细信息
+export function getGenTable(tableId) {
+  return request({
+    url: '/code/gen/' + tableId,
+    method: 'get'
+  })
+}
+
+// 查询表详细信息
+export function listAllColumnsByTableId(data) {
+  return request({
+    url: '/boman-web-core/p/cs/table/listAllColumnsByTableId',
+    method: 'post',
+    data
+  })
+}
+// 查询表HR详细信息
+export function genTableColumnList(query) {
+  return request({
+    url: '/boman-gen/genTableColumn/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 修改代码生成信息
+export function updateGenTable(data) {
+  return request({
+    url: '/code/gen',
+    method: 'put',
+    data: data
+  })
+}
+
+// 导入表
+export function importTable(data) {
+  return request({
+    url: '/code/gen/importTable',
+    method: 'post',
+    params: data
+  })
+}
+
+// 预览生成代码
+export function previewTable(tableId) {
+  return request({
+    url: '/code/gen/preview/' + tableId,
+    method: 'get'
+  })
+}
+
+// 删除表数据
+export function delTable(tableId) {
+  return request({
+    url: '/code/gen/' + tableId,
+    method: 'delete'
+  })
+}
+// 删除
+export function delPost(id) {
+  return request({
+    url: '/genTableColumn/columnIds/' + id,
+    method: 'delete'
+  })
+}
+
+// 生成代码（自定义路径）
+export function genCode(tableName) {
+  return request({
+    url: '/code/gen/genCode/' + tableName,
+    method: 'get'
+  })
+}
+
+// 同步数据库
+export function synchDb(tableName) {
+  return request({
+    url: '/code/gen/synchDb/' + tableName,
+    method: 'get'
+  })
+}
+
+// 查询数据库sql
+export function tableSql(id) {
+  return request({
+    url: '/boman-gen/tableSql/'+id,
+    method: 'get',
+  })
+}
+// 执行创建语句
+export function zxImplement(data) {
+  return request({
+    url: '/boman-gen/tableSql/implement',
+    method: 'post',
+    data
+  })
+}
+// 刷新创建语句
+export function getReload(data) {
+  return request({
+    url: '/boman-gen/tableSql/reload',
+    method: 'POST',
+    data
+  })
+}
+// 新增字段信息
+export function addGenTableColumn(data) {
+  return request({
+    url: '/boman-gen/genTableColumn',
+    method: 'POST',
+    data
+  })
+}
+// 删除字段信息
+export function delGenTableColumn(id) {
+  return request({
+    url: '/boman-gen/genTableColumn/' + id,
+    method: 'delete',
+  })
+}
+// 修改字段信息
+export function setGenTableColumn(data) {
+  return request({
+    url: '/boman-gen/genTableColumn',
+    method: 'put',
+    data
+  })
+}
+// 获取字段信息
+export function getGenTableColumn(tableId) {
+  return request({
+    url: '/boman-gen/genTableColumn/getColumnInfo/' + tableId,
+    method: 'get',
+  })
+}
+// 获取字段信息
+export function getByIdWithForeignKey(tableId) {
+  return request({
+    url: '/boman-gen/genTableColumn/getByIdWithForeignKey/' + tableId,
+    method: 'get',
+  })
+}
+// 获取字段信息
+export function getLoadTable() {
+  return request({
+    url: 'boman-gen/init/loadTable',
+    method: 'get',
+  })
+}
+
+// 获取快速查询  查询框数据/ */
+export function tableQuery(data) {
+  return request({
+    url: '/boman-web-core/p/cs/getTableQuery',
+    method: 'POST',
+    data
+  })
+}
+
+// 快速查询列表
+export function listIndexfou(data) {
+  return request({
+    url: '/boman-web-core/p/cs/queryList',
+    method: 'post',
+    data: data
+  })
+}
+// 通过
+export function listIndexfougru(data) {
+  return request({
+    url: '/jflow/p/c/task/page/pass',
+    method: 'post',
+    data: data
+  })
+}
+
+// 驳回
+export function listIndexfouboh(data) {
+  return request({
+    url: '/jflow/p/c/task/page/deny',
+    method: 'post',
+    data: data
+  })
+}
+
+// 配置规则
+export function ruledconfig(data) {
+  return request({
+    url: '/jflow/p/c/meta/column/list',
+    method: 'post',
+    data: data
+  })
+}
+// 配置字段
+export function ruledconfigzid(data) {
+  return request({
+    url: '/jflow/p/c/meta/refcolumn/fuzzyquery',
+    method: 'post',
+    data: data
+  })
+}
+export function ruledfrr(data) {
+  return request({
+    url: '/jflow/p/c/meta/refcolumn/list',
+    method: 'post',
+    data: data
+  })
+}

ruoyi-ui/src/assets/images/api/core/gridInfo.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询网格信息列表
+export function listGridInfo(query) {
+  return request({
+    url: '/boman-web-core/gridInfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 网格
+export function listRoleergthwg(data) {
+  return request({
+    url: '/boman-web-core/gridInfo/treeSelect',
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询网格信息详细
+export function getGridInfo(id) {
+  return request({
+    url: '/boman-web-core/gridInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增网格信息
+export function addGridInfo(data) {
+  return request({
+    url: '/boman-web-core/gridInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改网格信息
+export function updateGridInfo(data) {
+  return request({
+    url: '/boman-web-core/gridInfo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除网格信息
+export function delGridInfo(id) {
+  return request({
+    url: '/boman-web-core/gridInfo/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/assets/images/api/index.js

@@ -0,0 +1,110 @@
+import request from '@/utils/request'
+
+
+// 圆环列表
+export function treeselect(query) {
+  return request({
+    url: '/sts/smsts/' + query ,
+    method: 'get'
+  })
+}
+
+// 圆环列表上部
+
+export function listTsde(query) {
+  return request({
+    url: '/boman-web-core/index/stsByCzrkHomePage' ,
+    method: 'get'
+  })
+}
+
+
+
+// 查询设备信息列表
+export function listDevice(query) {
+  return request({
+    url: '/sts/per/school/smmx',
+    method: 'get',
+    params: query
+  })
+}
+
+
+
+// 折线图
+export function listzhex(query) {
+  return request({
+    url: '/boman-web-core/index/hjczLine',
+    method: 'get',
+    params: query
+  })
+}
+
+// 雷达图
+export function listleida(query) {
+  return request({
+    url: '/sts/echarts1 ',
+    method: 'get',
+    params: query
+  })
+}
+// 底部圆环数据
+export function listdbyh(query) {
+  return request({
+    url: '/sts/echarts2 ',
+    method: 'get',
+    params: query
+  })
+}
+// 柱状图数据
+export function listzhuzh(query) {
+  return request({
+    url: '/sts/echarts3 ',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 查询设备信息详细
+export function getDevice(id) {
+  return request({
+    url: '/school/device/' + id,
+    method: 'get'
+  })
+}
+
+// 新增设备信息
+export function addDevice(data) {
+  return request({
+    url: '/school/device',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改设备信息
+export function updateDevice(data) {
+  return request({
+    url: '/school/device',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备信息
+export function delDevice(id) {
+  return request({
+    url: '/school/device/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出
+export function exportPost(query) {
+  return request({
+    url: '/sts/per/school/smmx/export',
+    method: 'get',
+    params: query
+  })
+}

ruoyi-ui/src/assets/images/api/layoutAlgorithm.js

@@ -0,0 +1,123 @@
+
+// 查找数组中最后一个不为空的值，获取可使用空位,为了找出这一行是否能够存放当前元素。
+// 返回值为该行可放的空格数
+function getLastNotNull(array) {
+  let canUseLength = array.length;
+  // 数组取反,获取到第一个不为空的值，则判断出该行可放的空格数量
+  array.reverse().every((item, index) => {
+    if (item) {
+      canUseLength = index;
+      return false;
+    }
+    return true;
+  });
+  return canUseLength;
+}
+
+
+// 判断从当前空格开始填，是否所有空格都能够放入
+// currentRow:当前开始填充行
+// currentCol:当前开始填充列
+// pointer:当前元素的数据，宽高
+// ListsMap:当前整个填充块的
+// defaultColumn:默认一列的行数
+function checkAllSpace(currentRow, currentCol, pointer, ListsMap, defaultColumn) {
+  const rowArray = Array(pointer.row).fill(null);
+  const colArray = Array(pointer.col).fill(null);
+  
+  let flag = true;
+  rowArray.map((item, row) => {
+    colArray.map((temp, col) => {
+      if (ListsMap[row + currentRow][col + currentCol]) {
+        flag = false;
+      }
+    });
+  });
+  if ((currentCol + pointer.col) > defaultColumn) {
+    flag = false;
+  }
+  return flag;
+}
+
+
+// defaultColumn:默认每行的列数
+// lists:[{  //每一个item的行和宽
+//   row:,
+//   col:
+// }]
+// type:fill  填充  newline  换行
+// 返回值是在lists的item中添加x,y属性:
+// {
+//   y:i+1,  //列
+//   x:j+1,  //行
+//   row:pointer.row, //行高
+//   col:pointer.col  //宽高
+// }
+function layoutAlgorithm(defaultColumn, lists, type = 'fill') {
+  // 定义每一行的空数据defaultRow
+  const defaultRow = Array(defaultColumn).fill(null);
+  // 定义最大行数
+  const num = lists.reduce((sum, current) => { sum += (!current.row || current.row < 1) ? 1 : current.row; return sum; }, 0);
+  const sumArray = Array(num).fill(null);
+
+  // 定义map模型 默认 50*defaultColumn的布局
+  const ListsMap = sumArray.concat([]).reduce((currentValue) => {
+    currentValue.push(defaultRow.concat([]));
+    return currentValue;
+  }, []);
+
+
+  const coordinateMap = {};
+  // 遍历配置文件的行列数，获取对应的grid布局坐标
+  lists.every((pointer, pointerIndex) => {
+    // 对初始化数据进行判断处理
+    // 当列数大于默认分列时，将当前元素列改为默认的分列数
+    // 当当前项没有设置宽高，默认设为1
+    if (pointer.show === false) { // 当属性show为false时，则默认返回位置(-1,-1)即不显示该节点
+      if (!coordinateMap[pointerIndex]) { // 记录起始的行列以及宽高，作为function返回值
+        pointer.x = -1;
+        pointer.y = -1;
+        coordinateMap[pointerIndex] = pointer;
+      }
+      return true;
+    }
+    pointer.col = (!pointer.col || pointer.col < 1) ? 1 : pointer.col;
+    pointer.col = pointer.col > defaultColumn ? defaultColumn : pointer.col;
+    pointer.row = (!pointer.row || pointer.row < 1) ? 1 : pointer.row;
+    ListsMap.every((item, i) => item.every((temp, j) => {
+      // 当类型为换行时,判断该行是否可放入,不可放入时则换行
+      if (type === 'newline') {
+        if (getLastNotNull([].concat(item)) < pointer.col) {
+          return true;
+        }
+      }
+      // 当类型为填充时,才执行checkAllSpace，对对应的所有空格进行可填充判断
+      if (!temp && (type === 'fill' ? checkAllSpace(i, j, pointer, ListsMap, defaultColumn) : true)) { // 为空时可放
+        if (!coordinateMap[pointerIndex]) { // 记录起始的行列以及宽高，作为function返回值
+          pointer.x = j + 1;
+          pointer.y = i + 1;
+          coordinateMap[pointerIndex] = pointer;
+        }
+        // 将对应的点打上标记
+        const rowArray = Array(pointer.row).fill(null);
+        const colArray = Array(pointer.col).fill(null);
+        rowArray.map((item, row) => {
+          colArray.map((temp, col) => {
+            ListsMap[i + row][j + col] = `k${pointerIndex}`;
+            return true;
+          });
+          return true;
+        });
+
+        return false;
+      }
+      return true;
+    }));
+    return true;
+  });
+
+  return coordinateMap;
+} 
+
+
+export default layoutAlgorithm;

ruoyi-ui/src/assets/images/api/login.js

@@ -0,0 +1,57 @@
+import request from '@/utils/request'
+
+// 登录方法
+export function login(username, password, code, uuid) {
+  return request({
+    url: '/auth/login',
+    method: 'post',
+    data: { username, password, code, uuid }
+  })
+}
+
+// 刷新方法
+export function refreshToken() {
+  return request({
+    url: '/auth/refresh',
+    method: 'post'
+  })
+}
+
+// 获取用户详细信息
+export function getInfo() {
+  return request({
+    url: '/system/user/getInfo',
+    method: 'get'
+  })
+}
+
+// 退出方法
+export function logout() {
+  return request({
+    url: '/auth/logout',
+    method: 'delete'
+  })
+}
+
+// 获取验证码
+export function getCodeImg() {
+  return request({
+    url: '/code',
+    method: 'get'
+  })
+}
+
+// 获取二维码code
+export function getLoginCode() {
+  return request({
+    url: '/auth/getQrCode',
+    method: 'post'
+  })
+}
+// 二维码是否扫码
+export function getScanStatus(code) {
+  return request({
+    url: `/auth/getPool/${code}`,
+    method: 'get',
+  })
+}

ruoyi-ui/src/assets/images/api/menu.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+// 获取路由
+export const getRouters = () => {
+  return request({
+    url: '/system/menu/getRouters',
+    method: 'get'
+  })
+}

ruoyi-ui/src/assets/images/api/modeler.js

@@ -0,0 +1,126 @@
+import request from '@/utils/request'
+
+export const getTabList = (data) => {
+  return request({
+    headers: {
+      'accountName': 'guest'
+    },
+    url: '/jflow/p/c/meta/table/list',
+    method: 'post',
+    data
+  })
+}
+export const delRemove = (data) => {
+  return request({
+    headers: {
+      'accountName': 'guest'
+    },
+    url: '/jflow/p/cs/module/remove',
+    method: 'post',
+    data
+  })
+}
+export const getColumnList = (data) => {
+  return request({
+    headers: {
+      'accountName': 'guest'
+    },
+    url: '/jflow/p/c/meta/column/list',
+    method: 'post',
+    data
+  })
+}
+// 流程模型列表
+export const getSearch = (data) => {
+  return request({
+    headers: {
+      'accountName': 'guest'
+    },
+    url: '/jflow/p/cs/module/search',
+    method: 'post',
+    data
+  })
+}
+export const setMigrate = (data) => {
+  return request({
+    headers: {
+      'accountName': 'guest'
+    },
+    url: '/jflow/p/cs/module/migrate',
+    method: 'post',
+    data
+  })
+}
+// 发布流程
+export const setPublish = (data) => {
+  return request({
+    headers: {
+      'accountName': 'guest'
+    },
+    url: '/jflow/p/cs/module/publish',
+    method: 'post',
+    data
+  })
+}
+//停用流程
+export const setUnpublish = (data) => {
+  return request({
+    headers: {
+      'accountName': 'guest'
+    },
+    url: '/jflow/p/cs/module/unpublish',
+    method: 'post',
+    data
+  })
+}
+//复制流程
+export const setCopy = (data) => {
+  return request({
+    headers: {
+      'accountName': 'guest'
+    },
+    url: '/jflow/p/cs/module/copy',
+    method: 'post',
+    data
+  })
+}
+export const getLoad = (data) => {
+  return request({
+    headers: {
+      'accountName': 'guest'
+    },
+    url: '/jflow/p/cs/module/load',
+    method: 'post',
+    data
+  })
+}
+export const getDuplicate = (data) => {
+  return request({
+    headers: {
+      'accountName': 'guest'
+    },
+    url: '/jflow/p/cs/module/duplicate',
+    method: 'post',
+    data
+  })
+}
+export const getCommit = (data) => {
+  return request({
+    headers: {
+      'accountName': 'guest'
+    },
+    url: '/jflow/p/cs/module/commit',
+    method: 'post',
+    data
+  })
+}
+export const getPublish = (data) => {
+  return request({
+    headers: {
+      'accountName': 'guest'
+    },
+    url: '/jflow/p/cs/module/publish',
+    method: 'post',
+    data
+  })
+}

ruoyi-ui/src/assets/images/api/monitor/job.js

@@ -0,0 +1,71 @@
+import request from '@/utils/request'
+
+// 查询定时任务调度列表
+export function listJob(query) {
+  return request({
+    url: '/schedule/job/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询定时任务调度详细
+export function getJob(jobId) {
+  return request({
+    url: '/schedule/job/' + jobId,
+    method: 'get'
+  })
+}
+
+// 新增定时任务调度
+export function addJob(data) {
+  return request({
+    url: '/schedule/job',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改定时任务调度
+export function updateJob(data) {
+  return request({
+    url: '/schedule/job',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除定时任务调度
+export function delJob(jobId) {
+  return request({
+    url: '/schedule/job/' + jobId,
+    method: 'delete'
+  })
+}
+
+// 任务状态修改
+export function changeJobStatus(jobId, status) {
+  const data = {
+    jobId,
+    status
+  }
+  return request({
+    url: '/schedule/job/changeStatus',
+    method: 'put',
+    data: data
+  })
+}
+
+
+// 定时任务立即执行一次
+export function runJob(jobId, jobGroup) {
+  const data = {
+    jobId,
+    jobGroup
+  }
+  return request({
+    url: '/schedule/job/run',
+    method: 'put',
+    data: data
+  })
+}

ruoyi-ui/src/assets/images/api/monitor/jobLog.js

@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 查询调度日志列表
+export function listJobLog(query) {
+  return request({
+    url: '/schedule/job/log/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除调度日志
+export function delJobLog(jobLogId) {
+  return request({
+    url: '/schedule/job/log/' + jobLogId,
+    method: 'delete'
+  })
+}
+
+// 清空调度日志
+export function cleanJobLog() {
+  return request({
+    url: '/schedule/job/log/clean',
+    method: 'delete'
+  })
+}

ruoyi-ui/src/assets/images/api/monitor/online.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 查询在线用户列表
+export function list(query) {
+  return request({
+    url: '/system/online/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 强退用户
+export function forceLogout(tokenId) {
+  return request({
+    url: '/system/online/' + tokenId,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/assets/images/api/system/bin.js

@@ -0,0 +1,152 @@
+import request from '@/utils/request'
+
+// 查询疫苗信息列表
+export function listInfo(query) {
+  return request({
+    url: '/boman-web-core/core/ryrl/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function listInfotj(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/stsByCzrk ',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 查询疫苗信息详细
+export function getInfo(id) {
+  return request({
+    url: '/boman-web-core/core/ryrl/getById/' + id,
+    method: 'get'
+  })
+}
+
+// 户籍地址 新增修改
+export function listRoleer(data) {
+  return request({
+    url: '/boman-web-core/administrativeInfo/treeSelect',
+    method: 'get',
+    // data
+  })
+}
+
+// 户籍地址 新增修改
+export function listRoleergth(data) {
+  return request({
+    url: '/boman-web-core/core/fxry/getSysRegion',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 户籍地址搜索
+export function listRoleerseavh(data) {
+  return request({
+    url: '/boman-web-core/administrativeInfo/treeSelectVillage',
+    method: 'get',
+    // data
+  })
+}
+
+
+// 新增人员信息
+export function addInfo(data) {
+  return request({
+    url: '/boman-web-core/core/ryrl/addRlry',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改疫苗信息
+export function updateInfo(data) {
+  return request({
+    url: '/boman-web-core/core/ryrl/editRlry',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除疫苗信息
+export function delInfo(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/deleteCzrk' ,
+    method: 'get',
+    params: query
+
+  })
+}
+
+// 导出疫苗信息
+export function exportInfo(query) {
+  return request({
+    url: '/boman-web-core/core/info/export',
+    method: 'post',
+    data: query
+  })
+}
+
+// 查询身份证信息
+export function idces(query) {
+  return request({
+    url: '/boman-web-core/core/info/findHjInfo',
+    method: 'post',
+    data: query
+  })
+}
+// 导出参数
+export function exportConfig(query) {
+  return request({
+    url: '/boman-file/common/file/async/export',
+    method: 'post',
+    data: query
+  })
+}
+
+// 导出参数
+export function exportConfigtyr(query) {
+  return request({
+    url: '/boman-file/common/file/before/download ',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除疫苗名称信息
+export function delInfort(id) {
+  return request({
+    url: '/boman-web-core/core/info/vaccineInfoUser/' + id,
+    method: 'get'
+  })
+}
+
+// 列表查看疫苗信息
+export function yiaoe(query) {
+  return request({
+    url: '/boman-web-core/core/info/findInfoUser',
+    method: 'post',
+	data: query
+  })
+}
+
+export function delInfohy(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/reduction/' + query,
+    method: 'get'
+  })
+}
+
+// 导出错误日志
+export function importLog(query){
+  return request({
+    url: '/boman-web-core/ymjzImportError/list',
+    method: 'get',
+    data: query
+  })
+}

ruoyi-ui/src/assets/images/api/system/claim.js

@@ -0,0 +1,170 @@
+import request from '@/utils/request'
+
+// /boman-web-core/core/ryrl/list
+// 查询疫苗信息列表
+export function listInfo(query) {
+  return request({
+    url: '/boman-web-core/core/ryrl/listHj',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询常住疫苗信息列表
+export function listInfoch(query) {
+  return request({
+    url: '/boman-web-core/core/ryrl/listCz',
+    method: 'get',
+    params: query
+  })
+}
+
+
+export function delInfohy(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/reduction/' + query,
+    method: 'get'
+  })
+}
+
+
+// 查询疫苗信息详细
+export function getInfo(id) {
+  return request({
+    url: '/boman-web-core/core/czrk/getById/' + id,
+    method: 'get'
+  })
+}
+
+// 户籍地址 新增修改
+export function listRoleer(data) {
+  return request({
+    url: '/boman-web-core/administrativeInfo/treeSelect',
+    method: 'get',
+    // data
+  })
+}
+
+// 户籍地址搜索
+export function listRoleerseavh(data) {
+  return request({
+    url: '/boman-web-core/administrativeInfo/treeSelectVillage',
+    method: 'get',
+    // data
+  })
+}
+
+
+// 新增人员信息
+export function addInfo(data) {
+  return request({
+    url: '/boman-web-core/core/ryrl/addRlry',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改疫苗信息
+// export function updateInfo(data) {
+//   return request({
+//     url: '/boman-web-core/core/ryrl/editRlry',
+//     method: 'post',
+//     data: data
+//   })
+// }
+export function updateInfo(data) {
+  return request({
+    url: '/boman-web-core/core/ryrl/editRlry',
+    method: 'post',
+    data: data
+  })
+}
+
+// boman-web-core/core/czrk/deleteCzrk
+// 删除疫苗信息
+export function delInfo(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/changeCzrk' ,
+    method: 'post',
+    data: query
+  })
+}
+
+// 导出疫苗信息
+export function exportInfo(query) {
+  return request({
+    url: '/boman-web-core/core/info/export',
+    method: 'post',
+    data: query
+  })
+}
+
+// // 查询身份证信息
+// export function idces(query) {
+//   return request({
+//     url: '/boman-web-core/core/info/findHjInfo',
+//     method: 'post',
+//     data: query
+//   })
+// }
+
+
+// 网格
+export function listRoleergthwg(data) {
+  return request({
+    url: '/boman-web-core/gridInfo/treeSelect',
+    method: 'post',
+    data: data
+  })
+}
+// 查询身份证信息
+export function idces(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/findHjInfo',
+    method: 'post',
+    data: query
+  })
+}
+// 导出参数
+export function exportConfig(query) {
+  return request({
+    url: '/boman-file/common/file/async/export',
+    method: 'post',
+    data: query
+  })
+}
+
+// 导出参数
+export function exportConfigtyr(query) {
+  return request({
+    url: '/boman-file/common/file/before/download ',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除疫苗名称信息
+export function delInfort(id) {
+  return request({
+    url: '/boman-web-core/core/info/vaccineInfoUser/' + id,
+    method: 'get'
+  })
+}
+
+// 列表查看疫苗信息
+export function yiaoe(query) {
+  return request({
+    url: '/boman-web-core/core/info/findInfoUser',
+    method: 'post',
+	data: query
+  })
+}
+
+// 导出错误日志
+export function importLog(query){
+  return request({
+    url: '/boman-web-core/ymjzImportError/list',
+    method: 'get',
+    data: query
+  })
+}

ruoyi-ui/src/assets/images/api/system/coming.js

@@ -0,0 +1,252 @@
+import request from '@/utils/request'
+
+// 查询户籍疫苗信息列表
+
+export function listInfo(query) {
+  return request({
+    url: '/boman-web-core/core/toQianshan/toQianshan',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询居住地址疫苗信息列表
+// export function listInfos(query) {
+//   return request({
+//     url: '/boman-web-core/core/jzdz/list',
+//     method: 'get',
+//     params: query
+//   })
+// }
+export function listInfos(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/unusualList',
+    method: 'get',
+    data: query
+  })
+}
+
+export function listInfotj(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/stsByCzrk ',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 新增人员列表
+export function listInfotjxz(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/listByXz',
+    method: 'get',
+    params: query
+  })
+}
+
+// 减少人员列表
+export function listInfotjjs(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/listByJs',
+    method: 'get',
+    params: query
+  })
+}
+
+// boman-web-core/core/czrk/family
+// 家庭成员信息
+export function listInfotjjsfaml(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/family/' + query,
+    method: 'get'
+    // params: query
+  })
+}
+
+
+// 一键确认
+// export function listInfotjjssbule(query) {
+//   console.log(query)
+//   return request({
+//     url: '/boman-web-core/core/ryrl/confirmInfo/' + query ,
+//     method: 'get'
+//     // params: query
+//   })
+// }
+export function listInfotjjssbule(query) {
+  console.log(query)
+  return request({
+    url: '/boman-web-core/core/czrk/synchronization/' + query ,
+    method: 'get'
+    // params: query
+  })
+}
+
+
+
+
+
+// 查询疫苗信息详细
+export function getInfo(id) {
+  return request({
+    url: '/boman-web-core/core/ryrl/getById/' + id,
+    method: 'get'
+  })
+}
+// export function getInfo(id) {
+//   return request({
+//     url: '/boman-web-core/core/czrk/getById/' + id,
+//     method: 'get'
+//   })
+// }
+
+// 户籍地址 新增修改
+export function listRoleer(data) {
+  return request({
+    url: '/boman-web-core/administrativeInfo/treeSelect',
+    method: 'get',
+    // data
+  })
+}
+
+// 户籍地址 新增修改
+export function listRoleergth(data) {
+  return request({
+    url: '/boman-system/chinaArea/treeSelect',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 网格
+export function listRoleergthwg(data) {
+  return request({
+    url: '/boman-web-core/gridInfo/treeSelect',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 户籍地址搜索
+export function listRoleerseavh(data) {
+  return request({
+    url: '/boman-web-core/administrativeInfo/treeSelectVillage',
+    method: 'get',
+    // data
+  })
+}
+
+
+// /boman-web-core/core/ryrl/addRlry
+// 新增人员信息
+export function addInfo(data) {
+  return request({
+    url: '/boman-web-core/core/czrk/addCzrk',
+    method: 'post',
+    data: data
+  })
+}
+
+// boman-web-core/core/ryrl/editRlry
+// 修改疫苗信息
+export function updateInfo(data) {
+  return request({
+    url: '/boman-web-core/core/czrk/editCzrk',
+    method: 'post',
+    data: data
+  })
+}
+
+// boman-web-core/core/czrk/deleteCzrk
+// 删除疫苗信息
+export function delInfo(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/changeCzrk' ,
+    method: 'post',
+    data: query
+
+  })
+}
+
+// 导出疫苗信息
+export function exportInfo(query) {
+  return request({
+    url: '/boman-web-core/core/info/export',
+    method: 'post',
+    data: query
+  })
+}
+
+// 查询身份证信息
+// export function idces(query) {
+//   return request({
+//     url: '/boman-web-core/core/info/findHjInfo',
+//     method: 'post',
+//     data: query
+//   })
+// }
+// 一键同步信息
+
+export function listInfotjjssquer(query) {
+ return request({
+    url: '/boman-web-core/core/czrk/synchronization/' +  query,
+    method: 'get'
+    // params: query
+  })
+}
+
+// 查询身份证信息
+export function idces(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/findHjInfo',
+    method: 'post',
+    data: query
+  })
+}
+
+
+// 导出参数
+export function exportConfig(query) {
+  return request({
+    url: '/boman-file/common/file/async/export',
+    method: 'post',
+    data: query
+  })
+}
+
+// 导出参数
+export function exportConfigtyr(query) {
+  return request({
+    url: '/boman-file/common/file/before/download ',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除疫苗名称信息
+export function delInfort(id) {
+  return request({
+    url: '/boman-web-core/core/info/vaccineInfoUser/' + id,
+    method: 'get'
+  })
+}
+
+// 列表查看疫苗信息
+export function yiaoe(query) {
+  return request({
+    url: '/boman-web-core/core/info/findInfoUser',
+    method: 'post',
+	data: query
+  })
+}
+
+// 导出错误日志
+export function importLog(query){
+  return request({
+    url: '/boman-web-core/ymjzImportError/list',
+    method: 'get',
+    data: query
+  })
+}

ruoyi-ui/src/assets/images/api/system/config.js

@@ -0,0 +1,193 @@
+import request from '@/utils/request'
+
+// 查询参数列表
+export function listConfig(query) {
+  return request({
+    url: '/system/config/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function listInfotj(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/stsByCzrkHomePage',
+    method: 'get',
+    params: query
+  })
+}
+export function delInfohy(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/reduction/' + query,
+    method: 'get'
+  })
+}
+
+
+// 新增人员列表
+export function listInfotjxz(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/listByXz',
+    method: 'get',
+    params: query
+  })
+}
+
+// 减少人员列表
+export function listInfotjjs(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/listByJs',
+    method: 'get',
+    params: query
+  })
+}
+
+export function listIndextwo(query) {
+  return request({
+    url: '/system/dict/data/type/' + query,
+    method: 'get'
+    // params: query
+  })
+}
+// 获取表单查询字段、按钮、表头
+export function getTableQuery(data) {
+  return request({
+    url: '/boman-web-core/p/cs/getTableQuery',
+    method: 'POST',
+    data
+  })
+}
+
+
+
+
+export function listIndextherr(query) {
+  return request({
+    url: '/system/dict/data/type/' + query,
+    method: 'get'
+    // params: query listIndextherr
+  })
+}
+
+// 统计
+export function tjList(query) {
+  return request({
+    url: '/boman-web-core/vaccination/statisticYmjz',
+    method: 'get'
+    // params: query listIndextherr
+  })
+}
+
+
+
+// 查询参数详细
+export function getConfig(id) {
+  return request({
+    url: '/system/config/' + id,
+    method: 'get'
+  })
+}
+
+// 根据参数键名查询参数值
+export function getConfigKey(configKey) {
+  return request({
+    url: '/system/config/configKey/' + configKey,
+    method: 'get'
+  })
+}
+
+// 新增参数配置
+export function addConfig(data) {
+  return request({
+    url: '/system/config',
+    method: 'post',
+    data: data
+  })
+}
+export function addConfigindex(data) {
+  return request({
+    url: '/boman-web-core/p/cs/objectSave',
+    method: 'post',
+    data: data
+  })
+}
+
+export function listIndex(data) {
+  return request({
+    url: '/boman-web-core/p/cs/queryList',
+    method: 'post',
+    data: data
+  })
+}
+
+export function listIndexber(data) {
+  return request({
+    url: '/boman-web-core/p/cs/queryList',
+    method: 'post',
+    data: data
+  })
+}
+
+
+
+export function listIndexfou(data) {
+  return request({
+    url: '/boman-web-core/p/cs/queryList',
+    method: 'post',
+    data: data
+  })
+}
+// export function listIndextanl(data) {
+//   return request({
+//     url: '/boman-web-core/p/cs/table/getByTableName',
+//     method: 'post',
+//     data: data
+//   })
+// }
+
+export function listIndextanl(data) {
+  return request({
+    url: '/boman-web-core/p/cs/getObject',
+    method: 'post',
+    data: data
+  })
+}
+// 修改参数配置
+export function updateConfig(data) {
+  return request({
+    url: '/system/config',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除参数配置
+export function delConfig(id) {
+  return request({
+    url: '/system/config/' + id,
+    method: 'delete'
+  })
+}
+
+export function delIndexnabd(data) {
+  return request({
+    url: 'boman-web-core/p/cs/objectDelete',
+    method: 'POST',
+    data
+  })
+}
+
+// 清理参数缓存
+export function clearCache() {
+  return request({
+    url: '/system/config/clearCache',
+    method: 'delete'
+  })
+}
+// 查询用户个人信息
+export function getUserProfile() {
+  return request({
+    url: '/system/user/profile',
+    method: 'get'
+  })
+}

ruoyi-ui/src/assets/images/api/system/dept.js

@@ -0,0 +1,107 @@
+import request from '@/utils/request'
+
+// 查询部门列表
+export function listDept(query) {
+  return request({
+    url: '/system/dept/list',
+    method: 'get',
+    params: query
+  })
+}
+// 行政区域
+export function listRoleergth(data) {
+  return request({
+    url: '/boman-system/chinaArea/treeSelect',
+    method: 'post',
+    data: data
+  })
+}
+
+
+
+// 查询部门列表
+export function listDeptri(query) {
+  return request({
+    url: '/system/dept/treeselect',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询部门列表
+export function listDeptrity(query) {
+  return request({
+    url: '/system/dept/deptList',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 查询部门列表（排除节点）
+export function listDeptExcludeChild(id) {
+  return request({
+    url: '/system/dept/list/exclude/' + id,
+    method: 'get'
+  })
+}
+
+// 查询部门详细
+export function getDept(id) {
+  return request({
+    url: '/system/dept/' + id,
+    method: 'get'
+  })
+}
+
+// 查询部门下拉树结构
+export function treeselect(query) {
+  return request({
+    url: '/system/dept/treeselect',
+    method: 'get',
+	params: query
+  })
+}
+
+// 查询部门下拉树结构
+export function treeselectdepts(query) {
+  return request({
+    url: '/system/dept/depts',
+    method: 'get',
+	params: query
+  })
+}
+
+// 根据角色ID查询部门树结构
+export function roleDeptTreeselect(roleId) {
+  return request({
+    url: '/system/dept/roleDeptTreeselect/' + roleId,
+    method: 'get'
+  })
+}
+
+// 新增部门
+export function addDept(data) {
+  return request({
+    url: '/system/dept',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改部门
+export function updateDept(data) {
+  return request({
+    url: '/system/dept',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除部门
+export function delDept(id) {
+  return request({
+    url: '/system/dept/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/assets/images/api/system/dict/data.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询字典数据列表
+export function listData(query) {
+  return request({
+    url: '/system/dict/data/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询字典数据详细
+export function getData(dictCode) {
+  return request({
+    url: '/system/dict/data/' + dictCode,
+    method: 'get'
+  })
+}
+
+// 根据字典类型查询字典数据信息
+export function getDicts(dictType) {
+  return request({
+    url: '/system/dict/data/type/' + dictType,
+    method: 'get'
+  })
+}
+
+// 新增字典数据
+export function addData(data) {
+  return request({
+    url: '/system/dict/data',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改字典数据
+export function updateData(data) {
+  return request({
+    url: '/system/dict/data',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除字典数据
+export function delData(dictCode) {
+  return request({
+    url: '/system/dict/data/' + dictCode,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/assets/images/api/system/dict/menuDict.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询字典数据列表
+export function listData(query) {
+  return request({
+    url: '/system/dict/data/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询字典数据详细
+export function getData(dictCode) {
+  return request({
+    url: '/system/dict/data/' + dictCode,
+    method: 'get'
+  })
+}
+
+// 根据字典类型查询字典数据信息
+export function getDicts(dictType) {
+  return request({
+    url: '/system/dict/data/type/' + dictType,
+    method: 'get'
+  })
+}
+
+// 新增字典数据
+export function addData(data) {
+  return request({
+    url: '/system/dict/data',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改字典数据
+export function updateData(data) {
+  return request({
+    url: '/system/dict/data',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除字典数据
+export function delData(dictCode) {
+  return request({
+    url: '/system/dict/data/' + dictCode,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/assets/images/api/system/dict/type.js

@@ -0,0 +1,60 @@
+import request from '@/utils/request'
+
+// 查询字典类型列表
+export function listType(query) {
+  return request({
+    url: '/system/dict/type/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询字典类型详细
+export function getType(id) {
+  return request({
+    url: '/system/dict/type/' + id,
+    method: 'get'
+  })
+}
+
+// 新增字典类型
+export function addType(data) {
+  return request({
+    url: '/system/dict/type',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改字典类型
+export function updateType(data) {
+  return request({
+    url: '/system/dict/type',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除字典类型
+export function delType(id) {
+  return request({
+    url: '/system/dict/type/' + id,
+    method: 'delete'
+  })
+}
+
+// 清理参数缓存
+export function clearCache() {
+  return request({
+    url: '/system/dict/type/clearCache',
+    method: 'delete'
+  })
+}
+
+// 获取字典选择框列表
+export function optionselect() {
+  return request({
+    url: '/system/dict/type/optionselect',
+    method: 'get'
+  })
+}

ruoyi-ui/src/assets/images/api/system/dxxf.js

@@ -0,0 +1,251 @@
+import request from '@/utils/request'
+
+// 查询户籍疫苗信息列表
+export function listInfo(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/unusualList',
+    method: 'post',
+    data: query
+  })
+} 
+
+// 查询居住地址疫苗信息列表
+// export function listInfos(query) {
+//   return request({
+//     url: '/boman-web-core/core/jzdz/list',
+//     method: 'get',
+//     params: query
+//   })
+// }
+export function listInfos(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/unusualList',
+    method: 'get',
+    data: query
+  })
+}
+
+export function listInfotj(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/stsByCzrk ',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 新增人员列表
+export function listInfotjxz(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/listByXz',
+    method: 'get',
+    params: query
+  })
+}
+
+// 减少人员列表
+export function listInfotjjs(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/listByJs',
+    method: 'get',
+    params: query
+  })
+}
+
+// boman-web-core/core/czrk/family
+// 家庭成员信息
+export function listInfotjjsfaml(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/family/' + query,
+    method: 'get'
+    // params: query
+  })
+}
+
+
+// 一键确认
+// export function listInfotjjssbule(query) {
+//   console.log(query)
+//   return request({
+//     url: '/boman-web-core/core/ryrl/confirmInfo/' + query ,
+//     method: 'get'
+//     // params: query
+//   })
+// }
+export function listInfotjjssbule(query) {
+  console.log(query)
+  return request({
+    url: '/boman-web-core/core/czrk/synchronization/' + query ,
+    method: 'get'
+    // params: query
+  })
+}
+
+
+
+
+
+// 查询疫苗信息详细
+export function getInfo(id) {
+  return request({
+    url: '/boman-web-core/core/ryrl/getById/' + id,
+    method: 'get'
+  })
+}
+// export function getInfo(id) {
+//   return request({
+//     url: '/boman-web-core/core/czrk/getById/' + id,
+//     method: 'get'
+//   })
+// }
+
+// 户籍地址 新增修改
+export function listRoleer(data) {
+  return request({
+    url: '/boman-web-core/administrativeInfo/treeSelect',
+    method: 'get',
+    // data
+  })
+}
+
+// 户籍地址 新增修改
+export function listRoleergth(data) {
+  return request({
+    url: '/boman-system/chinaArea/treeSelect',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 网格
+export function listRoleergthwg(data) {
+  return request({
+    url: '/boman-web-core/gridInfo/treeSelect',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 户籍地址搜索
+export function listRoleerseavh(data) {
+  return request({
+    url: '/boman-web-core/administrativeInfo/treeSelectVillage',
+    method: 'get',
+    // data
+  })
+}
+
+
+// /boman-web-core/core/ryrl/addRlry
+// 新增人员信息
+export function addInfo(data) {
+  return request({
+    url: '/boman-web-core/core/czrk/addCzrk',
+    method: 'post',
+    data: data
+  })
+}
+
+// boman-web-core/core/ryrl/editRlry
+// 修改疫苗信息
+export function updateInfo(data) {
+  return request({
+    url: '/boman-web-core/core/czrk/editCzrk',
+    method: 'post',
+    data: data
+  })
+}
+
+// boman-web-core/core/czrk/deleteCzrk
+// 删除疫苗信息
+export function delInfo(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/changeCzrk' ,
+    method: 'post',
+    data: query
+
+  })
+}
+
+// 导出疫苗信息
+export function exportInfo(query) {
+  return request({
+    url: '/boman-web-core/core/info/export',
+    method: 'post',
+    data: query
+  })
+}
+
+// 查询身份证信息
+// export function idces(query) {
+//   return request({
+//     url: '/boman-web-core/core/info/findHjInfo',
+//     method: 'post',
+//     data: query
+//   })
+// }
+// 一键同步信息
+
+export function listInfotjjssquer(query) {
+ return request({
+    url: '/boman-web-core/core/czrk/synchronization/' +  query,
+    method: 'get'
+    // params: query
+  })
+}
+
+// 查询身份证信息
+export function idces(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/findHjInfo',
+    method: 'post',
+    data: query
+  })
+}
+
+
+// 导出参数
+export function exportConfig(query) {
+  return request({
+    url: '/boman-file/common/file/async/export',
+    method: 'post',
+    data: query
+  })
+}
+
+// 导出参数
+export function exportConfigtyr(query) {
+  return request({
+    url: '/boman-file/common/file/before/download ',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除疫苗名称信息
+export function delInfort(id) {
+  return request({
+    url: '/boman-web-core/core/info/vaccineInfoUser/' + id,
+    method: 'get'
+  })
+}
+
+// 列表查看疫苗信息
+export function yiaoe(query) {
+  return request({
+    url: '/boman-web-core/core/info/findInfoUser',
+    method: 'post',
+	data: query
+  })
+}
+
+// 导出错误日志
+export function importLog(query){
+  return request({
+    url: '/boman-web-core/ymjzImportError/list',
+    method: 'get',
+    data: query
+  })
+}

ruoyi-ui/src/assets/images/api/system/editing.js

@@ -0,0 +1,74 @@
+import request from '@/utils/request'
+
+// 获取表单数据
+export function getQueryList(data) {
+  return request({
+    url: '/boman-web-core/p/cs/table/getByTableName',
+    method: 'POST',
+    data
+  })
+}
+// 获取表单查询字段、按钮、表头
+export function getTableQuery(data) {
+  return request({
+    url: '/boman-web-core/p/cs/getTableQuery',
+    method: 'POST',
+    data
+  })
+}
+
+// 保存
+export function addbjectSave(data) {
+  return request({
+    url: '/boman-web-core/p/cs/objectSave',
+    method: 'POST',
+    data
+  })
+}
+// 获取表单列表数据
+export function getObject(data) {
+  return request({
+    url: '/boman-web-core/p/cs/getObject',
+    method: 'POST',
+    data
+  })
+}
+// 根据表名获取表单信息
+export function getByTableName(data) {
+  return request({
+    url: '/boman-web-core/p/cs/table/getByTableName',
+    method: 'POST',
+    data
+  })
+}
+export function delMenu(id) {
+  return request({
+    url: 'boman-web-core/p/cs/objectDelete',
+    method: 'delete'
+  })
+}
+
+// 提交
+export function tableSubimt(data) {
+  return request({
+    url: '/boman-web-core/p/cs/objectSubmit',
+    method: 'POST',
+    data
+  })
+}
+ // 反提交
+ export function tableSubimtanit(data) {
+   return request({
+     url: '/boman-web-core/p/cs/objectUnSubmit',
+     method: 'POST',
+     data
+   })
+ }
+// 获取表单tab数据
+ export function geteditindeTab(data) {
+   return request({
+     url: '/boman-web-core/p/cs/objectTab',
+     method: 'POST',
+     data
+   })
+ }

ruoyi-ui/src/assets/images/api/system/eturnees.js

@@ -0,0 +1,133 @@
+import request from '@/utils/request'
+
+// 查询疫苗信息列表
+export function listInfo(query) {
+  return request({
+    url: '/boman-web-core/core/fxry/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// // 查询疫苗信息列表
+// export function listInfo(query) {
+//   return request({
+//     url: '/boman-web-core/core/fxry/getSysRegion',
+//     method: 'post',
+//    data: query
+//   })
+// }
+
+// 查询疫苗信息详细
+export function getInfo(id) {
+  return request({
+    url: '/boman-web-core/core/fxry/getById/' + id,
+    method: 'get'
+  })
+}
+
+// 户籍地址 新增修改
+export function listRoleer(data) {
+  return request({
+    url: '/boman-web-core/administrativeInfo/treeSelect',
+    method: 'get',
+    // data
+  })
+}
+
+// 户籍地址搜索
+export function listRoleerseavh(data) {
+  return request({
+    url: '/boman-web-core/administrativeInfo/treeSelectVillage',
+    method: 'get',
+    // data
+  })
+}
+
+
+// 新增人员信息
+export function addInfo(data) {
+  return request({
+    url: '/boman-web-core/core/fxry/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改疫苗信息
+export function updateInfo(data) {
+  return request({
+    url: '/boman-web-core/core/fxry/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除疫苗信息
+export function delInfo(id) {
+  return request({
+    url: '/boman-web-core/core/fxry/delete/' + id,
+    method: 'get'
+  })
+}
+
+// 导出疫苗信息
+export function exportInfo(query) {
+  return request({
+    url: '/boman-web-core/core/info/export',
+    method: 'post',
+    data: query
+  })
+}
+
+// 查询身份证信息
+export function idces(query) {
+  return request({
+    url: '/boman-web-core/core/info/findHjInfo',
+    method: 'post',
+    data: query
+  })
+}
+// 导出参数
+export function exportConfig(query) {
+  return request({
+    url: '/boman-file/common/file/async/export',
+    method: 'post',
+    data: query
+  })
+}
+
+// 导出参数
+export function exportConfigtyr(query) {
+  return request({
+    url: '/boman-file/common/file/before/download ',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除疫苗名称信息
+export function delInfort(id) {
+  return request({
+    url: '/boman-web-core/core/info/vaccineInfoUser/' + id,
+    method: 'get'
+  })
+}
+
+// 列表查看疫苗信息
+export function yiaoe(query) {
+  return request({
+    url: '/boman-web-core/core/info/findInfoUser',
+    method: 'post',
+	data: query
+  })
+}
+
+// 导出错误日志
+export function importLog(query){
+  return request({
+    url: '/boman-web-core/ymjzImportError/list',
+    method: 'get',
+    data: query
+  })
+}

ruoyi-ui/src/assets/images/api/system/form.js

@@ -0,0 +1,95 @@
+import request from '@/utils/request'
+
+// 获取表单的查询字段、按钮、表头信息
+export function getTableQuery(data) {
+  return request({
+    url: '/boman-web-core/p/cs/getTableQuery',
+    method: 'POST',
+    data
+  })
+}
+// 获取单表单数据
+export function getObject(data) {
+  return request({
+    url: '/boman-web-core/p/cs/getObject',
+    method: 'POST',
+    data
+  })
+}
+
+export function getObjectqure(data) {
+  return request({
+    url: '/boman-web-core/p/cs/getTableQuery',
+    method: 'POST',
+    data
+  })
+}
+
+
+// 获取表单tab数据
+ export function geteditindeTab(data) {
+   return request({
+     url: '/boman-web-core/p/cs/objectTab',
+     method: 'POST',
+     data
+   })
+ }
+
+ export function listIndex(data) {
+   return request({
+     url: '/boman-web-core/p/cs/queryList',
+     method: 'post',
+     data: data
+   })
+ }
+
+ // 删除菜单
+ export function delMenutabform(data) {
+   return request({
+     url: 'boman-web-core/p/cs/objectDelete',
+     method: 'POST',
+     data
+   })
+ }
+
+ // 提交
+ export function tableSubimt(data) {
+   return request({
+     url: '/boman-web-core/p/cs/objectSubmit',
+     method: 'POST',
+     data
+   })
+ }
+  // 反提交
+  export function tableSubimtanit(data) {
+    return request({
+      url: '/boman-web-core/p/cs/objectUnSubmit',
+      method: 'POST',
+      data
+    })
+  }
+  // 保存
+  export function addbjectSave(data) {
+    return request({
+      url: '/boman-web-core/p/cs/objectSave',
+      method: 'POST',
+      data
+    })
+  }
+
+  // 查询用户个人信息
+  export function getUserProfilefor() {
+    return request({
+      url: '/system/user/profile',
+      method: 'get'
+    })
+  }
+
+  // 提交2.0
+  export function tabsubm(data) {
+    return request({
+      url: '/jflow/p/c/process/launch',
+      method: 'POST',
+      data
+    })
+  }

ruoyi-ui/src/assets/images/api/system/grid.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询潜山网格信息列表
+export function listGrid(query) {
+  return request({
+    url: '/boman-web-core/core/grid/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询潜山网格信息详细
+export function getGrid(id) {
+  return request({
+    url: '/boman-web-core/core/grid/' + id,
+    method: 'get'
+  })
+}
+
+// 新增潜山网格信息
+export function addGrid(data) {
+  return request({
+    url: '/boman-web-core/core/grid',
+    method: 'post',
+    data: data
+  })
+}
+
+export function cxwg(data) {
+  return request({
+    url: '/boman-web-core/core/grid/queryParent',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改潜山网格信息
+export function updateGrid(data) {
+  return request({
+    url: '/boman-web-core/core/grid',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除潜山网格信息
+export function delGrid(id) {
+  return request({
+    url: '/boman-web-core/core/grid/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/assets/images/api/system/logininfor.js

@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 查询登录日志列表
+export function list(query) {
+  return request({
+    url: '/system/logininfor/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除登录日志
+export function delLogininfor(id) {
+  return request({
+    url: '/system/logininfor/' + id,
+    method: 'delete'
+  })
+}
+
+// 清空登录日志
+export function cleanLogininfor() {
+  return request({
+    url: '/system/logininfor/clean',
+    method: 'delete'
+  })
+}

ruoyi-ui/src/assets/images/api/system/menu.js

@@ -0,0 +1,74 @@
+import request from '@/utils/request'
+
+// 查询菜单列表
+export function listMenu(query) {
+  return request({
+    url: '/system/menu/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询菜单详细
+export function getMenu(id) {
+  return request({
+    url: '/system/menu/' + id,
+    method: 'get'
+  })
+}
+
+// 查询菜单下拉树结构
+export function treeselect() {
+  return request({
+    url: '/system/menu/treeselect',
+    method: 'get'
+  })
+}
+
+// 根据角色ID查询菜单下拉树结构
+export function roleMenuTreeselect(roleId) {
+  return request({
+    url: '/system/menu/roleMenuTreeselect/' + roleId,
+    method: 'get'
+  })
+}
+// 根据角色ID查询菜单下拉树结构
+export function treeMenuNotAddLeafNode(roleId) {
+  return request({
+    url: '/system/menu/listTreeByRoleId/' + roleId,
+    method: 'get'
+  })
+}
+// 获取权限
+export function listMenus(id,menuId) {
+  return request({
+    url: '/system/menu/listMenus/roleId/' + menuId+'/menuId/'+id,
+    method: 'get'
+  })
+}
+
+// 新增菜单
+export function addMenu(data) {
+  return request({
+    url: '/system/menu',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改菜单
+export function updateMenu(data) {
+  return request({
+    url: '/system/menu',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除菜单
+export function delMenu(id) {
+  return request({
+    url: '/system/menu/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/assets/images/api/system/notice.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询公告列表
+export function listNotice(query) {
+  return request({
+    url: '/system/notice/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询公告详细
+export function getNotice(id) {
+  return request({
+    url: '/system/notice/' + id,
+    method: 'get'
+  })
+}
+
+// 新增公告
+export function addNotice(data) {
+  return request({
+    url: '/system/notice',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改公告
+export function updateNotice(data) {
+  return request({
+    url: '/system/notice',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除公告
+export function delNotice(id) {
+  return request({
+    url: '/system/notice/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/assets/images/api/system/operlog.js

@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 查询操作日志列表
+export function list(query) {
+  return request({
+    url: '/system/operlog/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除操作日志
+export function delOperlog(id) {
+  return request({
+    url: '/system/operlog/' + id,
+    method: 'delete'
+  })
+}
+
+// 清空操作日志
+export function cleanOperlog() {
+  return request({
+    url: '/system/operlog/clean',
+    method: 'delete'
+  })
+}

ruoyi-ui/src/assets/images/api/system/party.js

@@ -0,0 +1,272 @@
+import request from '@/utils/request'
+
+// 查询户籍疫苗信息列表
+export function listInfo(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/listDie',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询居住地址疫苗信息列表
+export function listInfos(query) {
+  return request({
+    url: '/boman-web-core/core/jzdz/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查看历史变更信息
+export function listInfosls(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/changeCzrkHistory',
+    method: 'post',
+    data: query
+  })
+}
+
+
+export function listInfotj(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/stsByCzrk ',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 新增人员列表
+export function listInfotjxz(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/listByXz',
+    method: 'get',
+    params: query
+  })
+}
+
+// 减少人员列表
+export function listInfotjjs(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/listByJs',
+    method: 'get',
+    params: query
+  })
+}
+
+// boman-web-core/core/czrk/family
+// 家庭成员信息
+export function listInfotjjsfaml(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/family/' + query,
+    method: 'get'
+    // params: query
+  })
+}
+
+
+// 一键确认
+export function listInfotjjssbule(query) {
+  console.log(query)
+  return request({
+    url: '/boman-web-core/core/ryrl/confirmInfo/' + query ,
+    method: 'get'
+    // params: query
+  })
+}
+// export function listInfotjjssbule(query) {
+//   console.log(query)
+//   return request({
+//     url: '/boman-web-core/core/czrk/synchronization/' + query ,
+//     method: 'get'
+//     // params: query
+//   })
+// }
+
+
+
+
+
+// 查询疫苗信息详细
+// export function getInfo(id) {
+//   return request({
+//     url: '/boman-web-core/core/ryrl/getById/' + id,
+//     method: 'get'
+//   })
+// }
+export function getInfo(id) {
+  return request({
+    url: '/boman-web-core/core/czrk/getById/' + id,
+    method: 'get'
+  })
+}
+
+// 户籍地址 新增修改
+export function listRoleer(data) {
+  return request({
+    url: '/boman-web-core/administrativeInfo/treeSelect',
+    method: 'get',
+    // data
+  })
+}
+
+// 户籍地址 新增修改
+export function listRoleergth(data) {
+  return request({
+    url: '/boman-system/chinaArea/treeSelect',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 网格
+export function listRoleergthwg(data) {
+  return request({
+    url: '/boman-web-core/gridInfo/treeSelect',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 户籍地址搜索
+export function listRoleerseavh(data) {
+  return request({
+    url: '/boman-web-core/administrativeInfo/treeSelectVillage',
+    method: 'get',
+    // data
+  })
+}
+
+
+// /boman-web-core/core/ryrl/addRlry
+// 新增人员信息
+export function addInfo(data) {
+  return request({
+    url: '/boman-web-core/core/czrk/addCzrk',
+    method: 'post',
+    data: data
+  })
+}
+
+// boman-web-core/core/ryrl/editRlry
+// 修改疫苗信息
+export function updateInfo(data) {
+  return request({
+    url: '/boman-web-core/core/czrk/editCzrk',
+    method: 'post',
+    data: data
+  })
+}
+
+// boman-web-core/core/czrk/deleteCzrk
+// 删除疫苗信息
+export function delInfo(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/changeCzrk' ,
+    method: 'post',
+    data: query
+
+  })
+}
+
+// 导出疫苗信息
+export function exportInfo(query) {
+  return request({
+    url: '/boman-web-core/core/info/export',
+    method: 'post',
+    data: query
+  })
+}
+
+// 查询身份证信息
+// export function idces(query) {
+//   return request({
+//     url: '/boman-web-core/core/info/findHjInfo',
+//     method: 'post',
+//     data: query
+//   })
+// }
+
+
+// 一键同步信息
+// export function listInfotjjssquer(query) {
+//  return request({
+//     url: '/boman-web-core/core/czrk/synchronization/' +  query,
+//     method: 'get'
+//     // params: query
+//   })
+// }
+
+export function listInfotjjssquer(query) {
+ return request({
+    url: '/boman-web-core/core/czrk/synchronization/' +  query,
+    method: 'get'
+    // params: query
+  })
+}
+
+// 查询身份证信息
+export function idces(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/findHjInfo',
+    method: 'post',
+    data: query
+  })
+}
+
+
+// 导出参数
+export function exportConfig(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/export',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出参数
+export function exportConfigtyr(query) {
+  return request({
+    url: '/boman-file/common/file/before/download ',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除疫苗名称信息
+export function delInfort(id) {
+  return request({
+    url: '/boman-web-core/core/info/vaccineInfoUser/' + id,
+    method: 'get'
+  })
+}
+
+// 列表查看疫苗信息
+export function yiaoe(query) {
+  return request({
+    url: '/boman-web-core/core/info/findInfoUser',
+    method: 'post',
+	data: query
+  })
+}
+
+// 导出错误日志
+export function importLog(query){
+  return request({
+    url: '/boman-web-core/ymjzImportError/list',
+    method: 'get',
+    data: query
+  })
+}
+
+//省市区
+export function treeselectdeptst(query){
+  return request({
+    url: '/boman-system/chinaArea/treeSelect',
+    method: 'get',
+    data: query
+  })
+}

ruoyi-ui/src/assets/images/api/system/permisss.js

@@ -0,0 +1,42 @@
+import request from '@/utils/request'
+
+// 查询列表
+export function listPostporen(query) {
+  return request({
+    url: '/boman-system/roleData/list',
+    method: 'get',
+    params: query
+  })
+}
+// 新增
+export function addlistPostporen(data) {
+  return request({
+    url: '/boman-system/roleData',
+    method: 'post',
+    data: data
+  })
+}
+
+// //修改
+export function getRoler(id) {
+  return request({
+    url: '/boman-system/roleData/' + id,
+    method:'get'
+
+  })
+}
+
+export function piutRoler(data) {
+  return request({
+    url: '/boman-system/roleData',
+    method:'put',
+    data:data
+  })
+}
+// // 删除
+export function delelistPostporen(id) {
+  return request({
+    url: '/boman-system/roleData/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/assets/images/api/system/personnel.js

@@ -0,0 +1,251 @@
+import request from '@/utils/request'
+
+// 查询户籍疫苗信息列表
+export function listInfo(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/unusualList',
+    method: 'post',
+    data: query
+  })
+} 
+
+// 查询居住地址疫苗信息列表
+// export function listInfos(query) {
+//   return request({
+//     url: '/boman-web-core/core/jzdz/list',
+//     method: 'get',
+//     params: query
+//   })
+// }
+export function listInfos(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/unusualList',
+    method: 'get',
+    data: query
+  })
+}
+
+export function listInfotj(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/stsByCzrk ',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 新增人员列表
+export function listInfotjxz(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/listByXz',
+    method: 'get',
+    params: query
+  })
+}
+
+// 减少人员列表
+export function listInfotjjs(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/listByJs',
+    method: 'get',
+    params: query
+  })
+}
+
+// boman-web-core/core/czrk/family
+// 家庭成员信息
+export function listInfotjjsfaml(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/family/' + query,
+    method: 'get'
+    // params: query
+  })
+}
+
+
+// 一键确认
+// export function listInfotjjssbule(query) {
+//   console.log(query)
+//   return request({
+//     url: '/boman-web-core/core/ryrl/confirmInfo/' + query ,
+//     method: 'get'
+//     // params: query
+//   })
+// }
+export function listInfotjjssbule(query) {
+  console.log(query)
+  return request({
+    url: '/boman-web-core/core/czrk/synchronization/' + query ,
+    method: 'get'
+    // params: query
+  })
+}
+
+
+
+
+
+// 查询疫苗信息详细
+export function getInfo(id) {
+  return request({
+    url: '/boman-web-core/core/ryrl/getById/' + id,
+    method: 'get'
+  })
+}
+// export function getInfo(id) {
+//   return request({
+//     url: '/boman-web-core/core/czrk/getById/' + id,
+//     method: 'get'
+//   })
+// }
+
+// 户籍地址 新增修改
+export function listRoleer(data) {
+  return request({
+    url: '/boman-web-core/administrativeInfo/treeSelect',
+    method: 'get',
+    // data
+  })
+}
+
+// 户籍地址 新增修改
+export function listRoleergth(data) {
+  return request({
+    url: '/boman-system/chinaArea/treeSelect',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 网格
+export function listRoleergthwg(data) {
+  return request({
+    url: '/boman-web-core/gridInfo/treeSelect',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 户籍地址搜索
+export function listRoleerseavh(data) {
+  return request({
+    url: '/boman-web-core/administrativeInfo/treeSelectVillage',
+    method: 'get',
+    // data
+  })
+}
+
+
+// /boman-web-core/core/ryrl/addRlry
+// 新增人员信息
+export function addInfo(data) {
+  return request({
+    url: '/boman-web-core/core/czrk/addCzrk',
+    method: 'post',
+    data: data
+  })
+}
+
+// boman-web-core/core/ryrl/editRlry
+// 修改疫苗信息
+export function updateInfo(data) {
+  return request({
+    url: '/boman-web-core/core/czrk/editCzrk',
+    method: 'post',
+    data: data
+  })
+}
+
+// boman-web-core/core/czrk/deleteCzrk
+// 删除疫苗信息
+export function delInfo(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/changeCzrk' ,
+    method: 'post',
+    data: query
+
+  })
+}
+
+// 导出疫苗信息
+export function exportInfo(query) {
+  return request({
+    url: '/boman-web-core/core/info/export',
+    method: 'post',
+    data: query
+  })
+}
+
+// 查询身份证信息
+// export function idces(query) {
+//   return request({
+//     url: '/boman-web-core/core/info/findHjInfo',
+//     method: 'post',
+//     data: query
+//   })
+// }
+// 一键同步信息
+
+export function listInfotjjssquer(query) {
+ return request({
+    url: '/boman-web-core/core/czrk/synchronization/' +  query,
+    method: 'get'
+    // params: query
+  })
+}
+
+// 查询身份证信息
+export function idces(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/findHjInfo',
+    method: 'post',
+    data: query
+  })
+}
+
+
+// 导出参数
+export function exportConfig(query) {
+  return request({
+    url: '/boman-file/common/file/async/export',
+    method: 'post',
+    data: query
+  })
+}
+
+// 导出参数
+export function exportConfigtyr(query) {
+  return request({
+    url: '/boman-file/common/file/before/download ',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除疫苗名称信息
+export function delInfort(id) {
+  return request({
+    url: '/boman-web-core/core/info/vaccineInfoUser/' + id,
+    method: 'get'
+  })
+}
+
+// 列表查看疫苗信息
+export function yiaoe(query) {
+  return request({
+    url: '/boman-web-core/core/info/findInfoUser',
+    method: 'post',
+	data: query
+  })
+}
+
+// 导出错误日志
+export function importLog(query){
+  return request({
+    url: '/boman-web-core/ymjzImportError/list',
+    method: 'get',
+    data: query
+  })
+}

ruoyi-ui/src/assets/images/api/system/post.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询岗位列表
+export function listPost(query) {
+  return request({
+    url: '/system/post/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询岗位详细
+export function getPost(id) {
+  return request({
+    url: '/system/post/' + id,
+    method: 'get'
+  })
+}
+
+// 新增岗位
+export function addPost(data) {
+  return request({
+    url: '/system/post',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改岗位
+export function updatePost(data) {
+  return request({
+    url: '/system/post',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除岗位
+export function delPost(id) {
+  return request({
+    url: '/system/post/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/assets/images/api/system/postsr.js

@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+// 查询岗位列表
+export function listPost(query) {
+  return request({
+    url: '/boman-web-core/ipTimes/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function listlie(query) {
+  return request({
+    url: '/boman-web-core/ipTimes/' + query,
+    method: 'get'
+    // params: query
+  })
+}
+
+// 查询岗位详细
+export function getPost(id) {
+  return request({
+    url: '/boman-web-core/ipTimes/get/' + id,
+    method: 'get'
+  })
+}
+
+// 新增岗位
+export function addPost(data) {
+  return request({
+    url: '/boman-web-core/ipTimes/saveOrUpdate',
+    method: 'post',
+    data: data
+  })
+}
+
+// 新增岗位
+export function appIdhu(data) {
+  return request({
+    url: '/boman-web-core/ipTimes/getKey',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改岗位
+export function updatePost(data) {
+  return request({
+    url: '/boman-web-core/ipTimes/saveOrUpdate',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除岗位
+export function delPost(data) {
+  return request({
+    url: '/boman-web-core/ipTimes/delete',
+    method: 'post',
+    data: data
+  })
+}

ruoyi-ui/src/assets/images/api/system/resident.js

@@ -0,0 +1,174 @@
+import request from '@/utils/request'
+
+// 查询疫苗信息列表
+export function listInfo(query) {
+  return request({
+    url: '/boman-web-core/core/hsjl/pcList',
+    method: 'get',
+    params: query
+  })
+}
+
+export function listInfotj(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/stsByCzrk ',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 新增人员列表
+export function listInfotjxz(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/listByXz',
+    method: 'get',
+    params: query
+  })
+}
+
+// 减少人员列表
+export function listInfotjjs(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/listByJs',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 家庭成员信息
+export function listInfotjjsfaml(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/family/' + query,
+    method: 'get'
+    // params: query
+  })
+}
+
+
+// 查询疫苗信息详细
+export function getInfo(id) {
+  return request({
+    url: '/boman-web-core/core/hsjl/getById/' + id,
+    method: 'get'
+  })
+}
+
+// 户籍地址 新增修改
+export function listRoleer(data) {
+  return request({
+    url: '/boman-web-core/administrativeInfo/treeSelect',
+    method: 'get',
+    // data
+  })
+}
+
+// 户籍地址 新增修改
+export function listRoleergth(data) {
+  return request({
+    url: '/boman-system/chinaArea/treeSelect',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 户籍地址搜索
+export function listRoleerseavh(data) {
+  return request({
+    url: '/boman-web-core/administrativeInfo/treeSelectVillage',
+    method: 'get',
+    // data
+  })
+}
+
+
+// 新增人员信息
+export function addInfo(data) {
+  return request({
+    url: '/boman-web-core/core/ryrl/addRlry',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改疫苗信息
+export function updateInfo(data) {
+  return request({
+    url: '/boman-web-core/core/ryrl/editRlry',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除疫苗信息
+export function delInfo(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/deleteCzrk' ,
+    method: 'get',
+    params: query
+
+  })
+}
+
+// 导出疫苗信息
+export function exportInfo(query) {
+  return request({
+    url: '/boman-web-core/core/info/export',
+    method: 'post',
+    data: query
+  })
+}
+
+// 查询身份证信息
+export function idces(query) {
+  return request({
+    url: '/boman-web-core/core/info/findHjInfo',
+    method: 'post',
+    data: query
+  })
+}
+// 导出参数
+export function exportConfig(query) {
+  return request({
+    url: '/boman-file/common/file/async/export',
+    method: 'post',
+    data: query
+  })
+}
+
+// 导出参数
+export function exportConfigtyr(query) {
+  return request({
+    url: '/boman-file/common/file/before/download ',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除疫苗名称信息
+export function delInfort(id) {
+  return request({
+    url: '/boman-web-core/core/info/vaccineInfoUser/' + id,
+    method: 'get'
+  })
+}
+
+// 列表查看疫苗信息
+export function yiaoe(query) {
+  return request({
+    url: '/boman-web-core/core/info/findInfoUser',
+    method: 'post',
+	data: query
+  })
+}
+
+// 导出错误日志
+export function importLog(query){
+  return request({
+    url: '/boman-web-core/ymjzImportError/list',
+    method: 'get',
+    data: query
+  })
+}

ruoyi-ui/src/assets/images/api/system/residentss.js

@@ -0,0 +1,283 @@
+import request from '@/utils/request'
+
+// 查询户籍疫苗信息列表
+export function listInfo(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询居住地址疫苗信息列表
+export function listInfos(query) {
+  return request({
+    url: '/boman-web-core/core/jzdz/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查看历史变更信息
+export function listInfosls(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/changeCzrkHistory',
+    method: 'post',
+    data: query
+  })
+}
+
+
+export function listInfotj(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/stsByCzrk ',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 新增人员列表
+export function listInfotjxz(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/listByXz',
+    method: 'get',
+    params: query
+  })
+}
+
+// 减少人员列表
+export function listInfotjjs(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/listByJs',
+    method: 'get',
+    params: query
+  })
+}
+
+// boman-web-core/core/czrk/family
+// 家庭成员信息
+export function listInfotjjsfaml(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/family/' + query,
+    method: 'get'
+    // params: query
+  })
+}
+
+// 一键未认领
+export function listInfotjjsfamlwrl(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/setNoRl',
+    method: 'get',
+    params: query
+  })
+}
+
+
+
+
+// 一键确认
+export function listInfotjjssbule(query) {
+  console.log(query)
+  return request({
+    url: '/boman-web-core/core/ryrl/confirmInfo/' + query ,
+    method: 'get'
+    // params: query
+  })
+}
+// export function listInfotjjssbule(query) {
+//   console.log(query)
+//   return request({
+//     url: '/boman-web-core/core/czrk/synchronization/' + query ,
+//     method: 'get'
+//     // params: query
+//   })
+// }
+
+
+
+
+
+// 查询疫苗信息详细
+// export function getInfo(id) {
+//   return request({
+//     url: '/boman-web-core/core/ryrl/getById/' + id,
+//     method: 'get'
+//   })
+// }
+export function getInfo(id) {
+  return request({
+    url: '/boman-web-core/core/czrk/getById/' + id,
+    method: 'get'
+  })
+}
+
+// 户籍地址 新增修改
+export function listRoleer(data) {
+  return request({
+    url: '/boman-web-core/administrativeInfo/treeSelect',
+    method: 'get',
+    // data
+  })
+}
+
+// 户籍地址 新增修改
+export function listRoleergth(data) {
+  return request({
+    url: '/boman-system/chinaArea/treeSelect',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 网格
+export function listRoleergthwg(data) {
+  return request({
+    url: '/boman-web-core/gridInfo/treeSelect',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 户籍地址搜索
+export function listRoleerseavh(data) {
+  return request({
+    url: '/boman-web-core/administrativeInfo/treeSelectVillage',
+    method: 'get',
+    // data
+  })
+}
+
+
+// /boman-web-core/core/ryrl/addRlry
+// 新增人员信息
+export function addInfo(data) {
+  return request({
+    url: '/boman-web-core/core/czrk/addCzrk',
+    method: 'post',
+    data: data
+  })
+}
+
+// boman-web-core/core/ryrl/editRlry
+// 修改疫苗信息
+export function updateInfo(data) {
+  return request({
+    url: '/boman-web-core/core/czrk/editCzrk',
+    method: 'post',
+    data: data
+  })
+}
+
+// boman-web-core/core/czrk/deleteCzrk
+// 删除疫苗信息
+export function delInfo(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/changeCzrk' ,
+    method: 'post',
+    data: query
+
+  })
+}
+
+// 导出疫苗信息
+export function exportInfo(query) {
+  return request({
+    url: '/boman-web-core/core/info/export',
+    method: 'post',
+    data: query
+  })
+}
+
+// 查询身份证信息
+// export function idces(query) {
+//   return request({
+//     url: '/boman-web-core/core/info/findHjInfo',
+//     method: 'post',
+//     data: query
+//   })
+// }
+
+
+// 一键同步信息
+// export function listInfotjjssquer(query) {
+//  return request({
+//     url: '/boman-web-core/core/czrk/synchronization/' +  query,
+//     method: 'get'
+//     // params: query
+//   })
+// }
+
+export function listInfotjjssquer(query) {
+ return request({
+    url: '/boman-web-core/core/czrk/synchronization/' +  query,
+    method: 'get'
+    // params: query
+  })
+}
+
+// 查询身份证信息
+export function idces(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/findHjInfo',
+    method: 'post',
+    data: query
+  })
+}
+
+
+// 导出参数
+export function exportConfig(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/export',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出参数
+export function exportConfigtyr(query) {
+  return request({
+    url: '/boman-file/common/file/before/download ',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除疫苗名称信息
+export function delInfort(id) {
+  return request({
+    url: '/boman-web-core/core/info/vaccineInfoUser/' + id,
+    method: 'get'
+  })
+}
+
+// 列表查看疫苗信息
+export function yiaoe(query) {
+  return request({
+    url: '/boman-web-core/core/info/findInfoUser',
+    method: 'post',
+	data: query
+  })
+}
+
+// 导出错误日志
+export function importLog(query){
+  return request({
+    url: '/boman-web-core/ymjzImportError/list',
+    method: 'get',
+    data: query
+  })
+}
+
+//省市区
+export function treeselectdeptst(query){
+  return request({
+    url: '/boman-system/chinaArea/treeSelect',
+    method: 'get',
+    data: query
+  })
+}

ruoyi-ui/src/assets/images/api/system/role.js

@@ -0,0 +1,76 @@
+import request from '@/utils/request'
+
+// 查询角色列表
+export function listRole(query) {
+  return request({
+    url: '/system/role/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询角色详细
+export function getRole(id) {
+  return request({
+    url: '/system/role/' + id,
+    method: 'get'
+  })
+}
+
+// 保存
+export function setMenu(data) {
+  return request({
+    url: '/boman-system/role/menu',
+    method: 'post',
+    data: data
+  })
+}
+
+// 新增角色
+export function addRole(data) {
+  return request({
+    url: '/system/role',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改角色
+export function updateRole(data) {
+  return request({
+    url: '/system/role',
+    method: 'put',
+    data: data
+  })
+}
+
+// 角色数据权限
+export function dataScope(data) {
+  return request({
+    url: '/system/role/dataScope',
+    method: 'put',
+    data: data
+  })
+}
+
+// 角色状态修改
+export function changeRoleStatus(id, status) {
+  const data = {
+    id,
+    status
+  }
+  return request({
+    url: '/system/role/changeStatus',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除角色
+export function delRole(id) {
+  return request({
+    url: '/system/role/' + id,
+    method: 'delete'
+  })
+}
+

ruoyi-ui/src/assets/images/api/system/table.js

@@ -0,0 +1,127 @@
+import request from '@/utils/request'
+
+// 获取表单数据
+export function getQueryList(data) {
+  return request({
+    url: '/boman-web-core/p/cs/queryList',
+    method: 'POST',
+    data
+  })
+}
+// 获取表单查询字段、按钮、表头
+export function getTableQuery(data) {
+  return request({
+    url: '/boman-web-core/p/cs/getObject',
+    method: 'POST',
+    data
+  })
+}
+
+// 销假
+export function ancellation(data) {
+  return request({
+    url: '/boman-web-core/cancel/leave',
+    method: 'POST',
+    data
+  })
+}
+
+
+// 获取表单查询字段、按钮、表头
+export function tableQuery(data) {
+  return request({
+    url: '/boman-web-core/p/cs/getTableQuery',
+    method: 'POST',
+    data
+  })
+}
+
+// 保存
+export function addbjectSave(data) {
+  return request({
+    url: '/boman-web-core/p/cs/objectSave',
+    method: 'POST',
+    data
+  })
+}
+// 获取表单列表数据
+export function getObject(data) {
+  return request({
+    url: '/boman-web-core/p/cs/getObject',
+    method: 'POST',
+    data
+  })
+}
+// 根据表名获取表单信息
+export function getByTableName(data) {
+  return request({
+    url: '/boman-web-core/p/cs/table/getByTableName',
+    method: 'POST',
+    data
+  })
+}
+export function delMenu(data) {
+  return request({
+    url: '/boman-web-core/p/cs/objectDelete',
+    method: 'POST',
+    data
+  })
+}
+
+// 提交
+export function tableSubimt(data) {
+  return request({
+    url: '/boman-web-core/p/cs/objectSubmit',
+    method: 'POST',
+    data
+  })
+}
+ // 反提交
+ export function tableSubimtanit(data) {
+   return request({
+     url: '/boman-web-core/p/cs/objectUnSubmit',
+     method: 'POST',
+     data
+   })
+ }
+// 获取表单tab数据
+ export function geteditindeTab(data) {
+   return request({
+     url: '/boman-web-core/p/cs/objectTab',
+     method: 'POST',
+     data
+   })
+ }
+
+ // 删除菜单
+ export function delMenutab(data) {
+   return request({
+     url: 'boman-web-core/p/cs/objectDelete',
+     method: 'POST',
+     data
+   })
+ }
+ // 提交2.0
+ export function tabsubm(data) {
+   return request({
+     url: '/jflow/p/c/process/launch',
+     method: 'POST',
+     data
+   })
+ }
+
+ export function bohuie(data) {
+   return request({
+     url: '/jflow/p/c/task/backlog/detail',
+     method: 'POST',
+     data
+   })
+ }
+
+ // 查询用户个人信息
+ export function getUserProfiletab() {
+   return request({
+     url: '/system/user/profile',
+     method: 'get'
+   })
+ }

ruoyi-ui/src/assets/images/api/system/time.js

@@ -0,0 +1,124 @@
+import request from '@/utils/request'
+
+// 查询疫苗信息列表
+export function listInfo(query) {
+  return request({
+    url: '/boman-web-core/core/info/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询疫苗信息详细
+export function getInfo(id) {
+  return request({
+    url: '/boman-web-core/core/info/' + id,
+    method: 'get'
+  })
+}
+
+// 户籍地址 新增修改
+export function listRoleer(data) {
+  return request({
+    url: '/boman-web-core/administrativeInfo/treeSelect',
+    method: 'get',
+    // data
+  })
+}
+
+// 户籍地址搜索
+export function listRoleerseavh(data) {
+  return request({
+    url: '/boman-web-core/administrativeInfo/treeSelectVillage',
+    method: 'get',
+    // data
+  })
+}
+
+
+// 新增疫苗信息
+export function addInfo(data) {
+  return request({
+    url: '/boman-web-core/core/info',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改疫苗信息
+export function updateInfo(data) {
+  return request({
+    url: '/boman-web-core/core/info',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除疫苗信息
+export function delInfo(id) {
+  return request({
+    url: '/boman-web-core/core/info/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出疫苗信息
+export function exportInfo(query) {
+  return request({
+    url: '/boman-web-core/core/info/export',
+    method: 'post',
+    data: query
+  })
+}
+
+// 查询身份证信息
+export function idces(query) {
+  return request({
+    url: '/boman-web-core/core/info/findHjInfo',
+    method: 'post',
+    data: query
+  })
+}
+// 导出参数
+export function exportConfig(query) {
+  return request({
+    url: '/boman-file/common/file/async/export',
+    method: 'post',
+    data: query
+  })
+}
+
+// 导出参数
+export function exportConfigtyr(query) {
+  return request({
+    url: '/boman-file/common/file/before/download ',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除疫苗名称信息
+export function delInfort(id) {
+  return request({
+    url: '/boman-web-core/core/info/vaccineInfoUser/' + id,
+    method: 'get'
+  })
+}
+
+// 列表查看疫苗信息
+export function yiaoe(query) {
+  return request({
+    url: '/boman-web-core/core/info/findInfoUser',
+    method: 'post',
+	data: query
+  })
+}
+
+// 导出错误日志
+export function importLog(query){
+  return request({
+    url: '/boman-web-core/ymjzImportError/list',
+    method: 'get',
+    data: query
+  })
+}

ruoyi-ui/src/assets/images/api/system/tongj.js

@@ -0,0 +1,56 @@
+import request from '@/utils/request'
+
+// 查询岗位列表
+export function listPost(data) {
+  return request({
+    url: '/boman-web-core/attendance/statistics',
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询岗位详细
+export function getPost(val,id,) {
+  return request({
+    url: '/boman-web-core/attendance/findDate/' + val + '/' + id,
+    method: 'get'
+  })
+}
+
+// 导出
+export function getDown(data) {
+ return request({
+   headers: {
+     'Content-Type': 'application/vnd.ms-excel'
+   },
+   url: '/boman-file/common/file/export/statisticsByMonth',
+   method: 'post',
+   data: data
+ })
+}
+
+// 新增岗位
+export function addPost(data) {
+  return request({
+    url: '/system/post',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改岗位
+export function updatePost(data) {
+  return request({
+    url: '/system/post',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除岗位
+export function delPost(id) {
+  return request({
+    url: '/system/post/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/assets/images/api/system/ucleic.js

@@ -0,0 +1,251 @@
+import request from '@/utils/request'
+
+// 查询户籍疫苗信息列表
+export function listInfo(query) {
+  return request({
+    url: '/boman-web-core/core/account/nucleicAcid/hj',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询居住地址疫苗信息列表
+// export function listInfos(query) {
+//   return request({
+//     url: '/boman-web-core/core/jzdz/list',
+//     method: 'get',
+//     params: query
+//   })
+// }
+export function listInfos(query) {
+  return request({
+    url: '/boman-web-core/core/account/nucleicAcid/jzdz',
+    method: 'get',
+    params: query
+  })
+}
+
+export function listInfotj(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/vaccineStatistics',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 新增人员列表
+export function listInfotjxz(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/listByXz',
+    method: 'get',
+    params: query
+  })
+}
+
+// 减少人员列表
+export function listInfotjjs(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/listByJs',
+    method: 'get',
+    params: query
+  })
+}
+
+// boman-web-core/core/czrk/family
+// 家庭成员信息
+export function listInfotjjsfaml(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/family/' + query,
+    method: 'get'
+    // params: query
+  })
+}
+
+
+// 一键确认
+// export function listInfotjjssbule(query) {
+//   console.log(query)
+//   return request({
+//     url: '/boman-web-core/core/ryrl/confirmInfo/' + query ,
+//     method: 'get'
+//     // params: query
+//   })
+// }
+export function listInfotjjssbule(query) {
+  console.log(query)
+  return request({
+    url: '/boman-web-core/core/czrk/synchronization/' + query ,
+    method: 'get'
+    // params: query
+  })
+}
+
+
+
+
+
+// 查询疫苗信息详细
+export function getInfo(id) {
+  return request({
+    url: '/boman-web-core/core/ryrl/getById/' + id,
+    method: 'get'
+  })
+}
+// export function getInfo(id) {
+//   return request({
+//     url: '/boman-web-core/core/czrk/getById/' + id,
+//     method: 'get'
+//   })
+// }
+
+// 户籍地址 新增修改
+export function listRoleer(data) {
+  return request({
+    url: '/boman-web-core/administrativeInfo/treeSelect',
+    method: 'get',
+    // data
+  })
+}
+
+// 户籍地址 新增修改
+export function listRoleergth(data) {
+  return request({
+    url: '/boman-system/chinaArea/treeSelect',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 网格
+export function listRoleergthwg(data) {
+  return request({
+    url: '/boman-web-core/gridInfo/treeSelect',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 户籍地址搜索
+export function listRoleerseavh(data) {
+  return request({
+    url: '/boman-web-core/administrativeInfo/treeSelectVillage',
+    method: 'get',
+    // data
+  })
+}
+
+
+// /boman-web-core/core/ryrl/addRlry
+// 新增人员信息
+export function addInfo(data) {
+  return request({
+    url: '/boman-web-core/core/czrk/addCzrk',
+    method: 'post',
+    data: data
+  })
+}
+
+// boman-web-core/core/ryrl/editRlry
+// 修改疫苗信息
+export function updateInfo(data) {
+  return request({
+    url: '/boman-web-core/core/czrk/editCzrk',
+    method: 'post',
+    data: data
+  })
+}
+
+// boman-web-core/core/czrk/deleteCzrk
+// 删除疫苗信息
+export function delInfo(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/changeCzrk' ,
+    method: 'post',
+    data: query
+
+  })
+}
+
+// 导出疫苗信息
+export function exportInfo(query) {
+  return request({
+    url: '/boman-web-core/core/info/export',
+    method: 'post',
+    data: query
+  })
+}
+
+// 查询身份证信息
+// export function idces(query) {
+//   return request({
+//     url: '/boman-web-core/core/info/findHjInfo',
+//     method: 'post',
+//     data: query
+//   })
+// }
+// 一键同步信息
+
+export function listInfotjjssquer(query) {
+ return request({
+    url: '/boman-web-core/core/czrk/synchronization/' +  query,
+    method: 'get'
+    // params: query
+  })
+}
+
+// 查询身份证信息
+export function idces(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/findHjInfo',
+    method: 'post',
+    data: query
+  })
+}
+
+
+// 导出参数
+export function exportConfig(query) {
+  return request({
+    url: '/boman-file/common/file/async/export',
+    method: 'post',
+    data: query
+  })
+}
+
+// 导出参数
+export function exportConfigtyr(query) {
+  return request({
+    url: '/boman-file/common/file/before/download ',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除疫苗名称信息
+export function delInfort(id) {
+  return request({
+    url: '/boman-web-core/core/info/vaccineInfoUser/' + id,
+    method: 'get'
+  })
+}
+
+// 列表查看疫苗信息
+export function yiaoe(query) {
+  return request({
+    url: '/boman-web-core/core/info/findInfoUser',
+    method: 'post',
+	data: query
+  })
+}
+
+// 导出错误日志
+export function importLog(query){
+  return request({
+    url: '/boman-web-core/ymjzImportError/list',
+    method: 'get',
+    data: query
+  })
+}

ruoyi-ui/src/assets/images/api/system/user.js

@@ -0,0 +1,141 @@
+import request from '@/utils/request'
+import { praseStrEmpty } from "@/utils/ruoyi";
+
+// 查询用户列表
+export function listUser(query) {
+  return request({
+    url: '/system/user/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function listRoleergth(data) {
+  return request({
+    url: '/boman-web-core/core/fxry/getSysRegion',
+    method: 'post',
+    data: data
+  })
+}
+
+
+export function rensh(query) {
+  return request({
+    url: '/system/online/onlineNum',
+    method: 'get',
+    params: query
+  })
+}
+
+
+
+
+
+
+// 网格
+export function listRoleergthwg(data) {
+  return request({
+    url: '/boman-web-core/gridInfo/treeSelect',
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询用户详细
+export function getUser(id) {
+  return request({
+    url: '/system/user/' + praseStrEmpty(id),
+    method: 'get'
+  })
+}
+
+// 新增用户
+export function addUser(data) {
+  return request({
+    url: '/system/user',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改用户
+export function updateUser(data) {
+  return request({
+    url: '/system/user',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除用户
+export function delUser(id) {
+  return request({
+    url: '/system/user/' + id,
+    method: 'delete'
+  })
+}
+
+// 用户密码重置
+export function resetUserPwd(id, password) {
+  const data = {
+    id,
+    password
+  }
+  return request({
+    url: '/system/user/resetPwd',
+    method: 'put',
+    data: data
+  })
+}
+
+// 用户状态修改
+export function changeUserStatus(id, status) {
+  const data = {
+    id,
+    status
+  }
+  return request({
+    url: '/system/user/changeStatus',
+    method: 'put',
+    data: data
+  })
+}
+
+// 查询用户个人信息
+export function getUserProfile() {
+  return request({
+    url: '/system/user/profile',
+    method: 'get'
+  })
+}
+
+// 修改用户个人信息
+export function updateUserProfile(data) {
+  return request({
+    url: '/system/user/profile',
+    method: 'put',
+    data: data
+  })
+}
+
+// 用户密码重置
+export function updateUserPwd(oldPassword, newPassword) {
+  const data = {
+    oldPassword,
+    newPassword
+  }
+  return request({
+    url: '/system/user/profile/updatePwd',
+    method: 'put',
+    params: data
+  })
+}
+
+// 用户头像上传
+export function uploadAvatar(data) {
+  return request({
+    url: '/system/user/profile/avatar',
+    method: 'post',
+    data: data
+  })
+}

ruoyi-ui/src/assets/images/api/system/uzhu.js

@@ -0,0 +1,236 @@
+import request from '@/utils/request'
+
+// 查询户籍疫苗信息列表
+export function listInfo(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询居住地址疫苗信息列表
+export function listInfos(query) {
+  return request({
+    url: '/boman-web-core/core/jzdz/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function listInfotj(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/stsByCzrk ',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 新增人员列表
+export function listInfotjxz(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/listByXz',
+    method: 'get',
+    params: query
+  })
+}
+
+// 减少人员列表
+export function listInfotjjs(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/listByJs',
+    method: 'get',
+    params: query
+  })
+}
+
+// boman-web-core/core/czrk/family
+// 家庭成员信息
+export function listInfotjjsfaml(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/family/' + query,
+    method: 'get'
+    // params: query
+  })
+}
+
+
+// 一键确认
+export function listInfotjjssbule(query) {
+  console.log(query)
+  return request({
+    url: '/boman-web-core/core/ryrl/confirmInfo/' + query ,
+    method: 'get'
+    // params: query
+  })
+}
+
+
+
+
+
+// 查询疫苗信息详细
+export function getInfo(id) {
+  return request({
+    url: '/boman-web-core/core/ryrl/getById/' + id,
+    method: 'get'
+  })
+}
+// export function getInfo(id) {
+//   return request({
+//     url: '/boman-web-core/core/czrk/getById/' + id,
+//     method: 'get'
+//   })
+// }
+
+// 户籍地址 新增修改
+export function listRoleer(data) {
+  return request({
+    url: '/boman-web-core/administrativeInfo/treeSelect',
+    method: 'get',
+    // data
+  })
+}
+
+// 户籍地址 新增修改
+export function listRoleergth(data) {
+  return request({
+    url: '/boman-web-core/core/fxry/getSysRegion',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 网格
+export function listRoleergthwg(data) {
+  return request({
+    url: '/boman-web-core/gridInfo/treeSelect',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 户籍地址搜索
+export function listRoleerseavh(data) {
+  return request({
+    url: '/boman-web-core/administrativeInfo/treeSelectVillage',
+    method: 'get',
+    // data
+  })
+}
+
+
+// /boman-web-core/core/ryrl/addRlry
+// 新增人员信息
+export function addInfo(data) {
+  return request({
+    url: '/boman-web-core/core/czrk/addCzrk',
+    method: 'post',
+    data: data
+  })
+}
+
+// boman-web-core/core/ryrl/editRlry
+// 修改疫苗信息
+export function updateInfo(data) {
+  return request({
+    url: '/boman-web-core/core/czrk/editCzrk',
+    method: 'post',
+    data: data
+  })
+}
+
+// boman-web-core/core/czrk/deleteCzrk
+// 删除疫苗信息
+export function delInfo(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/changeCzrk' ,
+    method: 'post',
+    data: query
+
+  })
+}
+
+// 导出疫苗信息
+export function exportInfo(query) {
+  return request({
+    url: '/boman-web-core/core/info/export',
+    method: 'post',
+    data: query
+  })
+}
+
+// 查询身份证信息
+// export function idces(query) {
+//   return request({
+//     url: '/boman-web-core/core/info/findHjInfo',
+//     method: 'post',
+//     data: query
+//   })
+// }
+// 一键同步信息
+
+export function listInfotjjssquer(query) {
+ return request({
+    url: '/boman-web-core/core/czrk/synchronization/' +  query,
+    method: 'get'
+    // params: query
+  })
+}
+
+// 查询身份证信息
+export function idces(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/findHjInfo',
+    method: 'post',
+    data: query
+  })
+}
+
+
+// 导出参数
+export function exportConfig(query) {
+  return request({
+    url: '/boman-file/common/file/async/export',
+    method: 'post',
+    data: query
+  })
+}
+
+// 导出参数
+export function exportConfigtyr(query) {
+  return request({
+    url: '/boman-file/common/file/before/download ',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除疫苗名称信息
+export function delInfort(id) {
+  return request({
+    url: '/boman-web-core/core/info/vaccineInfoUser/' + id,
+    method: 'get'
+  })
+}
+
+// 列表查看疫苗信息
+export function yiaoe(query) {
+  return request({
+    url: '/boman-web-core/core/info/findInfoUser',
+    method: 'post',
+	data: query
+  })
+}
+
+// 导出错误日志
+export function importLog(query){
+  return request({
+    url: '/boman-web-core/ymjzImportError/list',
+    method: 'get',
+    data: query
+  })
+}

ruoyi-ui/src/assets/images/api/system/xsr.js

@@ -0,0 +1,171 @@
+import request from '@/utils/request'
+
+// /boman-web-core/core/ryrl/list
+// 查询疫苗信息列表
+export function listInfo(query) {
+  return request({
+    url: '/boman-web-core/birthRecords/listDie',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询常住疫苗信息列表
+export function listInfoch(query) {
+  return request({
+    url: '/boman-web-core/core/ryrl/listCz',
+    method: 'get',
+    params: query
+  })
+}
+
+
+export function delInfohy(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/reduction/' + query,
+    method: 'get'
+  })
+}
+
+
+// 查询疫苗信息详细
+export function getInfo(id) {
+  return request({
+    url: '/boman-web-core/core/czrk/findXsInfo',
+    method: 'get',
+    params: id
+  })
+}
+
+// 户籍地址 新增修改
+export function listRoleer(data) {
+  return request({
+    url: '/boman-web-core/administrativeInfo/treeSelect',
+    method: 'get',
+    // data
+  })
+}
+
+// 户籍地址搜索
+export function listRoleerseavh(data) {
+  return request({
+    url: '/boman-web-core/administrativeInfo/treeSelectVillage',
+    method: 'get',
+    // data
+  })
+}
+
+
+// 新增人员信息
+export function addInfo(data) {
+  return request({
+    url: '/boman-web-core/core/czrk/addBabyCzrk',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改疫苗信息
+// export function updateInfo(data) {
+//   return request({
+//     url: '/boman-web-core/core/ryrl/editRlry',
+//     method: 'post',
+//     data: data
+//   })
+// }
+export function updateInfo(data) {
+  return request({
+    url: '/boman-web-core/core/ryrl/editRlry',
+    method: 'post',
+    data: data
+  })
+}
+
+// boman-web-core/core/czrk/deleteCzrk
+// 删除疫苗信息
+export function delInfo(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/changeCzrk' ,
+    method: 'post',
+    data: query
+  })
+}
+
+// 导出疫苗信息
+export function exportInfo(query) {
+  return request({
+    url: '/boman-web-core/core/info/export',
+    method: 'post',
+    data: query
+  })
+}
+
+// // 查询身份证信息
+// export function idces(query) {
+//   return request({
+//     url: '/boman-web-core/core/info/findHjInfo',
+//     method: 'post',
+//     data: query
+//   })
+// }
+
+
+// 网格
+export function listRoleergthwg(data) {
+  return request({
+    url: '/boman-web-core/gridInfo/treeSelect',
+    method: 'post',
+    data: data
+  })
+}
+// 查询身份证信息
+export function idces(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/findHjInfo',
+    method: 'post',
+    data: query
+  })
+}
+// 导出参数
+export function exportConfig(query) {
+  return request({
+    url: '/boman-file/common/file/async/export',
+    method: 'post',
+    data: query
+  })
+}
+
+// 导出参数
+export function exportConfigtyr(query) {
+  return request({
+    url: '/boman-file/common/file/before/download ',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除疫苗名称信息
+export function delInfort(id) {
+  return request({
+    url: '/boman-web-core/core/info/vaccineInfoUser/' + id,
+    method: 'get'
+  })
+}
+
+// 列表查看疫苗信息
+export function yiaoe(query) {
+  return request({
+    url: '/boman-web-core/core/info/findInfoUser',
+    method: 'post',
+	data: query
+  })
+}
+
+// 导出错误日志
+export function importLog(query){
+  return request({
+    url: '/boman-web-core/ymjzImportError/list',
+    method: 'get',
+    data: query
+  })
+}

ruoyi-ui/src/assets/images/api/tool/gen.js

@@ -0,0 +1,243 @@
+import request from '@/utils/request'
+
+// 新增关联表
+export function addGenTable(data) {
+  return request({
+    url: '/boman-gen/genTableRelation',
+    method: 'post',
+    data
+  })
+}
+// 修改关联表
+export function setGenTable(data) {
+  return request({
+    url: '/boman-gen/genTableRelation',
+    method: 'put',
+    data
+  })
+}
+// 删除关联表
+export function delGenTable(tableId) {
+  return request({
+    url: '/boman-gen/genTableRelation/' + tableId,
+    method: 'delete',
+  })
+}
+// 查看关联表
+export function qurGenTable(tableId) {
+  return request({
+    url: '/boman-gen/genTableRelation/' + tableId,
+    method: 'get',
+  })
+}
+
+// 关联表列表
+export function tabList(query) {
+  return request({
+    url: '/boman-gen/genTableRelation/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询生成表数据
+export function listTable(query) {
+  return request({
+    url: '/code/gen/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询db数据库列表
+export function listDbTable(query) {
+  return request({
+    url: '/code/gen/db/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增
+export function addMenu(data) {
+  return request({
+    url: '/boman-gen/gen/addTable',
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询表详细信息
+export function getGenTable(tableId) {
+  return request({
+    url: '/code/gen/' + tableId,
+    method: 'get'
+  })
+}
+
+// 查询表详细信息
+export function listAllColumnsByTableId(data) {
+  return request({
+    url: '/boman-web-core/p/cs/table/listAllColumnsByTableId',
+    method: 'post',
+    data
+  })
+}
+// 查询表HR详细信息
+export function genTableColumnList(query) {
+  return request({
+    url: '/boman-gen/genTableColumn/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 修改代码生成信息
+export function updateGenTable(data) {
+  return request({
+    url: '/code/gen',
+    method: 'put',
+    data: data
+  })
+}
+
+// 导入表
+export function importTable(data) {
+  return request({
+    url: '/code/gen/importTable',
+    method: 'post',
+    params: data
+  })
+}
+
+// 预览生成代码
+export function previewTable(tableId) {
+  return request({
+    url: '/code/gen/preview/' + tableId,
+    method: 'get'
+  })
+}
+
+// 删除表数据
+export function delTable(tableId) {
+  return request({
+    url: '/code/gen/' + tableId,
+    method: 'delete'
+  })
+}
+// 删除
+export function delPost(id) {
+  return request({
+    url: '/genTableColumn/columnIds/' + id,
+    method: 'delete'
+  })
+}
+
+// 生成代码（自定义路径）
+export function genCode(tableName) {
+  return request({
+    url: '/code/gen/genCode/' + tableName,
+    method: 'get'
+  })
+}
+
+// 同步数据库
+export function synchDb(tableName) {
+  return request({
+    url: '/code/gen/synchDb/' + tableName,
+    method: 'get'
+  })
+}
+
+// 查询数据库sql
+export function tableSql(id) {
+  return request({
+    url: '/boman-gen/tableSql/'+id,
+    method: 'get',
+  })
+}
+// 执行创建语句
+export function zxImplement(data) {
+  return request({
+    url: '/boman-gen/tableSql/implement',
+    method: 'post',
+    data
+  })
+}
+// 刷新创建语句
+export function getReload(data) {
+  return request({
+    url: '/boman-gen/tableSql/reload',
+    method: 'POST',
+    data
+  })
+}
+// 新增字段信息
+export function addGenTableColumn(data) {
+  return request({
+    url: '/boman-gen/genTableColumn',
+    method: 'POST',
+    data
+  })
+}
+// 删除字段信息
+export function delGenTableColumn(id) {
+  return request({
+    url: '/boman-gen/genTableColumn/' + id,
+    method: 'delete',
+  })
+}
+// 修改字段信息
+export function setGenTableColumn(data) {
+  return request({
+    url: '/boman-gen/genTableColumn',
+    method: 'put',
+    data
+  })
+}
+// 获取字段信息
+export function getGenTableColumn(tableId) {
+  return request({
+    url: '/boman-gen/genTableColumn/getColumnInfo/' + tableId,
+    method: 'get',
+  })
+}
+// 获取字段信息
+export function getByIdWithForeignKey(tableId) {
+  return request({
+    url: '/boman-gen/genTableColumn/getByIdWithForeignKey/' + tableId,
+    method: 'get',
+  })
+}
+// 获取字段信息
+export function getLoadTable() {
+  return request({
+    url: 'boman-gen/init/loadTable',
+    method: 'get',
+  })
+}
+
+// 获取快速查询  查询框数据/ */
+export function tableQuery(data) {
+  return request({
+    url: '/boman-web-core/p/cs/getTableQuery',
+    method: 'POST',
+    data
+  })
+}
+
+// 快速查询列表
+export function listIndexfou(data) {
+  return request({
+    url: '/boman-web-core/p/cs/queryList',
+    method: 'post',
+    data: data
+  })
+}
+
+// 时间相差
+export function listIndextime(data) {
+  return request({
+    url: '/boman-web-core/attendance/calcTime',
+    method: 'post',
+    data: data
+  })
+}

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

@@ -94,12 +94,11 @@ export default {
           this.fileList = list.map(item => {
             if (typeof item === "string") {
               if (item.indexOf(this.baseUrl) === -1) {
-                  item = { name:item, url:item };
+                  item = { name: this.baseUrl + item, url: this.baseUrl + item };
               } else {
                   item = { name: item, url: item };
               }
             }
-            console.log(item,24)
             return item;
           });
         } else {
@@ -128,12 +127,11 @@ export default {
     },
     // 上传成功回调
     handleUploadSuccess(res) {
-      this.uploadList.push({ name: res.originalFilename, url: res.url });
+      this.uploadList.push({ name: res.fileName, url: res.fileName });
       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();
       }
@@ -183,6 +181,7 @@ export default {
       this.dialogImageUrl = file.url;
       this.dialogVisible = true;
     },
+    
     // 对象转成指定字符串分隔
     listToString(list, separator) {
       let strs = "";

ruoyi-ui/src/main.js

@@ -18,7 +18,7 @@ import './assets/icons' // icon
 import './permission' // permission control
 import { getDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/system/config";
-import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi";
+import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, selectDictLabelss, handleTree } from "@/utils/ruoyi";
 // 分页组件
 import Pagination from "@/components/Pagination";
 // 自定义表格工具组件
@@ -46,6 +46,7 @@ Vue.prototype.resetForm = resetForm
 Vue.prototype.addDateRange = addDateRange
 Vue.prototype.selectDictLabel = selectDictLabel
 Vue.prototype.selectDictLabels = selectDictLabels
+Vue.prototype.selectDictLabelss = selectDictLabelss
 Vue.prototype.download = download
 Vue.prototype.handleTree = handleTree
 

ruoyi-ui/src/utils/ruoyi.js

@@ -68,7 +68,7 @@ export function addDateRange(params, dateRange, propName) {
   return search;
 }
 
-// 回显数据字典 
+// 回显数据字典
 export function selectDictLabel(datas, value) {
   if (value === undefined) {
     return "";
@@ -77,6 +77,25 @@ export function selectDictLabel(datas, value) {
   Object.keys(datas).some((key) => {
     if (datas[key].value == ('' + value)) {
       actions.push(datas[key].label);
+      console.log(actions,5)
+      return true;
+    }
+  })
+  if (actions.length === 0) {
+    actions.push(value);
+  }
+  return actions.join('');
+}
+// 回显数据字典
+export function selectDictLabelss(datas, value) {
+  if (value === undefined) {
+    return "";
+  }
+  var actions = [];
+  Object.keys(datas).some((key) => {
+    if (datas[key].menuId == ('' + value)) {
+      actions.push(datas[key].menuName);
+      console.log(actions,5)
       return true;
     }
   })
@@ -233,4 +252,4 @@ export async function blobValidate(data) {
   } catch (error) {
     return true;
   }
-}
+}

ruoyi-ui/src/views/login.vue

@@ -1,14 +1,49 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">信用平台</h3>
+      <img src="../assets/images/icon_dl_ewm@2x.png" v-if="stageType==1" @click="dhiwyrei" alt="" class="icon_rw">
+      <img src="../assets/images/icon_dl_madl@2x.png" v-if="stageType==2" alt="" @click="bkue" class="icon_mim">
+      <h3 class="title"> 信用平台</h3>
+      <!-- <div v-if="statusFlag==2">
+        <div class="erw_img">
+          <img src="" alt="" class="imgs">
+          <p>请使用手机扫描上方二维码登录</p>
+        </div>
+        <div class="mim_p">
+          密码登录
+        </div>
+      </div> -->
+	  <!-- 2 -->
+
+	  <div v-show="stageType==2" class="login-erw">
+      <h2 v-if="stageType==2" class="logerw_tit">
+        请使用<span style="color: red;">小程序中扫码登录功能</span>,扫码快速登录
+      </h2>
+      <p>请扫描下方的二维码</p>
+      <p>安全登录，防止盗号</p>
+      <div class="logerw_img" ref="qrCodeUrl">
+      </div>
+
+      <div class="ts_p" v-if="isInvalid">
+        二维码已过期，请点击<span @click="getQecode">刷新</span>重试
+      </div>
+      <!-- <div class="logerw_fot" @click="two_fn">
+        账号密码登录
+      </div> -->
+    </div>
+	<div v-show="stageType==3" class="login-erw-thre">
+	  <div class="log_erw_thre_img">
+	    <img src="../assets/images/pic_dlcg@2x.png" alt="" class="img">
+	  </div>
+	  <div class="log_erw_thre_rig">
+	    <h3>{{ success_status?'页面超时，请重新扫描二维码':'扫描成功，请在手机上确认是否授权登录'}}</h3>
+	    <p v-if="!success_status">使用其他方式登录，请<span @click="three_fn">返回</span></p>
+	    <div v-if="success_status" class="thre_btn" @click="three_sj_fn">返回上一页</div>
+	  </div>
+	</div>
+      <div v-if="stageType==1">
       <el-form-item prop="username">
-        <el-input
-          v-model="loginForm.username"
-          type="text"
-          auto-complete="off"
-          placeholder="账号"
-        >
+        <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
@@ -23,7 +58,7 @@
           <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
-      <el-form-item prop="code" v-if="captchaOnOff">
+      <el-form-item prop="code">
         <el-input
           v-model="loginForm.code"
           auto-complete="off"
@@ -38,143 +73,407 @@
         </div>
       </el-form-item>
       <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
-      <el-form-item style="width:100%;">
+      <el-form-item style="width:100%; margin-bottom: 42px;">
+         <div class="medTitle">
+           快捷登录
+         </div>
+         <div class="med_icons">
+           <div class="med_icons_item" @click="btns">
+             <img src="@/assets/images/icon_kjdl_wz@2x.png" alt="" class="icon">
+             <p>皖事通</p>
+           </div>
+           <div class="med_icons_item" @click="btns">
+             <img src="@/assets/images/icon_kjdl_dd@2x.png" alt="" class="icon">
+             <p>钉钉</p>
+           </div>
+           <div class="med_icons_item" @click="btns">
+             <img src="@/assets/images/icon_kjdl_wx@2x.png" alt="" class="icon">
+             <p>微信</p>
+           </div>
+           <div class="med_icons_item" @click="btns">
+             <img src="@/assets/images/icon_kjdl_qywx@2x.png" alt="" class="icon">
+             <p>企业微信</p>
+           </div>
+           <div class="med_icons_item" @click="btns">
+             <img src="@/assets/images/icon_kjdl_qq@2x.png" alt="" class="icon">
+             <p>QQ</p>
+           </div>
+         </div>
+      </el-form-item>
+      <el-form-item style="width:100%;margin-bottom: 0;">
         <el-button
           :loading="loading"
           size="medium"
           type="primary"
-          style="width:100%;"
+          style="width: 100%;background-color: #2865E1;height: 45px;"
           @click.native.prevent="handleLogin"
         >
           <span v-if="!loading">登 录</span>
           <span v-else>登 录 中...</span>
         </el-button>
-        <div style="float: right;" v-if="register">
-          <router-link class="link-type" :to="'/register'">立即注册</router-link>
-        </div>
+        <p class="div_p">
+          * 使用快捷登录，请先绑定第三方账号
+        </p>
       </el-form-item>
+      </div>
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <!-- <span>Copyright © 2018-2022 ruoyi.vip All Rights Reserved.</span> -->
+      <!-- <span>Copyright © 2018-2021 ruoyi.vip All Rights Reserved.</span> -->
     </div>
   </div>
 </template>
 
 <script>
-import { getCodeImg } from "@/api/login";
-import Cookies from "js-cookie";
-import { encrypt, decrypt } from '@/utils/jsencrypt'
-
-export default {
-  name: "Login",
-  data() {
-    return {
-      codeUrl: "",
-      loginForm: {
-        username: "admin",
-        password: "admin123",
-        rememberMe: false,
-        code: "",
-        uuid: ""
+  import {
+    getCodeImg,
+    getLoginCode,
+    getScanStatus
+  } from "@/api/login";
+  import Cookies from "js-cookie";
+  import QRCode from 'qrcodejs2'
+  import settings from "@/settings";
+  import {
+    encrypt,
+    decrypt
+  } from '@/utils/jsencrypt'
+  import {setToken} from '@/utils/auth'
+
+  export default {
+    name: "Login",
+    data() {
+      return {
+        stageType: 1, //1密码登录  2扫码登录 3扫码成功
+        isInvalid: false, // true失效  false有效
+        setInStatus: '', // 校验是否扫码 时间函数
+        codeUrl: "",
+        cookiePassword: "",
+        loginForm: {
+          username: "",
+          password: "",
+          rememberMe: false,
+          code: "",
+          uuid: ""
+        },
+        loginRules: {
+          username: [{
+            required: true,
+            trigger: "blur",
+            message: "用户名不能为空"
+          }],
+          password: [{
+            required: true,
+            trigger: "blur",
+            message: "密码不能为空"
+          }],
+          code: [{
+            required: true,
+            trigger: "change",
+            message: "验证码不能为空"
+          }]
+        },
+        setInStatus_num: 0,
+        loading: false,
+        qecode: '', // code
+        redirect: undefined,
+        success_status: false, // 扫描成功 是否超时
+        setInSuccess_fn: '', // 扫码成功函数
+        setInSuccess_num: 0, // 扫码成功计时
+      };
+    },
+    watch: {
+      $route: {
+        handler: function(route) {
+          this.redirect = route.query && route.query.redirect;
+        },
+        immediate: true
+      }
+    },
+    created() {
+      this.getCode();
+      this.getCookie();
+    },
+    methods: {
+		btns() {
+		  this.msgInfo('暂未开放')
+		},
+      getCode() {
+        getCodeImg().then(res => {
+          this.codeUrl = "data:image/gif;base64," + res.img;
+          this.loginForm.uuid = res.uuid;
+        });
       },
-      loginRules: {
-        username: [
-          { required: true, trigger: "blur", message: "请输入您的账号" }
-        ],
-        password: [
-          { required: true, trigger: "blur", message: "请输入您的密码" }
-        ],
-        code: [{ required: true, trigger: "change", message: "请输入验证码" }]
+      two_fn() {
+        this.stageType = 1
+        this.setInStatus_num = 0
+        this.isInvalid = false
+        if(this.setInStatus){
+          clearInterval(this.setInStatus)
+        }
       },
-      loading: false,
-      // 验证码开关
-      captchaOnOff: true,
-      // 注册开关
-      register: false,
-      redirect: undefined
-    };
-  },
-  watch: {
-    $route: {
-      handler: function(route) {
-        this.redirect = route.query && route.query.redirect;
+      three_sj_fn() {
+        this.getQecode()
       },
-      immediate: true
-    }
-  },
-  created() {
-    this.getCode();
-    this.getCookie();
-  },
-  methods: {
-    getCode() {
-      getCodeImg().then(res => {
-        this.captchaOnOff = res.captchaOnOff === undefined ? true : res.captchaOnOff;
-        if (this.captchaOnOff) {
-          this.codeUrl = "data:image/gif;base64," + res.img;
-          this.loginForm.uuid = res.uuid;
+      three_fn() {
+        this.stageType = 1
+        this.setInSuccess_num = 0
+        this.success_status = false
+        if(this.setInSuccess_fn){
+          clearInterval(this.setInSuccess_fn)
         }
-      });
-    },
-    getCookie() {
-      const username = Cookies.get("username");
-      const password = Cookies.get("password");
-      const rememberMe = Cookies.get('rememberMe')
-      this.loginForm = {
-        username: username === undefined ? this.loginForm.username : username,
-        password: password === undefined ? this.loginForm.password : decrypt(password),
-        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
-      };
-    },
-    handleLogin() {
-      this.$refs.loginForm.validate(valid => {
-        if (valid) {
-          this.loading = true;
-          if (this.loginForm.rememberMe) {
-            Cookies.set("username", this.loginForm.username, { expires: 30 });
-            Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
-            Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
-          } else {
-            Cookies.remove("username");
-            Cookies.remove("password");
-            Cookies.remove('rememberMe');
+      },
+      creatQrCode(url) {
+        const _this = this
+        this.$refs.qrCodeUrl.innerHTML="";
+        let qrcode = new QRCode(_this.$refs.qrCodeUrl, {
+          text: url, // 需要转换为二维码的内容
+          width: 200,
+          height: 200,
+          colorDark: '#000000',
+          colorLight: '#ffffff',
+          correctLevel: QRCode.CorrectLevel.H
+        })
+        console.log(qrcode,987)
+        this.setInStatus_fn()
+      },
+      setInStatus_fn() {
+        this.setInStatus = setInterval(red => {
+          this.setInStatus_num ++
+          if(this.setInStatus_num==180){
+            this.setInStatus_num = 0
+            this.isInvalid = true
+            clearInterval(this.setInStatus)
+          }else{
+            getScanStatus(this.qecode).then(res => {
+              if(res.msg == 'has_scan'){
+                clearInterval(this.setInStatus)
+                this.setInStatus_num = 0
+                this.stageType=3
+                this.succes_fn()
+              }
+            })
           }
-          this.$store.dispatch("Login", this.loginForm).then(() => {
-            this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
-          }).catch(() => {
-            this.loading = false;
-            if (this.captchaOnOff) {
-              this.getCode();
+        },1000)
+      },
+      succes_fn() {
+        this.setInSuccess_fn = setInterval(red => {
+          this.setInSuccess_num++
+          if(this.setInSuccess_num==180){
+            this.setInSuccess_num = 0
+            this.success_status = true
+            clearInterval(this.setInSuccess_fn)
+          }else{
+            getScanStatus(this.qecode).then(res => {
+              if(res.msg.includes('login_success:')){
+                clearInterval(this.setInSuccess_fn)
+                let token = res.msg.replace('login_success:','')
+                setToken(token)
+                this.$store.commit('SET_TOKEN', token)
+                this.$router.push({
+                  path: this.redirect || "/"
+                }).catch(() => {});
+              }
+            })
+          }
+        },1000)
+      },
+      getQecode() {
+        getLoginCode().then(res => {
+          this.qecode = res.data
+          console.log(res.msg,67)
+          let apiurl = settings.urls
+          // if(apiurl.includes('118.178.139.79')){
+          //   apiurl = 'https://video.zhongxinyun.com.cn/api'
+          // }
+		  // /dev-api
+          let urls = `${apiurl}/prod-api/auth/scanCode/${res.data}`
+          console.log(urls,987)
+          this.creatQrCode(urls)
+          this.isInvalid = false
+          this.stageType = 2
+        })
+      },
+	  dhiwyrei(){
+		  this.stageType=2
+		  this.getQecode()
+	  },
+      getCookie() {
+        const username = Cookies.get("username");
+        const password = Cookies.get("password");
+        const rememberMe = Cookies.get('rememberMe')
+        this.loginForm = {
+          username: username === undefined ? this.loginForm.username : username,
+          password: password === undefined ? this.loginForm.password : decrypt(password),
+          rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
+        };
+      },
+      handleLogin() {
+        this.$refs.loginForm.validate(valid => {
+          if (valid) {
+            this.loading = true;
+            if (this.loginForm.rememberMe) {
+              Cookies.set("username", this.loginForm.username, {
+                expires: 30
+              });
+              Cookies.set("password", encrypt(this.loginForm.password), {
+                expires: 30
+              });
+              Cookies.set('rememberMe', this.loginForm.rememberMe, {
+                expires: 30
+              });
+            } else {
+              Cookies.remove("username");
+              Cookies.remove("password");
+              Cookies.remove('rememberMe');
             }
-          });
-        }
-      });
+            this.$store.dispatch("Login", this.loginForm).then(() => {
+              this.$router.push({
+                path: this.redirect || "/"
+              }).catch(() => {});
+            }).catch(() => {
+              this.loading = false;
+              this.getCode();
+            });
+          }
+        });
+      },
+	  bkue(){
+		  this.stageType =1
+      clearInterval(this.setInStatus)
+	  }
+
     }
-  }
-};
+  };
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
 .login {
   display: flex;
-  justify-content: center;
+  justify-content: flex-end;
   align-items: center;
   height: 100%;
   background-image: url("../assets/images/login-background.jpg");
   background-size: cover;
 }
+.div_p{
+  text-align: center;
+  font-size: 11px;
+  color: #AAAAAA;
+  // line-height: 1;
+}
+.medTitle{
+  margin-top: 10px;
+  text-align: center;
+  line-height: 50px;
+  position: relative;
+  color: #343434;
+  font-size: 14px;
+  font-weight: bold;
+  margin-bottom: 5px;
+  &::before{
+    content: "";
+    position: absolute;
+    width: 30px;
+    height: 2px;
+    border-radius: 1px;
+    background-color: #F4AD6B;
+    top: 0;
+    left: 50%;
+    transform: translateX(-50%);
+  }
+}
+.med_icons{
+  display: flex;
+  justify-content: space-between;
+  width: 365px;
+  position: relative;
+  left: -23px;
+
+  .med_icons_item{
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    cursor: pointer;
+    .icon{
+      width: 34px;
+      height: 34px;
+      margin-bottom: 6px;
+    }
+    p{
+      text-align: center;
+      font-size: 11px;
+      color: #666666;
+      line-height: 24px;
+      margin: 0;
+    }
+  }
+}
 .title {
-  margin: 0px auto 30px auto;
+  margin: 0px auto 40px auto;
   text-align: center;
-  color: #707070;
+  color: #343434;
+  padding:  0 15px;
+  position: relative;
+  font-weight: normal;
+  font-size: 22px;
+  &::before{
+    position: absolute;
+    content: '';
+    width: 145px;
+    height: 15px;
+    background-image: url('../assets/images/pic_dlbt_hx@2x.png');
+    background-size: 100% 100%;
+    bottom: -15px;
+    left: 50%;
+    transform: translateX(-50%);
+  }
 }
 
 .login-form {
   border-radius: 6px;
   background: #ffffff;
-  width: 400px;
-  padding: 25px 25px 5px 25px;
+  width: 441px;
+  box-shadow: 0 0 25px #E3E3EA;
+  margin-right: 101px;
+  background-image: urk;
+  padding: 58px 62px 49px;
+  position: relative;
+  .icon_rw{
+    position: absolute;
+    width: 72px;
+    height: 72px;
+    top: 11px;
+    right: 11px;
+    cursor: pointer;
+  }
+  .icon_mim{
+    position: absolute;
+    width: 57px;
+    height: 57px;
+    top: 11px;
+    right: 11px;
+    cursor: pointer;
+  }
+  .erw_img{
+    margin: 69px 0 83px;
+    text-align: center;
+    .img{
+      width: 240px;
+      height: 240px;
+      margin-bottom: 17px;
+    }
+    p{
+      color: #666666;
+      font-size: 14px;
+    }
+  }
+  .mim_p{
+    text-align: center;
+    color: #2865E1;
+    font-size: 15px;
+    font-weight: bold;
+    text-decoration: underline;
+  }
   .el-input {
     height: 38px;
     input {
@@ -216,4 +515,105 @@ export default {
 .login-code-img {
   height: 38px;
 }
+
+ .login-erw-thre {
+    border-radius: 4px;
+    background: #ffffff;
+    padding: 0;
+    text-align: center;
+    display: flex;
+    align-items: center;
+
+    .log_erw_thre_img {
+      width: 181px;
+      height: 270px;
+
+      .img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+
+    .log_erw_thre_rig {
+      h3 {
+        font-size: 16px;
+        color: #343434;
+        margin: 0 0 40px;
+      }
+       .thre_btn{
+         width: 120px;
+         height: 36px;
+         color: #24B2FA;
+         border: 1px solid #24B2FA;
+         box-sizing: border-box;
+         border-radius: 18px;
+         cursor: pointer;
+         margin: 0 auto;
+         line-height: 36px;
+       }
+      p {
+        font-size: 14px;
+        color: #666666;
+        text-align: left;
+
+        span {
+          color: #24B2FA;
+          margin-left: 4px;
+          cursor: pointer;
+        }
+      }
+    }
+  }
+
+  .login-erw {
+    border-radius: 4px;
+    background: #ffffff;
+    width: 335px;
+    padding: 35px 31px 24px;
+    position: relative;
+    text-align: center;
+
+    .logerw_tit {
+      color: #343434;
+      font-size: 23px;
+      margin: 0 0 20px;
+    }
+
+    p {
+      color: #343434;
+      font-size: 15px;
+      margin: 0;
+      line-height: 22px;
+    }
+
+    .logerw_img {
+      width: 200px;
+      height: 200px;
+      margin: 22px auto 15px;
+      border: 1px solid #E4E4E4;
+      padding: 6px;
+      box-sizing: border-box;
+      img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+    .ts_p{
+      font-size: 14px;
+      margin-bottom: 25px;
+      color: #343434;
+      span{
+        margin: 0 3px;
+        color: #24B2FA;
+        cursor: pointer;
+      }
+    }
+
+    .logerw_fot {
+      text-align: right;
+      font-size: 15px;
+      color: #666666;
+      cursor: pointer;
+    }
+  }
 </style>

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

@@ -0,0 +1,460 @@
+<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="merchantsName">
+          <el-select  filterable style="width: 100%;" v-model="queryParams.merchantsId" placeholder="请选择商户名称">
+                      <el-option
+                        v-for="dict in merchantsNameList"
+                        :key="dict.businessId"
+                        :label="dict.businessName"
+                        :value="dict.businessId"
+                        @click.native="optionClicks(dict.businessName)"
+                      ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="权益等级" prop="interestsLevel ">
+          <el-select :multiple="true"  style="width: 100%;" v-model="queryParams.interestsLevel " 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-form-item label="权益次数" prop="interestsNumber">
+          <el-input v-model="queryParams.interestsNumber" type="number" placeholder="请输入权益次数" />
+        </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:table: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:table: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:table: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:table:export']"
+        >导出</el-button>
+      </el-col> -->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+
+      <el-table-column label="商户名称" align="center" prop="merchantsName" />
+      <el-table-column label="权益等级" align="center" prop="interestsLevel" />
+      <el-table-column label="权益次数" align="center" prop="interestsNumber" />
+      <el-table-column label="权益描述" align="center" prop="account" />
+      <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:table:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:table: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="24">
+            <el-form-item label="类别名称" prop="interestsPolicyId">
+              <treeselect v-model="form.interestsPolicyId" :options="deptOptions" :normalizer="normalizer"  placeholder="请选择上级类别" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="商户名称" prop="merchantsId">
+              <el-select  filterable style="width: 100%;" v-model="form.merchantsId" placeholder="请选择商户名称">
+                          <el-option
+                            v-for="dict in merchantsNameList"
+                            :key="dict.businessId"
+                            :label="dict.businessName"
+                            :value="dict.businessId"
+                            @click.native="optionClick(dict.businessName)"
+                          ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-for="(item, index) in form.interestsNumberTableList">
+            <el-col :span="11">
+              <el-form-item label="权益等级" prop="rightsRank">
+                <el-select  style="width: 100%;" v-model="item.rightsRank" 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="11">
+            <el-form-item label="权益次数" prop="number">
+              <el-input v-model="item.number" type="number" placeholder="请输入权益次数" />
+            </el-form-item>
+            </el-col>
+            <el-col :span="2">
+              <div class="hyeoa" style="margin-top: 10px;">
+              	 <el-tooltip class="item" effect="dark" content="新增信息,请慎重操作" placement="top-start">
+              	      <img src="../../../assets/images/icon_tc_add.png" alt="" class="hueyde" @click="tijea(index)" />
+              	    </el-tooltip>
+              		<el-tooltip class="item" effect="dark" content="删除无法恢复,请慎重操作" placement="top-start">
+              		     <img src="../../../assets/images/delei.png" alt="" class="hueydele" @click="naeyrfakjf(index, item)" />
+              		   </el-tooltip>
+              </div>
+            </el-col>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="权益描述" prop="account">
+              <editor v-model="form.account" :min-height="192"/>
+            </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 { listTable, mersList, getTable, delTable, addTable, updateTable, delseeu } from "@/api/system/table";
+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 {
+  dicts: ['credit_level', 'sys_user_sex'],
+  components: { Treeselect },
+  name: "Table",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 商户权益记录表格数据
+      tableList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 部门树选项
+      deptOptions: undefined,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        merchantsName: null,
+        account: null,
+        isDel: null
+      },
+      // 表单参数
+      form: {
+        interestsNumberTableList:[{rightsRank:'',number:""}]
+      },
+      // 表单校验
+      rules: {
+        merchantsId: [
+          { required: true, message: "商户id不能为空", trigger: "blur" }
+        ],
+        merchantsName: [
+          { required: true, message: "商户名称不能为空", trigger: "change" }
+        ],
+        parentId: [
+          { required: true, message: "类别名称不能为空", trigger: "change" }
+        ]
+
+      },
+      merchantsNameList:[],
+      nske:null
+    };
+  },
+  created() {
+    listMenu().then(response => {
+      // this.menuList = response.rows;
+      this.deptOptions = this.handleTree(response.data, "menuId")
+      console.log(this.deptOptions)
+      // this.total = response.total;
+    });
+    this.getList();
+    this.mersNameList()
+  },
+  methods: {
+    /** 查询商户权益记录列表 */
+    getList() {
+      this.loading = true;
+      listTable(this.queryParams).then(response => {
+        this.tableList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+
+    // 查询商户名称信息
+    mersNameList(){
+     this.loading = true;
+     mersList().then(response => {
+       this.merchantsNameList = response.rows;
+       this.loading = false;
+     });
+    },
+    /** 转换部门数据结构 */
+    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 = {
+        id: null,
+        merchantsId: null,
+        merchantsName: null,
+        account: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        isDel: null,
+        interestsNumberTableList:[{rightsRank:'',number:''}]
+      };
+      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.title = "添加商户权益记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getTable(id).then(response => {
+        this.form = response.data;
+        if(this.form.interestsNumberTableList == null){
+          this.form.interestsNumberTableList = [{rightsRank:'',number:''}]
+        }
+        this.open = true;
+        this.title = "修改商户权益记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if(this.form.interestsNumberTableList[0].rightsRank == ''){
+            this.$message({
+                      message: '权益等级，权益次数必填',
+                      type: 'warning'
+                    });
+             return false;
+          }
+          if (this.form.id != null) {
+            updateTable(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addTable(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 delTable(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/table/export', {
+        ...this.queryParams
+      }, `table_${new Date().getTime()}.xlsx`)
+    },
+    // 点击新增
+    tijea(index) {
+    	console.log(index+ 1)
+    	this.form.interestsNumberTableList.push({
+    		rightsRank: '',
+    		rightsRank: '',
+        plaed:'请选择权益等级',
+    	});
+      // this.nhyeojd = true
+    },
+    // 点击删除
+    naeyrfakjf(index, item) {
+      // console.log(this.form.czrkJzdzList.length,347)
+
+      var that = this
+      this.$confirm('是否确认删除信息?', '警告', {
+      	confirmButtonText: '确定',
+      	cancelButtonText: '取消',
+      	type: 'warning'
+      })
+      	.then(function() {
+      		return that.delseeug(index,item)
+      	})
+      	.then(() => {
+
+      	});
+
+    },
+    delseeug(index,item){
+    	console.log(234)
+    	if (this.form.interestsNumberTableList.length == 1) {
+        this.$message({
+                  message: '只剩一条数据，无法删除',
+                  type: 'warning'
+                });
+    		return false;
+    	}
+    	if (this.title == '添加商户权益记录') {
+    		// 新增
+        this.$modal.msgSuccess("操作成功");
+    		this.form.interestsNumberTableList.splice(index, 1);
+    	} else if(this.title == '修改商户权益记录') {
+    		// 修改
+    		// ()
+        delseeu(item.numberId).then(response => {
+          this.$modal.msgSuccess("操作成功");
+          this.form.interestsNumberTableList.splice(index, 1);
+        });
+
+    	}
+      // this.msgSuccess('删除成功');
+    },
+    // 新增修改 商品名称
+    optionClick(data){
+       this.form.merchantsName = data
+    },
+    // 搜索 商品名称
+    optionClicks(data){
+       this.queryParams.merchantsName = data
+    },
+
+  }
+};
+</script>
+<style>
+  .hueyde {
+  	width: 18px;
+  	height: 18px;
+  	margin: 0 5px;
+  	margin-right: 10px;
+  }
+  .hueydele {
+  	width: 15px;
+  	height: 18px;
+  }
+</style>

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

@@ -163,12 +163,13 @@
           <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" />
+            <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer"  placeholder="请选择上级类别" />
           </el-form-item>
           </el-col>
-
+          
           <el-col :span="12">
           <el-form-item label="显示顺序" prop="orderNum">
             <el-input v-model="form.orderNum" type="number" placeholder="请输入显示顺序" />

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

@@ -1,26 +1,56 @@
 <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-row>
+       <el-col :span="7">
+         <el-form-item label="商家名称" prop="businessName">
+           <el-input
+             v-model="queryParams.businessName"
+             placeholder="请输入商家名称"
+             clearable
+             style="width: 220px;"
+             @keyup.enter.native="handleQuery"
+           />
+         </el-form-item>
+       </el-col>
+       <el-col :span="7">
+         <el-form-item label="分类名称" prop="policyId">
+            <el-cascader
+               :options="deptOptions"
+               :props="propsList"
+               clearable
+               style="width: 220px;"
+               v-model="mngtsr"
+               @change="mjue"
+               >
+               </el-cascader>
+           <!-- <treeselect style="width: 220px;" v-model="queryParams.policyId" :options="deptOptions" :normalizer="normalizer"  placeholder="请选择分类名称" /> -->
+         </el-form-item>
+       </el-col>
+       <el-col :span="6">
+         <el-form-item label="商家电话" prop="businessPhone">
+           <el-input
+             v-model="queryParams.businessPhone"
+             placeholder="请输入商家电话"
+             clearable
+             style="width: 180px;"
+             @keyup.enter.native="handleQuery"
+           />
+         </el-form-item>
+       </el-col>
+
+       <el-col :span="4">
+         <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-col>
+     </el-row>
+
+
+
+
+
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -76,16 +106,17 @@
       <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" >
+      <el-table-column label="商家政策" align="center" prop="businessPolicy" width="170" :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="orderNum" /> -->
+      <!-- <el-table-column label="商家状态" align="center" prop="visible" /> -->
+      <!-- :formatter="homeNameFormat" -->
+      <el-table-column label="分类名称" align="center" prop="menuNames" width="110"  />
       <el-table-column label="商家商标" align="center" prop="photo" width="100">
         <template slot-scope="scope">
           <image-preview :src="scope.row.photo" :width="50" :height="50"/>
@@ -135,7 +166,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="分类名称" prop="policyId">
+            <el-form-item label="分类名称" prop="menuIdList">
               <!-- <el-select v-model="form.policyId" placeholder="分类名称"  style="width: 100%;">
                 <el-option
                   v-for="dict in dict.type.sys_yes_no"
@@ -144,7 +175,7 @@
                   :value="dict.value"
                 />
               </el-select> -->
-              <treeselect v-model="form.policyId" :options="deptOptions" :normalizer="normalizer"  placeholder="请选择父级类别ID" />
+              <treeselect :value-consists-of="valueConsistsOf" @input="nhyud" :multiple="true" v-model="form.menuIdList" :options="deptOptions" :normalizer="normalizer"  placeholder="请选择分类名称" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -182,12 +213,6 @@
           </el-col>
         </el-row>
 
-
-
-
-
-
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -236,6 +261,13 @@ export default {
         businessName: null,
         businessPhone: null,
       },
+      propsList:{
+        value: 'menuId',
+        label: 'menuName',
+        checkStrictly: true,
+        lazy: true,
+        leaf: "leaf"
+      },
       // 表单参数
       form: {},
       // 表单校验
@@ -244,14 +276,24 @@ export default {
       rules: {
         businessName: [{ required: true, message: '商家名称不能为空', trigger: 'blur' }],
 
-        policyId: [{ required: true, message: '请选择分类名称', trigger: 'blur' }],
+        menuIdList: [{ required: true, message: '请选择分类名称', trigger: 'blur' }],
 
         businessPolicy: [{ required: true, message: '商家政策不能为空', trigger: 'blur' }]
-      }
+      },
+      valueConsistsOf:'LEAF_PRIORITY',
+      mngtsr:[]
     };
   },
+
   created() {
+    listMenu().then(response => {
+      // this.menuList = response.rows;
+      this.deptOptions = this.handleTree(response.data, "menuId")
+      console.log(this.deptOptions)
+      // this.total = response.total;
+    });
     this.getList();
+
   },
   methods: {
     /** 查询入驻商家列表 */
@@ -285,13 +327,20 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
-        remark: null
+        remark: null,
+        menuIdList:[]
       };
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
+      if(this.queryParams.policyId !== null){
+        this.queryParams.policyId = this.mngtsr[this.mngtsr.length - 1]
+      }
+      if(this.queryParams.policyId !== undefined){
+        this.queryParams.policyId = this.mngtsr[this.mngtsr.length - 1]
+      }
       this.getList();
     },
     /** 重置按钮操作 */
@@ -299,6 +348,9 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    homeNameFormat(row, column) {
+      return this.selectDictLabelss(this.deptOptions,row.policyId);
+      },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.businessId)
@@ -321,17 +373,36 @@ export default {
     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;
       });
+      getMerchants(businessId).then(response => {
+        if(response.data.menuIdList == null){
+          response.data.menuIdList = []
+        }
+        if(response.data.menuIdList[0] == null){
+          response.data.menuIdList = []
+        }
+        if(response.data.menuIdList == undefined){
+          response.data.menuIdList = []
+        }
+        this.form = response.data;
+        console.log(response.data.policyId);
+
+        // response.data.policyId = response.data.policyId + ''
+        // this.form.policyId = response.data.policyId.split(',')
+        // for(var i = 0;   i < this.form.policyId.length; i++){
+        //   this.form.policyId[i] = this.form.policyId[i] - 0
+        // }
+        // this.form.policyId = [17,13]
+        console.log(this.form.policyId);
+        this.open = true;
+        this.title = "修改入驻商家";
+      });
+
     },
     /** 转换部门数据结构 */
     normalizer(node) {
@@ -380,6 +451,13 @@ export default {
       this.download('system/merchants/export', {
         ...this.queryParams
       }, `入驻商家表格数据.xlsx`)
+    },
+    nhyud(data){
+      console.log(data,34);
+    },
+    mjue(data){
+      console.log(data);
+
     }
   }
 };

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

@@ -0,0 +1,274 @@
+<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="recordYear">
+        <el-date-picker
+              v-model="queryParams.recordYear"
+              type="datetime"
+              placeholder="选择日期时间"
+              clearable
+              value-format="yyyy-MM-dd HH:mm:ss"
+              format="yyyy-MM-dd HH:mm:ss"
+              @keyup.enter.native="handleQuery"
+              >
+            </el-date-picker>
+      </el-form-item>
+      <el-form-item label="记录名称" prop="recordName">
+        <el-input
+          v-model="queryParams.recordName"
+          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:record: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:record: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:record: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:record:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row> -->
+
+    <el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange">
+      <el-table-column label="记录时间" align="center" prop="recordYear" />
+      <el-table-column label="记录类型" align="center" prop="recordType" />
+      <el-table-column label="记录名称" align="center" prop="recordName" />
+      <el-table-column label="使用次数" align="center" prop="useNum" />
+      <el-table-column label="剩余次数" align="center" prop="surplusNum" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <!-- <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:record:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:record: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>
+      <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 { listRecord, getRecord, delRecord, addRecord, updateRecord } from "@/api/system/record";
+
+export default {
+  name: "Record",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 使用记录表格数据
+      recordList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        recordYear: null,
+        recordType: null,
+        recordName: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询使用记录列表 */
+    getList() {
+      this.loading = true;
+      listRecord(this.queryParams).then(response => {
+        this.recordList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        recordId: null,
+        recordYear: null,
+        recordType: null,
+        recordName: null,
+        orderNum: null,
+        useNum: null,
+        creditId: null,
+        surplusNum: 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.recordId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加使用记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const recordId = row.recordId || this.ids
+      getRecord(recordId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改使用记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.recordId != null) {
+            updateRecord(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addRecord(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const recordIds = row.recordId || this.ids;
+      this.$modal.confirm('是否确认删除使用记录编号为"' + recordIds + '"的数据项？').then(function() {
+        return delRecord(recordIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/record/export', {
+        ...this.queryParams
+      }, `record_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

ruoyi-ui/vue.config.js

@@ -7,7 +7,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
+const name = process.env.VUE_APP_TITLE || '信用平台' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
@@ -34,8 +34,10 @@ module.exports = {
     open: true,
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
+      // http://192.168.101.11:9000
+      // http://118.31.23.65:5007
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080`,
+        target: `http://192.168.101.168:9000`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''