Skip to content

F
founder_vue
Commit 9d6f4dab by 张超军
Options

冲突

parents 4c7bf783 2880cf39
Showing with 722 additions and 280 deletions
src/assets/styles/main.scss
...@@ -5,7 +5,9 @@ ...@@ -5,7 +5,9 @@
margin: 0; margin: 0;
box-sizing: border-box; box-sizing: border-box;
} }
body {
overflow: hidden;
}
.disabel { .disabel {
border: none !important; border: none !important;
background-color: #ecedf1 !important; background-color: #ecedf1 !important;
......
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: 2021-11-30 13:45:59 * @LastEditTime: 2021-12-09 15:57:53
* @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
--> -->
<template> <template>
<el-tooltip
class="item"
effect="dark"
:content="valStr"
:disabled="disable"
placement="top-start"
:open-delay="1000"
>
<div :style="{ width: width + 'rem' }"> <div :style="{ width: width + 'rem' }">
<el-cascader <el-cascader
v-model="form[id]" v-model="form[id]"
...@@ -23,6 +31,7 @@ ...@@ -23,6 +31,7 @@
> >
</el-cascader> </el-cascader>
</div> </div>
</el-tooltip>
</template> </template>
<script> <script>
export default { export default {
...@@ -31,8 +40,28 @@ export default { ...@@ -31,8 +40,28 @@ export default {
options: [], options: [],
casVal: null, casVal: null,
placeholder: "请选择", placeholder: "请选择",
valStr: "",
valTempStr: "",
}; };
}, },
watch: {
form: {
handler(val) {
//保存选中的label
setTimeout(() => {
//获取提示的中文
this.valStr = $(this.$refs.cascader.$el).find("input").val();
//如果是单位，从后截图6位中文然后赋值
if (!this.codeName) {
this.valTempStr = this.getTemplateStr(this.valStr);
$(this.$refs.cascader.$el).find("input").val(this.valTempStr);
}
}, 0);
},
immediate: true,
deep: true,
},
},
props: { props: {
props: { props: {
type: Object, type: Object,
...@@ -56,13 +85,38 @@ export default { ...@@ -56,13 +85,38 @@ export default {
}, },
codeName: String, codeName: String,
}, },
computed: {
disable() {
if (this.valStr?.trim() == "" || this.form[this.id]?.trim() == "") {
return true;
} else {
return false;
}
},
},
methods: { methods: {
change(val) { change(val) {
let newVal = val; let newVal = val;
if (!newVal) newVal = ""; if (!newVal) newVal = "";
this.$set(this.form, this.id, newVal); this.$set(this.form, this.id, newVal);
//选择完以后关闭下拉版
this.$refs.cascader.dropDownVisible = false; this.$refs.cascader.dropDownVisible = false;
}, },
getTemplateStr(str) {
let newStr;
let index = str.indexOf("[");
if (index >= 0) {
if (index > 6) {
newStr = "..." + str.slice(index - 6);
}
if (index <= 6) {
newStr = str;
}
} else {
newStr = "";
}
return newStr;
},
getTreeData(data) { getTreeData(data) {
if (data && data.length > 0) { if (data && data.length > 0) {
return data.map((item) => ({ return data.map((item) => ({
......
src/plugins/axios.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:57:48 * @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-10 09:46:36 * @LastEditTime: 2021-12-11 14:19:58
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\plugins\axios.js * @FilePath: \指纹系统\founder_vue\src\plugins\axios.js
...@@ -65,10 +65,14 @@ _axios.interceptors.request.use( ...@@ -65,10 +65,14 @@ _axios.interceptors.request.use(
_axios.interceptors.response.use( _axios.interceptors.response.use(
function (response) { function (response) {
if (response.headers.token) localStorage.setItem("token", response.headers.token); if (response.headers.token) localStorage.setItem("token", response.headers.token);
if (response.config.loading !== false) {
hideLoading(response.config.loadingTarget);
// console.log(response.config.loadingTarget);
}
if (response.data.code == 401) { if (response.data.code == 401) {
if (resTimer) clearTimeout(resTimer) if (resTimer) clearTimeout(resTimer)
resTimer = setTimeout(() => { resTimer = setTimeout(() => {
MessageBox.confirm('登陆超时请重新登录, 是否继续?', '提示', { MessageBox.confirm(response.data.message == '未登录' ? '登陆超时请重新登录, 是否继续?' : response.data.message, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
...@@ -77,10 +81,7 @@ _axios.interceptors.response.use( ...@@ -77,10 +81,7 @@ _axios.interceptors.response.use(
}).catch(() => { }).catch(() => {
}); });
}, 500); }, 500);
} return;
if (response.config.loading !== false) {
hideLoading(response.config.loadingTarget);
// console.log(response.config.loadingTarget);
} }
// NProgress.done(); // NProgress.done();
return response; return response;
......
src/router/index.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:57:48 * @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-11 11:44:03 * @LastEditTime: 2021-12-11 14:20:10
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\router\index.js * @FilePath: \指纹系统\founder_vue\src\router\index.js
......
src/store/modules/loading.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-11-04 11:12:33 * @Date: 2021-11-04 11:12:33
* @LastEditTime: 2021-12-05 20:34:25 * @LastEditTime: 2021-12-09 10:08:11
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\store\modules\zwbj.js * @FilePath: \指纹系统\founder_vue\src\store\modules\zwbj.js
*/ */
import { SET_LOADING, SET_JUMPROUTE, SET_PREROUTE, SET_WILLROUTE, SET_SMALLLOADING, SET_LOADINGSD } from "./mutations-types"; import { SET_LOADING, SET_JUMPROUTE, SET_PREROUTE, SET_WILLROUTE, SET_SMALLLOADING, SET_LOADINGSD, SET_GLASS } from "./mutations-types";
const state = { const state = {
// 是否处于加载中 // 是否处于加载中
loading: false, loading: false,
...@@ -18,28 +18,33 @@ const state = { ...@@ -18,28 +18,33 @@ const state = {
// 即将要跳转的路由 // 即将要跳转的路由
willRoute: '', willRoute: '',
// 手动路由加载 // 手动路由加载
loading_sd: false loading_sd: false,
//全局毛玻璃
groundGlassBoo: false,
}; };
const mutations = { const mutations = {
[SET_LOADING] (state, content) { [SET_LOADING](state, content) {
state.loading = content state.loading = content
}, },
[SET_JUMPROUTE] (state, content) { [SET_JUMPROUTE](state, content) {
state.jumproute = content state.jumproute = content
}, },
[SET_PREROUTE] (state, content) { [SET_PREROUTE](state, content) {
state.preRoute = content state.preRoute = content
}, },
[SET_WILLROUTE] (state, content) { [SET_WILLROUTE](state, content) {
state.willRoute = content state.willRoute = content
}, },
[SET_SMALLLOADING] (state, content) { [SET_SMALLLOADING](state, content) {
state.smallLoading = content state.smallLoading = content
}, },
[SET_LOADINGSD] (state, content) { [SET_LOADINGSD](state, content) {
state.loading_sd = content state.loading_sd = content
}, },
[SET_GLASS](state, content) {
state.groundGlassBoo = content
},
}; };
const actions = { const actions = {
......
src/store/modules/mutations-types.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-11-04 13:14:49 * @Date: 2021-11-04 13:14:49
* @LastEditTime: 2021-12-06 11:46:37 * @LastEditTime: 2021-12-09 10:07:50
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\store\modules\mutations-types.js * @FilePath: \指纹系统\founder_vue\src\store\modules\mutations-types.js
...@@ -43,3 +43,5 @@ export const SET_LOADINGSD = 'setLoadingSd' ...@@ -43,3 +43,5 @@ export const SET_LOADINGSD = 'setLoadingSd'
// 是否切换到了人像 // 是否切换到了人像
export const SET_ISFACE = 'setIsFace' export const SET_ISFACE = 'setIsFace'
// 记录全局毛玻璃是否开启
export const SET_GLASS = 'setGlass'
src/utils/requestLoading.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-11-26 16:37:59 * @Date: 2021-11-26 16:37:59
* @LastEditTime: 2021-12-07 20:15:55 * @LastEditTime: 2021-12-09 17:10:50
* @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\utils\requestLoading.js * @FilePath: \founder_vue\src\utils\requestLoading.js
......
src/views/AllPersonnelBase/AllPersonnelBase.vue
...@@ -98,8 +98,8 @@ ...@@ -98,8 +98,8 @@
> >
<span v-html="'&nbsp;&nbsp;'"></span> <span v-html="'&nbsp;&nbsp;'"></span>
<i <i
class="el-icon-info" class="iconfont icon-tanhao1"
style="color: #055fe7; font-size: 15px" style="color: #055fe7; font-size: 16px; margin: 0 0.625rem;"
></i> ></i>
已选择 已选择
<span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​ <span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​
...@@ -135,18 +135,21 @@ ...@@ -135,18 +135,21 @@
prop="ysxtAsjxgrybh" prop="ysxtAsjxgrybh"
label="人员编号" label="人员编号"
:width="width1" :width="width1"
show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xm" prop="xm"
label="姓名" label="姓名"
:width="width2" :width="width2"
show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zjhm" prop="zjhm"
label="身份证号" label="身份证号"
:width="width3" :width="width3"
show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -505,7 +508,7 @@ export default { ...@@ -505,7 +508,7 @@ export default {
width3: 180, width3: 180,
width2: 100, width2: 100,
width1: 220, width1: 220,
height: 550, height: 500,
disabled: false, // 新增人员按钮状态 disabled: false, // 新增人员按钮状态
isShowTjddl: false, // 添加到队列 isShowTjddl: false, // 添加到队列
isShowGz: false, // 关注 isShowGz: false, // 关注
...@@ -1418,4 +1421,7 @@ export default { ...@@ -1418,4 +1421,7 @@ export default {
} }
} }
} }
/deep/.el-table--enable-row-transition .el-table__body td.el-table__cell {
height: 55px;
}
</style> </style>
src/views/AllPersonnelBase/dclb.vue
...@@ -141,8 +141,8 @@ ...@@ -141,8 +141,8 @@
> >
<span v-html="'&nbsp;&nbsp;'"></span> <span v-html="'&nbsp;&nbsp;'"></span>
<i <i
class="el-icon-info" class="iconfont icon-tanhao1"
style="color: #055fe7; font-size: 15px" style="color: #055fe7; font-size: 16px; margin: 0 0.625rem;"
></i> ></i>
已选择 已选择
<span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​ <span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​
...@@ -171,6 +171,7 @@ ...@@ -171,6 +171,7 @@
hasChildren: 'hasChildren', hasChildren: 'hasChildren',
}" }"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
@expand-change="hadnlExpandChange1"
> >
<el-table-column <el-table-column
type="selection" type="selection"
...@@ -220,6 +221,7 @@ ...@@ -220,6 +221,7 @@
prop="barcode" prop="barcode"
label="人员编号" label="人员编号"
:width="width2" :width="width2"
show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -257,12 +259,30 @@ ...@@ -257,12 +259,30 @@
label="数据类型" label="数据类型"
:width="width2" :width="width2"
> >
<template slot-scope="scope">
<div>
<span>{{scope.row.dataTypeName}}</span>
<span
class='tz'
v-if="scope.row.featureName"
>特征</span>
</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="exportName" prop="exportName"
label="导出模式" label="导出模式"
width="auto" width="auto"
> >
<template slot-scope="scope">
<div>
<span>{{scope.row.exportName}}</span>
<span
class='tm'
v-if="scope.row.declassificationName"
>脱密</span>
</div>
</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
...@@ -282,6 +302,7 @@ ...@@ -282,6 +302,7 @@
hasChildren: 'hasChildren', hasChildren: 'hasChildren',
}" }"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
@expand-change="hadnlExpandChange2"
> >
<el-table-column <el-table-column
type="selection" type="selection"
...@@ -331,6 +352,7 @@ ...@@ -331,6 +352,7 @@
prop="barcode" prop="barcode"
label="案事件编号" label="案事件编号"
:width="width4" :width="width4"
show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -344,6 +366,15 @@ ...@@ -344,6 +366,15 @@
label="导出模式" label="导出模式"
:width="width1" :width="width1"
> >
<template slot-scope="scope">
<div>
<span>{{scope.row.exportName}}</span>
<span
class='tm'
v-if="scope.row.declassificationName"
>脱密</span>
</div>
</template>
</el-table-column> </el-table-column>
<el-table-column width="auto"> <el-table-column width="auto">
</el-table-column> </el-table-column>
...@@ -418,6 +449,7 @@ export default { ...@@ -418,6 +449,7 @@ export default {
multipleSelection: [], // 表单选择项目 multipleSelection: [], // 表单选择项目
isShowTip: false, //批量操作提示 isShowTip: false, //批量操作提示
selectBoo: false,// 是否批量操作 selectBoo: false,// 是否批量操作
expanded: false, // 展开标志
}; };
}, },
created () { created () {
...@@ -535,6 +567,116 @@ export default { ...@@ -535,6 +567,116 @@ export default {
this.$message.error("抱歉，复制条码号失败！"); this.$message.error("抱歉，复制条码号失败！");
} }
}, },
// 展开或关闭行
hadnlExpandChange1 (row, expanded) {
// console.log(row, expanded, "hadnlExpandChange1")
// let oldObj = row;
// 获取展开标志
this.expanded = expanded;
// 获取下标
var i = this.tableDate1.findIndex((table) => table.sequenceNumber === row.sequenceNumber);
// var i = this.tableData.findIndex(table => table.id === row.id);
console.log(i, 112233);
if (expanded) {
this.tableDate1[i] = {
taskNumber: row.taskNumber,
sequenceNumber: row.sequenceNumber,
personExportRecordGrandchildren: row.personExportRecordGrandchildren,
// qid: row.qid,
// children: row.children,
// queryId: row.queryId,
expanded: true,
};
this.$forceUpdate();
} else {
//console.info("折叠时row数据", this.list[i]);
this.tableDate1[i] = {
taskNumber: row.taskNumber,
sequenceNumber: row.sequenceNumber,
personExportRecordGrandchildren: row.personExportRecordGrandchildren,
barcode: row.personExportRecordGrandchildren[0].barcode,
collectIdName: row.personExportRecordGrandchildren[0].collectIdName,
collectIdCard: row.personExportRecordGrandchildren[0].collectIdCard,
dataType: row.personExportRecordGrandchildren[0].dataType,
dataTypeName: row.personExportRecordGrandchildren[0].dataTypeName,
declassificationName: row.personExportRecordGrandchildren[0].declassificationName,
declassificationStatus: row.personExportRecordGrandchildren[0].declassificationStatus,
exportName: row.personExportRecordGrandchildren[0].exportName,
exportTime: row.personExportRecordGrandchildren[0].exportTime,
exportType: row.personExportRecordGrandchildren[0].exportType,
failReason: row.personExportRecordGrandchildren[0].failReason,
featureName: row.personExportRecordGrandchildren[0].featureName,
featureStatus: row.personExportRecordGrandchildren[0].featureStatus,
id: row.personExportRecordGrandchildren[0].id,
picCount: row.personExportRecordGrandchildren[0].picCount,
plainCount: row.personExportRecordGrandchildren[0].plainCount,
plamCount: row.personExportRecordGrandchildren[0].plamCount,
rollCount: row.personExportRecordGrandchildren[0].rollCount,
status: row.personExportRecordGrandchildren[0].status,
statusName: row.personExportRecordGrandchildren[0].statusName,
expanded: false,
};
//console.log(this.list[i]);
this.$forceUpdate();
// //console.info("塞完数据的row", this.list[i]);
}
},
// 展开或关闭行
hadnlExpandChange2 (row, expanded) {
console.log(row, expanded, "hadnlExpandChange2")
// let oldObj = row;
// 获取展开标志
this.expanded = expanded;
// 获取下标
var i = this.tableDate2.findIndex((table) => table.sequenceNumber === row.sequenceNumber);
// var i = this.tableData.findIndex(table => table.id === row.id);
console.log(i, 112233);
if (expanded) {
this.tableDate2[i] = {
taskNumber: row.taskNumber,
sequenceNumber: row.sequenceNumber,
caseExportRecordGrandchildren: row.caseExportRecordGrandchildren,
// qid: row.qid,
// children: row.children,
// queryId: row.queryId,
expanded: true,
};
this.$forceUpdate();
} else {
//console.info("折叠时row数据", this.list[i]);
this.tableDate2[i] = {
taskNumber: row.taskNumber,
sequenceNumber: row.sequenceNumber,
caseExportRecordGrandchildren: row.caseExportRecordGrandchildren,
barcode: row.caseExportRecordGrandchildren[0].barcode,
collectIdName: row.caseExportRecordGrandchildren[0].collectIdName,
collectIdCard: row.caseExportRecordGrandchildren[0].collectIdCard,
dataType: row.caseExportRecordGrandchildren[0].dataType,
dataTypeName: row.caseExportRecordGrandchildren[0].dataTypeName,
declassificationName: row.caseExportRecordGrandchildren[0].declassificationName,
declassificationStatus: row.caseExportRecordGrandchildren[0].declassificationStatus,
exportName: row.caseExportRecordGrandchildren[0].exportName,
exportTime: row.caseExportRecordGrandchildren[0].exportTime,
exportType: row.caseExportRecordGrandchildren[0].exportType,
failReason: row.caseExportRecordGrandchildren[0].failReason,
featureName: row.caseExportRecordGrandchildren[0].featureName,
featureStatus: row.caseExportRecordGrandchildren[0].featureStatus,
id: row.caseExportRecordGrandchildren[0].id,
picCount: row.caseExportRecordGrandchildren[0].picCount,
plainCount: row.caseExportRecordGrandchildren[0].plainCount,
plamCount: row.caseExportRecordGrandchildren[0].plamCount,
rollCount: row.caseExportRecordGrandchildren[0].rollCount,
status: row.caseExportRecordGrandchildren[0].status,
statusName: row.caseExportRecordGrandchildren[0].statusName,
expanded: false,
};
//console.log(this.list[i]);
this.$forceUpdate();
// //console.info("塞完数据的row", this.list[i]);
}
},
/** /**
* @description: 是否是批量操作 * @description: 是否是批量操作
* @param {*} * @param {*}
...@@ -661,6 +803,34 @@ export default { ...@@ -661,6 +803,34 @@ export default {
}; };
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
// 特征
.tz {
display: inline-block;
width: 32px;
height: 20px;
background: #ddebff;
border-radius: 2px;
font-size: 12px;
font-family: MicrosoftYaHei;
color: #055fe7;
line-height: 20px;
text-align: center;
margin-left: 8px;
}
// 脱密
.tm {
display: inline-block;
width: 32px;
height: 20px;
background: #ffebed;
border-radius: 2px;
font-size: 12px;
font-family: MicrosoftYaHei;
color: #e60012;
line-height: 20px;
text-align: center;
margin-left: 8px;
}
// 隐藏掉table多选框 // 隐藏掉table多选框
.delSelection /deep/.el-table-column--selection .cell { .delSelection /deep/.el-table-column--selection .cell {
display: none; display: none;
...@@ -999,4 +1169,15 @@ export default { ...@@ -999,4 +1169,15 @@ export default {
background-repeat: no-repeat; background-repeat: no-repeat;
transform: rotate(180deg) !important; transform: rotate(180deg) !important;
} }
.el-table tr {
height: 55px;
}
.el-checkbox__input.is-checked .el-checkbox__inner {
background-color: #006aff;
border-color: #006aff;
}
.el-checkbox__input.is-indeterminate .el-checkbox__inner {
background-color: #006aff;
border-color: #006aff;
}
</style> </style>
src/views/AllPersonnelBase/gzlb.vue
...@@ -217,8 +217,8 @@ ...@@ -217,8 +217,8 @@
> >
<span v-html="'&nbsp;&nbsp;'"></span> <span v-html="'&nbsp;&nbsp;'"></span>
<i <i
class="el-icon-info" class="iconfont icon-tanhao1"
style="color: #055fe7; font-size: 15px" style="color: #055fe7; font-size: 16px; margin: 0 0.625rem;"
></i> ></i>
已选择 已选择
<span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​ <span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​
...@@ -258,6 +258,7 @@ ...@@ -258,6 +258,7 @@
prop="followPerson.barcode" prop="followPerson.barcode"
label="人员编号" label="人员编号"
:width="width2" :width="width2"
show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -279,6 +280,7 @@ ...@@ -279,6 +280,7 @@
prop="followPerson.idcard" prop="followPerson.idcard"
label="身份证号" label="身份证号"
:width="width3" :width="width3"
show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -297,13 +299,14 @@ ...@@ -297,13 +299,14 @@
@click="handleClick(scope.row)" @click="handleClick(scope.row)"
> >
<div <div
class="icon bj" class="icon-div "
@click="handleClick(scope.row)" @click="handleClick(scope.row)"
> >
<img <!-- <img
src="../../assets/img/qbryk/bj.svg" src="../../assets/img/qbryk/bj.svg"
alt="" alt=""
/> /> -->
<span class="iconfont">&#xe635;</span>
</div> </div>
</el-tooltip> </el-tooltip>
<!-- <el-tooltip <!-- <el-tooltip
...@@ -331,13 +334,14 @@ ...@@ -331,13 +334,14 @@
:open-delay="500" :open-delay="500"
> >
<div <div
class="icon look" class="icon-div "
@click="isShowFcxBtn1(scope.row)" @click="isShowFcxBtn1(scope.row)"
> >
<img <!-- <img
src="../../assets/img/qbryk/search.svg" src="../../assets/img/qbryk/search.svg"
alt="" alt=""
/> /> -->
<span class="iconfont">&#xe607;</span>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
...@@ -348,13 +352,14 @@ ...@@ -348,13 +352,14 @@
:open-delay="500" :open-delay="500"
> >
<div <div
class="icon bz" class="icon-div "
@click.stop="isShowFztmBtn(scope.row)" @click.stop="isShowFztmBtn(scope.row)"
> >
<img <!-- <img
src="../../assets/img/qbryk/bz.svg" src="../../assets/img/qbryk/bz.svg"
alt="" alt=""
/> /> -->
<span class="iconfont">&#xe605;</span>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
...@@ -366,21 +371,21 @@ ...@@ -366,21 +371,21 @@
> >
<div <div
@click.stop @click.stop
class="icon del" class="icon-div "
> >
<el-popconfirm <el-popconfirm
placement="top-start" placement="top-start"
:hide-icon="true" :hide-icon="true"
confirm-button-text="确认" confirm-button-text="确认"
@confirm="qxgz(scope.row.followPerson.personId)" @confirm="qxgz(scope.row.followPerson.personId)"
class="icon del"
title="确认要取消关注吗？该操作无法撤消！" title="确认要取消关注吗？该操作无法撤消！"
> >
<div slot="reference"> <div slot="reference">
<img <!-- <img
src="../../assets/img/qbryk/qxgz.svg" src="../../assets/img/qbryk/qxgz.svg"
alt="" alt=""
/> /> -->
<span class="iconfont">&#xe60a;</span>
</div> </div>
</el-popconfirm> </el-popconfirm>
</div> </div>
...@@ -417,6 +422,7 @@ ...@@ -417,6 +422,7 @@
prop="followCase.barcode" prop="followCase.barcode"
label="案事件编号" label="案事件编号"
:width="width6" :width="width6"
show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -430,6 +436,7 @@ ...@@ -430,6 +436,7 @@
prop="followCase.collectunitName" prop="followCase.collectunitName"
label="提取单位" label="提取单位"
:width="width3" :width="width3"
show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -455,13 +462,14 @@ ...@@ -455,13 +462,14 @@
@click="handleClick(scope.row)" @click="handleClick(scope.row)"
> >
<div <div
class="icon bj" class="icon-div "
@click="handleClick(scope.row)" @click="handleClick(scope.row)"
> >
<img <!-- <img
src="../../assets/img/qbryk/bj.svg" src="../../assets/img/qbryk/bj.svg"
alt="" alt=""
/> /> -->
<span class="iconfont">&#xe635;</span>
</div> </div>
</el-tooltip> </el-tooltip>
<!-- <el-tooltip <!-- <el-tooltip
...@@ -490,13 +498,14 @@ ...@@ -490,13 +498,14 @@
:open-delay="500" :open-delay="500"
> >
<div <div
class="icon look" class="icon-div "
@click="isShowFcxBtn1(scope.row)" @click="isShowFcxBtn1(scope.row)"
> >
<img <!-- <img
src="../../assets/img/qbryk/search.svg" src="../../assets/img/qbryk/search.svg"
alt="" alt=""
/> /> -->
<span class="iconfont">&#xe607;</span>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
...@@ -507,13 +516,14 @@ ...@@ -507,13 +516,14 @@
:open-delay="500" :open-delay="500"
> >
<div <div
class="icon bz" class="icon-div "
@click.stop="isShowFztmBtn(scope.row)" @click.stop="isShowFztmBtn(scope.row)"
> >
<img <!-- <img
src="../../assets/img/qbryk/bz.svg" src="../../assets/img/qbryk/bz.svg"
alt="" alt=""
/> /> -->
<span class="iconfont">&#xe605;</span>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
...@@ -525,21 +535,21 @@ ...@@ -525,21 +535,21 @@
> >
<div <div
@click.stop @click.stop
class="icon del" class="icon-div "
> >
<el-popconfirm <el-popconfirm
placement="top-start" placement="top-start"
:hide-icon="true" :hide-icon="true"
confirm-button-text="确认" confirm-button-text="确认"
@confirm="qxgzAj(scope.row.followCase.caseId)" @confirm="qxgzAj(scope.row.followCase.caseId)"
class="icon del"
title="确认要取消关注该数据吗？该操作无法撤消！" title="确认要取消关注该数据吗？该操作无法撤消！"
> >
<div slot="reference"> <div slot="reference">
<img <!-- <img
src="../../assets/img/qbryk/qxgz.svg" src="../../assets/img/qbryk/qxgz.svg"
alt="" alt=""
/> /> -->
<span class="iconfont">&#xe60a;</span>
</div> </div>
</el-popconfirm> </el-popconfirm>
</div> </div>
...@@ -1209,40 +1219,6 @@ export default { ...@@ -1209,40 +1219,6 @@ export default {
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
.el-message-box__message {
margin: 23px 24px 17px 24px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
}
.el-message-box__btns {
margin-bottom: 24px;
padding-bottom: 24px;
// 交换 确定 和 取消 按钮的位置
.el-button:nth-child(1) {
float: right;
margin-right: 23%;
width: 72px;
height: 40px;
background: #055fe7;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #ffffff;
}
.el-button:nth-child(2) {
float: left;
margin-left: 23%;
width: 72px;
height: 40px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #aeb5c2;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #2e3846;
}
}
.el-popconfirm__main { .el-popconfirm__main {
margin: 23px 24px 17px 24px; margin: 23px 24px 17px 24px;
font-size: 14px; font-size: 14px;
...@@ -1461,6 +1437,25 @@ export default { ...@@ -1461,6 +1437,25 @@ export default {
object-fit: fill; object-fit: fill;
} }
} }
.icon-div {
width: 20px;
height: 20px;
display: flex;
overflow: visible;
background: white;
margin-right: 14px;
}
.iconfont {
width: 16px;
height: 16px;
font-family: "iconfont" !important;
font-size: 16px;
font-style: normal;
color: #055fe7;
object-fit: fill;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.ops { .ops {
display: flex; display: flex;
} }
...@@ -1545,4 +1540,15 @@ export default { ...@@ -1545,4 +1540,15 @@ export default {
} }
} }
} }
/deep/.el-table--enable-row-transition .el-table__body td.el-table__cell {
height: 55px;
}
/deep/.el-checkbox__input.is-checked .el-checkbox__inner {
background-color: #006aff;
border-color: #006aff;
}
/deep/.el-checkbox__input.is-indeterminate .el-checkbox__inner {
background-color: #006aff;
border-color: #006aff;
}
</style> </style>
src/views/AllPersonnelBase/modules/ajxxk.vue
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<div class='sjx l1'> <div class='sjx l1'>
<span class="span1">案件编号：</span> <span class="span1">案件编号：</span>
<span class="span2">{{this.ysajjbxx.ysxtAsjbh}}</span> <span class="span2">{{this.ysajjbxx.ysxtAsjbh}}</span>
<span class="span3">比中</span> <span :class="fcxInfo.hitStatus==1?'span3':'span3 wbz'">比中</span>
</div> </div>
<div class='sjx l2'> <div class='sjx l2'>
<span class="span1">现勘编号：</span> <span class="span1">现勘编号：</span>
...@@ -184,6 +184,7 @@ export default { ...@@ -184,6 +184,7 @@ export default {
lastQueryTime: '', lastQueryTime: '',
queryCount: '', queryCount: '',
queryType: '', queryType: '',
hitStatus: '',
}, },
CaseImg: [ // 案件图像 CaseImg: [ // 案件图像
], ],
...@@ -263,6 +264,7 @@ export default { ...@@ -263,6 +264,7 @@ export default {
this.fcxInfo.lastQueryTime = response.data.ret.lastQueryTime this.fcxInfo.lastQueryTime = response.data.ret.lastQueryTime
this.fcxInfo.queryCount = response.data.ret.queryCount this.fcxInfo.queryCount = response.data.ret.queryCount
this.fcxInfo.queryType = response.data.ret.queryType this.fcxInfo.queryType = response.data.ret.queryType
this.fcxInfo.hitStatus = response.data.ret.hitStatus
//console.info("查询结果===>", this.tableDate); //console.info("查询结果===>", this.tableDate);
// this.userInfo = this.getUserInfo(this.tableDate); // this.userInfo = this.getUserInfo(this.tableDate);
} else { } else {
...@@ -332,11 +334,21 @@ export default { ...@@ -332,11 +334,21 @@ export default {
} }
.zwDivBody { .zwDivBody {
display: flex; display: flex;
justify-content: space-between; justify-content: flex-start;
align-items: flex-start;
flex-wrap: wrap; flex-wrap: wrap;
height: 580px; height: 580px;
> div {
&:nth-of-type(5n) {
margin-right: 0;
.zw {
margin-right: 0 !important;
}
}
}
.zw { .zw {
width: 110px; width: 110px;
margin-right: 18px;
.zwImg { .zwImg {
width: 110px; width: 110px;
height: 110px; height: 110px;
...@@ -421,6 +433,10 @@ export default { ...@@ -421,6 +433,10 @@ export default {
line-height: 24px; line-height: 24px;
margin-left: 10px; margin-left: 10px;
} }
.wbz {
background-color: #ecedf1;
color: #aeafb4;
}
} }
.l2 { .l2 {
margin: 15px 0; margin: 15px 0;
......
src/views/AllPersonnelBase/modules/ryxxk.vue
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<div class='sjx l1'> <div class='sjx l1'>
<span class="span1">人员编号：</span> <span class="span1">人员编号：</span>
<span class="span2">{{ysryjbxx.ysxtAsjxgrybh}}</span> <span class="span2">{{ysryjbxx.ysxtAsjxgrybh}}</span>
<span class="span3">比中</span> <span :class="fcxInfo.hitStatus==1?'span3':'span3 wbz'">比中</span>
</div> </div>
<div class='sjx l2'> <div class='sjx l2'>
<span class="span1">姓名：</span> <span class="span1">姓名：</span>
...@@ -400,6 +400,7 @@ export default { ...@@ -400,6 +400,7 @@ export default {
lastQueryTime: '', lastQueryTime: '',
queryCount: '', queryCount: '',
queryType: '', queryType: '',
hitStatus: '',
}, },
RollImgNum: 0, // 滚动指纹个数 RollImgNum: 0, // 滚动指纹个数
PlainImgNum: 0,// 平面指纹个数 PlainImgNum: 0,// 平面指纹个数
...@@ -613,6 +614,7 @@ export default { ...@@ -613,6 +614,7 @@ export default {
this.fcxInfo.lastQueryTime = response.data.ret.lastQueryTime this.fcxInfo.lastQueryTime = response.data.ret.lastQueryTime
this.fcxInfo.queryCount = response.data.ret.queryCount this.fcxInfo.queryCount = response.data.ret.queryCount
this.fcxInfo.queryType = response.data.ret.queryType this.fcxInfo.queryType = response.data.ret.queryType
this.fcxInfo.hitStatus = response.data.ret.hitStatus
//console.info("查询结果===>", this.tableDate); //console.info("查询结果===>", this.tableDate);
// this.userInfo = this.getUserInfo(this.tableDate); // this.userInfo = this.getUserInfo(this.tableDate);
} else { } else {
...@@ -634,6 +636,10 @@ export default { ...@@ -634,6 +636,10 @@ export default {
this.PlainImgfingerLoading = true // 平面加载 this.PlainImgfingerLoading = true // 平面加载
this.PlamLoading = true// 掌纹加载 this.PlamLoading = true// 掌纹加载
this.FaceLoading = true// 人像加载 this.FaceLoading = true// 人像加载
this.RollImgNum = 0 // 滚动指纹个数
this.PlainImgNum = 0// 平面指纹个数
this.PalmImgNum = 0// 掌纹个数
this.FaceImgNum = 0// 人像个数
this.radio1 = 1 this.radio1 = 1
this.RollImg = [ // 滚动 this.RollImg = [ // 滚动
{ name: "右拇", code: 1, img: null }, { name: "右拇", code: 1, img: null },
...@@ -679,6 +685,10 @@ export default { ...@@ -679,6 +685,10 @@ export default {
this.PlainImgfingerLoading = true // 平面加载 this.PlainImgfingerLoading = true // 平面加载
this.PlamLoading = true// 掌纹加载 this.PlamLoading = true// 掌纹加载
this.FaceLoading = true// 人像加载 this.FaceLoading = true// 人像加载
this.RollImgNum = 0 // 滚动指纹个数
this.PlainImgNum = 0// 平面指纹个数
this.PalmImgNum = 0// 掌纹个数
this.FaceImgNum = 0// 人像个数
this.radio1 = 1 this.radio1 = 1
this.RollImg = [ // 滚动 this.RollImg = [ // 滚动
{ name: "右拇", code: 1, img: null }, { name: "右拇", code: 1, img: null },
...@@ -998,6 +1008,10 @@ export default { ...@@ -998,6 +1008,10 @@ export default {
line-height: 24px; line-height: 24px;
margin-left: 10px; margin-left: 10px;
} }
.wbz {
background-color: #ecedf1;
color: #aeafb4;
}
} }
.l2 { .l2 {
margin: 15px 0; margin: 15px 0;
......
src/views/AllPersonnelBase/qbalk.vue
...@@ -90,8 +90,8 @@ ...@@ -90,8 +90,8 @@
> >
<span v-html="'&nbsp;&nbsp;'"></span> <span v-html="'&nbsp;&nbsp;'"></span>
<i <i
class="el-icon-info" class="iconfont icon-tanhao1"
style="color:#055FE7;font-size:.9375rem" style="color: #055fe7; font-size: 16px; margin: 0 0.625rem;"
></i> ></i>
已选择<span style="color:#055FE7">{{multipleSelection.length}}</span>项​ 已选择<span style="color:#055FE7">{{multipleSelection.length}}</span>项​
<!-- <span v-html="'&nbsp;&nbsp;'"></span> --> <!-- <span v-html="'&nbsp;&nbsp;'"></span> -->
...@@ -124,6 +124,7 @@ ...@@ -124,6 +124,7 @@
prop="ysxtAsjbh" prop="ysxtAsjbh"
label="案事件编号" label="案事件编号"
:width="width1" :width="width1"
show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -137,6 +138,7 @@ ...@@ -137,6 +138,7 @@
prop="xckybh" prop="xckybh"
label="现勘编号" label="现勘编号"
:width="width1" :width="width1"
show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -457,7 +459,7 @@ export default { ...@@ -457,7 +459,7 @@ export default {
width3: 100, width3: 100,
width2: 180, width2: 180,
width1: 220, width1: 220,
height: 550, height: 500,
isShowAjxxk: false,// 案件信息卡 isShowAjxxk: false,// 案件信息卡
disabled: false, // 新增案件按钮状态 disabled: false, // 新增案件按钮状态
isShowTjddl: false,// 添加到队列 isShowTjddl: false,// 添加到队列
...@@ -1294,4 +1296,7 @@ const datas1 = [ ...@@ -1294,4 +1296,7 @@ const datas1 = [
} }
} }
} }
/deep/.el-table--enable-row-transition .el-table__body td.el-table__cell {
height: 55px;
}
</style> </style>
src/views/Home/Home.vue
...@@ -140,7 +140,7 @@ export default { ...@@ -140,7 +140,7 @@ export default {
}, },
logout() { logout() {
this.$axios this.$axios
.get("/login/login/logout") .get("/security/logout")
.then((res) => { .then((res) => {
if (res.data.code == 200) { if (res.data.code == 200) {
localStorage.removeItem("token"); //删除名称为“token”的信息。 localStorage.removeItem("token"); //删除名称为“token”的信息。
...@@ -158,7 +158,7 @@ export default { ...@@ -158,7 +158,7 @@ export default {
}, },
created() { created() {
sessionStorage.setItem("crumbs", []); sessionStorage.setItem("crumbs", []);
this.userInfo = JSON.parse(localStorage.getItem("userInfo")).user; this.userInfo = JSON.parse(localStorage.getItem("userInfo"));
console.log(this.userInfo); console.log(this.userInfo);
}, },
}; };
......
src/views/SystemManage/GroupManage.vue
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
></SelectCode> ></SelectCode>
</div> </div>
<div class="clear-btn" @click="clear" v-if="newStr">清空</div> <div class="clear-btn" @click="clear" v-if="newStr">清空</div>
<div class="btn" @click="search">筛选用户组</div> <div class="btn" @click="search('yes')">筛选用户组</div>
</div> </div>
<div class="operation"> <div class="operation">
<div class="btn1" @click="batch">批量操作</div> <div class="btn1" @click="batch">批量操作</div>
...@@ -207,7 +207,9 @@ ...@@ -207,7 +207,9 @@
</div> </div>
<div class="footer"> <div class="footer">
<span class="count" <span class="count"
>共{{ tableData.length }} 条记录 第{{ page.page }}/{{ Tpage }}页</span >共{{ total }} 条记录 第{{
searchParams.page > countPage ? countPage : searchParams.page
}}/{{ countPage }}页</span
> >
<div class="page"> <div class="page">
<el-pagination <el-pagination
...@@ -215,11 +217,11 @@ ...@@ -215,11 +217,11 @@
background background
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrPageChange" @current-change="handleCurrPageChange"
:current-page="page.page" :current-page="searchParams.page"
:page-sizes="[10, 20, 50, 100]" :page-sizes="[10, 20, 50, 100]"
:page-size="page.total" :page-size="searchParams.size"
layout="prev, pager, next" layout="prev, pager, next"
:total="page.count" :total="total"
> >
</el-pagination> </el-pagination>
</div> </div>
...@@ -740,16 +742,8 @@ export default { ...@@ -740,16 +742,8 @@ export default {
name: "", name: "",
dwCode: "", dwCode: "",
groupRole: [], groupRole: [],
// usergroup.append('Id', "用户组Id"); page: 1,
// groupname, size: 10,
// groupdesc,
// userId(多个用户id之间用逗号隔开),
// username(多个用户名之间用逗号隔开),
// roleId(多个角色id之间用逗号隔开),
// rolename(多个角色名之间用逗号隔开),
// status(激活状态：0未激活；1已激活)
// usergroup.append('page', "数据查询当前页码");//必填
// usergroup.append('total', "每页显示的数据条数");//必填
}, },
page: { page: {
total: 20, total: 20,
...@@ -809,9 +803,13 @@ export default { ...@@ -809,9 +803,13 @@ export default {
userAddCheckList: [], userAddCheckList: [],
userAddArr: [], userAddArr: [],
src: require("@/assets/img/police-badge.png"), src: require("@/assets/img/police-badge.png"),
total: 0,
}; };
}, },
computed: { computed: {
countPage() {
return Math.ceil(this.total / 10) > 0 ? Math.ceil(this.total / 10) : 1;
},
// 计算总页数 // 计算总页数
Tpage() { Tpage() {
return Math.floor(this.page.count / this.page.total) + 1; return Math.floor(this.page.count / this.page.total) + 1;
...@@ -819,7 +817,7 @@ export default { ...@@ -819,7 +817,7 @@ export default {
newStr() { newStr() {
let str = ""; let str = "";
for (let key in this.searchParams) { for (let key in this.searchParams) {
if (key != "page" && key != "groupRole") { if (key != "page" && key != "groupRole" && key != "size") {
str += this.searchParams[key].trim(); str += this.searchParams[key].trim();
} }
if (key == "groupRole") { if (key == "groupRole") {
...@@ -881,14 +879,14 @@ export default { ...@@ -881,14 +879,14 @@ export default {
}, },
clear() { clear() {
for (let key in this.searchParams) { for (let key in this.searchParams) {
if (key != "page" || key != "groupRole") { if (key != "page" && key != "groupRole" && key != "size") {
this.$set(this.searchParams, key, ""); this.$set(this.searchParams, key, "");
} }
if (key == "groupRole") { if (key == "groupRole") {
this.$set(this.searchParams, key, []); this.$set(this.searchParams, key, []);
} }
} }
this.search(); this.search("yes");
}, },
//角色设置前端动效 //角色设置前端动效
settingPerson(item, minus, add) { settingPerson(item, minus, add) {
...@@ -1043,7 +1041,7 @@ export default { ...@@ -1043,7 +1041,7 @@ export default {
}, 500); }, 500);
this.getAddUserList(); this.getAddUserList();
this.getUserList(); this.getUserList();
this.search(); this.search("yes");
} }
}); });
}) })
...@@ -1063,12 +1061,12 @@ export default { ...@@ -1063,12 +1061,12 @@ export default {
}, },
// 当期页发生变化 // 当期页发生变化
handleCurrPageChange: function (val) { handleCurrPageChange: function (val) {
this.page.page = val; this.searchParams.page = val;
this.search(); this.search();
}, },
// 每页展示数量发生变化 // 每页展示数量发生变化
handleSizeChange: function (val) { handleSizeChange: function (val) {
this.page.total = val; this.searchParams.size = val;
this.search(); this.search();
}, },
// 打开新增弹窗 // 打开新增弹窗
...@@ -1201,7 +1199,7 @@ export default { ...@@ -1201,7 +1199,7 @@ export default {
}, 800); }, 800);
this.isShowAddUserDialogBg = false; this.isShowAddUserDialogBg = false;
this.isShowAddUserDialog = false; this.isShowAddUserDialog = false;
this.search(); this.search("yes");
} else if (res.data.code == 400 || res.data.code == 500) { } else if (res.data.code == 400 || res.data.code == 500) {
setTimeout(() => { setTimeout(() => {
this.$message.error(res.data.detail); this.$message.error(res.data.detail);
...@@ -1296,7 +1294,7 @@ export default { ...@@ -1296,7 +1294,7 @@ export default {
}), }),
}).then((res) => { }).then((res) => {
if (res.data.code == 200 && res.data.info == "success") { if (res.data.code == 200 && res.data.info == "success") {
this.search(); this.search("yes");
setTimeout(() => { setTimeout(() => {
this.$message.success("删除成功"); this.$message.success("删除成功");
this.offMultiple(); this.offMultiple();
...@@ -1305,8 +1303,12 @@ export default { ...@@ -1305,8 +1303,12 @@ export default {
}); });
}, },
// 搜索 // 搜索
search() { search(boo) {
let params = {}; let params = {};
if (boo) {
this.$set(this.searchParams, "page", 1);
this.$set(this.searchParams, "size", 10);
}
for (let key in this.searchParams) { for (let key in this.searchParams) {
if (key == "groupRole") { if (key == "groupRole") {
params[key] = this.searchParams[key].join(); params[key] = this.searchParams[key].join();
...@@ -1314,7 +1316,6 @@ export default { ...@@ -1314,7 +1316,6 @@ export default {
params[key] = this.searchParams[key]; params[key] = this.searchParams[key];
} }
} }
this.$axios({ this.$axios({
url: "/security/user-groups/search", url: "/security/user-groups/search",
method: "post", method: "post",
...@@ -1324,8 +1325,10 @@ export default { ...@@ -1324,8 +1325,10 @@ export default {
}, },
}).then((res) => { }).then((res) => {
if (res.data.code == 200) { if (res.data.code == 200) {
this.tableData = res.data.detail; let result = res.data.detail;
this.allTableData = res.data.detail; this.tableData = result.userGroups;
this.allTableData = result.userGroups;
this.total = result.total;
this.key++; this.key++;
} }
}); });
...@@ -1333,7 +1336,8 @@ export default { ...@@ -1333,7 +1336,8 @@ export default {
}, },
activated() { activated() {
this.$bus.on("enter", () => { this.$bus.on("enter", () => {
this.search(); if (this.$store.state.loading.groundGlassBoo) return;
this.search("yes");
}); });
}, },
deactivated() { deactivated() {
...@@ -1343,11 +1347,11 @@ export default { ...@@ -1343,11 +1347,11 @@ export default {
this.$bus.off("enter"); this.$bus.off("enter");
}, },
mounted() { mounted() {
this.search(); this.search("yes");
this.$bus.on("enter", () => { this.$bus.on("enter", () => {
this.search(); if (this.$store.state.loading.groundGlassBoo) return;
this.search("yes");
}); });
debugger;
this.$nextTick(() => { this.$nextTick(() => {
document.body.appendChild(this.$refs.isShowEditGroupDialog); document.body.appendChild(this.$refs.isShowEditGroupDialog);
document.body.appendChild(this.$refs.isShowAddUserDialog); document.body.appendChild(this.$refs.isShowAddUserDialog);
...@@ -1356,7 +1360,6 @@ export default { ...@@ -1356,7 +1360,6 @@ export default {
}); });
}, },
destroyed() { destroyed() {
debugger;
$(".groupAddDialog").remove(); $(".groupAddDialog").remove();
$(".groupEditDialog").remove(); $(".groupEditDialog").remove();
$(".groupJueseDialog").remove(); $(".groupJueseDialog").remove();
......
src/views/SystemManage/GroupPermission.vue
...@@ -488,7 +488,7 @@ ...@@ -488,7 +488,7 @@
import "@/icons/group-item.svg"; import "@/icons/group-item.svg";
import qs from "qs"; import qs from "qs";
export default { export default {
name: "UserPermission", // name: "UserPermission",
data() { data() {
return { return {
id: "", id: "",
......
src/views/SystemManage/PermissionManage.vue
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
></SelectCode> ></SelectCode>
</div> </div>
<div class="clear" @click="userClear" v-if="newStr1">清空</div> <div class="clear" @click="userClear" v-if="newStr1">清空</div>
<div class="btn" @click="searchUser">筛选用户</div> <div class="btn" @click="searchUser('yes')">筛选用户</div>
</div> </div>
<!-- 用户表格--> <!-- 用户表格-->
<div class="table"> <div class="table">
...@@ -218,9 +218,9 @@ ...@@ -218,9 +218,9 @@
<!-- 用户分页--> <!-- 用户分页-->
<div class="footer"> <div class="footer">
<span class="count" <span class="count"
>共{{ userTableData.length }} 条记录 第{{ userPage.page }}/{{ >共{{ userTotal }} 条记录 第{{
userTpage userPage.page > userCont ? userCont : userPage.page
}}页</span }}/{{ userCont }}页</span
> >
<div class="page"> <div class="page">
<el-pagination <el-pagination
...@@ -228,10 +228,10 @@ ...@@ -228,10 +228,10 @@
background background
@size-change="userHandleSizeChange" @size-change="userHandleSizeChange"
@current-change="userHandleCurrPageChange" @current-change="userHandleCurrPageChange"
:current-page="userPage.page" :current-page="userSearchParams.page"
:page-size="userPage.total" :page-size="userSearchParams.size"
layout="prev, pager, next" layout="prev, pager, next"
:total="userPage.count" :total="userTotal"
> >
</el-pagination> </el-pagination>
</div> </div>
...@@ -285,7 +285,7 @@ ...@@ -285,7 +285,7 @@
></SelectCode> ></SelectCode>
</div> </div>
<div class="clear" @click="groupClear" v-if="newStr2">清空</div> <div class="clear" @click="groupClear" v-if="newStr2">清空</div>
<div class="btn" @click="searchGroup">筛选用户组</div> <div class="btn" @click="searchGroup('yes')">筛选用户组</div>
</div> </div>
<!-- 用户组表格--> <!-- 用户组表格-->
<div class="table"> <div class="table">
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
ref="multipleTable" ref="multipleTable"
:data="groupTableData" :data="groupTableData"
:key="key2" :key="key2"
class="table" class="table groupTable"
> >
<el-table-column <el-table-column
prop="name" prop="name"
...@@ -439,9 +439,11 @@ ...@@ -439,9 +439,11 @@
<!-- 用户组分页--> <!-- 用户组分页-->
<div class="footer"> <div class="footer">
<span class="count" <span class="count"
>共{{ groupTableData.length }} 条记录 第{{ grouppage.page }}/{{ >共{{ groupTotal }} 条记录 第{{
groupTpage groupSearchParams.page > groupCont
}}页</span ? groupCont
: groupSearchParams.page
}}/{{ groupCont }}页</span
> >
<div class="page"> <div class="page">
<el-pagination <el-pagination
...@@ -449,10 +451,10 @@ ...@@ -449,10 +451,10 @@
background background
@size-change="groupHandleSizeChange" @size-change="groupHandleSizeChange"
@current-change="groupHandleCurrPageChange" @current-change="groupHandleCurrPageChange"
:current-page="grouppage.page" :current-page="groupSearchParams.page"
:page-size="grouppage.total" :page-size="groupSearchParams.size"
layout="prev, pager, next" layout="prev, pager, next"
:total="grouppage.count" :total="groupTotal"
> >
</el-pagination> </el-pagination>
</div> </div>
...@@ -591,6 +593,8 @@ export default { ...@@ -591,6 +593,8 @@ export default {
unitCode: "", unitCode: "",
roleId: [], roleId: [],
permissionId: [], permissionId: [],
page: 1,
size: 10,
}, },
userPage: { userPage: {
total: 20, total: 20,
...@@ -614,15 +618,29 @@ export default { ...@@ -614,15 +618,29 @@ export default {
name: "", name: "",
dwCode: "", dwCode: "",
groupRole: [], groupRole: [],
page: 1,
size: 10,
}, },
grouppage: { grouppage: {
total: 20, total: 20,
count: 0, count: 0,
page: 1, page: 1,
}, },
userTotal: 0,
groupTotal: 0,
}; };
}, },
computed: { computed: {
userCont() {
return Math.ceil(this.userTotal / 10) > 0
? Math.ceil(this.userTotal / 10)
: 1;
},
groupCont() {
return Math.ceil(this.groupTotal / 10) > 0
? Math.ceil(this.groupTotal / 10)
: 1;
},
// 计算总页数 // 计算总页数
userTpage() { userTpage() {
return Math.floor(this.userPage.count / this.userPage.total) + 1; return Math.floor(this.userPage.count / this.userPage.total) + 1;
...@@ -630,7 +648,7 @@ export default { ...@@ -630,7 +648,7 @@ export default {
newStr2() { newStr2() {
let str = ""; let str = "";
for (let key in this.groupSearchParams) { for (let key in this.groupSearchParams) {
if (key != "page" && key != "groupRole") { if (key != "page" && key != "groupRole" && key != "size") {
str += this.groupSearchParams[key].trim(); str += this.groupSearchParams[key].trim();
} }
if (key == "groupRole") { if (key == "groupRole") {
...@@ -646,7 +664,8 @@ export default { ...@@ -646,7 +664,8 @@ export default {
key != "page" && key != "page" &&
key != "roleId" && key != "roleId" &&
key != "userGroupId" && key != "userGroupId" &&
key != "permissionId" key != "permissionId" &&
key != "size"
) { ) {
str += this.userSearchParams[key].trim(); str += this.userSearchParams[key].trim();
} }
...@@ -760,12 +779,13 @@ export default { ...@@ -760,12 +779,13 @@ export default {
}, },
// 用户清空 // 用户清空
userClear() { userClear() {
// userSearchParams debugger;
for (let key in this.userSearchParams) { for (let key in this.userSearchParams) {
if ( if (
key != "page" || key != "page" &&
key != "userGroupId" || key != "size" &&
key != "roleId" || key != "userGroupId" &&
key != "roleId" &&
key != "permissionId" key != "permissionId"
) { ) {
this.$set(this.userSearchParams, key, ""); this.$set(this.userSearchParams, key, "");
...@@ -774,36 +794,39 @@ export default { ...@@ -774,36 +794,39 @@ export default {
this.$set(this.userSearchParams, key, []); this.$set(this.userSearchParams, key, []);
} }
} }
this.searchUser("yes");
this.searchUser();
}, },
// 用户组清空 // 用户组清空
groupClear() { groupClear() {
for (let key in this.groupSearchParams) { for (let key in this.groupSearchParams) {
if (key != "page" || key != "groupRole") { if (key != "page" && key != "groupRole" && key != "size") {
this.$set(this.groupSearchParams, key, ""); this.$set(this.groupSearchParams, key, "");
} }
if (key == "groupRole") { if (key == "groupRole") {
this.$set(this.groupSearchParams, key, []); this.$set(this.groupSearchParams, key, []);
} }
} }
this.searchGroup(); this.searchGroup("yes");
}, },
// 用户当期页发生变化 // 用户当期页发生变化
userHandleCurrPageChange: function (val) { userHandleCurrPageChange: function (val) {
this.userPage.page = val; this.userSearchParams.page = val;
this.searchUser(); this.searchUser();
}, },
// 用户每页展示数量发生变化 // 用户每页展示数量发生变化
userHandleSizeChange: function (val) { userHandleSizeChange: function (val) {
this.userPage.total = val; this.userSearchParams.size = val;
this.searchUser(); this.searchUser();
}, },
// 获取用户信息 // 获取用户信息
searchUser() { searchUser(boo) {
//console.info("搜索用户列表"); //console.info("搜索用户列表");
let params = {}; let params = {};
if (boo) {
this.$set(this.userSearchParams, "page", 1);
this.$set(this.userSearchParams, "size", 10);
}
for (let key in this.userSearchParams) { for (let key in this.userSearchParams) {
if (key == "userGroupId" || key == "roleId" || key == "permissionId") { if (key == "userGroupId" || key == "roleId" || key == "permissionId") {
params[key] = this.userSearchParams[key].join(); params[key] = this.userSearchParams[key].join();
...@@ -820,7 +843,9 @@ export default { ...@@ -820,7 +843,9 @@ export default {
}, },
}).then((res) => { }).then((res) => {
if (res.data.code == 200) { if (res.data.code == 200) {
this.userTableData = res.data.detail; let result = res.data.detail;
this.userTableData = result.users;
this.userTotal = result.total;
this.key1++; this.key1++;
} }
}); });
...@@ -838,18 +863,22 @@ export default { ...@@ -838,18 +863,22 @@ export default {
}, },
// 用户组当前页发生变化 // 用户组当前页发生变化
groupHandleCurrPageChange: function (val) { groupHandleCurrPageChange: function (val) {
this.grouppage.page = val; this.groupSearchParams.page = val;
this.searchGroup(); this.searchGroup();
}, },
// 用户组每页展示数量发生变化 // 用户组每页展示数量发生变化
groupHandleSizeChange: function (val) { groupHandleSizeChange: function (val) {
this.grouppage.total = val; this.groupSearchParams.size = val;
this.searchGroup(); this.searchGroup();
}, },
// 获取用户组信息 // 获取用户组信息
searchGroup() { searchGroup(boo) {
let params = {}; let params = {};
if (boo) {
this.$set(this.groupSearchParams, "page", 1);
this.$set(this.groupSearchParams, "size", 10);
}
for (let key in this.groupSearchParams) { for (let key in this.groupSearchParams) {
if (key == "groupRole") { if (key == "groupRole") {
params[key] = this.groupSearchParams[key].join(); params[key] = this.groupSearchParams[key].join();
...@@ -857,6 +886,7 @@ export default { ...@@ -857,6 +886,7 @@ export default {
params[key] = this.groupSearchParams[key]; params[key] = this.groupSearchParams[key];
} }
} }
this.$axios({ this.$axios({
url: "/security/user-groups/search", url: "/security/user-groups/search",
method: "post", method: "post",
...@@ -866,7 +896,9 @@ export default { ...@@ -866,7 +896,9 @@ export default {
}, },
}).then((res) => { }).then((res) => {
if (res.data.code == 200) { if (res.data.code == 200) {
this.groupTableData = res.data.detail; let result = res.data.detail;
this.groupTableData = result.userGroups;
this.groupTotal = result.total;
this.key2++; this.key2++;
} }
}); });
...@@ -969,10 +1001,11 @@ export default { ...@@ -969,10 +1001,11 @@ export default {
}, },
activated() { activated() {
this.$bus.on("enter", () => { this.$bus.on("enter", () => {
if (this.$store.state.loading.groundGlassBoo) return;
if (this.isUser) { if (this.isUser) {
this.searchUser(); this.searchUser("yes");
} else { } else {
this.searchGroup(); this.searchGroup("yes");
} }
}); });
}, },
...@@ -984,15 +1017,16 @@ export default { ...@@ -984,15 +1017,16 @@ export default {
}, },
mounted() { mounted() {
this.$bus.on("enter", () => { this.$bus.on("enter", () => {
if (this.$store.state.loading.groundGlassBoo) return;
if (this.isUser) { if (this.isUser) {
this.searchUser(); this.searchUser("yes");
} else { } else {
this.searchGroup(); this.searchGroup("yes");
} }
}); });
this.isUser = true; this.isUser = true;
if (this.isUser) { if (this.isUser) {
this.searchUser(); this.searchUser("yes");
} }
this.$nextTick(() => { this.$nextTick(() => {
document.body.appendChild(this.$refs.isShowUserDialog); document.body.appendChild(this.$refs.isShowUserDialog);
...@@ -1009,6 +1043,9 @@ export default { ...@@ -1009,6 +1043,9 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
@import "scss/group"; @import "scss/group";
@import "scss/permission"; @import "scss/permission";
.groupTable {
height: 550px !important;
}
.el-table /deep/ { .el-table /deep/ {
.el-tooltip { .el-tooltip {
width: 100% !important; width: 100% !important;
......
src/views/SystemManage/RoleManage.vue
...@@ -491,7 +491,7 @@ export default { ...@@ -491,7 +491,7 @@ export default {
if (item) { if (item) {
let id = this.diyRoleList.length + 20 + "copy"; let id = this.diyRoleList.length + 20 + "copy";
var roleitem = { var roleitem = {
name: item.name + "_copy", name: "请输入名称",
value: "", value: "",
flag: false, flag: false,
code: this.diyRoleList.length, code: this.diyRoleList.length,
...@@ -520,11 +520,14 @@ export default { ...@@ -520,11 +520,14 @@ export default {
// 保存 // 保存
save() { save() {
let self = this; let self = this;
//如果是添加角色
if (this.customAddUser.length > 0) { if (this.customAddUser.length > 0) {
//如果选的用户不是添加的用户
if (this.diyRoleItemIndex !== this.customAddUser[0].id) { if (this.diyRoleItemIndex !== this.customAddUser[0].id) {
let userObj = this.diyRoleList.find( let userObj = this.diyRoleList.find(
(i) => i.id == this.diyRoleItemIndex (i) => i.id == this.diyRoleItemIndex
); );
debugger;
//修改 //修改
let obj = { let obj = {
id: this.diyRoleItemIndex, id: this.diyRoleItemIndex,
...@@ -535,7 +538,7 @@ export default { ...@@ -535,7 +538,7 @@ export default {
return; return;
} }
console.log(this.customAddUser); console.log(this.customAddUser);
//如果位置在新增的用户就新增
let name = this.customAddUser[0].value; let name = this.customAddUser[0].value;
let checkArr = this.checkList; let checkArr = this.checkList;
let params = { let params = {
...@@ -571,12 +574,12 @@ export default { ...@@ -571,12 +574,12 @@ export default {
}, 800); }, 800);
} else { } else {
setTimeout(() => { setTimeout(() => {
this.$message.success("新增角色失败!"); this.$message.error(res.data.detail);
}, 800); }, 800);
} }
}); });
} else { } else {
//修改 //修改角色
let userObj = this.diyRoleList.find( let userObj = this.diyRoleList.find(
(i) => i.id == this.diyRoleItemIndex (i) => i.id == this.diyRoleItemIndex
); );
...@@ -589,6 +592,7 @@ export default { ...@@ -589,6 +592,7 @@ export default {
this.editUserRole(obj); this.editUserRole(obj);
} }
}, },
//选中主的全选子的，取消主的取消全部子的
handleCheckAllChange(boo, id) { handleCheckAllChange(boo, id) {
let obj = this.permissionDataList.find((i) => i.id == id); let obj = this.permissionDataList.find((i) => i.id == id);
let sonArr = obj.children.map((i) => i.id); let sonArr = obj.children.map((i) => i.id);
...@@ -619,12 +623,15 @@ export default { ...@@ -619,12 +623,15 @@ export default {
this.checkList = []; this.checkList = [];
} }
} }
//分开button，重构数据
this.defaultRoleBtns = result.filter((i) => i.defaultFlag == 1); this.defaultRoleBtns = result.filter((i) => i.defaultFlag == 1);
this.diyRoleList = result.filter((i) => { this.diyRoleList = JSON.parse(JSON.stringify(result)).filter(
(i) => {
i.value = i.name; i.value = i.name;
i.name = "请输入名称";
return i.defaultFlag == 0; return i.defaultFlag == 0;
}); }
);
//console.log(1111111, this.diyRoleList); //console.log(1111111, this.diyRoleList);
let arr = [...this.diyRoleList, ...this.defaultRoleBtns]; let arr = [...this.diyRoleList, ...this.defaultRoleBtns];
let obj = arr.find((i) => i.id == this.diyRoleItemIndex); let obj = arr.find((i) => i.id == this.diyRoleItemIndex);
...@@ -644,6 +651,13 @@ export default { ...@@ -644,6 +651,13 @@ export default {
this.$message.error("请选择角色后操作"); this.$message.error("请选择角色后操作");
return; return;
} }
if (
this.customAddUser.length > 0 &&
this.btnCheckList.includes(this.customAddUser[0].id)
) {
this.$message.error("请保存后进行删除操作");
return;
}
let ids = this.btnCheckList.join(","); let ids = this.btnCheckList.join(",");
let boo = this.btnCheckList.find((i) => i == this.diyRoleItemIndex); let boo = this.btnCheckList.find((i) => i == this.diyRoleItemIndex);
let loading = this.$loading({ let loading = this.$loading({
...@@ -688,7 +702,7 @@ export default { ...@@ -688,7 +702,7 @@ export default {
let id = this.diyRoleList.length + 20 + "l"; let id = this.diyRoleList.length + 20 + "l";
var roleitem = { var roleitem = {
value: "", value: "",
name: "自定义" + (this.diyRoleList.length + 1), name: "请输入名称",
flag: false, flag: false,
code: this.diyRoleList.length, code: this.diyRoleList.length,
edit: true, edit: true,
...@@ -748,6 +762,10 @@ export default { ...@@ -748,6 +762,10 @@ export default {
this.$message.success("更新成功"); this.$message.success("更新成功");
}, 500); }, 500);
this.resetEdit(); this.resetEdit();
} else {
setTimeout(() => {
this.$message.error(res.data.detail);
}, 500);
} }
}); });
}, },
...@@ -761,6 +779,7 @@ export default { ...@@ -761,6 +779,7 @@ export default {
this.viewSelect(item); this.viewSelect(item);
this.diyRoleItemIndex = item.id; this.diyRoleItemIndex = item.id;
}, },
// 选中的权限
viewSelect(item) { viewSelect(item) {
this.checkList = this.checkList =
(item.permissions && item.permissions.map((i) => i.id)) || []; (item.permissions && item.permissions.map((i) => i.id)) || [];
...@@ -774,7 +793,7 @@ export default { ...@@ -774,7 +793,7 @@ export default {
this.diyRoleItemIndex = item.id; this.diyRoleItemIndex = item.id;
this.viewSelect(item); this.viewSelect(item);
}, },
// 编辑 // 编辑以后出现输入框的一系列细节
editDiyRoleItem(item) { editDiyRoleItem(item) {
let edit = item.edit; let edit = item.edit;
let index = this.diyRoleList.findIndex((i) => i.id == item.id); let index = this.diyRoleList.findIndex((i) => i.id == item.id);
......
src/views/SystemManage/UserManage.vue
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
></SelectCode> ></SelectCode>
</div> </div>
<div class="clear-btn" @click="clear" v-if="newStr">清空</div> <div class="clear-btn" @click="clear" v-if="newStr">清空</div>
<div class="btn" @click="search">筛选用户</div> <div class="btn" @click="search('yes')">筛选用户</div>
</div> </div>
<div class="operation"> <div class="operation">
<div class="btn1" @click="batch">批量操作</div> <div class="btn1" @click="batch">批量操作</div>
...@@ -242,7 +242,9 @@ ...@@ -242,7 +242,9 @@
</div> </div>
<div class="footer"> <div class="footer">
<span class="count" <span class="count"
>共{{ tableData.length }} 条记录 第{{ page.page }}/{{ Tpage }}页</span >共{{ total }} 条记录 第{{
searchParams.page > countPage ? countPage : searchParams.page
}}/{{ countPage }}页</span
> >
<div class="page"> <div class="page">
<el-pagination <el-pagination
...@@ -250,11 +252,11 @@ ...@@ -250,11 +252,11 @@
background background
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrPageChange" @current-change="handleCurrPageChange"
:current-page="page.page" :current-page="searchParams.page"
:page-sizes="[10, 20, 50, 100]" :page-sizes="[10, 20, 50, 100]"
:page-size="page.total" :page-size="searchParams.size"
layout="prev, pager, next" layout="prev, pager, next"
:total="page.count" :total="total"
> >
</el-pagination> </el-pagination>
</div> </div>
...@@ -404,6 +406,7 @@ ...@@ -404,6 +406,7 @@
<el-input <el-input
placeholder="请输入用户名" placeholder="请输入用户名"
class="input-info" class="input-info"
disabled
maxlength="8" maxlength="8"
show-word-limit show-word-limit
v-model="editFormParams.username" v-model="editFormParams.username"
...@@ -725,12 +728,15 @@ export default { ...@@ -725,12 +728,15 @@ export default {
unitCode: "", unitCode: "",
roleId: [], roleId: [],
permissionId: [], permissionId: [],
page: 1,
size: 10,
}, },
page: { page: {
total: 10, total: 10,
count: 0, count: 0,
page: 1, page: 1,
}, },
total: 0,
// 选中数据 // 选中数据
multipleSelection: [], multipleSelection: [],
isShowTip: false, //批量操作提示 isShowTip: false, //批量操作提示
...@@ -750,6 +756,9 @@ export default { ...@@ -750,6 +756,9 @@ export default {
}; };
}, },
computed: { computed: {
countPage() {
return Math.ceil(this.total / 10) > 0 ? Math.ceil(this.total / 10) : 1;
},
newWidth() { newWidth() {
let w1 = 1920; let w1 = 1920;
let w2 = window.innerWidth; let w2 = window.innerWidth;
...@@ -787,7 +796,8 @@ export default { ...@@ -787,7 +796,8 @@ export default {
key != "page" && key != "page" &&
key != "roleId" && key != "roleId" &&
key != "userGroupId" && key != "userGroupId" &&
key != "permissionId" key != "permissionId" &&
key != "size"
) { ) {
str += this.searchParams[key].trim(); str += this.searchParams[key].trim();
} }
...@@ -823,7 +833,7 @@ export default { ...@@ -823,7 +833,7 @@ export default {
}, 800); }, 800);
this.isShowAddUserDialog = false; this.isShowAddUserDialog = false;
this.isShowAddUserDialogBg = false; this.isShowAddUserDialogBg = false;
this.search(); this.search("yes");
} else if (res.data.code == 400 || res.data.code == 500) { } else if (res.data.code == 400 || res.data.code == 500) {
setTimeout(() => { setTimeout(() => {
this.$message.error(res.data.detail); this.$message.error(res.data.detail);
...@@ -902,10 +912,11 @@ export default { ...@@ -902,10 +912,11 @@ export default {
clear() { clear() {
for (let key in this.searchParams) { for (let key in this.searchParams) {
if ( if (
key != "page" || key != "page" &&
key != "userGroupId" || key != "userGroupId" &&
key != "roleId" || key != "roleId" &&
key != "permissionId" key != "permissionId" &&
key != "size"
) { ) {
this.$set(this.searchParams, key, ""); this.$set(this.searchParams, key, "");
} }
...@@ -913,11 +924,14 @@ export default { ...@@ -913,11 +924,14 @@ export default {
this.$set(this.searchParams, key, []); this.$set(this.searchParams, key, []);
} }
} }
this.search("yes");
this.search();
}, },
search() { search(boo) {
let params = {}; let params = {};
if (boo) {
this.$set(this.searchParams, "page", 1);
this.$set(this.searchParams, "size", 10);
}
for (let key in this.searchParams) { for (let key in this.searchParams) {
if (key == "userGroupId" || key == "roleId" || key == "permissionId") { if (key == "userGroupId" || key == "roleId" || key == "permissionId") {
params[key] = this.searchParams[key].join(); params[key] = this.searchParams[key].join();
...@@ -925,9 +939,6 @@ export default { ...@@ -925,9 +939,6 @@ export default {
params[key] = this.searchParams[key]; params[key] = this.searchParams[key];
} }
} }
console.log(params); ///////////////////
//console.info("搜索用户列表");
this.$axios({ this.$axios({
url: "/security/users/search", url: "/security/users/search",
method: "post", method: "post",
...@@ -937,8 +948,10 @@ export default { ...@@ -937,8 +948,10 @@ export default {
}, },
}).then((res) => { }).then((res) => {
if (res.data.code == 200) { if (res.data.code == 200) {
this.tableData = res.data.detail; let result = res.data.detail;
this.allTableData = res.data.detail; this.tableData = result.users;
this.allTableData = result.users;
this.total = result.total;
this.key++; this.key++;
} }
}); });
...@@ -970,12 +983,12 @@ export default { ...@@ -970,12 +983,12 @@ export default {
}, },
// 当期页发生变化 // 当期页发生变化
handleCurrPageChange: function (val) { handleCurrPageChange: function (val) {
this.page.page = val; this.searchParams.page = val;
this.search(); this.search();
}, },
// 每页展示数量发生变化 // 每页展示数量发生变化
handleSizeChange: function (val) { handleSizeChange: function (val) {
this.page.total = val; this.searchParams.size = val;
this.search(); this.search();
}, },
// 打开新增弹窗 // 打开新增弹窗
...@@ -1104,7 +1117,7 @@ export default { ...@@ -1104,7 +1117,7 @@ export default {
}), }),
}).then((res) => { }).then((res) => {
if (res.data.code == 200 && res.data.info == "success") { if (res.data.code == 200 && res.data.info == "success") {
this.search(); this.search("yes");
setTimeout(() => { setTimeout(() => {
this.$message.success("删除成功"); this.$message.success("删除成功");
this.offMultiple(); this.offMultiple();
...@@ -1118,7 +1131,8 @@ export default { ...@@ -1118,7 +1131,8 @@ export default {
}, },
activated() { activated() {
this.$bus.on("enter", () => { this.$bus.on("enter", () => {
this.search(); if (this.$store.state.loading.groundGlassBoo) return;
this.search("yes");
}); });
}, },
deactivated() { deactivated() {
...@@ -1128,9 +1142,10 @@ export default { ...@@ -1128,9 +1142,10 @@ export default {
this.$bus.off("enter"); this.$bus.off("enter");
}, },
mounted() { mounted() {
this.search(); this.search("yes");
this.$bus.on("enter", () => { this.$bus.on("enter", () => {
this.search(); if (this.$store.state.loading.groundGlassBoo) return;
this.search("yes");
}); });
this.$nextTick(() => { this.$nextTick(() => {
document.body.appendChild(this.$refs.addUserDialog); document.body.appendChild(this.$refs.addUserDialog);
......
src/views/SystemManage/UserPermission.vue
...@@ -412,7 +412,7 @@ ...@@ -412,7 +412,7 @@
<script> <script>
export default { export default {
name: "UserPermission", // name: "UserPermission",
data() { data() {
return { return {
id: "", id: "",
......
src/views/SystemManage/scss/group.scss
...@@ -223,9 +223,12 @@ ...@@ -223,9 +223,12 @@
} }
} }
.table-data { .table-data /deep/{
height: 580px; height: 530px;
width: 100%; width: 100%;
.el-table {
height: 510px!important;
}
.tagsBox { .tagsBox {
display: flex; display: flex;
.el-tooltip { .el-tooltip {
...@@ -329,6 +332,7 @@ ...@@ -329,6 +332,7 @@
} }
} }
.el-table /deep/ { .el-table /deep/ {
.is-checked { .is-checked {
.el-checkbox__inner { .el-checkbox__inner {
background: #055fe7; background: #055fe7;
......
src/views/SystemManage/scss/user.scss
...@@ -181,9 +181,12 @@ ...@@ -181,9 +181,12 @@
} }
} }
} }
.table-data { .table-data /deep/ {
height: 580px; height: 530px;
width: 100%; width: 100%;
.el-table {
height: 510px !important;
}
.tagsBox { .tagsBox {
display: flex; display: flex;
.el-tooltip { .el-tooltip {
......
src/views/cxyrd/LL.vue
...@@ -13,6 +13,11 @@ ...@@ -13,6 +13,11 @@
<div class="lt_main_left"> <div class="lt_main_left">
<LLSrc <LLSrc
:src-data="qid" :src-data="qid"
@sourceObj="
(val) => {
sourceObj = val;
}
"
@switchName=" @switchName="
(val) => { (val) => {
fingerShowType = val; fingerShowType = val;
...@@ -27,7 +32,14 @@ ...@@ -27,7 +32,14 @@
<ImageEd></ImageEd> <ImageEd></ImageEd>
</div> </div>
<div class="lt_main_right"> <div class="lt_main_right">
<LLCandidate :fingerShowType="fingerShowType"></LLCandidate> <LLCandidate
:fingerShowType="fingerShowType"
@targetObj="
(val) => {
targetObj = val;
}
"
></LLCandidate>
</div> </div>
</div> </div>
</div> </div>
...@@ -59,7 +71,7 @@ ...@@ -59,7 +71,7 @@
串查 串查
</div> </div>
</div> </div>
<div class="bzitem"> <div class="bzitem" style="visibility: hidden">
<div class="bzname">现场勘验编号：</div> <div class="bzname">现场勘验编号：</div>
<div class="bzvalue">{{ xckybh }}</div> <div class="bzvalue">{{ xckybh }}</div>
</div> </div>
...@@ -115,30 +127,31 @@ ...@@ -115,30 +127,31 @@
<div class="bz-target"> <div class="bz-target">
<div class="bzitem"> <div class="bzitem">
<div class="bzname">比中单位：</div> <div class="bzname">比中单位：</div>
<div class="bzvalue">{{ bzdw }}</div> <div class="bzvalue">{{ bzr.unitName }}</div>
</div> </div>
<div class="bzitem"> <div class="bzitem">
<div class="bzname">比中人：</div> <div class="bzname">比中人：</div>
<div class="bzvalue">{{ bzr }}</div> <div class="bzvalue">{{ bzr.name }}</div>
</div> </div>
<div class="bzitem"> <div class="bzitem">
<div class="bzname">单位代码：</div> <div class="bzname">单位代码：</div>
<div class="bzvalue">{{ dwdm }}</div> <div class="bzvalue">{{ bzr.unitCode }}</div>
</div> </div>
<div class="bzitem"> <div class="bzitem">
<div class="bzname">比中人身份证号：</div> <div class="bzname">比中人身份证号：</div>
<div class="bzvalue">{{ bzrsfzh }}</div> <div class="bzvalue">{{ bzr.idCard }}</div>
</div> </div>
<div class="bzitem"> <div class="bzitem">
<div class="bzname">比中时间：</div> <div class="bzname">比中时间：</div>
<div class="bzvalue">{{ bzsj }}</div> <div class="bzvalue">{{ bzr.bzTime }}</div>
</div> </div>
<div class="bzitem"> <div class="bzitem">
<div class="bzname">比中人联系电话：</div> <div class="bzname">比中人联系电话：</div>
<el-input <el-input
class="bzphone" class="bzphone"
v-model="phone" v-model="bzr.phoneNumber"
placeholder="请输入内容" placeholder="请输入内容"
disabled
></el-input> ></el-input>
<div class="input-error" v-show="isPhoneError"> <div class="input-error" v-show="isPhoneError">
<!-- <img src="@/assets/img/inputerror.png" alt=""> --> <!-- <img src="@/assets/img/inputerror.png" alt=""> -->
...@@ -233,10 +246,23 @@ export default { ...@@ -233,10 +246,23 @@ export default {
xckybh: "", xckybh: "",
rybh: "", rybh: "",
zw: "", zw: "",
//比中人信息
bzr: {
bzTime: "",
idCard: "",
phoneNumber: "",
name: "",
unitCode: "",
unitName: "",
},
// 是否展示认定完成确认框背景 // 是否展示认定完成确认框背景
isShowrdwcDialogBg: false, isShowrdwcDialogBg: false,
// 是否展示认定完成确认框 // 是否展示认定完成确认框
isShowrdwcDialog: false, isShowrdwcDialog: false,
//当前选中的源对象
sourceObj: {},
//当前选中的目标对象
targetObj: {},
}; };
}, },
created() { created() {
...@@ -336,27 +362,35 @@ export default { ...@@ -336,27 +362,35 @@ export default {
return; return;
} }
// 3：串查 // 3：串查
let querytype = 3; let queryType = "3";
this.$axios({ this.$axios({
method: "post", method: "post",
url: "/api/matchcand/affirm/hit", url: "/api/matchcand/affirm/hit",
data: { data: {
affirmstatus, srcseqno: parseInt(srcseqno),
srcseqno, destseqno: parseInt(destseqno),
destseqno,
srcbarcode, srcbarcode,
destbarcode, destbarcode,
qqid, qqid: parseInt(qqid),
qid, qid: parseInt(qid),
querytype, queryType,
affirmDescribe: self.textarea, affirmDescribe: self.textarea,
userName: self.bzr.name,
idCard: self.bzr.idCard,
tel: self.bzr.phoneNumber,
unit: self.bzr.unitName,
unitCode: self.bzr.unitCode,
affirmtime: new Date(self.bzr.bzTime),
}, },
}) })
.then((response) => { .then((response) => {
if(response.data.code == 0){
// 跟新列表数据 // 跟新列表数据
self.$bus.emit("updateFinderSource"); self.$bus.emit("updateFinderSource");
//console.log(response);
this.$message.success("比中成功！"); this.$message.success("比中成功！");
}else{
this.$message.error(response.data.message)
}
}) })
.catch((err) => { .catch((err) => {
this.$message.error("比中失败！"); this.$message.error("比中失败！");
...@@ -398,6 +432,7 @@ export default { ...@@ -398,6 +432,7 @@ export default {
"xh", "xh",
sessionStorage.getItem("destseqno") || "" sessionStorage.getItem("destseqno") || ""
); );
this.$set(this.bzr, "bzTime", result.time);
} }
}); });
}, },
...@@ -422,33 +457,9 @@ export default { ...@@ -422,33 +457,9 @@ export default {
} }
} }
this.$set(self.source, "xh", sessionStorage.getItem("zcseq") || ""); this.$set(self.source, "xh", sessionStorage.getItem("zcseq") || "");
this.$set(this.bzr, "bzTime", result.time);
} }
}); });
// this.$axios({
// method: "post",
// url: "/api/user/searchByUserid",
// data: {
// id: id,
// },
// loading: false,
// }).then(async (res) => {
// if (res.data.code == 0) {
// let data = res.data.ret[0];
// //console.log(data);
// let dw = await self.$axios({
// method: "get",
// url: "/api/code/unit/one/" + data.userunit,
// loading: false,
// });
// let time = new Date(data.updatetime);
// self.bzsj = Utils.timeStampTurnTime2(time);
// self.bzr = data.userdesc;
// self.dwdm = dw.data.ret.code;
// self.bzdw = dw.data.ret.name;
// self.bzrsfzh = data.idcard;
// self.phone = data.telephone;
// }
// });
}, },
/** /**
* @description: 比中 * @description: 比中
...@@ -456,12 +467,26 @@ export default { ...@@ -456,12 +467,26 @@ export default {
* @return {*} * @return {*}
*/ */
Bz() { Bz() {
if (
(this.targetObj.affirmstatus == 2 ||
this.targetObj.affirmstatus == 3) &&
(this.sourceObj.affirmstatus == 2 || this.sourceObj.affirmstatus == 3)
) {
this.$message.error("已经比中过的数据无法再次比中！");
return;
}
let params = JSON.parse(localStorage.getItem("userInfo"));
for (let key in this.bzr) {
this.bzr[key] = params[key];
}
this.getUserInfo(); this.getUserInfo();
this.getUserInfo2(); this.getUserInfo2();
this.asjbh = sessionStorage.getItem("srcbarcode"); this.asjbh = sessionStorage.getItem("srcbarcode");
this.xh = sessionStorage.getItem("srcseqno"); this.xh = sessionStorage.getItem("srcseqno");
this.rybh = sessionStorage.getItem("destbarcode"); this.rybh = sessionStorage.getItem("destbarcode");
this.judgeZw(Number(sessionStorage.getItem("destseqno"))); this.judgeZw(Number(sessionStorage.getItem("destseqno")));
this.isShowbzDialogBg = true; this.isShowbzDialogBg = true;
this.isShowbzDialog = true; this.isShowbzDialog = true;
}, },
......
src/views/cxyrd/QueryConfirm.vue
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
@change="selectUserInfo" @change="selectUserInfo"
> >
<el-option <el-option
v-for="item in userOption" v-for="(item,index) in userOption"
:key="item.userid" :key="index"
:label="item.userdesc" :label="item.userdesc"
:value="item.userid" :value="item.userid"
> >
...@@ -34,10 +34,10 @@ ...@@ -34,10 +34,10 @@
</el-select> </el-select>
</div> </div>
<div class="display_style"> <div class="display_style">
<span>任务号/查询ID：</span> <span>查询ID：</span>
<el-input <el-input
class="el_input" class="el_input"
placeholder="请输入任务号/查询ID" placeholder="请输入查询ID"
v-model="reqParam.contrastCustomSearchReq.qqid" v-model="reqParam.contrastCustomSearchReq.qqid"
></el-input> ></el-input>
</div> </div>
...@@ -62,6 +62,9 @@ ...@@ -62,6 +62,9 @@
range-separator="-" range-separator="-"
start-placeholder="开始时间" start-placeholder="开始时间"
end-placeholder="结束时间" end-placeholder="结束时间"
:picker-options="{
disabledDate: disabledDate,
}"
> >
</el-date-picker> </el-date-picker>
</div> </div>
...@@ -624,6 +627,13 @@ export default { ...@@ -624,6 +627,13 @@ export default {
}, },
}, },
methods: { methods: {
disabledDate(a) {
if (a.getTime() > new Date().getTime()) {
return true;
} else {
return false;
}
},
// 获取认定列表 // 获取认定列表
search() { search() {
this.getParam(); this.getParam();
...@@ -637,7 +647,7 @@ export default { ...@@ -637,7 +647,7 @@ export default {
this.list = response.data.ret.list; this.list = response.data.ret.list;
this.reqParam.page.total = response.data.ret.total; this.reqParam.page.total = response.data.ret.total;
//console.info("查询结果===>", this.list); //console.info("查询结果===>", this.list);
this.userInfo = this.getUserInfo(this.list); // this.userInfo = this.getUserInfo(this.list);
} else { } else {
// 请求成功无返回值 // 请求成功无返回值
this.list = []; this.list = [];
...@@ -688,7 +698,7 @@ export default { ...@@ -688,7 +698,7 @@ export default {
}); });
} }
}); });
this.userOption = this.unique(userInfo); // this.userOption = this.unique(userInfo);
// //console.info("用户信息==>", this.userOption); // //console.info("用户信息==>", this.userOption);
}, },
// 用户信息去重 // 用户信息去重
......
src/views/cxyrd/modules/LLCandidate.vue
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</div> </div>
<div class="lt_candidate_number"> <div class="lt_candidate_number">
<el-table <el-table
highlight-current-row :highlight-current-row="isDelete ? false : true"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
class="lt_candidate_table" class="lt_candidate_table"
:data="tableData" :data="tableData"
...@@ -1037,13 +1037,9 @@ export default { ...@@ -1037,13 +1037,9 @@ export default {
* @return {*} * @return {*}
*/ */
handleCurrentChange(val, old) { handleCurrentChange(val, old) {
debugger;
if (!val) return; if (!val) return;
// document if (this.isDelete) return;
// .getElementsByClassName("lcurrte")[0] this.$emit("targetObj", val);
// .parentElement.parentElement.parentElement.classList.remove(
// "current-row"
// );
this.targetBh = val.destbarcode; this.targetBh = val.destbarcode;
let self = this; let self = this;
if (val.removeFlag == "1") { if (val.removeFlag == "1") {
......
src/views/cxyrd/modules/LLSrc.vue
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<div <div
class="finger_print" class="finger_print"
:class="{ :class="{
finger_print_active: index === isActive, finger_print_active: item.seq === isActive,
fingerLook: item.clickLog == 1, fingerLook: item.clickLog == 1,
fingerRD: item.affirmstatus == 1, fingerRD: item.affirmstatus == 1,
fingerBZ: item.affirmstatus == 2, fingerBZ: item.affirmstatus == 2,
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<div <div
class="finger_print_number" class="finger_print_number"
:class="{ :class="{
finger_print_number_active: index === isActive, finger_print_number_active: item.seq === isActive,
fingerLookNum: item.clickLog == 1, fingerLookNum: item.clickLog == 1,
fingerRDNum: item.affirmstatus == 1, fingerRDNum: item.affirmstatus == 1,
fingerBZNum: item.affirmstatus == 2, fingerBZNum: item.affirmstatus == 2,
...@@ -147,27 +147,27 @@ ...@@ -147,27 +147,27 @@
<div <div
class="finger_print_zw" class="finger_print_zw"
:class="{ :class="{
finger_print_active_zw: index === isActive, finger_print_active_zw: item.seq === isActive,
fingerLook: item.clickLog == 1, fingerLook: item.clickLog == 1,
fingerRD: item.affirmstatus == 1, fingerRD: item.affirmstatus == 1,
fingerBZ: item.affirmstatus == 2, fingerBZ: item.affirmstatus == 2,
fingerRB: item.affirmstatus == 3, fingerRB: item.affirmstatus == 3,
}" }"
v-for="(item, index) in enumerate" v-for="(item, index) in plamList"
@click="changeStyle(index, item)" @click="changeStyle(index, item)"
:key="index" :key="index"
> >
<div <div
class="finger_print_number" class="finger_print_number"
:class="{ :class="{
finger_print_number_active: index === isActive, finger_print_number_active: item.seq === isActive,
fingerLookNum: item.clickLog == 1, fingerLookNum: item.clickLog == 1,
fingerRDNum: item.affirmstatus == 1, fingerRDNum: item.affirmstatus == 1,
fingerBZNum: item.affirmstatus == 2, fingerBZNum: item.affirmstatus == 2,
fingerRBNum: item.affirmstatus == 3, fingerRBNum: item.affirmstatus == 3,
}" }"
> >
{{ 100 + Number(index + 1) }} {{ Number(item.seq + 1) &lt; 11 ? ("0" + Number(item.seq)) : Number(item.seq) }}
</div> </div>
<img :src="'data:image/jpeg;base64,' + item.image" /> <img :src="'data:image/jpeg;base64,' + item.image" />
<div class="finger-tips"> <div class="finger-tips">
...@@ -266,6 +266,7 @@ export default { ...@@ -266,6 +266,7 @@ export default {
// 加载动画 // 加载动画
loading: null, loading: null,
timer: null, timer: null,
plamList: [],
}; };
}, },
methods: { methods: {
...@@ -274,6 +275,9 @@ export default { ...@@ -274,6 +275,9 @@ export default {
*/ */
switchZhangWen() { switchZhangWen() {
this.fingerShowType = "掌纹"; this.fingerShowType = "掌纹";
if (this.plamList && this.plamList?.length > 0) {
this.changeStyle(0, this.plamList[0]);
}
this.$emit("switchName", this.fingerShowType); this.$emit("switchName", this.fingerShowType);
}, },
/** /**
...@@ -281,6 +285,9 @@ export default { ...@@ -281,6 +285,9 @@ export default {
*/ */
switchZhiWen() { switchZhiWen() {
this.fingerShowType = "指纹"; this.fingerShowType = "指纹";
if (this.enumerate && this.enumerate?.length > 0) {
this.changeStyle(0, this.enumerate[0]);
}
this.$emit("switchName", this.fingerShowType); this.$emit("switchName", this.fingerShowType);
}, },
/** /**
...@@ -306,6 +313,19 @@ export default { ...@@ -306,6 +313,19 @@ export default {
return "looked"; return "looked";
} }
}, },
//获取掌纹
getPlam() {
this.$axios
.post("/api/org/case/palm/barcode", {
barcode: sessionStorage.getItem("srcbarcode"),
})
.then((res) => {
if (res.data.code == 0 && res.data.message == "success") {
let result = res.data.ret;
this.plamList = result;
}
});
},
/** /**
* @description: 选择切换 * @description: 选择切换
* @param {*} val * @param {*} val
...@@ -316,6 +336,7 @@ export default { ...@@ -316,6 +336,7 @@ export default {
if (!val) return; if (!val) return;
let self = this; let self = this;
// 发送请求 // 发送请求
this.fingerShowType = "指纹";
self.$store.commit("loading/setLoading", true); self.$store.commit("loading/setLoading", true);
self.qqid = val.qqid; self.qqid = val.qqid;
self.qid = val.qid; self.qid = val.qid;
...@@ -397,6 +418,8 @@ export default { ...@@ -397,6 +418,8 @@ export default {
self.changeStyle(0, self.enumerate[0]); self.changeStyle(0, self.enumerate[0]);
} }
}); });
self.getPlam();
self.isActive = ""; self.isActive = "";
} }
...@@ -470,12 +493,12 @@ export default { ...@@ -470,12 +493,12 @@ export default {
}, },
// 指纹部分 增加边框 // 指纹部分 增加边框
changeStyle(index, imageInfo) { changeStyle(index, imageInfo) {
console.log(imageInfo);
let self = this; let self = this;
this.isActive = index; this.isActive = imageInfo.seq;
//console.log(this.isActive); //console.log(this.isActive);
// 存储源数据序号 // 存储源数据序号
if (imageInfo) { if (imageInfo) {
this.$emit("sourceObj", imageInfo);
// 改变数据为点击状态 // 改变数据为点击状态
self.$set(imageInfo, "clickLog", "1"); self.$set(imageInfo, "clickLog", "1");
sessionStorage.setItem("srcseqno", imageInfo.seq); sessionStorage.setItem("srcseqno", imageInfo.seq);
......
src/views/cxyrd/modules/TTPlam.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-10-23 17:43:14 * @Date: 2021-10-23 17:43:14
* @LastEditTime: 2021-12-06 10:01:49 * @LastEditTime: 2021-12-09 17:28:43
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\modules\TTPlam.vue * @FilePath: \指纹系统\founder_vue\src\views\cxyrd\modules\TTPlam.vue
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
</p> </p>
<el-carousel <el-carousel
@mousewheel.native="rollScroll($event)" @mousewheel.native="rollScroll($event)"
@change="change"
direction="vertical" direction="vertical"
ref="carousel" ref="carousel"
:autoplay="false" :autoplay="false"
...@@ -144,6 +145,7 @@ export default { ...@@ -144,6 +145,7 @@ export default {
return { return {
zwName: "222", zwName: "222",
loadingIndex: 0, loadingIndex: 0,
changeIndex: 0,
sourceSrc: "", sourceSrc: "",
targetSrc: "", targetSrc: "",
isShowDetail: false, isShowDetail: false,
...@@ -179,6 +181,9 @@ export default { ...@@ -179,6 +181,9 @@ export default {
}); });
}, },
methods: { methods: {
change(val) {
this.changeIndex = val;
},
rollScroll(event) { rollScroll(event) {
let _that = this; let _that = this;
// chrome、ie使用的wheelDelta，火狐使用detail // chrome、ie使用的wheelDelta，火狐使用detail
...@@ -187,16 +192,17 @@ export default { ...@@ -187,16 +192,17 @@ export default {
if (!_that.timeOut) { if (!_that.timeOut) {
_that.timeOut = setTimeout(() => { _that.timeOut = setTimeout(() => {
_that.timeOut = null; _that.timeOut = null;
scrollVal > 0 if (scrollVal > 0 && _that.changeIndex > 0) {
? _that.$refs.carousel.prev() _that.$refs.carousel.prev();
: _that.$refs.carousel.next(); } else if (scrollVal <= 0 && _that.changeIndex < 3) {
_that.$refs.carousel.next();
}
}, 300); }, 300);
} else { } else {
} }
}, },
showDetail(item) { showDetail(item) {
this.checkItem = item; this.checkItem = item;
console.log(this.checkItem);
this.isShowDetail = true; this.isShowDetail = true;
this.$emit("logbg", true); this.$emit("logbg", true);
}, },
...@@ -205,6 +211,9 @@ export default { ...@@ -205,6 +211,9 @@ export default {
$(".plamDetail").remove(); $(".plamDetail").remove();
}, },
watch: { watch: {
isPlam(val) {
if (val) this.changeIndex = 0;
},
plamDetail(val) { plamDetail(val) {
this.isShowDetail = false; this.isShowDetail = false;
}, },
......
src/views/login/modules/AccountsLogin.vue
...@@ -83,7 +83,7 @@ export default { ...@@ -83,7 +83,7 @@ export default {
let me = this; let me = this;
me.btnLoading = true; me.btnLoading = true;
this.$axios({ this.$axios({
url: "/login/login/myLoginForm", url: "/security/login/myLoginForm",
method: "post", method: "post",
data: qs.stringify(userinfo), data: qs.stringify(userinfo),
headers: { headers: {
......
src/views/zljc/Index.vue
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
@keyup.enter.native="search" @keyup.enter.native="search"
> >
<el-option <el-option
label="未检查" label="待检查"
value="0" value="0"
></el-option> ></el-option>
<el-option <el-option
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
<el-tag v-show="isShowTip"> <el-tag v-show="isShowTip">
<span v-html="'&nbsp;&nbsp;'"></span> <span v-html="'&nbsp;&nbsp;'"></span>
<i <i
class="el-icon-info" class="iconfont icon-tanhao1"
style="color: #055fe7; font-size: 16px; margin: 0 0.625rem;" style="color: #055fe7; font-size: 16px; margin: 0 0.625rem;"
></i> ></i>
已选择 已选择
...@@ -142,12 +142,14 @@ ...@@ -142,12 +142,14 @@
prop="barcode" prop="barcode"
label="人员编号" label="人员编号"
:width="width1" :width="width1"
show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="name" prop="name"
label="姓名" label="姓名"
:width="width3" :width="width3"
show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -187,7 +189,7 @@ ...@@ -187,7 +189,7 @@
:width="width3" :width="width3"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.inspectionFlag==0">未检查</div> <div v-if="scope.row.inspectionFlag==0">待检查</div>
<div v-if="scope.row.inspectionFlag==1">已检查</div> <div v-if="scope.row.inspectionFlag==1">已检查</div>
<div v-if="scope.row.inspectionFlag==2">合格</div> <div v-if="scope.row.inspectionFlag==2">合格</div>
<div v-if="scope.row.inspectionFlag==3">不合格</div> <div v-if="scope.row.inspectionFlag==3">不合格</div>
...@@ -556,4 +558,7 @@ $tableHeight: var(--tableHeight, 550px); ...@@ -556,4 +558,7 @@ $tableHeight: var(--tableHeight, 550px);
} }
} }
} }
/deep/.el-table tr {
height: 55px;
}
</style> </style>
\ No newline at end of file
src/views/zljc/jcxq.vue
...@@ -59,10 +59,10 @@ export default { ...@@ -59,10 +59,10 @@ export default {
<style lang="scss"scoped> <style lang="scss"scoped>
.p1 { .p1 {
padding-top: 108px; padding-top: 109px;
} }
.p2 { .p2 {
padding-top: 57px; padding-top: 58px;
} }
.jcxq { .jcxq {
position: relative; position: relative;
...@@ -71,7 +71,7 @@ export default { ...@@ -71,7 +71,7 @@ export default {
height: 100%; height: 100%;
.fixedBox { .fixedBox {
position: absolute; position: absolute;
top: 0; top: 0.5px;
left: 0; left: 0;
width: 100%; width: 100%;
background-color: #fff; background-color: #fff;
......
vue.config.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:57:48 * @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-11 11:34:19 * @LastEditTime: 2021-12-11 14:19:43
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js * @FilePath: \指纹系统\founder_vue\vue.config.js
......
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