Commit e21383d7 by yuhao

修改

parent 53822ec8
......@@ -10,4 +10,31 @@ export const insertXzqqXx = params =>
export const selectAll = params =>
postform(`${base.alyIP}/hcypgl/selectAll`, params);
//详情
export const selectOne = params =>
postform(`${base.alyIP}/hcypgl/selectOne`, params);
export const imgInfo = params =>
postform(`${base.alyIP}/hcypgl/imgInfo`, params);
// 整体修改
export const updateXzqqXx = params =>
postform(`${base.alyIP}/hcypgl/updateXzqqXx`, params);
// 审批
export const shXzqqXx = params =>
postform(`${base.alyIP}/hcypgl/shXzqqXx`, params);
// 删除
export const deleteById = params =>
postform(`${base.alyIP}/hcypgl/deleteById`, params);
// 列表
export const selectCyglList = params =>
postform(`${base.alyIP}/hcypgl/selectCyglList`, params);
// 列表
export const selectUserNewList = params =>
postform(`${base.alyIP}/hcypgl/selectUserNewList`, params);
export const insertCyglById = params =>
postform(`${base.alyIP}/hcypgl/insertCyglById`, params);
export const deleteCyglById = params =>
postform(`${base.alyIP}/hcypgl/deleteCyglById`, params);
export const insertFkXx = params =>
postform(`${base.alyIP}/hcypgl/insertFkXx`, params);
export const selectFkXxOne = params =>
postform(`${base.alyIP}/hcypgl/selectFkXxOne`, params);
\ No newline at end of file
......@@ -9,6 +9,7 @@
style="width: 100%"
border
@sort-change='sortTableFun'
@selection-change="handleSelectionChange"
v-loading="columObj.loading">
<!-- 选择框是否开启,selectable控制是否单行禁用 -->
<el-table-column v-if="columObj.selection"
......@@ -159,7 +160,7 @@
:page-sizes="[10, 15, 20, 30,50]"
:page-size="pageObj.pageData.size"
background
layout="sizes,prev, pager, next,jumper"
layout="total,sizes,prev, pager, next,jumper"
:total="pageObj.total">
</el-pagination>
</div>
......@@ -203,6 +204,9 @@ export default {
handleCurrentChange (e) {
this.$emit('handleCurrentChange', e);
},
handleSelectionChange (e) {
this.$emit('handleSelectionChange', e);
},
// 导出数据
exportData () {
this.$emit('exportData', '')
......
<template>
<div>
<!--字典框 @emitValue="getLbValue"-->
<el-select
:placeholder="curItem.placeholder"
<el-select :placeholder="curItem.placeholder"
v-model="curFormData[curItem.id]"
:class="curItem.code"
popper-class="zdyCodeDialog"
......@@ -17,27 +16,21 @@
(val, $event) =>
showCodeTreeDialog(val, curItem, curFormData, curItem.id)
"
clearable
>
<el-option
v-for="item2 in codeTreeConfig.fieldItem"
clearable>
<el-option v-for="item2 in codeTreeConfig.fieldItem"
:key="item2.id"
:label="item2.label"
:value="item2.id"
>
:value="item2.id">
</el-option>
</el-select>
<!--多级或多数据下拉框弹框样式-->
<el-dialog
v-if="dialogCodeVisible"
<el-dialog v-if="dialogCodeVisible"
custom-class="treeDialog"
:visible.sync="dialogCodeVisible"
style="z-index: 2020 !important"
:close-on-click-modal="false"
center
>
<div
slot="title"
center>
<div slot="title"
class="header-title"
style="
text-align: left;
......@@ -47,32 +40,26 @@
font-weight: bold;
line-height: 30px;
opacity: 1;
"
>
">
<div>{{ codeTreeConfig.title }}</div>
</div>
<el-input
placeholder="输入关键字进行过滤"
<el-input placeholder="输入关键字进行过滤"
v-model="filterText"
style="
margin-bottom: 4px;
width: calc(100% - 26px) !important;
margin-left: 15px;
margin-top: 2px;
"
>
">
</el-input>
<div
style="
<div style="
width: calc(100% - 18px);
height: calc(100% - 42px);
overflow-y: auto;
border-bottom: 1px solid #f2f2f2;
margin-left: 7px;
"
>
<el-tree
:props="defaultProps"
">
<el-tree :props="defaultProps"
node-key="id"
:filter-node-method="filterNode"
ref="codeTreeDialog"
......@@ -89,22 +76,17 @@
:load="loadNode"
check-strictly
show-checkbox
style="height: 288px"
>
style="height: 288px">
</el-tree>
</div>
<div slot="footer" class="dialog-footer ar" style="margin-top: 11px">
<el-button
@click="dialogCodeVisible = false"
style="width: 120px; height: 36px"
>取 消</el-button
>
<el-button
type="primary"
<div slot="footer"
class="dialog-footer ar"
style="margin-top: 11px">
<el-button @click="dialogCodeVisible = false"
style="width: 120px; height: 36px">取 消</el-button>
<el-button type="primary"
@click="forSureSelectCode"
style="width: 120px; height: 36px"
>确 定</el-button
>
style="width: 120px; height: 36px">确 定</el-button>
</div>
</el-dialog>
</div>
......@@ -120,7 +102,7 @@ export default {
currentItem: Object,
sendId: String,
},
data() {
data () {
return {
curFormData: this.formData,
curItem: this.currentItem,
......@@ -155,19 +137,19 @@ export default {
};
},
computed: {
newValue() {
newValue () {
this.getcode();
return this.curFormData[this.curItem.id];
},
},
watch: {
formData(val) {
formData (val) {
this.curFormData = val;
},
filterText(val) {
filterText (val) {
this.$refs.codeTreeDialog.filter(val);
},
newValue(val) {
newValue (val) {
// if (val != '' && this.codeTreeConfig.fieldItem == null) {
if (val != "") {
var self = this;
......@@ -215,7 +197,7 @@ export default {
},
},
methods: {
getcode() {
getcode () {
var self = this;
if (self.curFormData[self.curItem.id]) {
let parm = {
......@@ -261,7 +243,7 @@ export default {
}
},
// 搜索树状数据中的 ID
queryTree(tree, id) {
queryTree (tree, id) {
let stark = [];
stark = stark.concat(tree);
while (stark.length) {
......@@ -277,7 +259,7 @@ export default {
return "";
},
//多选模式下移除tag时触发
removeTag(val) {
removeTag (val) {
let self = this,
label = "";
self.codeTreeConfig.fieldItem.splice(
......@@ -294,11 +276,11 @@ export default {
this.$emit("getDialogSeleted", label);
},
//可清空的单选模式下用户点击清空按钮时触发
clearSeleted() {
clearSeleted () {
this.$emit("getDialogSeleted", "");
},
//确定选择当前用户
forSureSelectCode() {
forSureSelectCode () {
var self = this;
var thisCodeOptions = [];
if (self.$refs.codeTreeDialog.getCheckedNodes().length != 0) {
......@@ -357,12 +339,12 @@ export default {
self.dialogCodeVisible = false;
},
//对树节点进行筛选
filterNode(value, data) {
filterNode (value, data) {
if (!value) return true;
return data.label.indexOf(value) !== -1 || data.id.indexOf(value) !== -1;
},
//树节点点击事件(改为点选)
handleNodeClick(data, checked) {
handleNodeClick (data, checked) {
var self = this;
if (!self.curItem.multiple) {
if (checked === true) {
......@@ -376,13 +358,13 @@ export default {
}
},
//树形字典节点点击事件(用来拦截并控制单选)
codeTreeNodeCheck(data, checked, node) {
codeTreeNodeCheck (data, checked, node) {
console.log(data, checked, node);
},
/**
* 展示字典树弹出框
*/
showCodeTreeDialog(value, item, realFormLableAlign, realValueKey) {
showCodeTreeDialog (value, item, realFormLableAlign, realValueKey) {
var self = this;
//判断是否要回显
if (realFormLableAlign[realValueKey]) {
......@@ -454,7 +436,7 @@ export default {
/**
* 懒加载节点
*/
loadNode(currentNode, resolve) {
loadNode (currentNode, resolve) {
var self = this;
var cc = arguments;
let parm = {
......@@ -481,7 +463,7 @@ export default {
}
});
},
doQueryRequest(form, relurl) {
doQueryRequest (form, relurl) {
var currentUrl = relurl ? relurl : this.cxUrl;
return Http({
url: url.alyIP + currentUrl,
......@@ -489,14 +471,14 @@ export default {
params: form,
method: "get",
headers: {
"blade-auth": localStorage.getItem("token"),
"blade-auth": sessionStorage.getItem("token"),
},
});
},
/**
* 获取子字典数据
*/
getChildrenCode(codeArry, singleRo) {
getChildrenCode (codeArry, singleRo) {
var self = this;
singleRo.children.forEach((childrenItem) => {
if (childrenItem.children && childrenItem.children.length > 0) {
......@@ -508,7 +490,7 @@ export default {
/**
* 获取子字典数据item
*/
getChildrenItem(orgId, singleRo) {
getChildrenItem (orgId, singleRo) {
var self = this;
var readyToReturn;
singleRo.children.forEach((childrenItem) => {
......
......@@ -22,22 +22,26 @@
<el-input-number v-if="item.type === 'inputNum'"
size="small"
placeholder="请输入" :min="0"
placeholder="请输入"
:min="0"
v-model.trim="formData[item.prop]"
:disabled="item.disabled"
:style="{ width: item.width }"
@change="item.change && item.change(formData[item.prop])"></el-input-number>
<div v-if="item.type === 'inputRangeNum'" style="display: inline-flex">
<div v-if="item.type === 'inputRangeNum'"
style="display: inline-flex">
<el-input-number size="small"
placeholder="请输入" :min="0"
placeholder="请输入"
:min="0"
v-model.trim="formData[item.propMin]"
:disabled="item.disabled"
:style="{ width: item.width }"
@change="item.change && item.change(formData[item.propMin])"></el-input-number>
<el-input-number size="small"
placeholder="请输入" :min="0"
placeholder="请输入"
:min="0"
v-model.trim="formData[item.propMax]"
:disabled="item.disabled"
:style="{ width: item.width }"
......@@ -216,8 +220,8 @@ export default {
});
}
} else if (val.type == "codeTreeDialogs") {
let unitcode = JSON.parse(localStorage.getItem("userInfo")).unitcode;
let grade = JSON.parse(localStorage.getItem("userInfo")).grade;
let unitcode = JSON.parse(sessionStorage.getItem("userInfo")).unitcode;
let grade = JSON.parse(sessionStorage.getItem("userInfo")).grade;
if (grade == 'S' || grade == 'T') {
var newUnicode = unitcode.substring(0, 2) + '0000000000'
} else if (grade == 'D') {
......
/**
* 项目默认配置项
* primaryColor - 默认主题色, 如果修改颜色不生效,请清理 localStorage
* primaryColor - 默认主题色, 如果修改颜色不生效,请清理 sessionStorage
* navTheme - sidebar theme ['dark', 'light'] 两种主题
* colorWeak - 色盲模式
* layout - 整体布局方式 ['sidemenu', 'topmenu'] 两种布局
......@@ -9,7 +9,7 @@
* autoHideHeader - 向下滚动时,隐藏 Header : boolean
* contentWidth - 内容区布局: 流式 | 固定
*
* storageOptions: {} - Vue-ls 插件配置项 (localStorage/sessionStorage)
* storageOptions: {} - Vue-ls 插件配置项 (sessionStorage/sessionStorage)
*
*/
export default {
......
......@@ -104,7 +104,7 @@ import { mapGetters } from "vuex";
import checkPermission from '@/utils/permission' // 权限判断函数
import path from 'path'
import router from '@/router'
import {activeLogOper} from "@/api/manage/manage";
import { activeLogOper } from "@/api/manage/manage";
export default {
name: "leftMenu_components",
props: {
......@@ -126,7 +126,7 @@ export default {
topMenus: [],
activeName: "",
topHeader: "",
realname: JSON.parse(localStorage.getItem("userInfo")).realname
realname: JSON.parse(sessionStorage.getItem("userInfo")).realname
};
},
computed: {
......@@ -141,7 +141,7 @@ export default {
created () {
console.log(router.options.routes, 3232)
// console.log(this.$route.matched[1], this.$route.meta.activePath, 1111);
this.navList = JSON.parse(localStorage.getItem("navList"));
this.navList = JSON.parse(sessionStorage.getItem("navList"));
this.topMenus = this.topMenu;
this.leftMenus = this.leftMenu;
this.topHeader = this.header;
......@@ -270,7 +270,7 @@ export default {
this.$router.push(item.index);
path.resolve('/', item.index)
}
activeLogOper({activeMenu : item.index}).then(res=>{})
activeLogOper({ activeMenu: item.index }).then(res => { })
},
handleClick (tab) {
this.activeName = tab.name;
......@@ -279,11 +279,11 @@ export default {
handleMenuOpen (key, keyPath) { },
handleMenuClose (key, keyPath) { },
changeSidebar (index) {
localStorage.setItem("routerPath", index);
sessionStorage.setItem("routerPath", index);
},
loginOut () {
localStorage.removeItem("userInfo")
localStorage.removeItem('token')
sessionStorage.removeItem("userInfo")
sessionStorage.removeItem('token')
this.$router.replace('/login')
}
},
......
......@@ -13,7 +13,7 @@
</transition>
<!-- <el-scrollbar style="height: calc(100% - 68px)"> -->
<el-menu @select="changeSidebar"
:default-active="'/' + this.$route.path.split('/')[1] "
:default-active="this.$route.path "
@open="handleMenuOpen"
@close="handleMenuClose"
:collapse="isCollapse"
......@@ -305,8 +305,8 @@ export default {
type: "warning",
})
.then(() => {
localStorage.removeItem("userInfo")
localStorage.removeItem('token')
sessionStorage.removeItem("userInfo")
sessionStorage.removeItem('token')
this.$router.replace('/login')
}).catch(() => { });
}
......@@ -359,6 +359,9 @@ export default {
.el-menu-item {
padding-left: 14px !important;
}
::v-deep .el-submenu__title {
padding-left: 14px !important;
}
.get-user {
/deep/.el-menu--popup {
min-width: 90px !important;
......
......@@ -36,9 +36,9 @@ Vue.prototype.$util = Util;
window.util = Util;
Vue.use(VueWechatTitle);
let userInfo = window.localStorage.getItem("userInfo") || "";
let userInfo = window.sessionStorage.getItem("userInfo") || "";
if (userInfo) {
userInfo = JSON.parse(window.localStorage.getItem("userInfo"))
userInfo = JSON.parse(window.sessionStorage.getItem("userInfo"))
let zjhm = userInfo.identitycard.replace(/^(.{10})(?:\d+)(.{4})$/, "$1****$2")
let name = userInfo.realname.substring(0, userInfo.realname.length - 1)
let names = userInfo.realname.replace(name, '***')
......
......@@ -5,7 +5,7 @@ export const AccountPermissions = {
let testPermission = '430001,dzCeshi01,dzCeshi02,dzCeshi03,fzMlPt,fzHkSp,fzZlSp';
//正式环境开放的radion选项
let prodOptions = '外卖,SF,通话记录,KS';
let userInfo = JSON.parse(localStorage.getItem('userInfo'));
let userInfo = JSON.parse(sessionStorage.getItem('userInfo'));
//发起权限
let userPermission = userInfo.permission;
if (userPermission.indexOf('A120404') >= 0) {
......
......@@ -12,6 +12,39 @@ const menuLayouts = [
},
component: () => import("@/views/hcyp/queryHcyp.vue")
},
{
path: "/queryHcypXj",
name: "queryHcypXj",
meta: {
title: '合成研判',
auth: "5",
isUpdata: false,
affix: true
},
component: () => import("@/views/hcyp/queryHcypXj.vue")
},
{
path: "/querySpgl",
name: "querySpgl",
meta: {
title: '审批管理',
auth: "5",
isUpdata: false,
affix: true
},
component: () => import("@/views/hcyp/querySpgl.vue")
},
{
path: "/queryCygl",
name: "queryCygl",
meta: {
title: '成员管理',
auth: "5",
isUpdata: false,
affix: true
},
component: () => import("@/views/hcyp/queryCygl.vue")
},
]
export default [{
......@@ -28,4 +61,14 @@ export default [{
affix: true
},
component: () => import("@/views/hcyp/addHcyp.vue")
}, {
path: "/detailHcyp",
name: "detailHcyp",
meta: {
title: '合成研判',
auth: "5",
isUpdata: false,
affix: true
},
component: () => import("@/views/hcyp/detailHcyp.vue")
},]
\ No newline at end of file
......@@ -22,13 +22,5 @@ export default [
},
component: () => import("@/views/index/login.vue")
},
{
path: "/startApply",
name: "startApply",
meta: {
title: "调证请求",
auth: "5"
},
component: () => import("@/views/pageModule/startApply.vue")
},
]
\ No newline at end of file
......@@ -14,7 +14,7 @@ const store = new Vuex.Store({
getters,
plugins: [
createPersistedState({
storage: window.localStorage,
storage: window.sessionStorage,
reducer (val) {
const { user } = val;
return { user };
......
......@@ -41,8 +41,8 @@ const actions = {
},
logout ({ commit }) {
commit('SET_ROLES', [])
localStorage.removeItem("userInfo");
localStorage.removeItem('token', '')
sessionStorage.removeItem("userInfo");
sessionStorage.removeItem('token', '')
},
};
......
......@@ -3,7 +3,7 @@
* @type {{}}
*/
let jumpUrlPath = {};
const userInfo = localStorage.getItem('userInfo') && JSON.parse(localStorage.getItem('userInfo'))
const userInfo = sessionStorage.getItem('userInfo') && JSON.parse(sessionStorage.getItem('userInfo'))
//案件档案跳转地址
//jumpUrlPath.toAjda = "http://65.26.2.101:9026/#/jump?path=queryAjda&asjbh=";
jumpUrlPath.toAjda = "http://65.26.106.172:9026/#/jump?path=queryAjda&asjbh=";
......
import axios from "axios";
import store from "../store";
import {Message, MessageBox} from "element-ui";
import { Message, MessageBox } from "element-ui";
import qs from "qs";
var arr = document.cookie.split("; ");
......@@ -46,7 +46,7 @@ var json = axios.create({
var down = axios.create({
headers: {
"content-type": "application/json",
"blade-auth": window.localStorage.getItem("token")
"blade-auth": window.sessionStorage.getItem("token")
},
});
......@@ -56,7 +56,7 @@ axios.interceptors.request.use(
config.headers["Content-Type"] = "application/x-www-form-urlencoded";
let token = localStorage.getItem("token")
let token = sessionStorage.getItem("token")
if (config.url.indexOf("/api/blade-auth/token") === -1) {
config.headers["blade-auth"] = token;
}
......@@ -77,15 +77,15 @@ axios.interceptors.response.use(
window.location.host.length - 5
);
let unitcode = ''
if (JSON.parse(window.localStorage.getItem("userInfo"))) {
unitcode = JSON.parse(window.localStorage.getItem("userInfo")).unitcode
if (JSON.parse(window.sessionStorage.getItem("userInfo"))) {
unitcode = JSON.parse(window.sessionStorage.getItem("userInfo")).unitcode
}
// debugger
var self = this
if (status == "401" || status == '403') {
let notice = message;
if(!notice){
if (!notice) {
notice = response.data.msg;
}
MessageBox.confirm(notice, "提示", {
......@@ -143,7 +143,7 @@ axios.interceptors.response.use(
instance.interceptors.request.use(
config => {
let token = localStorage.getItem("token")
let token = sessionStorage.getItem("token")
if (config.url.indexOf("/api/blade-auth/token") === -1) {
config.headers["blade-auth"] = token;
......@@ -164,8 +164,8 @@ instance.interceptors.response.use(
window.location.host.length - 5
);
let unitcode = ''
if (JSON.parse(window.localStorage.getItem("userInfo"))) {
unitcode = JSON.parse(window.localStorage.getItem("userInfo")).unitcode
if (JSON.parse(window.sessionStorage.getItem("userInfo"))) {
unitcode = JSON.parse(window.sessionStorage.getItem("userInfo")).unitcode
}
var self = this
if (status == "401") {
......@@ -213,8 +213,8 @@ json.interceptors.response.use(
window.location.host.length - 5
);
let unitcode = ''
if (JSON.parse(window.localStorage.getItem("userInfo"))) {
unitcode = JSON.parse(window.localStorage.getItem("userInfo")).unitcode
if (JSON.parse(window.sessionStorage.getItem("userInfo"))) {
unitcode = JSON.parse(window.sessionStorage.getItem("userInfo")).unitcode
}
var self = this
if (status == "401") {
......@@ -250,7 +250,7 @@ json.interceptors.response.use(
json.interceptors.request.use(
config => {
config.headers["Content-Type"] = "application/x-www-form-urlencoded";
let token = localStorage.getItem("token")
let token = sessionStorage.getItem("token")
if (config.url.indexOf("/api/blade-auth/token") === -1) {
config.headers["blade-auth"] = token;
}
......@@ -268,7 +268,7 @@ json.interceptors.request.use(
* @returns {Promise}
*/
export function get(url, params) {
export function get (url, params) {
return new Promise((resolve, reject) => {
axios
.get(url, {
......@@ -290,7 +290,7 @@ export function get(url, params) {
* @returns {Promise}
*/
export function post(url, params) {
export function post (url, params) {
return new Promise((resolve, reject) => {
axios
.post(url, qs.stringify(params))
......@@ -309,7 +309,7 @@ export function post(url, params) {
* @param data
* @returns {Promise}
*/
export function postform(url, data) {
export function postform (url, data) {
return new Promise((resolve, reject) => {
instance.post(url, data).then(response => {
resolve(response);
......@@ -325,7 +325,7 @@ export function postform(url, data) {
* @param data
* @returns {Promise}
*/
export function postdown(url, data) {
export function postdown (url, data) {
return new Promise((resolve, reject) => {
down.post(url, data).then(response => {
resolve(response);
......@@ -342,7 +342,7 @@ export function postdown(url, data) {
* @param data
* @returns {Promise}
*/
export function postJson(url, data) {
export function postJson (url, data) {
// debugger
return new Promise((resolve, reject) => {
json.post(url, JSON.parse(data)).then(response => {
......
......@@ -26,6 +26,7 @@
@rowBtn="rowBtn"
@rowOperation="rowOperation">
<template #btnGroup="scope">
<!-- v-if="scope.scope.xzzt=='0'" -->
<el-button class="hbyp"
type="text"
size="mini"
......@@ -33,14 +34,15 @@
<el-button class="hbyp"
type="text"
size="mini"
@click="editBtn(scope.scope)">删除</el-button>
@click="deletBtn(scope.scope)">删除</el-button>
<el-button class="hbyp"
type="text"
size="mini"
@click="editBtn(scope.scope)">详情</el-button>
@click="detailBtn(scope.scope)">详情</el-button>
<el-button class="hbyp"
type="text"
size="mini"
v-if="scope.scope.xzzt=='0'"
:loading="loadingAPP"
@click="toApprovalBtn(scope.scope)">提交审批</el-button>
......@@ -56,6 +58,8 @@ import Myform from '@/components/myForm.vue'
import Mytable from '@/components/Mytable.vue'
import {
selectAll,//协助查询
shXzqqXx,
deleteById
} from "@/api/statistical.js"
import SelectTreeDialog from "@c/treeCode_components.vue";
import { mapGetters } from "vuex"
......@@ -66,32 +70,33 @@ export default {
data () {
return {
userInfo: {},
// 表单域标签的宽度
labelWidth: '150px',
// 表单配置
formConfig: [
{
label: '线索状态:',
prop: 'xszt',
prop: 'xzzt',
type: 'select',
width: '100%',
options: [
{
label: '草稿',
value: '01'
value: '0'
}, {
label: '待审批',
value: '02'
value: '1'
},
{
label: '审批不通过',
value: '03'
value: '2'
}, {
label: '待反馈',
value: '04'
value: '4'
}, {
label: '已反馈',
value: '05'
value: '5'
},
]
},
......@@ -134,7 +139,7 @@ export default {
],
// 表单数据
formData: {
xszt: '',
xzzt: '',
xslx: '',
xshm: '',
asjbh: '',
......@@ -161,7 +166,7 @@ export default {
{
id: "queryHcyp",
label: "数据管理",
newAuth: [],
newAuth: [""],
index: "/queryHcyp",
className: "iconfont icon-ziyuanliebiao1",
hasChildren: true,
......@@ -178,14 +183,41 @@ export default {
]
},
{
id: "queryApproval",
label: "注册审核管理",
newAuth: ["C1903", "F010101"],
index: "/queryApproval",
id: "querySpgl",
label: "审批管理",
newAuth: [],
index: "/querySpgl",
className: "iconfont icon-ziyuanliebiao1",
hasChildren: false,
},
{
id: "queryCygl",
label: "成员管理",
newAuth: [],
index: "/queryCygl",
className: "iconfont icon-ziyuanliebiao1",
hasChildren: false,
},
],
leftMenusBj: [
{
id: "queryHcyp",
label: "本单位线索",
newAuth: [],
index: "/queryHcyp",
className: "iconfont icon-shenpi",
hasChildren: false,
},
],
leftMenusXj: [
{
id: "queryHcypXj",
label: "下级单位线索",
newAuth: [],
index: "/queryHcypXj",
className: "iconfont icon-shenpi",
hasChildren: false,
},
],
value1: true,//启用
value2: false,//禁用
......@@ -243,7 +275,7 @@ export default {
label: "线索描述",
width: "",
align: "center",
showToolTip: true,
}, {
text: true,
prop: "asjbh",
......@@ -269,7 +301,7 @@ export default {
},
{
text: true,
prop: "xszt",
prop: "xzztStr",
editRow: undefined,
label: "线索状态",
width: "",
......@@ -305,6 +337,14 @@ export default {
}
},
created () {
this.userInfo = JSON.parse(sessionStorage.getItem("userInfo"))
if (this.userInfo.grade == 'D') {
this.leftMenus[0].children.push(...this.leftMenusXj)
}
// else if (this.userInfo.grade == 'S' || this.userInfo.grade == 'D') {
// this.leftMenus[0].children.push(this.leftMenusXj)
// }
console.log(this.leftMenus, 11222);
this.$store.commit("user/SET_LeftMenu", this.leftMenus);
this.$store.commit("user/SET_Header", '合成研判管理');
......@@ -322,9 +362,17 @@ export default {
window.removeEventListener("message", this.messageReciver, false);
},
methods: {
detailBtn (rows) {
this.$router.pushToTab({
path: '/detailHcyp',
query: {
id: rows.xxzjbh,
}
})
},
editBtn (rows) {
this.$router.pushToTab({
path: '/editBaxz',
path: '/addHcyp',
query: {
id: rows.xxzjbh,
}
......@@ -362,6 +410,23 @@ export default {
}
},
deletBtn (rows) {
this.$confirm("此操作将删除该条信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(async () => {
const params = new FormData()
params.append('xxzjbh', rows.xxzjbh)
let res = await deleteById(params)
if (res && res.code == 200) {
this.$message.success('删除成功!')
this.getList()
}
}).catch(() => {
});
},
messageReciver (e) {
if (e.origin == location.origin && e.data == 'appReloadData') {
this.getList();
......@@ -373,7 +438,7 @@ export default {
},
resetData () {
this.formData = {
xszt: '',
xzzt: '',
xslx: '',
xshm: '',
asjbh: '',
......@@ -426,11 +491,13 @@ export default {
const params = new FormData()
params.append('page', this.pageObj.pageData.page)
params.append('limit', this.pageObj.pageData.size)
params.append('xszt', this.formData.xszt)
params.append('xzzt', this.formData.xzzt)
params.append('xslx', this.formData.xslx)
params.append('xshm', this.formData.xshm)
params.append('asjbh', this.formData.asjbh)
params.append('ajmc', this.formData.ajmc)
params.append('ajlbdm', this.formData.ajlbdm)
params.append('sfbj', 'bdw')
let res = await selectAll(params)
if (res && res.code == 200) {
this.tableData = res.data.rows
......
......@@ -15,13 +15,13 @@ export default {
login () {
var self = this;
// const tokenOld = encrypt.Encrypt(self.$route.query.token)
localStorage.removeItem("userInfo");
sessionStorage.removeItem("userInfo");
sign({
token: encrypt.Decrypt(self.$route.query.token),
}).then((res) => {
if (res.code == 200) {
localStorage.setItem("token", "bearer " + res.data.accessToken);
localStorage.setItem("userInfo", JSON.stringify(res.data));
sessionStorage.setItem("token", "bearer " + res.data.accessToken);
sessionStorage.setItem("userInfo", JSON.stringify(res.data));
const roles = res.data.permission.split(",");
this.$store.commit("user/SET_ROLES", roles);
this.Loading.close();
......
......@@ -31,11 +31,11 @@ export default {
self.doQueryRequest(params, "/blade-auth/sign").then((res) => {
this.Loading.close();
if (res.code == 200) {
localStorage.removeItem("userInfo");
localStorage.removeItem("gzzm_userInfo");
localStorage.setItem("token", "bearer " + res.data.accessToken);
localStorage.setItem("userInfo", JSON.stringify(res.data));
localStorage.setItem("gzzm_userInfo", self.$route.query.gzzm_token);
sessionStorage.removeItem("userInfo");
sessionStorage.removeItem("gzzm_userInfo");
sessionStorage.setItem("token", "bearer " + res.data.accessToken);
sessionStorage.setItem("userInfo", JSON.stringify(res.data));
sessionStorage.setItem("gzzm_userInfo", self.$route.query.gzzm_token);
const roles = res.data.permission.split(",");
this.$store.commit("user/SET_ROLES", roles);
......
......@@ -80,11 +80,15 @@ export default {
password: this.ruleForm2.password,
}).then((res) => {
if (res.code == 200) {
localStorage.setItem("token", "bearer " + res.data.accessToken);
localStorage.setItem("userInfo", JSON.stringify(res.data));
sessionStorage.setItem("token", "bearer " + res.data.accessToken);
sessionStorage.setItem("userInfo", JSON.stringify(res.data));
const roles = res.data.permission.split(",");
this.$store.commit("user/SET_ROLES", roles);
if (res.data.grade == 'X' || res.data.grade == 'D') {
this.$router.push("/queryHcyp");
} else if (res.data.grade == 'S' || res.data.grade == 'D') {
this.$router.push("/queryHcypXj");
}
} else {
this.$confirm("账号或密码错误!", {
confirmButtonText: "确定",
......
<template>
<div class="Content">
<right-content
:pageBs="pageBs"
<right-content :pageBs="pageBs"
:header="header"
:cxFormData="cxFormData"
:cxQueryField="cxQueryField"
......@@ -14,75 +13,71 @@
@add="add"
@toInfor="toInfor"
@selectionChange="selectionChange"
@handleSwitch="handleSwitch"
>
@handleSwitch="handleSwitch">
<template #listOperation="scope">
<span class="hbyps" @click="editRole(scope.scope)"> 角色配置</span>
<span class="hbyps"
@click="editRole(scope.scope)"> 角色配置</span>
</template>
<template #czBtn="scope">
<span
@click="editMa(scope.scope)"
<span @click="editMa(scope.scope)"
class="edit"
style="margin-right: 16px"
>修改密码</span
>
<span @click="dele(scope.scope)" class="dele">删除</span>
style="margin-right: 16px">修改密码</span>
<span @click="dele(scope.scope)"
class="dele">删除</span>
<!-- <span @click="edit(scope.scope)" class="edit">编辑</span> -->
</template>
</right-content>
<el-dialog
title="角色管理"
<el-dialog title="角色管理"
:visible.sync="dialogVisible"
width="30%"
:before-close="handleClose"
>
<el-checkbox v-model="checkAll" @change="handleCheckAllChange"
>全选</el-checkbox
>
<el-tree
:data="treeData"
:before-close="handleClose">
<el-checkbox v-model="checkAll"
@change="handleCheckAllChange">全选</el-checkbox>
<el-tree :data="treeData"
show-checkbox
node-key="id"
ref="tree"
highlight-current
:props="defaultProps"
:default-checked-keys="selec"
@check-change="handleCheckChange"
>
@check-change="handleCheckChange">
</el-tree>
<span slot="footer" class="dialog-footer">
<span slot="footer"
class="dialog-footer">
<el-button @click="qx">取 消</el-button>
<el-button type="primary" @click="submitRole">确 定</el-button>
<el-button type="primary"
@click="submitRole">确 定</el-button>
</span>
</el-dialog>
<el-dialog title="修改密码" :visible.sync="dialogVisibleMzxg" width="30%">
<el-dialog title="修改密码"
:visible.sync="dialogVisibleMzxg"
width="30%">
<div class="name">
<el-form ref="form" :model="form" label-width="80px">
<el-form-item label="请输入旧密码: " v-if="!hasPermission">
<el-input
placeholder="请输入旧密码"
v-model="form.oldPassword"
></el-input>
<el-form ref="form"
:model="form"
label-width="80px">
<el-form-item label="请输入旧密码: "
v-if="!hasPermission">
<el-input placeholder="请输入旧密码"
v-model="form.oldPassword"></el-input>
</el-form-item>
<el-form-item label="请输入新密码: ">
<el-input
placeholder="请输入新密码"
<el-input placeholder="请输入新密码"
show-password
v-model="form.newPassword"
></el-input>
v-model="form.newPassword"></el-input>
</el-form-item>
<el-form-item label="请确定新密码: ">
<el-input
placeholder="请确定新密码"
<el-input placeholder="请确定新密码"
show-password
v-model="form.newPassword1"
></el-input>
v-model="form.newPassword1"></el-input>
</el-form-item>
</el-form>
</div>
<span slot="footer" class="dialog-footer">
<span slot="footer"
class="dialog-footer">
<el-button @click="dialogVisibleMzxg = false">取 消</el-button>
<el-button type="primary" @click="submitMaa">确 定</el-button>
<el-button type="primary"
@click="submitMaa">确 定</el-button>
</span>
</el-dialog>
</div>
......@@ -96,7 +91,7 @@ export default {
components: {
rightContent,
},
data() {
data () {
return {
form: {
id: "",
......@@ -306,16 +301,16 @@ export default {
checkAll: false,
identitycard: "",
selec: [],
tableData:[],
tableDataLength:0,
tableData: [],
tableDataLength: 0,
};
},
created() {
created () {
this.$store.commit("user/SET_Menu", this.Menu);
this.$store.commit("user/SET_LeftMenu", this.leftMenus);
this.$store.commit("user/SET_Header", this.header);
this.identitycard = JSON.parse(
localStorage.getItem("userInfo")
sessionStorage.getItem("userInfo")
).identitycard;
const roles = this.$store.getters && this.$store.getters.roles;
const permissionRoles = ["F0101", "admin", "A0000"];
......@@ -323,9 +318,9 @@ export default {
return permissionRoles.includes(role);
});
},
mounted() {},
mounted () { },
methods: {
doQuery(obj) {
doQuery (obj) {
const self = this
selectUserNewList({
...self.cxFormData,
......@@ -337,13 +332,13 @@ export default {
self.$refs.rightContent.closeLoading()
});
},
qx() {
qx () {
this.dialogVisible = false;
this.selec = [];
this.$refs.tree.setCheckedKeys([]);
this.checkAll = false;
},
getThead() {
getThead () {
if (this.isPremission >= 0 || this.isAdmin) {
let obj = {
label: "用户状态",
......@@ -352,11 +347,11 @@ export default {
this.cxDefaultFormThead.push(obj);
}
},
editMa(scope) {
editMa (scope) {
this.$set(this.form, "id", scope.row.id);
this.dialogVisibleMzxg = true;
},
submitMaa() {
submitMaa () {
if (this.form.newPassword == this.form.newPassword1) {
updateUserMm(this.form).then((res) => {
if (res.code == 200) {
......@@ -372,7 +367,7 @@ export default {
this.form.newPassword1 = "";
}
},
handleSwitch(obj) {
handleSwitch (obj) {
this.$confirm("是否修改用户状态", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
......@@ -394,7 +389,7 @@ export default {
});
});
},
submitRole() {
submitRole () {
let userIds = "";
this.selectedId.forEach((item) => {
userIds = item.id;
......@@ -422,7 +417,7 @@ export default {
this.$message.error("请选择用户权限");
}
},
editRole() {
editRole () {
if (this.selectedId.length > 0) {
this.dialogVisible = true;
this.selec = this.selectedId[0].userRolesIds;
......@@ -430,12 +425,12 @@ export default {
this.$message.error("请选择用户");
}
},
getTree() {
getTree () {
tree().then((res) => {
this.treeData = res.data.rows;
});
},
selectionChange(val) {
selectionChange (val) {
debugger;
this.selectedId = val;
this.checkAll = false;
......@@ -450,7 +445,7 @@ export default {
this.$refs.tree.setCheckedKeys([]);
});
},
handleCheckChange(data, checked) {
handleCheckChange (data, checked) {
debugger;
if (checked === true) {
if (data.hasChildren) {
......@@ -466,7 +461,7 @@ export default {
this.selec.splice(indexs, 1);
}
},
handleChildren(data) {
handleChildren (data) {
debugger;
data.forEach((item) => {
if (item.hasChildren) {
......@@ -476,13 +471,13 @@ export default {
}
});
},
handleClose() {
handleClose () {
this.dialogVisible = false;
},
add() {
add () {
this.$router.pushToTab("addUser");
},
toInfor(obj) {
toInfor (obj) {
this.$router.pushToTab({
path: "/userDetail",
query: {
......@@ -490,7 +485,7 @@ export default {
},
});
},
dele(obj) {
dele (obj) {
this.$confirm("此操作将永久删除该用户, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
......@@ -517,7 +512,7 @@ export default {
});
},
//全选
handleCheckAllChange(val) {
handleCheckAllChange (val) {
if (this.checkAll) {
this.$refs.tree.setCheckedNodes(this.treeData);
} else {
......@@ -525,7 +520,7 @@ export default {
this.selec = [];
}
},
getTreeCode(children) {
getTreeCode (children) {
children.forEach((item) => {
if (item.hasChildren) {
item.label = item.title;
......
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