Skip to content

F
founder_vue
Commit 16f22811 by liyuhang19990520
Options

Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

parents f0ab2094 808cd29a
Showing with 735 additions and 134 deletions
src/netmgr/bzxxgl/bzxxsh.js
import addrType from '../../netmgr/NetAddressType'
const _path = {
bzxxsh: addrType.api + '/hit',
bzxxsh: addrType.api + '/hit/',
}
export default {
shList(_parameter) {
return fHttp.postJson(_path.bzxxsh + '/queryAllSh', _parameter)
return fHttp.postJson(_path.bzxxsh + 'queryAllSh', _parameter)
},
sh(_parameter) {
return fHttp.postJson(_path.bzxxsh + '/udateShzt', _parameter)
return fHttp.postJson(_path.bzxxsh + 'udateShzt', _parameter)
},
updateJrzg(_parameter) {
return fHttp.postJson(_path.bzxxsh + '/updateJrzg', _parameter)
return fHttp.postJson(_path.bzxxsh + 'updateJrzg', _parameter)
},
plsb(_parameter) { // 批量上报
return fHttp.postJson(_path.bzxxsh + '/insertBeach', _parameter)
return fHttp.postJson(_path.bzxxsh + 'insertBeach', _parameter)
},
}
src/netmgr/xtfkgl/xtfkgl.js
......@@ -2,12 +2,15 @@ import addrType from '../../netmgr/NetAddressType'
const _path = {
ryfkgl: addrType.api + '/logic/person/',
ajfkgl: addrType.api + ''
ajfkgl: addrType.api + '/logic/case/'
}
export default {
ryList(_parameter) {// 获取人员逻辑库
return fHttp.postJson(_path.ryfkgl + 'queryAll', _parameter)
},
ajList(_parameter) {// 获取案件逻辑库
return fHttp.postJson(_path.ajfkgl + 'queryAll', _parameter)
},
}
src/request/http.js
......@@ -13,6 +13,8 @@ axios.defaults.headers = {
}
axios.defaults.responseType = 'json'
var common = axios.create()
var instance = axios.create({// post 常规请求
headers: {
'Content-Type': 'multipart/form-data'
......@@ -61,7 +63,7 @@ let onError = (error) => {
logger.error('onError-error', error)
logger.error('onError-error.toString', error.toString())
let result = {
code: -1,
code: 999,
message: ''
}
if (error.toString().indexOf('400') >= 0) {
......@@ -80,13 +82,11 @@ let onError = (error) => {
result.code = 501
result.message = '失败（501）：您的操作被取消或不允许提交！'
} else if (error.toString().indexOf('timeout') >= 0) {
result.code = -1
result.message = '请求超时，请检查网络连接!'
} else if (error.toString().indexOf('Cancel') >= 0) {
result.code = -2
result.code = 1000
result.message = '取消请求成功！'
} else {// 其他未知异常
result.code = -1
result.message = '未知错误：' + error.toString()
}
let errorMsg = error + '-------' + result.message
......@@ -101,7 +101,9 @@ let onResponse = (response) => {
if (response.headers && response.headers.token) localStorage.setItem(ACCESS_TOKEN, response.headers.token)
if (response.config && response.config.loading !== false) hideLoading(response.config.loadingTarget)
if (response.data && response.data.code) {
logger.info('response', response)
if (response.data && response.data.code >= 0) {
let status = response.data.code
let message = response.data.message
if (status === 0) {
......@@ -121,14 +123,14 @@ let onResponse = (response) => {
// request 请求拦截器
axios.interceptors.request.use(
common.interceptors.request.use(
config => {
config.headers['Content-Type'] = 'application/json'
config = initConfig(config)
return config
}, onError)
// response 响应拦截器
axios.interceptors.response.use(onResponse, onError)
common.interceptors.response.use(onResponse, onError)
instance.interceptors.request.use(
config => {
......@@ -173,7 +175,7 @@ let handleError = (response) => {
})
}, 500)
break
case -2:
case 1000:
type = 'info'
break
}
......@@ -200,7 +202,7 @@ export default {
*/
get(url, params) {
return new Promise((resolve, reject) => {
axios
common
.get(url, {
params: params
})
......@@ -219,7 +221,7 @@ export default {
*/
post(url, params, config) {
return new Promise((resolve, reject) => {
axios.post(url, qs.stringify(params), config)
common.post(url, qs.stringify(params), config)
.then(response => {
logger.net(data, url, response)
parseResponse(resolve, reject, response)
......
src/router/modules/leftMenu.js
......@@ -332,4 +332,16 @@ export default [
},
component: () => import('@/views/bzxxgl/stBzxxsh.vue')
},
{
path: '/xtfkgl',
name: 'xtfkgl',
hidden: false,
meta: {
title: '系统分库管理',
auth: 'H-4',
parentId: 'SystemManage'
},
component: () =>
import('@/views/xtfkgl/XtfkglMain.vue'),
},
]
src/views/AllPersonnelBase/modules/fcx.vue
......@@ -128,7 +128,7 @@
<el-radio-group v-model="ruleForm.queryClass">
<!-- <el-radio label="5">最低</el-radio> -->
<el-radio label="3">低</el-radio>
<el-radio label="2">中</el-radio>
<el-radio label="2">普通</el-radio>
<el-radio label="1">高</el-radio>
<!-- <el-radio label="1">最高</el-radio> -->
</el-radio-group>
......@@ -347,7 +347,7 @@
<el-radio-group v-model="ruleForm.queryClass">
<!-- <el-radio label="5">最低</el-radio> -->
<el-radio label="3">低</el-radio>
<el-radio label="2">中</el-radio>
<el-radio label="2">普通</el-radio>
<el-radio label="1">高</el-radio>
<!-- <el-radio label="1">最高</el-radio> -->
</el-radio-group>
......@@ -525,11 +525,17 @@ export default {
targets_aj: this.$store.state.ljk.targetOptions_aj, // 目标逻辑库（案件） vuex
dataRy: ['1'], // 人员 目标逻辑库 选中
dataAj: ['1'], // 案件 目标逻辑库 选中
radio: 'true',
byzsArr: '', // 本月总数(5个等级数组)
byzs: null,// 该类型下本月总数
sytsArr: null,// 剩余条数
syts: null, //该类型下剩余条数
bcxh: null, //本次消耗
......@@ -597,8 +603,8 @@ export default {
if (newVal == true) {
this.type == 'ry' ? this.title = '人员发查询' : this.title = '案件发查询'
this.type == 'ry' ? this.ruleForm.cxlx.querytype = '1' : this.ruleForm.cxlx.querytype = '2'
this.searchZTS()
this.searchsytsArr()
// this.searchZTS()
// this.searchsytsArr()
this.getQueryCount()
this.bcxh = this.rowData.length;
if (this.type == 'aj') {
......@@ -997,39 +1003,39 @@ export default {
},
// 获取发查询数据(总条数)
searchZTS () {
// //console.info("发查询条数请求===>", this.reqParam);
this.$axios
.get("/api/querylimit/select", { params: { userId: 1234 } })
.then(response => {
if (response.data.code === 0) {
this.byzsArr = response.data.ret
this.byzs = this.byzsArr[0].level1
//console.info("111发查询总条数返回列表===>", this.byzsArr);
// this.colorDiv()
} else {
this.$message.error(response.data.message);
}
});
},
// 获取发查询剩余条数
searchsytsArr () {
//console.info("发查询条数请求===>", this.reqParam);
this.$axios
.get("/api/querylimit/surplus", { params: { userId: 1234 } })
.then(response => {
if (response.data.code === 0) {
this.sytsArr = response.data.ret
this.syts = this.sytsArr[0].level1
//console.info("222发查询剩余条数返回列表===>", this.sytsArr);
} else {
// this.$message.error(response.data.message);
this.$message.error('获取发查询剩余条数失败');
// // 获取发查询数据(总条数)
// searchZTS () {
// // //console.info("发查询条数请求===>", this.reqParam);
// this.$axios
// .get("/api/querylimit/select", { params: { userId: 1234 } })
// .then(response => {
// if (response.data.code === 0) {
// this.byzsArr = response.data.ret
// this.byzs = this.byzsArr[0].level1
// //console.info("111发查询总条数返回列表===>", this.byzsArr);
// // this.colorDiv()
// } else {
// this.$message.error(response.data.message);
// }
// });
// },
// // 获取发查询剩余条数
// searchsytsArr () {
// //console.info("发查询条数请求===>", this.reqParam);
// this.$axios
// .get("/api/querylimit/surplus", { params: { userId: 1234 } })
// .then(response => {
// if (response.data.code === 0) {
// this.sytsArr = response.data.ret
// this.syts = this.sytsArr[0].level1
// //console.info("222发查询剩余条数返回列表===>", this.sytsArr);
// } else {
// // this.$message.error(response.data.message);
// this.$message.error('获取发查询剩余条数失败');
}
});
},
// }
// });
// },
// 发查询条数
getQueryCount () {
this.$axios
......@@ -1040,6 +1046,8 @@ export default {
// this.syts = this.sytsArr[0].level1
console.log("505050505050发查询剩余条数返回列表===>", response.data);
this.byzs = response.data.detail.totalCount // 本月总数
} else {
// this.$message.error(response.data.message);
this.$message.error('获取发查询剩余条数失败');
......
src/views/drFPTX/RAList.vue
......@@ -409,10 +409,7 @@
placement="right"
>
<div slot="content">{{scope.row.failReason}}</div>
<img
src="../../assets/img/confirm/history2x.png"
@click.stop="getDialog(scope.row)"
/>
<img src="../../assets/img/confirm/history2x.png" />
</el-tooltip>
</span>
</template>
......@@ -628,10 +625,7 @@
placement="right"
>
<div slot="content">{{scope.row.failReason}}</div>
<img
src="../../assets/img/confirm/history2x.png"
@click.stop="getDialog(scope.row)"
/>
<img src="../../assets/img/confirm/history2x.png" />
</el-tooltip>
</span>
</template>
......
src/views/xtfkgl/AddXtfkView.vue 0 → 100644
<template>
<div class="addUserDialogBg">
<!-- class="addUserDialogBg"-->
<div class="addUserDialog dialog">
<div class="head-title">
<div class="left">新增人员逻辑分库</div>
<div class="close" @click="canceladd">
<img src="@/assets/img/manage/close.png" alt="" />
</div>
</div>
<div class="info">
<el-form
label-position="left"
label-width="10rem"
:model="addFormParams"
:rules="addrules"
ref="addFormParams"
>
<el-form-item class="info-item" label="逻辑分库名称:" prop="name">
<el-input
placeholder="请输入"
class="input-info"
v-model="addFormParams.name"
></el-input>
</el-form-item>
<el-form-item class="info-item" label="数据库用户:">
<el-input
placeholder="请输入"
class="input-info"
v-model="addFormParams.describe"
></el-input>
</el-form-item>
<el-form-item class="info-item" label="逻辑库说明:">
<el-input
placeholder="请输入"
class="input-info"
v-model="addFormParams.describe"
></el-input>
</el-form-item>
<el-form-item class="info-item" label="启用状态:" prop="status">
<el-radio-group class="radio-info" v-model="addFormParams.status">
<el-radio :label="1" class="qiyong">启用</el-radio>
<el-radio :label="0" class="tingyong">停用</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item class="addbtns">
<el-button
class="add"
type="primary"
@click="submitForm('addFormParams')">提交
</el-button>
<el-button class="cancel" @click="canceladd">取消</el-button>
</el-form-item>
</el-form>
</div>
<br />
<!-- <gzl-view />-->
</div>
</div>
</template>
<script>
import GzlView from '../xtfkgl/GzlView.vue'
export default {
name: 'AddXtfkView',
components: {GzlView},
data() {
// 组名
var validateGroupname = (rule, value, callback) => {
if (value === '') {
callback(new Error('请输入用户组名称！'))
} else {
callback()
}
}
// 用户名ID
var validateUserId = (rule, value, callback) => {
if (value === '' || value.length == 0) {
callback(new Error('请选择加入用户组的用户！'))
} else {
callback()
}
}
// 用户名ID
var validateRoleId = (rule, value, callback) => {
if (value === '') {
callback(new Error('请选择用户组的角色!'))
} else {
callback()
}
}
// 启用状态校验
var validateStatus = (rule, value, callback) => {
if (value === '') {
callback(new Error('请选择状态!'))
} else {
callback()
}
}
return {
addFormParams: {
name: '', // 组名称
describe: '', // 用户组描述
userId: [], // 加入组用户
roleId: [], // 加入组角色
status: 1, // 0 未激活 1 已激活
},
addrules: {
name: [
{validator: validateGroupname, trigger: 'blur', required: true},
], //组名称
userId: [
{validator: validateUserId, trigger: 'change', required: true},
], // 用户名ID
roleId: [
{validator: validateRoleId, trigger: 'blur', required: true},
], //角色ID
status: [
{validator: validateStatus, trigger: 'blur', required: true},
], // 启用状态
},
// isShowAddUserDialogBg = true;
}
},
methods: {
submitForm() {
this.canceladd()
},
canceladd() {
this.$emit('close')
},
},
}
</script>
<style scoped lang="scss">
@import "./scss/dialog_table";
</style>
src/views/xtfkgl/GzlView.vue 0 → 100644
<template>
<div class="addUserDialogBg">
<!-- class="addUserDialogBg"-->
<div class="addUserDialog dialog">
<div class="head-title">
<div class="left">工作流设置</div>
<div class="close" @click="canceladd">
<img src="@/assets/img/manage/close.png" alt="" />
</div>
</div>
<div class="info">
<el-form
label-position="left"
label-width="10rem"
:model="addFormParams"
:rules="addrules"
ref="addFormParams"
>
<el-form-item class="info-item" label="工作模式:" prop="status">
<el-radio-group class="radio-info" v-model="addFormParams.status">
<el-radio :label="1" class="qiyong">串行模式</el-radio>
<el-radio :label="0" class="tingyong">并行模式</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item class="info-item" label="队列名称:" prop="name">
<el-input
placeholder="请输入"
class="input-info"
v-model="addFormParams.name"
></el-input>
</el-form-item>
<el-form-item class="info-item" label="工作队列:">
<el-input
placeholder="请输入"
class="input-info"
v-model="addFormParams.describe"
></el-input>
</el-form-item>
<el-form-item class="info-item" label="启用状态:" prop="status">
<el-radio-group class="radio-info" v-model="addFormParams.status">
<el-radio :label="1" class="qiyong">启用</el-radio>
<el-radio :label="0" class="tingyong">停用</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item class="addbtns">
<el-button
class="add"
type="primary"
@click="submitForm('addFormParams')">添加工作流
</el-button>
<el-button class="cancel" @click="canceladd">取消</el-button>
</el-form-item>
</el-form>
</div>
</div>
</div>
</template>
<script>
export default {
name: 'GzlView',
data() {
// 组名
var validateGroupname = (rule, value, callback) => {
if (value === '') {
callback(new Error('请输入用户组名称！'))
} else {
callback()
}
}
// 用户名ID
var validateUserId = (rule, value, callback) => {
if (value === '' || value.length == 0) {
callback(new Error('请选择加入用户组的用户！'))
} else {
callback()
}
}
// 用户名ID
var validateRoleId = (rule, value, callback) => {
if (value === '') {
callback(new Error('请选择用户组的角色!'))
} else {
callback()
}
}
// 启用状态校验
var validateStatus = (rule, value, callback) => {
if (value === '') {
callback(new Error('请选择状态!'))
} else {
callback()
}
}
return {
addFormParams: {
name: '', // 组名称
describe: '', // 用户组描述
userId: [], // 加入组用户
roleId: [], // 加入组角色
status: 1, // 0 未激活 1 已激活
},
addrules: {
name: [
{validator: validateGroupname, trigger: 'blur', required: true},
], //组名称
userId: [
{validator: validateUserId, trigger: 'change', required: true},
], // 用户名ID
roleId: [
{validator: validateRoleId, trigger: 'blur', required: true},
], //角色ID
status: [
{validator: validateStatus, trigger: 'blur', required: true},
], // 启用状态
},
// isShowAddUserDialogBg = true;
}
},
methods: {
submitForm() {
this.canceladd()
},
canceladd() {
this.$emit('close')
},
},
}
</script>
<style scoped lang="scss">
@import "./scss/dialog_table";
</style>
src/views/xtfkgl/XtfkglMain.vue
......@@ -29,34 +29,87 @@
<br />
<!-- 人员逻辑库 -->
<ry-xtljfk-view v-if="isPerson" />
<ry-xtljfk-view
ref="ryXtfk"
v-show="isPerson"
@openBj="openRyBj"
@openGzl="openRyGzl"
@openSjgl="openRySjgl" />
<!-- 案件逻辑库 -->
<aj-xtljfk-view v-else />
<aj-xtljfk-view
ref="ajXtfk"
v-show="!isPerson"
@openBj="openAjBj"
@openGzl="openAjGzl"
@openSjgl="openAjSjgl" />
<!-- 新增分库页面-->
<add-xtfk-view ref="addXtfkViewRef" v-show="isAddFk" @close="closeXtfkView" />
<gzl-view ref="gzlView" v-show="isShowGzl" @close="closeGzlView" />
</el-container>
</template>
<script>
import RyXtljfkView from '../xtfkgl/RyXtljfkView.vue'
import AjXtljfkView from '../xtfkgl/AjXtljfkView.vue'
import AddXtfkView from '../xtfkgl/AddXtfkView.vue'
import GzlView from '../xtfkgl/GzlView.vue'
export default {
name: 'XtfkglMain',
components: {
GzlView,
RyXtljfkView,
AjXtljfkView
AjXtljfkView,
AddXtfkView
},
data() {
return {
isShowGzl: false,
isAddFk: false,
isPerson: true,
}
},
mounted() {
},
methods: {
toggleView(state) {// true: 显示人员逻辑分库 false ：显示案件逻辑分库
this.isPerson = state
if (this.isPerson) {
this.$refs.ryXtfk.loadData()
} else {
this.$refs.ajXtfk.loadData()
}
},
addFk() { // 新增分库
this.isAddFk = true
},
openRyBj() { // 案件编辑
this.isAddFk = true
},
openRyGzl() { // 案件工作流
this.isShowGzl = true
},
openRySjgl() { // 案件数据管理
},
closeXtfkView() {
this.isAddFk = false
},
openAjBj() { // 案件编辑
this.isAddFk = true
},
openAjGzl() {// 案件工作流
this.isShowGzl = true
},
openAjSjgl() { // 案件数据管理
},
closeGzlView() {
this.isShowGzl = false
}
},
}
......@@ -65,5 +118,4 @@ export default {
<style scoped lang="scss">
@import "scss/xtfkgl_main";
</style>
src/views/xtfkgl/scss/dialog_table.scss 0 → 100644
.addUserDialogBg {
position: absolute;
top: 0;
left: 0;
z-index: 500;
width: 100%;
height: 100%;
background: rgba($color: #fff, $alpha: 0.65);
//filter: blur(2px);
}
.addUserDialog {
box-sizing: border-box;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-40%, -50%);
z-index: 1000;
width: 890px;
height: 440px;
background: #ffffff;
box-shadow: 0px 14px 30px 0px rgba(0, 21, 51, 0.25);
border-radius: 6px;
.head-title {
box-sizing: border-box;
width: 100%;
height: 50px;
display: flex;
justify-content: space-between;
padding: 14px 32px;
border-bottom: 1px solid #eeeeee;
.left {
font-size: 16px;
color: #282f3c;
}
.close {
cursor: pointer;
width: 13px;
height: 13px;
img {
object-fit: contain;
}
}
}
.info {
width: 100%;
display: flex;
flex-direction: column;
justify-content: center;
// padding-left: 200px;
padding-top: 10px;
margin-bottom: 10px;
.el-form /deep/ {
display: flex;
flex-flow: column;
justify-content: space-around;
align-items: center;
.addbtns {
.el-form-item__content {
}
}
}
.info-item {
margin-bottom: 20px;
width: 500px;
height: 40px;
display: flex;
flex-direction: row;
justify-content: center;
.input-info {
width: 204px;
height: 35px;
//background: #FFFFFF;
border-radius: 4px;
}
.radio-info {
margin-top: 10px;
width: 204px;
height: 35px;
}
}
}
.addbtns {
border-top: 1px solid #eeeeee;
padding-top: 20px;
width: 100%;
text-align: center;
.add {
width: 72px;
height: 40px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #aeb5c2;
font-size: 14px;
color: #2e3846;
line-height: 40px;
cursor: pointer;
margin-right: 24px;
}
.cancel {
width: 72px;
height: 40px;
background: #055fe7;
border-radius: 4px;
font-size: 14px;
color: #ffffff;
line-height: 40px;
cursor: pointer;
}
}
}
.dialog /deep/ {
.el-form-item__content {
margin-left: 20px !important;
position: relative !important;
.el-input__inner {
padding-right: 30px;
}
}
.el-form-item__error {
left: 100%;
width: 100%;
top: 50%;
box-sizing: border-box;
transform: translateY(-50%);
padding-left: 10px;
padding-top: 0 !important;
}
.el-form-item__label {
position: relative;
&::before {
position: absolute;
left: -10px;
transform: translateY(3px);
}
}
.is-error {
.el-input {
&::after {
display: block;
content: "";
width: 16px;
height: 16px;
position: absolute;
right: 10px;
top: 50%;
transform: translateY(-50%);
background: url("~@/assets/img/warn.png") 100% 100% / cover;
}
}
.el-input__inner {
border-color: #e6e6e8 !important;
color: #e60012;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06);
}
}
.el-radio-group {
display: flex;
align-items: center;
> .el-radio {
display: flex;
align-items: center;
margin-right: 20px;
}
.el-radio__label {
color: #333333 !important;
}
.qiyong,
.tingyong {
.el-radio__label {
position: relative;
padding-left: 20px !important;
&::before {
content: "";
display: block;
width: 8px;
height: 8px;
background: #00B47A;
border-radius: 50%;
position: absolute;
left: 6px;
top: 50%;
transform: translateY(-50%);
}
}
}
.tingyong {
.el-radio__label {
&::before {
background: #fe0000 !important;
}
}
}
.is-checked {
.el-radio__inner {
border-radius: 50% !important;
border-color: #055fe7;
background: #055fe7;
&::after {
width: 7px;
height: 7px;
border-radius: 50% !important;
}
}
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment