Skip to content

F
founder_vue
Commit f4aa70de by 李萌萌
Options

Merge branch 'dev_zwpt' of http://39.99.224.27:9022/changchao/founder_vue into dev_zwpt

parents caa94882 70521566
Showing with 368 additions and 338 deletions
public/JsonData/HnCodeJSON.json 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
public/JsonData/XzCodeJSON.json 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/Cascader.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-11-15 14:15:58 * @Date: 2021-11-15 14:15:58
* @LastEditTime: 2022-01-18 10:53:20 * @LastEditTime: 2022-01-18 15:43:56
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\components\confrim.vue * @FilePath: \founder_vue\src\components\confrim.vue
...@@ -145,10 +145,9 @@ export default { ...@@ -145,10 +145,9 @@ export default {
if (data && data.length > 0) { if (data && data.length > 0) {
return data.map((item) => ({ return data.map((item) => ({
...item, ...item,
key: !self.codeName key: !self.codeName ? `${item.name}[${item.code}]` : `${item.region}`,
? `${item.region}[${item.code}]`
: `${item.region}`,
regions: this.getTreeData(item.regions), regions: this.getTreeData(item.regions),
childCodeDwXz: this.getTreeData(item.childCodeDwXz),
})); }));
} }
}, },
...@@ -159,14 +158,14 @@ export default { ...@@ -159,14 +158,14 @@ export default {
mounted() { mounted() {
let self = this; let self = this;
if (!this.codeName) { if (!this.codeName) {
let unidata = this.$store.state.publicData.unitData; let unitAreaName = this.$store.state.publicData.unitAreaName;
let unicode = this.$store.state.publicData.unitCode; this.$axios.get(`JsonData/${unitAreaName}.json`).then((res) => {
unicode = unicode.split(","); if (res.data.length > 0) {
if (this.options.length <= 0) { if (this.options.length <= 0) {
this.options = this.getTreeData( this.options = self.getTreeData(res.data);
unidata.filter((i) => unicode.includes(i.code)) }
); }
} });
} else { } else {
this.$axios.get(`JsonData/${this.codeName}.json`).then((res) => { this.$axios.get(`JsonData/${this.codeName}.json`).then((res) => {
if (res.data.code == 0 && res.data.message == "success") { if (res.data.code == 0 && res.data.message == "success") {
......
src/components/SelectCode.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-11-25 10:15:01 * @Date: 2021-11-25 10:15:01
* @LastEditTime: 2022-01-18 10:47:44 * @LastEditTime: 2022-01-18 15:18:36
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\components\SelectCode.vue * @FilePath: \founder_vue\src\components\SelectCode.vue
...@@ -82,7 +82,12 @@ export default { ...@@ -82,7 +82,12 @@ export default {
}, },
//多选时最多可以选择几个 //多选时最多可以选择几个
multipleLimit: Number, multipleLimit: Number,
//接口参数
params: Object,
//调用接口方式
method: String,
}, },
computed: { computed: {
newVal() { newVal() {
return this.newForm[this.id]; return this.newForm[this.id];
...@@ -125,21 +130,35 @@ export default { ...@@ -125,21 +130,35 @@ export default {
if (!newVal) newVal = ""; if (!newVal) newVal = "";
this.$set(this.newForm, this.id, newVal); this.$set(this.newForm, this.id, newVal);
}, },
setValue(res) {
if (
(res.data.code == 0 || res.data.code == 200) &&
(res.data.message == "success" || res.data.info == "success")
) {
let result = res.data.ret || res.data.detail || [];
this.options = result.map((i) => {
i.str = `${i.name}`;
return i;
});
this.allData = JSON.parse(JSON.stringify(this.options));
}
},
getOptions() { getOptions() {
this.$axios.get(this.codeUrl).then((res) => { if (this.method == "post") {
this.loadingIndex++; this.$axios.post(this.codeUrl, this.params || null).then((res) => {
if ( this.loadingIndex++;
(res.data.code == 0 || res.data.code == 200) && this.setValue(res);
(res.data.message == "success" || res.data.info == "success") });
) { } else {
let result = res.data.ret || res.data.detail || []; this.$axios
this.options = result.map((i) => { .get(this.codeUrl, {
i.str = `${i.name}`; params: this.params || null,
return i; })
.then((res) => {
this.loadingIndex++;
this.setValue(res);
}); });
this.allData = JSON.parse(JSON.stringify(this.options)); }
}
});
}, },
offOption() { offOption() {
this.$refs.select.blur(); this.$refs.select.blur();
......
src/router/modules/leftMenu.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:58:13 * @Date: 2021-09-07 09:58:13
* @LastEditTime: 2022-01-17 16:06:18 * @LastEditTime: 2022-01-18 14:47:50
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\router\modules\index.js * @FilePath: \founder_vue\src\router\modules\index.js
...@@ -249,7 +249,7 @@ export default [ ...@@ -249,7 +249,7 @@ export default [
icon_a: '/img/baobiao_a.png', icon_a: '/img/baobiao_a.png',
meta: { meta: {
title: '统计报表', title: '统计报表',
auth: 'H' auth: 'I'
}, },
component: () => import('@/views/tjbb/tjbb.vue') component: () => import('@/views/tjbb/tjbb.vue')
}, },
...@@ -390,7 +390,7 @@ export default [ ...@@ -390,7 +390,7 @@ export default [
hidden: false, hidden: false,
meta: { meta: {
title: '操作日志', title: '操作日志',
auth: 'H-6', auth: 'H-7',
parentId: 'SystemManage' parentId: 'SystemManage'
}, },
component: () => component: () =>
......
src/store/modules/ljk.js
...@@ -62,6 +62,7 @@ const actions = { ...@@ -62,6 +62,7 @@ const actions = {
params.userId = userInfo.user.id params.userId = userInfo.user.id
params.userGroupIds = userInfo.groupIds params.userGroupIds = userInfo.groupIds
_axios.post('/api/code/caseLogic', params).then(res => { _axios.post('/api/code/caseLogic', params).then(res => {
console.log(res, '/api/code/caseLogic luojiku ')
if (res.data.code == 0 && res.data.message == "success") { if (res.data.code == 0 && res.data.message == "success") {
context.commit('ljkAj', res.data.ret); context.commit('ljkAj', res.data.ret);
} }
...@@ -75,7 +76,8 @@ const actions = { ...@@ -75,7 +76,8 @@ const actions = {
} }
params.userId = userInfo.user.id params.userId = userInfo.user.id
params.userGroupIds = userInfo.groupIds params.userGroupIds = userInfo.groupIds
_axios.get('/api/code/allLogicName', params).then(res => { _axios.post('/api/code/allLogicName', params).then(res => {
console.log(res, '/api/code/allLogicName luojiku ')
if (res.data.code == 0 && res.data.message == "success") { if (res.data.code == 0 && res.data.message == "success") {
context.commit('ljkAll', res.data.ret); context.commit('ljkAll', res.data.ret);
} }
......
src/store/modules/publicData.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-11-02 15:41:31 * @Date: 2021-11-02 15:41:31
* @LastEditTime: 2022-01-10 17:27:03 * @LastEditTime: 2022-01-18 15:47:49
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\store\modules\user.js * @FilePath: \founder_vue\src\store\modules\user.js
*/ */
import { _axios } from "@/plugins/axios"; import { _axios } from "@/plugins/axios";
const state = { const state = {
//所在单位所有json数据 //所展现的地区代码文件名
unitData: [], unitAreaName: 'XzCodeJSON',
//用户所在单位code
unitCode: '540000000000,430000000000',
}; };
const mutations = { const mutations = {
......
src/utils/UserUtil.js
...@@ -22,29 +22,30 @@ ...@@ -22,29 +22,30 @@
* </p> * </p>
*/ */
import Utils from '@/utils/util.js' import Utils from '@/utils/util.js'
import { Base64 } from 'js-base64' import {Base64} from 'js-base64'
const _USER_INFO_KEY = 'userInfo' const _USER_INFO_KEY = 'userInfo'
export default { export default {
getUser () {// 获取用户信息 getUser() {// 获取用户信息
let userInfo = JSON.parse(localStorage.getItem(_USER_INFO_KEY)) let userInfo = JSON.parse(localStorage.getItem(_USER_INFO_KEY))
logger.info('userInfo', userInfo)
return userInfo return userInfo
}, },
setUser (userInfo) {// 保存用户信息 setUser(userInfo) {// 保存用户信息
localStorage.setItem(_USER_INFO_KEY, JSON.stringify(userInfo)) localStorage.setItem(_USER_INFO_KEY, JSON.stringify(userInfo))
}, },
getHeaderUser () { getHeaderUser() {
let userInfo = JSON.parse(localStorage.getItem(_USER_INFO_KEY)) let userInfo = JSON.parse(localStorage.getItem(_USER_INFO_KEY))
let reqParam = { // 用户操作日志 let reqParam = { // 用户操作日志
logUserIp: localStorage.getItem('userIP'), // 操作人ip地址 logUserIp: localStorage.getItem('userIP'), // 操作人ip地址
logUserName: userInfo ? userInfo.name : '', // 操作人姓名 logUserName: userInfo ? userInfo.user.name : '', // 操作人姓名
logUserId: userInfo ? userInfo.id : '', // 操作人id logUserId: userInfo ? userInfo.user.id : '', // 操作人id
logDwCode: userInfo ? userInfo.unitCode : '', // 日志单位代码 logDwCode: userInfo ? userInfo.user.unitCode : '', // 日志单位代码
logDwName: userInfo ? userInfo.unitName : '', // 日志单位名称 logDwName: userInfo ? userInfo.user.unitName : '', // 日志单位名称
logTime: Utils.getCurrentDate() logTime: Utils.getCurrentDate()
} }
// logger.info('reqParam', reqParam) // logger.info('reqParam', reqParam)
......
src/views/AllPersonnelBase/AllPersonnelBase.vue
...@@ -12,8 +12,7 @@ ...@@ -12,8 +12,7 @@
clear="search-input" clear="search-input"
placeholder="请输入条码，*支持模糊搜索" placeholder="请输入条码，*支持模糊搜索"
v-model.trim="reqParam.personStoreCustomSearch.ysxtAsjxgrybh" v-model.trim="reqParam.personStoreCustomSearch.ysxtAsjxgrybh"
@change="backNumOne" @keyup.enter.native="search()"
@keyup.enter.native="search"
maxlength="23" maxlength="23"
show-word-limit show-word-limit
> >
...@@ -25,7 +24,7 @@ ...@@ -25,7 +24,7 @@
></i> ></i>
<div <div
class="search-icon el-icon-search" class="search-icon el-icon-search"
@click="search" @click="search()"
></div> ></div>
<el-radio-group <el-radio-group
v-model="reqParam.personStoreCustomSearch.searchOptions" v-model="reqParam.personStoreCustomSearch.searchOptions"
...@@ -575,11 +574,6 @@ export default { ...@@ -575,11 +574,6 @@ export default {
}; };
}, },
methods: { methods: {
// 筛选前页数为1
backNumOne () {
this.reqParam.page.currPage = 1// 当前页码
this.$forceUpdate()
},
// 单击行抽屉 // 单击行抽屉
handle (row, event, column) { handle (row, event, column) {
//console.log(row, event, column) //console.log(row, event, column)
...@@ -607,8 +601,9 @@ export default { ...@@ -607,8 +601,9 @@ export default {
this.toggleSelection(); this.toggleSelection();
}, },
// 获取全部人员列表请求 // 获取全部人员列表请求
search () { search (page = 1) {
// //console.info("请求===>", this.reqParam); // //console.info("请求===>", this.reqParam);
this.reqParam.page.currPage = page;
this.$axios this.$axios
.post("/api/personstore/person/list", this.reqParam) .post("/api/personstore/person/list", this.reqParam)
.then(response => { .then(response => {
...@@ -1014,9 +1009,9 @@ export default { ...@@ -1014,9 +1009,9 @@ export default {
* @return {*} * @return {*}
*/ */
handleCurrentChange (page) { handleCurrentChange (page) {
this.reqParam.page.currPage = page; // this.reqParam.page.currPage = page;
//console.log("当前页", this.reqParam.page.currPage); //console.log("当前页", this.reqParam.page.currPage);
this.search(); this.search(page);
}, },
/** /**
* @description: 清除所有选项 * @description: 清除所有选项
......
src/views/AllPersonnelBase/dclb.vue
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
>清空</el-button> >清空</el-button>
<el-button <el-button
class='sx' class='sx'
@click="search" @click="search()"
>筛选</el-button> >筛选</el-button>
</div> </div>
</div> </div>
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
>清空</el-button> >清空</el-button>
<el-button <el-button
class='sx' class='sx'
@click="search" @click="search()"
>筛选</el-button> >筛选</el-button>
</div> </div>
</div> </div>
...@@ -480,9 +480,10 @@ export default { ...@@ -480,9 +480,10 @@ export default {
}, },
methods: { methods: {
// 获取 // 获取
search () { search (page = 1) {
let reqUrl = null; let reqUrl = null;
let reqParam = null; let reqParam = null;
this.currPage1 = page;
if (this.showType == 1) { if (this.showType == 1) {
reqUrl = "/api/record/export/person/search"; reqUrl = "/api/record/export/person/search";
reqParam = { reqParam = {
...@@ -733,9 +734,9 @@ export default { ...@@ -733,9 +734,9 @@ export default {
* @return {*} * @return {*}
*/ */
handleCurrentChange1 (page) { handleCurrentChange1 (page) {
this.currPage1 = page;
//console.log("当前页", this.currPage1); //console.log("当前页", this.currPage1);
this.search(); this.search(page);
}, },
/** /**
* @description: pageSize 改变时会触发 * @description: pageSize 改变时会触发
...@@ -752,9 +753,9 @@ export default { ...@@ -752,9 +753,9 @@ export default {
* @return {*} * @return {*}
*/ */
handleCurrentChange2 (page) { handleCurrentChange2 (page) {
this.currPage1 = page;
//console.log("当前页", this.currPage1); //console.log("当前页", this.currPage1);
this.search(); this.search(page);
}, },
/** /**
* @description: 清除所有选项 * @description: 清除所有选项
......
src/views/AllPersonnelBase/gzlb.vue
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
>清空</el-button> >清空</el-button>
<el-button <el-button
class="sx" class="sx"
@click="search" @click="search()"
>筛选</el-button> >筛选</el-button>
</div> </div>
</div> </div>
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
placeholder="请输入条码号" placeholder="请输入条码号"
v-model.trim="barcode" v-model.trim="barcode"
maxlength="23" maxlength="23"
@keyup.enter.native="search" @keyup.enter.native="search()"
show-word-limit show-word-limit
clearable clearable
> >
...@@ -144,8 +144,8 @@ ...@@ -144,8 +144,8 @@
:form="ruleForm" :form="ruleForm"
:width="9.75" :width="9.75"
id="collectunitCode" id="collectunitCode"
:props='props'
></Cascader> ></Cascader>
<!-- <el-select <!-- <el-select
v-model="collectunitCode" v-model="collectunitCode"
placeholder="请选择提取单位" placeholder="请选择提取单位"
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
>清空</el-button> >清空</el-button>
<el-button <el-button
class="sx" class="sx"
@click="search" @click="search()"
>筛选</el-button> >筛选</el-button>
</div> </div>
</div> </div>
...@@ -662,6 +662,13 @@ export default { ...@@ -662,6 +662,13 @@ export default {
}, },
data () { data () {
return { return {
props: {
value: "code",
label: "key",
children: "childCodeDwXz",
checkStrictly: true,
emitPath: false,
},
barcode: "", // 条码号 barcode: "", // 条码号
name: '', // 姓名 name: '', // 姓名
sex: '',// 性别 sex: '',// 性别
...@@ -780,9 +787,11 @@ export default { ...@@ -780,9 +787,11 @@ export default {
}, },
methods: { methods: {
// 获取全部人员列表请求 // 获取全部人员列表请求
search () { search (page = 1) {
let reqUrl = null; let reqUrl = null;
let reqParam = null; let reqParam = null;
this.currPage1 = page;
if (this.showType == 1) { if (this.showType == 1) {
reqUrl = "/api/mypsn/list"; reqUrl = "/api/mypsn/list";
reqParam = { reqParam = {
...@@ -1189,9 +1198,8 @@ export default { ...@@ -1189,9 +1198,8 @@ export default {
* @return {*} * @return {*}
*/ */
handleCurrentChange1 (page) { handleCurrentChange1 (page) {
this.currPage1 = page;
//console.log("当前页", this.currPage1); //console.log("当前页", this.currPage1);
this.search(); this.search(page);
}, },
/** /**
* @description: pageSize 改变时会触发 * @description: pageSize 改变时会触发
...@@ -1208,9 +1216,8 @@ export default { ...@@ -1208,9 +1216,8 @@ export default {
* @return {*} * @return {*}
*/ */
handleCurrentChange2 (page) { handleCurrentChange2 (page) {
this.currPage1 = page;
//console.log("当前页", this.currPage1); //console.log("当前页", this.currPage1);
this.search(); this.search(page);
}, },
/** /**
* @description: 清除所有选项 * @description: 清除所有选项
......
src/views/AllPersonnelBase/modules/xzaj.vue
...@@ -214,6 +214,7 @@ ...@@ -214,6 +214,7 @@
<Cascader <Cascader
:form="ruleForm" :form="ruleForm"
id="tqdwGajgjgdm" id="tqdwGajgjgdm"
:props='props'
></Cascader> ></Cascader>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -316,6 +317,13 @@ export default { ...@@ -316,6 +317,13 @@ export default {
}, },
data () { data () {
return { return {
props: {
value: "code",
label: "key",
children: "childCodeDwXz",
checkStrictly: true,
emitPath: false,
},
dialogVisible: false, // 弹窗状态 dialogVisible: false, // 弹窗状态
labelPosition: "left", // 数据项对齐方式 labelPosition: "left", // 数据项对齐方式
checkedTargets: [1], // 选定的目标逻辑库 checkedTargets: [1], // 选定的目标逻辑库
......
src/views/AllPersonnelBase/qbalk.vue
...@@ -11,8 +11,7 @@ ...@@ -11,8 +11,7 @@
clear="search-input" clear="search-input"
placeholder="请输入条码，*支持模糊搜索" placeholder="请输入条码，*支持模糊搜索"
v-model.trim="reqParam.caseStoreCustomSearchReq.ysxtAsjbh" v-model.trim="reqParam.caseStoreCustomSearchReq.ysxtAsjbh"
@keyup.enter.native="search" @keyup.enter.native="search()"
@change="backNumOne"
maxlength="23" maxlength="23"
show-word-limit show-word-limit
></el-input> ></el-input>
...@@ -23,7 +22,7 @@ ...@@ -23,7 +22,7 @@
></i> ></i>
<div <div
class="search-icon el-icon-search" class="search-icon el-icon-search"
@click="search" @click="search()"
></div> ></div>
<el-radio-group v-model="reqParam.caseStoreCustomSearchReq.searchOptions"> <el-radio-group v-model="reqParam.caseStoreCustomSearchReq.searchOptions">
<el-radio :label="3">通用搜索</el-radio> <el-radio :label="3">通用搜索</el-radio>
...@@ -503,11 +502,6 @@ export default { ...@@ -503,11 +502,6 @@ export default {
}; };
}, },
methods: { methods: {
// 筛选前页数为1
backNumOne () {
this.reqParam.page.currPage = 1// 当前页码
this.$forceUpdate()
},
// 点击单条关闭批量操作 // 点击单条关闭批量操作
closeSelected () { closeSelected () {
this.disabled = false; this.disabled = false;
...@@ -516,8 +510,9 @@ export default { ...@@ -516,8 +510,9 @@ export default {
this.toggleSelection(); this.toggleSelection();
}, },
// 获取案件数据 // 获取案件数据
search () { search (page = 1) {
// console.info("案件请求===>", this.reqParam); // console.info("案件请求===>", this.reqParam);
this.reqParam.page.currPage = page;
this.$axios this.$axios
.post("/api/casestore/allcase", this.reqParam) .post("/api/casestore/allcase", this.reqParam)
.then(response => { .then(response => {
...@@ -878,8 +873,8 @@ export default { ...@@ -878,8 +873,8 @@ export default {
* @return {*} * @return {*}
*/ */
handleCurrentChange (page) { handleCurrentChange (page) {
this.reqParam.page.currPage = page;
this.search(); this.search(page);
console.log(page); console.log(page);
}, },
/** /**
......
src/views/SystemManage/GroupManage.vue
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
</div> </div>
<div class="search-item"> <div class="search-item">
<div class="label">用户所属单位名称：</div> <div class="label">用户所属单位名称：</div>
<Cascader :form="searchParams" id="dwCode" width="9.6875"></Cascader> <Cascader :form="searchParams" id="dwCode" width="9.6875" :props="props"></Cascader>
</div> </div>
<div class="search-item"> <div class="search-item">
<div class="label">组角色：</div> <div class="label">组角色：</div>
...@@ -784,6 +784,13 @@ export default { ...@@ -784,6 +784,13 @@ export default {
} }
}; };
return { return {
props: {
value: "code",
label: "key",
children: "childCodeDwXz",
checkStrictly: true,
emitPath: false,
},
width5: "", width5: "",
sWidth: 50, sWidth: 50,
width3: 90, width3: 90,
......
src/views/SystemManage/PermissionManage.vue
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
:form="userSearchParams" :form="userSearchParams"
id="unitCode" id="unitCode"
width="9.6875" width="9.6875"
:props="props"
></Cascader> ></Cascader>
</div> </div>
<div class="search-item"> <div class="search-item">
...@@ -582,6 +583,13 @@ export default { ...@@ -582,6 +583,13 @@ export default {
}, },
data() { data() {
return { return {
props: {
value: "code",
label: "key",
children: "childCodeDwXz",
checkStrictly: true,
emitPath: false,
},
key1: 1, key1: 1,
key2: 0, key2: 0,
isUser: false, isUser: false,
......
src/views/SystemManage/UserManage.vue
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</div> </div>
<div class="search-item"> <div class="search-item">
<div class="label">单位：</div> <div class="label">单位：</div>
<Cascader :form="searchParams" id="unitCode" width="9.6875"></Cascader> <Cascader :form="searchParams" id="unitCode" width="9.6875" :props="props"></Cascader>
</div> </div>
<div class="search-item"> <div class="search-item">
<div class="label">角色：</div> <div class="label">角色：</div>
...@@ -72,7 +72,11 @@ ...@@ -72,7 +72,11 @@
<el-checkbox v-model="checked" style="margin-right: 0.625rem" <el-checkbox v-model="checked" style="margin-right: 0.625rem"
>停用</el-checkbox >停用</el-checkbox
> >
<div class="btn1 f-default-button" @click="delMore()" v-if="roleArr.includes('H-1-1')"> <div
class="btn1 f-default-button"
@click="delMore()"
v-if="roleArr.includes('H-1-1')"
>
删除 删除
</div> </div>
<div class="add f-youling-button" @click="open"> <div class="add f-youling-button" @click="open">
...@@ -94,7 +98,7 @@ ...@@ -94,7 +98,7 @@
> >
<i <i
class="iconfont icon-tanhao1" class="iconfont icon-tanhao1"
style="color: #055fe7; font-size: 1rem; margin: 0 0.625rem;" style="color: #055fe7; font-size: 1rem; margin: 0 0.625rem"
></i> ></i>
已选择 已选择
<span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​ <span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​
...@@ -325,7 +329,11 @@ ...@@ -325,7 +329,11 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="info-item" label="所属单位:" prop="unitCode"> <el-form-item class="info-item" label="所属单位:" prop="unitCode">
<Cascader :form="addFormParams" id="unitCode"></Cascader> <Cascader
:form="addFormParams"
id="unitCode"
:props="props"
></Cascader>
</el-form-item> </el-form-item>
<el-form-item class="info-item" label="用户警号:" prop="policeNumber"> <el-form-item class="info-item" label="用户警号:" prop="policeNumber">
<el-input <el-input
...@@ -447,7 +455,11 @@ ...@@ -447,7 +455,11 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="info-item" label="所属单位:" prop="unitCode"> <el-form-item class="info-item" label="所属单位:" prop="unitCode">
<Cascader :form="editFormParams" id="unitCode"></Cascader> <Cascader
:form="editFormParams"
id="unitCode"
:props="props"
></Cascader>
</el-form-item> </el-form-item>
<el-form-item class="info-item" label="用户警号:" prop="policeNumber"> <el-form-item class="info-item" label="用户警号:" prop="policeNumber">
<el-input <el-input
...@@ -656,6 +668,13 @@ export default { ...@@ -656,6 +668,13 @@ export default {
width1: 100, width1: 100,
height: "33rem", height: "33rem",
sWidth: 50, sWidth: 50,
props: {
value: "code",
label: "key",
children: "childCodeDwXz",
checkStrictly: true,
emitPath: false,
},
// 新增对象 // 新增对象
addFormParams: { addFormParams: {
idCard: "", idCard: "",
......
src/views/SystemManage/systemLog.vue
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<Cascader <Cascader
:form="systemLogParam" :form="systemLogParam"
id="logDwCode" id="logDwCode"
@change="backNumOne" :props='props'
></Cascader> ></Cascader>
</el-form-item> </el-form-item>
<el-form-item label="查询日期："> <el-form-item label="查询日期：">
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
type="daterange" type="daterange"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
@change="backNumOne"
:picker-options="{ :picker-options="{
disabledDate: disabledDate, disabledDate: disabledDate,
}" }"
...@@ -40,7 +39,7 @@ ...@@ -40,7 +39,7 @@
>清空</el-button> >清空</el-button>
<el-button <el-button
class="cx" class="cx"
@click="getLogList" @click="getLogList()"
>查询</el-button> >查询</el-button>
</el-form-item> </el-form-item>
</div> </div>
...@@ -121,6 +120,13 @@ export default { ...@@ -121,6 +120,13 @@ export default {
}, },
data () { data () {
return { return {
props: {
value: "code",
label: "key",
children: "childCodeDwXz",
checkStrictly: true,
emitPath: false,
},
systemLogParam: { systemLogParam: {
logDwCode: '', // 查询单位代码 logDwCode: '', // 查询单位代码
logTimeStart: '', // 开始时间 logTimeStart: '', // 开始时间
...@@ -154,7 +160,9 @@ export default { ...@@ -154,7 +160,9 @@ export default {
this.width5 = (this.width5 * w2) / w1; this.width5 = (this.width5 * w2) / w1;
}, },
methods: { methods: {
getLogList () { getLogList (page = 1) {
console.log(page, ' getLogList (page = 1)')
this.systemLogParam.currPage = page;
this.getParam() this.getParam()
this.$axios this.$axios
.post('/api/log/logList', this.systemLogParam) .post('/api/log/logList', this.systemLogParam)
...@@ -172,11 +180,7 @@ export default { ...@@ -172,11 +180,7 @@ export default {
this.systemLogParam.currPage = 1// 当前页码 this.systemLogParam.currPage = 1// 当前页码
this.getLogList() this.getLogList()
}, },
// 筛选前页数为1
backNumOne () {
this.systemLogParam.currPage = 1// 当前页码
this.$forceUpdate()
},
// 格式化时间参数 // 格式化时间参数
getParam () { getParam () {
if (this.startEndDate !== null) { if (this.startEndDate !== null) {
...@@ -211,9 +215,9 @@ export default { ...@@ -211,9 +215,9 @@ export default {
}, },
// currentPage 改变时会触发 // currentPage 改变时会触发
handleCurrentChange (page) { handleCurrentChange (page) {
this.systemLogParam.currPage = page; // this.systemLogParam.currPage = page;
//console.log("当前页", this.reqParam.page.currPage); console.log("当前页", page);
this.getLogList(); this.getLogList(page);
}, },
} }
} }
......
src/views/bzxxgl/bzxxsh.vue
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<div class="cxtj-row2"> <div class="cxtj-row2">
<el-form-item :label="getSbdwLabel()" prop="sbdwGajgjgdm" class="sbdw"> <el-form-item :label="getSbdwLabel()" prop="sbdwGajgjgdm" class="sbdw">
<Cascader :form="ruleForm" id="sbdwGajgjgdm" :placeholder="'请选择复合单位'" <Cascader :form="ruleForm" id="sbdwGajgjgdm" :props="dwProps" :placeholder="'请选择复合单位'"
style="margin-right: 10px;" /> style="margin-right: 10px;" />
</el-form-item> </el-form-item>
...@@ -412,7 +412,13 @@ export default { ...@@ -412,7 +412,13 @@ export default {
YSB: {value: '06', name: '已上报'}, YSB: {value: '06', name: '已上报'},
}, },
shDialogVisiable: false, shDialogVisiable: false,
dwProps: {
value: "code",
label: "key",
children: "childCodeDwXz",
checkStrictly: true,
emitPath: false,
},
curSHItem: '', curSHItem: '',
curShType: {},// 格式 {name: '审核', value: '0', icon: '#icon-shenhe'}, curShType: {},// 格式 {name: '审核', value: '0', icon: '#icon-shenhe'},
curShDes: '',// 审核原因 curShDes: '',// 审核原因
......
src/views/bzxxgl/scss/fhxxLT.scss
...@@ -451,3 +451,10 @@ ...@@ -451,3 +451,10 @@
color: #fa9500 !important; color: #fa9500 !important;
} }
} }
.xmbm {
width: 42px;
overflow: hidden;
text-overflow:ellipsis;
white-space: nowrap;
}
src/views/cxyrd/modules/LLCandidate.vue
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<span>{{ fingerShowType }}</span> <span>{{ fingerShowType }}</span>
</div> </div>
</div> </div>
<el-input class="input" v-model="input3" placeholder="请输入条码号/指位" @keydown.enter="search"></el-input> <el-input class="input" v-model="input3" placeholder="请输入条码号/指位" @keydown.enter.native="search" clearable @clear="search"></el-input>
<div class="btn" @click="search"> <div class="btn" @click="search">
<img src="@/assets/img/rgrd/fangdajing.png" alt=""> <img src="@/assets/img/rgrd/fangdajing.png" alt="">
</div> </div>
......
src/views/cxyrd/modules/LTCandidate.vue
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
</div> </div>
<transition name="slide-fade"> <transition name="slide-fade">
<div class="selectFinger" v-show="isShowOptions" @click.stop> <div class="selectFinger" v-show="isShowOptions" @click.stop>
<div class="left-title">左手</div> <div class="left-title"><span>左手</span><span class="clear" @click="search">清空</span></div>
<div class="line" :class="{ active: leftRoll }"> <div class="line" :class="{ active: leftRoll }">
<div class="selected"> <div class="selected">
<i class="el-icon-check" v-show="leftRoll"></i> <i class="el-icon-check" v-show="leftRoll"></i>
...@@ -1204,6 +1204,7 @@ export default { ...@@ -1204,6 +1204,7 @@ export default {
*/ */
search () { search () {
let self = this; let self = this;
this.isShowOptions = false
if (self.isDelete) return; if (self.isDelete) return;
let zcseq = sessionStorage.getItem("zcseq"); let zcseq = sessionStorage.getItem("zcseq");
...@@ -1229,7 +1230,7 @@ export default { ...@@ -1229,7 +1230,7 @@ export default {
// 篩選初始化 // 篩選初始化
// 对勾 // 对勾
this.rightRoll = false; this.rightRoll = false;
this.rightPain = true; this.rightPain = false;
this.leftRoll = false; this.leftRoll = false;
this.leftPain = false; this.leftPain = false;
// 左手 // 左手
...@@ -1253,7 +1254,7 @@ export default { ...@@ -1253,7 +1254,7 @@ export default {
this.rightPS = false; this.rightPS = false;
this.rightPZ = false; this.rightPZ = false;
this.rightPH = false; this.rightPH = false;
this.rightPX = true; this.rightPX = false;
}); });
}, },
/** /**
...@@ -1552,7 +1553,7 @@ const candidates = [ ...@@ -1552,7 +1553,7 @@ const candidates = [
.btn { .btn {
cursor: pointer; cursor: pointer;
width: 32px; width: 32px;
height: 34px; height: 32px;
background: #055FE7; background: #055FE7;
border-radius: 0px 4px 4px 0px; border-radius: 0px 4px 4px 0px;
line-height: 32px; line-height: 32px;
...@@ -1710,6 +1711,16 @@ const candidates = [ ...@@ -1710,6 +1711,16 @@ const candidates = [
color: #666666; color: #666666;
padding-left: 16px; padding-left: 16px;
} }
.left-title {
display: flex;
justify-content: space-between;
align-items: center;
padding-right: 14px;
.clear {
cursor: pointer;
color: #006aff;
}
}
.right-title { .right-title {
margin-top: 7px; margin-top: 7px;
......
src/views/cxyrd/modules/TLCandidate.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="tl-candidate"> <div class="tl-candidate">
<div class="tl-search"> <div class="tl-search">
<div class="label">{{searchType}}</div> <div class="label">{{searchType}}</div>
<el-input class="input" v-model="input3" placeholder="请输入条码号/指位" @keydown.enter="search"></el-input> <el-input class="input" v-model="input3" placeholder="请输入条码号/指位" @keydown.enter.native="search" clearable @clear="search"></el-input>
<div class="btn" @click="search"> <div class="btn" @click="search">
<img src="@/assets/img/rgrd/fangdajing.png" alt=""> <img src="@/assets/img/rgrd/fangdajing.png" alt="">
</div> </div>
......
src/views/drFPTX/RAList.vue
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
v-model.trim="barcode" v-model.trim="barcode"
maxlength="23" maxlength="23"
show-word-limit show-word-limit
@keyup.enter.native="search" @keyup.enter.native="search()"
clearable clearable
> >
</el-input> </el-input>
...@@ -77,6 +77,8 @@ ...@@ -77,6 +77,8 @@
width="10.5" width="10.5"
:form="ruleForm" :form="ruleForm"
id="logicDatabase" id="logicDatabase"
method="post"
:params='params'
></SelectCode> ></SelectCode>
</div> </div>
<div v-show="showType==3"> <div v-show="showType==3">
...@@ -85,6 +87,8 @@ ...@@ -85,6 +87,8 @@
width="10.5" width="10.5"
:form="ruleForm" :form="ruleForm"
id="logicDatabase" id="logicDatabase"
method="post"
:params='params'
></SelectCode> ></SelectCode>
</div> </div>
</div> </div>
...@@ -93,7 +97,7 @@ ...@@ -93,7 +97,7 @@
<el-input <el-input
placeholder="请输入任务号" placeholder="请输入任务号"
v-model.trim="taskNumber" v-model.trim="taskNumber"
@keyup.enter.native="search" @keyup.enter.native="search()"
maxlength="14" maxlength="14"
show-word-limit show-word-limit
clearable clearable
...@@ -105,7 +109,7 @@ ...@@ -105,7 +109,7 @@
<el-select <el-select
v-model="status" v-model="status"
placeholder="请选择入库状态" placeholder="请选择入库状态"
@keyup.enter.native="search" @keyup.enter.native="search()"
clearable clearable
> >
<el-option <el-option
...@@ -120,7 +124,7 @@ ...@@ -120,7 +124,7 @@
<div class="search sjxz"> <div class="search sjxz">
<div class="item">时间选择：</div> <div class="item">时间选择：</div>
<el-date-picker <el-date-picker
@keyup.enter.native="search" @keyup.enter.native="search()"
v-model="startEndDate" v-model="startEndDate"
type="daterange" type="daterange"
start-placeholder="开始日期" start-placeholder="开始日期"
...@@ -140,7 +144,7 @@ ...@@ -140,7 +144,7 @@
>清空</el-button> >清空</el-button>
<button <button
class="sx f-primary-button" class="sx f-primary-button"
@click="search" @click="search()"
>筛选</button> >筛选</button>
</div> </div>
</div> </div>
...@@ -151,7 +155,7 @@ ...@@ -151,7 +155,7 @@
<div class='search barcode'> <div class='search barcode'>
<div class='item'> 条码号：</div> <div class='item'> 条码号：</div>
<el-input <el-input
@keyup.enter.native="search" @keyup.enter.native="search()"
placeholder="请输入条码号" placeholder="请输入条码号"
v-model.trim="barcode" v-model.trim="barcode"
maxlength="23" maxlength="23"
...@@ -163,7 +167,7 @@ ...@@ -163,7 +167,7 @@
<div class="search ljfk"> <div class="search ljfk">
<div class="item">查询类型：</div> <div class="item">查询类型：</div>
<el-select <el-select
@keyup.enter.native="search" @keyup.enter.native="search()"
v-model="queryType" v-model="queryType"
placeholder="请选择查询类型" placeholder="请选择查询类型"
> >
...@@ -179,7 +183,7 @@ ...@@ -179,7 +183,7 @@
<div class="search ljfk"> <div class="search ljfk">
<div class="item">逻辑分库：</div> <div class="item">逻辑分库：</div>
<el-select <el-select
@keyup.enter.native="search" @keyup.enter.native="search()"
v-model="logicDatabase" v-model="logicDatabase"
placeholder="请选择逻辑分库" placeholder="请选择逻辑分库"
filterable filterable
...@@ -221,7 +225,7 @@ ...@@ -221,7 +225,7 @@
<div class='search sjxz'> <div class='search sjxz'>
<div class='item'> 时间选择：</div> <div class='item'> 时间选择：</div>
<el-date-picker <el-date-picker
@keyup.enter.native="search" @keyup.enter.native="search()"
v-model="startEndDate" v-model="startEndDate"
type="daterange" type="daterange"
start-placeholder="开始日期" start-placeholder="开始日期"
...@@ -240,7 +244,7 @@ ...@@ -240,7 +244,7 @@
>清空</el-button> >清空</el-button>
<button <button
class="sx f-primary-button" class="sx f-primary-button"
@click="search" @click="search()"
>筛选</button> >筛选</button>
</div> </div>
</div> </div>
...@@ -862,6 +866,13 @@ export default { ...@@ -862,6 +866,13 @@ export default {
}, },
data () { data () {
return { return {
params: {
userId: JSON.parse(localStorage.getItem("userInfo")).user.id,
userGroupIds: JSON.parse(localStorage.getItem("userInfo")).groupIds
}, // 逻辑库组件参数
width_ljfk: 500, width_ljfk: 500,
width_ljfk2: 400, width_ljfk2: 400,
width5: 50, width5: 50,
...@@ -961,17 +972,18 @@ export default { ...@@ -961,17 +972,18 @@ export default {
this.selectBoo = false// 是否批量操作 this.selectBoo = false// 是否批量操作
this.isShowTip = false; this.isShowTip = false;
this.multipleSelection = []; this.multipleSelection = [];
// this.search();
this.clear() this.clear()
}, },
}, },
methods: { methods: {
// 获取全部人员列表请求 // 获取全部人员列表请求
search () { search (page = 1) {
this.getParam() this.getParam()
let reqUrl = null; let reqUrl = null;
let reqParam = null; let reqParam = null;
this.currPage1 = page;
this.currPage2 = page;
if (this.showType == 1) { if (this.showType == 1) {
reqUrl = "/api/record/import/pc/search"; reqUrl = "/api/record/import/pc/search";
reqParam = { reqParam = {
...@@ -1604,9 +1616,8 @@ export default { ...@@ -1604,9 +1616,8 @@ export default {
* @return {*} * @return {*}
*/ */
handleCurrentChange1 (page) { handleCurrentChange1 (page) {
this.currPage1 = page;
//console.log("当前页", this.currPage1); //console.log("当前页", this.currPage1);
this.search(); this.search(page);
}, },
/** /**
* @description: pageSize 改变时会触发 * @description: pageSize 改变时会触发
...@@ -1623,9 +1634,8 @@ export default { ...@@ -1623,9 +1634,8 @@ export default {
* @return {*} * @return {*}
*/ */
handleCurrentChange2 (page) { handleCurrentChange2 (page) {
this.currPage2 = page;
//console.log("当前页", this.currPage2); //console.log("当前页", this.currPage2);
this.search(); this.search(page);
}, },
/** /**
* @description: 清除所有选项 * @description: 清除所有选项
......
src/views/login/modules/AccountsLogin.vue
...@@ -225,7 +225,6 @@ export default { ...@@ -225,7 +225,6 @@ export default {
this.$message.success('登录成功！') this.$message.success('登录成功！')
//所在单位数据 //所在单位数据
this.$store.dispatch("publicData/_getList");
this.$store.dispatch("ljk/_ljkRy") // 获取用户人员逻辑库JSON this.$store.dispatch("ljk/_ljkRy") // 获取用户人员逻辑库JSON
this.$store.dispatch("ljk/_ljkAj") // 获取用户案件逻辑库JSON this.$store.dispatch("ljk/_ljkAj") // 获取用户案件逻辑库JSON
this.$store.dispatch("ljk/_ljkAll") // 获取用户所有逻辑库名称NAME this.$store.dispatch("ljk/_ljkAll") // 获取用户所有逻辑库名称NAME
......
src/views/rgrd/modules/LTCandidate.vue
...@@ -1417,10 +1417,10 @@ const candidates = [ ...@@ -1417,10 +1417,10 @@ const candidates = [
.btn { .btn {
cursor: pointer; cursor: pointer;
width: 44px; width: 44px;
height: 34px; height: 32px;
background: #006aff; background: #006aff;
border-radius: 0px 4px 4px 0px; border-radius: 0px 4px 4px 0px;
line-height: 34px; line-height: 32px;
color: #ffffff; color: #ffffff;
text-align: center; text-align: center;
font-size: 14px; font-size: 14px;
......
src/views/tjbb/tjbb.vue
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
:id="item.id" :id="item.id"
width="18.125" width="18.125"
v-else-if="item.type == 'cascader'" v-else-if="item.type == 'cascader'"
:props='props'
></Cascader> ></Cascader>
<el-input <el-input
v-model="queryParams[item.id]" v-model="queryParams[item.id]"
...@@ -116,6 +117,13 @@ export default { ...@@ -116,6 +117,13 @@ export default {
}, },
data () { data () {
return { return {
props: {
value: "code",
label: "key",
children: "childCodeDwXz",
checkStrictly: true,
emitPath: false,
},
queryParams: { queryParams: {
sj: "", sj: "",
unitcode: "", unitcode: "",
......
src/views/xtfkgl/AjXtljfkView.vue
...@@ -202,7 +202,7 @@ export default { ...@@ -202,7 +202,7 @@ export default {
let w1 = 1920 let w1 = 1920
let w2 = window.innerWidth let w2 = window.innerWidth
this.height = (this.height * w2) / w1 // this.height = (this.height * w2) / w1
this.width1 = (this.width1 * w2) / w1 this.width1 = (this.width1 * w2) / w1
this.width2 = (this.width2 * w2) / w1 this.width2 = (this.width2 * w2) / w1
this.width3 = (this.width3 * w2) / w1 this.width3 = (this.width3 * w2) / w1
...@@ -349,6 +349,9 @@ export default { ...@@ -349,6 +349,9 @@ export default {
ruleForm.page = page ruleForm.page = page
ruleForm.limit = limit ruleForm.limit = limit
ruleForm.userId = user.getUser().user.id
ruleForm.userGroupIds = user.getUser().groupIds
NetUtil.xtfkgl NetUtil.xtfkgl
.ajList(ruleForm) .ajList(ruleForm)
.then(res => { .then(res => {
......
src/views/xtfkgl/RyXtljfkView.vue
...@@ -233,17 +233,17 @@ export default { ...@@ -233,17 +233,17 @@ export default {
}, },
showMoreYhView(index) { showMoreYhView(index) {
this.isInParentView = true this.isInParentView = true
logger.info('tooltipParentEnter', 'tooltipParentEnter-' + index) // logger.info('tooltipParentEnter', 'tooltipParentEnter-' + index)
if (this.curMoreYhViewIndex !== index && this.curMoreYhViewIndex >= 0) { if (this.curMoreYhViewIndex !== index && this.curMoreYhViewIndex >= 0) {
this.tableDate[this.curMoreYhViewIndex].disabled = false this.tableDate[this.curMoreYhViewIndex].disabled = false
} }
this.tableDate[index].disabled = true this.tableDate[index].disabled = true
this.curMoreYhViewIndex = index this.curMoreYhViewIndex = index
logger.info('showMoreYhView-tableDate', this.tableDate) // logger.info('showMoreYhView-tableDate', this.tableDate)
}, },
hideMoreYhView(isDelay = true) { hideMoreYhView(isDelay = true) {
let _that = this let _that = this
logger.info('tooltipParentOut', 'tooltipParentOut') // logger.info('tooltipParentOut', 'tooltipParentOut')
if (isDelay) { if (isDelay) {
this.isInParentView = false this.isInParentView = false
setTimeout(function () { setTimeout(function () {
...@@ -353,6 +353,11 @@ export default { ...@@ -353,6 +353,11 @@ export default {
ruleForm.page = page ruleForm.page = page
ruleForm.limit = limit ruleForm.limit = limit
ruleForm.userId = user.getUser().user.id
ruleForm.userGroupIds = user.getUser().groupIds
logger.info('user', user.getUser())
NetUtil.xtfkgl NetUtil.xtfkgl
.ryList(ruleForm) .ryList(ruleForm)
.then(res => { .then(res => {
......
src/views/xtfkgl/XtfkAndGzlView.vue
...@@ -46,7 +46,9 @@ ...@@ -46,7 +46,9 @@
<el-form-item class="info-item" label="数据库用户："> <el-form-item class="info-item" label="数据库用户：">
<sjkyh-select ref='sjkyhSelect' :params='ljfkRuleForm.usersOrUserGroups' <sjkyh-select ref='sjkyhSelect' :params='ljfkRuleForm.usersOrUserGroups'
@select="selectYh"></sjkyh-select> @select="selectYh"></sjkyh-select>
<div class="tip" style="margin-top: -18px;"><span class="iconfont">&#xe649;</span>提示：如果不选择，默认全部用户！</div> <div class="tip" style="margin-top: -18px;"><span
class="iconfont">&#xe649;</span>提示：如果不选择，默认全部用户！
</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -66,11 +68,12 @@ ...@@ -66,11 +68,12 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item class="input-item-sm" label="逻辑库说明："> <el-form-item class="input-item-sm" label="逻辑库说明：" prop="description">
<el-input <el-input
class="input-info-sm" class="input-info-sm"
v-model.trim="ljfkRuleForm.description" v-model.trim="ljfkRuleForm.description"
placeholder="请输入" /> placeholder="请输入"
@change="ljksmChange" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -294,6 +297,13 @@ const _VIEW_TYPES = { ...@@ -294,6 +297,13 @@ const _VIEW_TYPES = {
GZL: 3 GZL: 3
} }
const validateisLjksm = (rule, value, callback) => {
if (value.length > 50) {
return callback(new Error('说明不能超过50个字！'))
} else {
callback()//必须有此项回调，否则验证会一直不通过
}
}
export default { export default {
name: 'XtfkAndGzlView', name: 'XtfkAndGzlView',
...@@ -347,7 +357,10 @@ export default { ...@@ -347,7 +357,10 @@ export default {
message: '名称包括汉字、字母，至少两个汉字!', message: '名称包括汉字、字母，至少两个汉字!',
trigger: 'change' trigger: 'change'
} }
] ],
description: [
{validator: validateisLjksm, min: 0, max: 50, message: '说明不能超过50个字！', trigger: 'change'}
],
}, },
} }
}, },
...@@ -366,6 +379,15 @@ export default { ...@@ -366,6 +379,15 @@ export default {
} }
}, },
methods: { methods: {
ljksmChange(val) {
if (val.length <= 0) {
this.ljfkRuleForm.description = '1 '
} else {
}
logger.info('ljksmChange', this.rules)
// logger.info('ljksmChange', val)
this.$forceUpdate()
},
isFirstItem(index) { isFirstItem(index) {
return index === 0 return index === 0
}, },
...@@ -596,7 +618,8 @@ export default { ...@@ -596,7 +618,8 @@ export default {
} }
</script> </script>
<style lang="scss">
</style>
<style scoped lang="scss"> <style scoped lang="scss">
@import "./scss/dialog_table"; @import "./scss/dialog_table";
......
src/views/zljc/Index.vue
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
:form="formInline" :form="formInline"
id="codeDwCode" id="codeDwCode"
width="9.75" width="9.75"
:props='props'
></Cascader> ></Cascader>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
...@@ -321,6 +322,13 @@ export default { ...@@ -321,6 +322,13 @@ export default {
} }
}, },
}, },
props: {
value: "code",
label: "key",
children: "childCodeDwXz",
checkStrictly: true,
emitPath: false,
},
formInline: { formInline: {
barcode: "", // 条码号 barcode: "", // 条码号
inspectionFlag: null, // 检查结果选择 inspectionFlag: null, // 检查结果选择
...@@ -367,8 +375,9 @@ export default { ...@@ -367,8 +375,9 @@ export default {
console.log(row.inspectionFlag); console.log(row.inspectionFlag);
}, },
// 获取全部人员列表请求 // 获取全部人员列表请求
search () { search (page = 1) {
this.getParam(); this.getParam();
this.currPage = page;
let reqParam = { let reqParam = {
page: "", // 条码号 page: "", // 条码号
limit: "", // 行数 limit: "", // 行数
...@@ -589,8 +598,8 @@ export default { ...@@ -589,8 +598,8 @@ export default {
* @return {*} * @return {*}
*/ */
handleCurrentChange (page) { handleCurrentChange (page) {
this.currPage = page;
this.search(); this.search(page);
}, },
}, },
created () { created () {
......
src/views/zljc/modules/ryxx.vue
...@@ -103,14 +103,6 @@ ...@@ -103,14 +103,6 @@
:disabled="true" :disabled="true"
clearable clearable
></el-input> ></el-input>
<!-- <SelectCode
codeUrl="/api/code/cjxxyydm"
width="16.5"
clearable
:form="ruleForm"
id="cjxxyydm"
:disabled="true"
></SelectCode> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> </el-col> <el-col :span="12"> </el-col>
...@@ -160,13 +152,6 @@ ...@@ -160,13 +152,6 @@
:disabled="true" :disabled="true"
clearable clearable
></el-input> ></el-input>
<!-- <SelectCode
codeUrl="/api/code/sex"
width="16.5"
clearable
:form="ruleForm"
id="xbdm"
></SelectCode> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -194,12 +179,6 @@ ...@@ -194,12 +179,6 @@
:disabled="true" :disabled="true"
clearable clearable
></el-input> ></el-input>
<!-- <SelectCode
codeUrl="/api/code/nationality"
width="16.5"
:form="ruleForm"
id="gjdm"
></SelectCode> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -214,13 +193,6 @@ ...@@ -214,13 +193,6 @@
:disabled="true" :disabled="true"
clearable clearable
></el-input> ></el-input>
<!-- <SelectCode
codeUrl="/api/code/nation"
width="16.5"
clearable
:form="ruleForm"
id="mzdm"
></SelectCode> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -235,13 +207,6 @@ ...@@ -235,13 +207,6 @@
:disabled="true" :disabled="true"
clearable clearable
></el-input> ></el-input>
<!-- <SelectCode
codeUrl="/api/code/certificates"
width="16.5"
clearable
:form="ruleForm"
id="cyzjdm"
></SelectCode> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -269,11 +234,6 @@ ...@@ -269,11 +234,6 @@
:disabled="true" :disabled="true"
clearable clearable
></el-input> ></el-input>
<!-- <Cascader
:form="ruleForm"
id="hjdzXzqhdm"
codeName="CODE_XZQH"
></Cascader> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -301,11 +261,6 @@ ...@@ -301,11 +261,6 @@
:disabled="true" :disabled="true"
clearable clearable
></el-input> ></el-input>
<!-- <Cascader
:form="ruleForm"
id="xzzXzqhdm"
codeName="CODE_XZQH"
></Cascader> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -384,11 +339,6 @@ ...@@ -384,11 +339,6 @@
:disabled="true" :disabled="true"
clearable clearable
></el-input> ></el-input>
<!-- <Cascader
:form="ruleForm"
id="nydwGajgjgdm"
></Cascader> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -483,8 +433,6 @@ ...@@ -483,8 +433,6 @@
</template> </template>
<script> <script>
import qs from 'qs' import qs from 'qs'
import Cascader from "@/components/Cascader.vue";
import SelectCode from "@/components/SelectCode.vue";
const targetOptions = ['基本人员库', '高危人员库', '非法人员库', '在逃人员库', '布控人员库', '前科人员库', '协查人员库']; const targetOptions = ['基本人员库', '高危人员库', '非法人员库', '在逃人员库', '布控人员库', '前科人员库', '协查人员库'];
export default { export default {
name: "ryxx", name: "ryxx",
...@@ -496,10 +444,6 @@ export default { ...@@ -496,10 +444,6 @@ export default {
default: false default: false
} }
}, },
components: {
Cascader,
SelectCode
},
created () { created () {
console.log(this.rowClick, '跳转参数人员信息') console.log(this.rowClick, '跳转参数人员信息')
this.id = this.rowData.id this.id = this.rowData.id
......
src/views/zzwcj/fingerprint.scss
...@@ -2789,7 +2789,7 @@ $dashed:var(--dashed,#055FE7); ...@@ -2789,7 +2789,7 @@ $dashed:var(--dashed,#055FE7);
} }
// .el-progress-circle // .el-progress-circle
/deep/.el-progress-circle__track { /deep/.el-progress-circle__track {
stroke: $uploadingcircleBg; // stroke: $uploadingcircleBg;
} }
.pro { .pro {
border: $uploadingBorder solid #26d31f; border: $uploadingBorder solid #26d31f;
......
src/views/zzwcj/fingerprint.vue
...@@ -605,7 +605,7 @@ ...@@ -605,7 +605,7 @@
<div class="uploading" v-show="uploadingStart"> <div class="uploading" v-show="uploadingStart">
<!-- <div class="uploading"> --> <!-- <div class="uploading"> -->
<div class="uploading-content" v-show="uploadingClose=='uploading'"> <div class="uploading-content" v-show="uploadingClose=='uploading'">
<el-progress class="pro" type="circle" :percentage="percentage" :color="uploadingColor" :show-text="isShowUploadingTxt" v-if="percentage"></el-progress> <el-progress class="pro" type="circle" :percentage="percentage" :color="uploadingColor" :show-text="isShowUploadingTxt"></el-progress>
<div class="uploading-title">{{uploadingTitle}}</div> <div class="uploading-title">{{uploadingTitle}}</div>
<div class="uploading-tip">{{uploadingTip}}</div> <div class="uploading-tip">{{uploadingTip}}</div>
<div v-show="isUploadingFinish" class="uploading-finish"> <div v-show="isUploadingFinish" class="uploading-finish">
...@@ -1157,10 +1157,14 @@ export default { ...@@ -1157,10 +1157,14 @@ export default {
// //console.log(this.rybh); // //console.log(this.rybh);
}, },
async mounted () { async mounted () {
// setInterval(() => { // this.uploadingStart = true
// let timePercentage = setInterval(() => {
// this.percentage++ // this.percentage++
// }, 5000); // if (this.percentage == 90) {
// console.log(this.themeType); // clearInterval(timePercentage)
// }
// }, 1000);
let self = this let self = this
/************************/ /************************/
function getIPs (callback) { function getIPs (callback) {
...@@ -8310,7 +8314,7 @@ export default { ...@@ -8310,7 +8314,7 @@ export default {
}, 1500); }, 1500);
return return
} else { } else {
if (self.cj_type === 0) { if (self.cj_type === 0 || self.cj_type === 2) {
self.isUploadingFinish = true self.isUploadingFinish = true
self.isShowUploadingTxt = false self.isShowUploadingTxt = false
self.uploadingTitle = '指纹上传完成' self.uploadingTitle = '指纹上传完成'
......
src/views/zzwlr/xzry.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-09-07 10:31:34 * @Date: 2021-09-07 10:31:34
* @LastEditTime: 2022-01-18 11:48:54 * @LastEditTime: 2022-01-18 14:31:18
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\zzwlr\Index.vue * @FilePath: \founder_vue\src\views\zzwlr\Index.vue
...@@ -304,9 +304,8 @@ ...@@ -304,9 +304,8 @@
zjhm: [ zjhm: [
{ required: true, message: "请输入证件号码", trigger: "blur" }, { required: true, message: "请输入证件号码", trigger: "blur" },
{ {
pattern: this.isZjhm, pattern:
// /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)/, /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)/,
message: "证件号码格式有误！", message: "证件号码格式有误！",
trigger: "blur", trigger: "blur",
}, },
...@@ -360,7 +359,12 @@ ...@@ -360,7 +359,12 @@
// console.log(this.$route.params.type==='edit'); // console.log(this.$route.params.type==='edit');
this.edit = "新增人员"; this.edit = "新增人员";
} }
this.ruleForm.cyzjdm = "111" ? this.isZjhm : /^(?:0|[1-9]\d{3,30})?$/ // this.ruleForm.cyzjdm == "111" ? this.isZjhm : /^(?:0|[1-9]\d{3,30})?$/
if(this.ruleForm.cyzjdm == "111") {
this.isZjhm = /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)/
} else {
this.isZjhm = /^(?:0|[1-9]\d{3,30})?$/
}
}, },
methods: { methods: {
auto(){ auto(){
...@@ -391,6 +395,13 @@ ...@@ -391,6 +395,13 @@
this.ruleForm.nysj = "2022-01-17" this.ruleForm.nysj = "2022-01-17"
this.ruleForm.nyryGmsfhm = "132910199608122049" this.ruleForm.nyryGmsfhm = "132910199608122049"
this.ruleForm.nyryLxdh = "13111133331" this.ruleForm.nyryLxdh = "13111133331"
// if(this.ruleForm.cyzjdm == "111") {
// this.$set(this.rules.zjhm[1], 'pattern', /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)/)
// } else {
// this.$set(this.rules.zjhm[1], 'pattern', /^(?:0|[1-9]\d{3,30})?$/)
// }
console.log(this.rules.zjhm);
}, },
disabledDate(a) { disabledDate(a) {
if (a.getTime() > new Date().getTime()) { if (a.getTime() > new Date().getTime()) {
...@@ -619,6 +630,15 @@ ...@@ -619,6 +630,15 @@
}); });
}, },
}, },
watch: {
"ruleForm.cyzjdm"(newValue, oldValue) {
if(this.ruleForm.cyzjdm == "111") {
this.$set(this.rules.zjhm[1], 'pattern', /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)/)
} else {
this.$set(this.rules.zjhm[1], 'pattern', /^(?:0|[1-9]\d{3,30})?$/)
}
}
},
}; };
</script> </script>
......
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