Commit 6aca5566 by liyuhang19990520

串查、权限

parent 86eb7772
{
"tags": {
"allowUnknownTags": true,
"dictionaries": [
"jsdoc",
"closure"
]
},
"source": {
"include": [
"src/api"
],
"exclude": []
},
"opts": {
"template": "src/utils/docdash",
"encoding": "utf8",
"destination": "./public/docs/",
"recurse": true,
"verbose": false
},
"plugins": [],
"templates": {
"cleverLinks": false,
"monospaceLinks": false,
"default": {
"outputSourceFiles": true,
"useLongnameInNav": false,
"includeDate": true
}
}
}
\ No newline at end of file
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
"element-ui": "^2.15.7", "element-ui": "^2.15.7",
"html2canvas": "^1.3.2", "html2canvas": "^1.3.2",
"js-cookie": "^2.2.1", "js-cookie": "^2.2.1",
"jwt-decode": "^3.1.2",
"lib-flexible": "^0.3.2", "lib-flexible": "^0.3.2",
"moment": "^2.29.1", "moment": "^2.29.1",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
...@@ -49,9 +50,11 @@ ...@@ -49,9 +50,11 @@
"@vue/eslint-config-prettier": "^6.0.0", "@vue/eslint-config-prettier": "^6.0.0",
"axios": "^0.23.0", "axios": "^0.23.0",
"babel-eslint": "^10.1.0", "babel-eslint": "^10.1.0",
"docdash": "^1.2.0",
"eslint": "^6.7.2", "eslint": "^6.7.2",
"eslint-plugin-prettier": "^3.1.3", "eslint-plugin-prettier": "^3.1.3",
"eslint-plugin-vue": "^6.2.2", "eslint-plugin-vue": "^6.2.2",
"jsdoc": "^3.6.7",
"node-sass": "^4.12.0", "node-sass": "^4.12.0",
"prettier": "^1.19.1", "prettier": "^1.19.1",
"sass-loader": "^8.0.2", "sass-loader": "^8.0.2",
......
...@@ -1485,6 +1485,28 @@ div { ...@@ -1485,6 +1485,28 @@ div {
color: #CCCCCC; color: #CCCCCC;
} }
} }
.delDesc {
display: flex;
align-items: center;
font-size: 16px;
.del-icon {
width: 16px;
height: 16px;
margin-right: 3px;
}
.scsj {
font-size: 16px;
font-family: MicrosoftYaHei;
color: #E60012;
opacity: 0.5;
}
.scsj-content {
font-size: 16px;
font-family: MicrosoftYaHei;
color: #E60012;
margin-right: 24px;
}
}
.shade_target { .shade_target {
position: absolute; position: absolute;
top: 0; top: 0;
...@@ -1512,6 +1534,9 @@ div { ...@@ -1512,6 +1534,9 @@ div {
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
color: #333333; color: #333333;
margin: 16px 0 0 24px; margin: 16px 0 0 24px;
display: flex;
align-items: center;
justify-content: space-between;
} }
.edit { .edit {
width: 72px; width: 72px;
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-09-09 09:28:46 * @Date: 2021-09-09 09:28:46
* @LastEditTime: 2021-12-03 21:30:36 * @LastEditTime: 2021-12-08 15:11:05
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue * @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
...@@ -406,7 +406,18 @@ ...@@ -406,7 +406,18 @@
<img class="del-img" src="@/assets/img/delete-image2.png" alt=""> <img class="del-img" src="@/assets/img/delete-image2.png" alt="">
<div class="del-name">源数据已删除,目标图像不显示</div> <div class="del-name">源数据已删除,目标图像不显示</div>
</div> </div>
<div class="title">目标数据</div> <div class="del-pre" v-if="!isDelete && targetIsDelete">
<img class="del-img" src="@/assets/img/delete-image.png" alt="">
<div class="del-name">图像已删除</div>
</div>
<div class="title">
<span>目标数据</span>
<div class="delDesc" v-if="!isDelete && targetIsDelete">
<img class="del-icon" src="@/assets/img/del-time.png" alt="">
<span class="scsj">删除时间:</span>
<span class="scsj-content">{{targetDelTime}}</span>
</div>
</div>
<div class="preview-target" v-show="isShowTargetPrivew"> <div class="preview-target" v-show="isShowTargetPrivew">
<img :src="previewTarget" alt=""> <img :src="previewTarget" alt="">
<img id="targetImage" style="display:none" :src="'data:image/jpeg;base64,'+targetImage" alt=""> <img id="targetImage" style="display:none" :src="'data:image/jpeg;base64,'+targetImage" alt="">
...@@ -719,7 +730,12 @@ export default { ...@@ -719,7 +730,12 @@ export default {
// 删除的信息 // 删除的信息
delMsg: '', delMsg: '',
// 删除的时间 // 删除的时间
delTime: '' delTime: '',
//目标删除标志
targetIsDelete: false,
//目标删除时间
targetDelTime: '',
}; };
}, },
components: { components: {
...@@ -1930,7 +1946,6 @@ export default { ...@@ -1930,7 +1946,6 @@ export default {
this.$bus.on('deleteMessage', (obj) => { this.$bus.on('deleteMessage', (obj) => {
if(obj.delTime != null) { if(obj.delTime != null) {
self.isDelete = true self.isDelete = true
self.delMsg = obj.msg
self.delTime = obj.delTime self.delTime = obj.delTime
self.sourceImage = null; self.sourceImage = null;
imageEditor.loadImageFromURL("xxx.jpg", "SampleImage").then(function(sizeValue) { imageEditor.loadImageFromURL("xxx.jpg", "SampleImage").then(function(sizeValue) {
...@@ -1951,6 +1966,23 @@ export default { ...@@ -1951,6 +1966,23 @@ export default {
self.delTime = '' self.delTime = ''
} }
}) })
this.$bus.on('targetDeleteMessage', (obj) => {
if(obj.delTime != null) {
self.targetIsDelete = true
self.targetDelTime = obj.delTime
self.targetImage = null;
imageEditor2.loadImageFromURL("xxx.jpg", "SampleImage").then(function(sizeValue) {
// //console.log(sizeValue);
imageEditor2.clearUndoStack();
}).catch(err => {
console.log(err);
});;
} else {
self.targetIsDelete = false
self.targetDelTime = ''
}
})
}, },
methods: { methods: {
/** /**
...@@ -5026,6 +5058,7 @@ export default { ...@@ -5026,6 +5058,7 @@ export default {
this.$bus.off('changImageEdit'); this.$bus.off('changImageEdit');
this.$bus.off('changImageEditTarget') this.$bus.off('changImageEditTarget')
this.$bus.off('deleteMessage') this.$bus.off('deleteMessage')
this.$bus.off('targetDeleteMessage')
}, },
watch: { watch: {
isActive(val) { isActive(val) {
......
...@@ -4,46 +4,28 @@ ...@@ -4,46 +4,28 @@
<div class="header"> <div class="header">
<!-- 头部左侧 --> <!-- 头部左侧 -->
<div class="left"> <div class="left">
<div><img <div><img src="../../assets/img/Home/jh.png" alt="" /></div>
src="../../assets/img/Home/jh.png"
alt=""
/></div>
<span><img <span><img src="../../assets/img/Home/title.png" alt="" /></span>
src="../../assets/img/Home/title.png"
alt=""
/></span>
</div> </div>
<!-- 头部右侧 --> <!-- 头部右侧 -->
<div class="right"> <div class="right">
<div> <div @click="$router.push('/UserManage')" style="cursor: pointer">
<img <img src="../../assets/img/Home/setting.svg" alt="" /> 系统管理
src="../../assets/img/Home/setting.svg"
alt=""
/> 系统管理
</div> </div>
<div class="role"> <div class="role">
<img <img src="../../assets/img/Home/role.svg" alt="" />用户信息
src="../../assets/img/Home/role.svg"
alt=""
/>用户角色
<div class="rolelist"> <div class="rolelist">
<ul> <ul>
<li>姓名:李某某</li> <li>用户名:{{ userInfo.id }}</li>
<li>单位:侦察大队</li> <li>&nbsp;&nbsp;&nbsp;名:{{ userInfo.name }}</li>
<li>角色:系统管理员</li> <li>&nbsp;&nbsp;&nbsp;位:{{ userInfo.unitName }}</li>
</ul> </ul>
</div> </div>
</div> </div>
<div <div style="cursor: pointer" @click="logout">
style="cursor: pointer" <img src="../../assets/img/Home/exit.svg" alt="" />安全退出
@click="logout"
>
<img
src="../../assets/img/Home/exit.svg"
alt=""
/>安全退出
</div> </div>
</div> </div>
<!-- 主体 --> <!-- 主体 -->
...@@ -54,10 +36,7 @@ ...@@ -54,10 +36,7 @@
<div class="todoview"> <div class="todoview">
<div class="todo"> <div class="todo">
<div> <div>
<img <img src="../../assets/img/Home/todoview.svg" alt="" />
src="../../assets/img/Home/todoview.svg"
alt=""
/>
</div> </div>
<p>待办工作</p> <p>待办工作</p>
</div> </div>
...@@ -88,54 +67,27 @@ ...@@ -88,54 +67,27 @@
<div class="todolist"> <div class="todolist">
<!-- 第一列 --> <!-- 第一列 -->
<div class="list l1"> <div class="list l1">
<div <div class="import_images" @click="goQBAJK">
class="import_images" <img src="../../assets/img/Home/import_images.svg" alt="" />
@click="goQBAJK"
>
<img
src="../../assets/img/Home/import_images.svg"
alt=""
/>
<div>案件图片导入</div> <div>案件图片导入</div>
</div> </div>
<div <div @click="godrFPTX" class="import_FTP">
@click="godrFPTX" <img src="../../assets/img/Home/import_FTP.svg" alt="" />
class="import_FTP"
>
<img
src="../../assets/img/Home/import_FTP.svg"
alt=""
/>
<div>FPTX导入</div> <div>FPTX导入</div>
</div> </div>
</div> </div>
<!-- 第二列 --> <!-- 第二列 -->
<div <div class="list l2" @click="gosjzygl">
class="list l2" <img src="../../assets/img/Home/query.svg" alt="" />
@click="gosjzygl"
>
<img
src="../../assets/img/Home/query.svg"
alt=""
/>
<p>发查询</p> <p>发查询</p>
</div> </div>
<!-- 第三列 --> <!-- 第三列 -->
<div <div @click="gobdrd" class="list l2 l3">
@click="gobdrd" <img src="../../assets/img/Home/comparison.svg" alt="" />
class="list l2 l3"
>
<img
src="../../assets/img/Home/comparison.svg"
alt=""
/>
<p>比对认定</p> <p>比对认定</p>
</div> </div>
<!-- 第四列 --> <!-- 第四列 -->
<div <div @click="gozzwcj" class="list l1 l4">
@click="gozzwcj"
class="list l1 l4"
>
<div class="import_images collect"> <div class="import_images collect">
<img <img
src="../../assets/img/Home/collect_new.svg" src="../../assets/img/Home/collect_new.svg"
...@@ -144,14 +96,8 @@ ...@@ -144,14 +96,8 @@
/> />
<div>活体采集</div> <div>活体采集</div>
</div> </div>
<div <div @click="gosjzygl" class="import_FTP management">
@click="gosjzygl" <img src="../../assets/img/Home/management.svg" alt="" />
class="import_FTP management"
>
<img
src="../../assets/img/Home/management.svg"
alt=""
/>
<div>数据资源管理</div> <div>数据资源管理</div>
</div> </div>
</div> </div>
...@@ -163,16 +109,16 @@ ...@@ -163,16 +109,16 @@
<script> <script>
import qs from "qs"; import qs from "qs";
import jwtDecode from "jwt-decode";
export default { export default {
name: "Home", name: "Home",
data () { data() {
return { return {
userInfo: { userName: "admin", passWord: "123456" }, userInfo: {},
}; };
}, },
methods: { methods: {
goQBAJK () { goQBAJK() {
this.$router.push({ this.$router.push({
path: "/qbalk", path: "/qbalk",
query: { query: {
...@@ -180,19 +126,19 @@ export default { ...@@ -180,19 +126,19 @@ export default {
}, },
}); });
}, },
godrFPTX () { godrFPTX() {
this.$router.push("/drFPTX"); this.$router.push("/drFPTX");
}, },
gobdrd () { gobdrd() {
this.$router.push("/cxyrd"); this.$router.push("/cxyrd");
}, },
gosjzygl () { gosjzygl() {
this.$router.push("/AllPersonnelBaseIndex/"); this.$router.push("/AllPersonnelBaseIndex/");
}, },
gozzwcj () { gozzwcj() {
// this.$router.push("/AllPersonnelBaseIndex"); // this.$router.push("/AllPersonnelBaseIndex");
}, },
logout () { logout() {
this.$axios this.$axios
.get("/login/login/logout") .get("/login/login/logout")
.then((res) => { .then((res) => {
...@@ -203,12 +149,17 @@ export default { ...@@ -203,12 +149,17 @@ export default {
this.$message.info("退出成功!"); this.$message.info("退出成功!");
} }
}) })
.catch((err) => { .catch((err) => {});
});
}, },
}, },
created () { mounted() {
// const decode = jwtDecode('Security-ceyJhbGciOiJIUzUxMiJ9.eyJqdGkiOiIxIiwic3ViIjoiYWRtaW4iLCJpYXQiOjE2Mzg5MzYwMTAsImF1dGhvcml0aWVzIjoiXCJST0xFX0EsUk9MRV9CLFJPTEVfQyxST0xFX0QsUk9MRV9FLFJPTEVfRixST0xFX0csUk9MRV9ILFJPTEVfSSxST0xFX0EtMSxST0xFX0EtMixST0xFX0ItMSxST0xFX0ItMixST0xFX0ItMyxST0xFX0ItNCxST0xFX0ItNSxST0xFX0MtMSxST0xFX0MtMixST0xFX0QtMSxST0xFX0QtMixST0xFX0QtMyxST0xFX0QtNCxST0xFX0QtNSxST0xFX0QtNixST0xFX0QtNyxST0xFX0QtOCxST0xFX0QtOSxST0xFX0QtMTAsUk9MRV9ELTExLFJPTEVfRC0xMixST0xFX0QtMTMsUk9MRV9ELTE0LFJPTEVfRC0xNSxST0xFX0QtMTYsUk9MRV9ELTE3LFJPTEVfRC0xOCxST0xFX0UtMSxST0xFX0UtMixST0xFX0UtMyxST0xFX0UtNCxST0xFX0UtNSxST0xFX0YtMSxST0xFX0YtMixST0xFX0YtMyxST0xFX0ctMSxST0xFX0ctMixST0xFX0ctMyxST0xFX0gtMSxST0xFX0gtMixST0xFX0gtMyxST0xFX0gtNCxST0xFX0gtNSxST0xFX0gtNixST0xFX0gtNyxST0xFX0gtOCxST0xFX0gtOSxST0xFX0gtMTAsUk9MRV9ILTExLFJPTEVfSS0xLFJPTEVfSS0yLFJPTEVfSS0zLFJPTEVfSS00LFJPTEVfSS01LFJPTEVfSS02LFJPTEVfSS03LFJPTEVfSS04LFJPTEVfSS05LFJPTEVfSS0xMCxST0xFX0ktMTEsUk9MRV9JLTEyLFJPTEVfSS0xMyxST0xFX0ktMTQsUk9MRV9JLTE1XCIiLCJpc3MiOiJ6Y2ciLCJleHAiOjE2Mzg5Mzk2MTB9.GsTfUvF1V54ow09aQPz9W0Uyu2INrwod2lqqVlL9S3cf8-cbXENa-LFyqUcfma5UFckPtj2ZrV6ZyPP-HhDvhg');
// console.log(decode);
},
created() {
sessionStorage.setItem("crumbs", []); sessionStorage.setItem("crumbs", []);
this.userInfo = JSON.parse(localStorage.getItem("userInfo")).user;
console.log(this.userInfo);
}, },
}; };
</script> </script>
...@@ -277,30 +228,29 @@ export default { ...@@ -277,30 +228,29 @@ export default {
position: absolute; position: absolute;
top: 170%; top: 170%;
left: -80%; left: -80%;
width: 160px; width: 180px;
background-color: transparent; background-color: transparent;
color: #000; color: #000;
display: none; display: none;
} }
.header .right div .rolelist ul{ .header .right div .rolelist ul {
width: 160px; width: 180px;
height: 144px; height: 144px;
background: #ffffff; background: #ffffff;
box-shadow: 0px 4px 14px 0px rgba(0, 0, 0, 0.2); box-shadow: 0px 4px 14px 0px rgba(0, 0, 0, 0.2);
border-radius: 0px 0px 6px 6px; border-radius: 0px 0px 6px 6px;
} }
.header .right div .rolelist li{ .header .right div .rolelist li {
width: 160px; width: 180px;
height: 48px; height: 48px;
background: transparent; background: transparent;
padding: 12px 16px; padding: 12px 16px;
font-size: 14px; font-size: 14px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
} }
.header .right div img { .header .right div img {
margin-right: 7px; margin-right: 7px;
} }
......
...@@ -641,8 +641,7 @@ ...@@ -641,8 +641,7 @@
</div> </div>
</div> </div>
<div class="addbtns"> <div class="addbtns">
<div class="btn1" @click="canceluser">确认</div> <div class="btn2" @click="canceluser">关闭</div>
<div class="btn2" @click="canceluser">取消</div>
</div> </div>
</div> </div>
</el-container> </el-container>
...@@ -657,7 +656,7 @@ import Cascader from "@/components/Cascader.vue"; ...@@ -657,7 +656,7 @@ import Cascader from "@/components/Cascader.vue";
import SelectCode from "@/components/SelectCode.vue"; import SelectCode from "@/components/SelectCode.vue";
import qs from "qs"; import qs from "qs";
export default { export default {
name: "GroupManage", // name: "GroupManage",
components: { components: {
Confirmation, Confirmation,
SelectCode, SelectCode,
...@@ -1348,6 +1347,7 @@ export default { ...@@ -1348,6 +1347,7 @@ export default {
this.$bus.on("enter", () => { this.$bus.on("enter", () => {
this.search(); this.search();
}); });
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,6 +1356,7 @@ export default { ...@@ -1356,6 +1356,7 @@ export default {
}); });
}, },
destroyed() { destroyed() {
debugger;
$(".groupAddDialog").remove(); $(".groupAddDialog").remove();
$(".groupEditDialog").remove(); $(".groupEditDialog").remove();
$(".groupJueseDialog").remove(); $(".groupJueseDialog").remove();
......
...@@ -413,7 +413,7 @@ ...@@ -413,7 +413,7 @@
</div> </div>
<div <div
class="userDialog groupYonghuDialog" class="userDialog bjgroupYonghuDialog"
v-show="isShowUserDialog" v-show="isShowUserDialog"
ref="isShowUserDialog" ref="isShowUserDialog"
> >
...@@ -478,8 +478,7 @@ ...@@ -478,8 +478,7 @@
</div> </div>
</div> </div>
<div class="addbtns"> <div class="addbtns">
<div class="btn1" @click="canceluser">确认</div> <div class="btn2" @click="canceluser">关闭</div>
<div class="btn2" @click="canceluser">取消</div>
</div> </div>
</div> </div>
</el-container> </el-container>
...@@ -763,7 +762,7 @@ export default { ...@@ -763,7 +762,7 @@ export default {
}, },
}, },
destroyed() { destroyed() {
$(".groupYonghuDialog").remove(); $(".bjgroupYonghuDialog").remove();
}, },
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
......
...@@ -460,7 +460,7 @@ ...@@ -460,7 +460,7 @@
</div> </div>
<div <div
class="userDialog groupYonghuDialog" class="userDialog perGroupYonghuDialog"
v-show="isShowUserDialog" v-show="isShowUserDialog"
ref="isShowUserDialog" ref="isShowUserDialog"
> >
...@@ -525,8 +525,7 @@ ...@@ -525,8 +525,7 @@
</div> </div>
</div> </div>
<div class="addbtns"> <div class="addbtns">
<div class="btn1" @click="canceluser">确认</div> <div class="btn2" @click="canceluser">关闭</div>
<div class="btn2" @click="canceluser">取消</div>
</div> </div>
</div> </div>
</el-container> </el-container>
...@@ -537,7 +536,7 @@ import "@/icons/group-item.svg"; ...@@ -537,7 +536,7 @@ import "@/icons/group-item.svg";
import SelectCode from "@/components/SelectCode.vue"; import SelectCode from "@/components/SelectCode.vue";
import Cascader from "@/components/Cascader.vue"; import Cascader from "@/components/Cascader.vue";
export default { export default {
name: "PermissionManage", // name: "PermissionManage",
components: { components: {
SelectCode, SelectCode,
Cascader, Cascader,
...@@ -561,7 +560,7 @@ export default { ...@@ -561,7 +560,7 @@ export default {
this.groupWidths.btnwidth = (this.groupWidths.btnwidth * w2) / w1; this.groupWidths.btnwidth = (this.groupWidths.btnwidth * w2) / w1;
}, },
destroyed() { destroyed() {
$(".groupYonghuDialog").remove(); $(".perGroupYonghuDialog").remove();
}, },
data() { data() {
return { return {
......
...@@ -373,7 +373,7 @@ import "@/icons/copy_xuan.svg"; ...@@ -373,7 +373,7 @@ import "@/icons/copy_xuan.svg";
import qs from "qs"; import qs from "qs";
import Confirmation from "@/components/Confirmation.vue"; import Confirmation from "@/components/Confirmation.vue";
export default { export default {
name: "RoleManage", // name: "RoleManage",
components: { components: {
Confirmation, Confirmation,
}, },
......
...@@ -293,13 +293,13 @@ ...@@ -293,13 +293,13 @@
v-model="addFormParams.name" v-model="addFormParams.name"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item class="info-item" label="身份证号:" prop="identityCard"> <el-form-item class="info-item" label="身份证号:" prop="idCard">
<el-input <el-input
placeholder="请输入用户警号" placeholder="请输入身份证号"
class="input-info" class="input-info"
v-model="addFormParams.identityCard" v-model="addFormParams.idCard"
></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"></Cascader>
</el-form-item> </el-form-item>
...@@ -406,6 +406,13 @@ ...@@ -406,6 +406,13 @@
v-model="editFormParams.name" v-model="editFormParams.name"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="info-item" label="身份证号:" prop="idCard">
<el-input
placeholder="请输入身份证号"
class="input-info"
v-model="editFormParams.idCard"
></el-input>
</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"></Cascader>
</el-form-item> </el-form-item>
...@@ -469,7 +476,7 @@ import Cascader from "@/components/Cascader.vue"; ...@@ -469,7 +476,7 @@ import Cascader from "@/components/Cascader.vue";
import Confirmation from "@/components/Confirmation.vue"; import Confirmation from "@/components/Confirmation.vue";
import SelectCode from "@/components/SelectCode.vue"; import SelectCode from "@/components/SelectCode.vue";
export default { export default {
name: "UserManage", // name: "UserManage",
components: { components: {
Confirmation, Confirmation,
Cascader, Cascader,
...@@ -602,6 +609,7 @@ export default { ...@@ -602,6 +609,7 @@ export default {
sWidth: 50, sWidth: 50,
// 新增对象 // 新增对象
addFormParams: { addFormParams: {
idCard: "",
identityCard: "", identityCard: "",
username: "2233333", username: "2233333",
phoneNumber: "13327454372", phoneNumber: "13327454372",
...@@ -616,6 +624,7 @@ export default { ...@@ -616,6 +624,7 @@ export default {
roleId: [], roleId: [],
}, },
editFormParams: { editFormParams: {
idCard: '',//身份证号
identityCard: "", identityCard: "",
username: "", //用户名 username: "", //用户名
name: "", //姓名 name: "", //姓名
...@@ -628,9 +637,7 @@ export default { ...@@ -628,9 +637,7 @@ export default {
}, },
addrules: { addrules: {
//身份证 //身份证
identityCard: [ idCard: [{ trigger: "blur", required: true }],
{ validator: validatePass, trigger: "blur", required: true },
],
password: [ password: [
{ validator: validatePass, trigger: "blur", required: true }, { validator: validatePass, trigger: "blur", required: true },
], //密码 ], //密码
...@@ -659,6 +666,7 @@ export default { ...@@ -659,6 +666,7 @@ export default {
], // 启用状态 ], // 启用状态
}, },
editrules: { editrules: {
idCard: [{ trigger: "blur", required: true }],
username: [ username: [
{ validator: validateUsername, trigger: "blur", required: true }, { validator: validateUsername, trigger: "blur", required: true },
], //用户名 ], //用户名
......
...@@ -330,6 +330,11 @@ export default { ...@@ -330,6 +330,11 @@ export default {
let destbarcode = sessionStorage.getItem("destbarcode") || ""; let destbarcode = sessionStorage.getItem("destbarcode") || "";
let qqid = sessionStorage.getItem("qqid") || ""; let qqid = sessionStorage.getItem("qqid") || "";
let qid = sessionStorage.getItem("qid") || ""; let qid = sessionStorage.getItem("qid") || "";
if (!destbarcode) {
this.$message.error("信息不全,无法比中!");
return;
}
// 3:串查 // 3:串查
let querytype = 3; let querytype = 3;
this.$axios({ this.$axios({
......
...@@ -184,12 +184,20 @@ export default { ...@@ -184,12 +184,20 @@ export default {
}); });
self.$bus.on("initCandidate", (tableData) => { self.$bus.on("initCandidate", (tableData) => {
//console.log(tableData);
self.tableData = tableData; self.tableData = tableData;
if (self.tableData) { if (self.tableData) {
self.total = self.tableData.length; self.total = self.tableData.length;
} }
self.sourceTableData = tableData; self.sourceTableData = tableData;
if (!tableData || tableData?.length <= 0) {
sessionStorage.removeItem("destbarcode");
this.$bus.emit("changImageEditTarget", "xxx");
self.$bus.emit("targetDeleteMessage", {
msg: null,
delTime: null,
});
return;
}
// 默认选中第一条数据 // 默认选中第一条数据
if (self.tableData && self.tableData.length > 0) { if (self.tableData && self.tableData.length > 0) {
self.$refs.singleTable.setCurrentRow(self.tableData[0]); self.$refs.singleTable.setCurrentRow(self.tableData[0]);
...@@ -1029,6 +1037,7 @@ export default { ...@@ -1029,6 +1037,7 @@ export default {
* @return {*} * @return {*}
*/ */
handleCurrentChange(val, old) { handleCurrentChange(val, old) {
debugger;
if (!val) return; if (!val) return;
// document // document
// .getElementsByClassName("lcurrte")[0] // .getElementsByClassName("lcurrte")[0]
...@@ -1037,6 +1046,22 @@ export default { ...@@ -1037,6 +1046,22 @@ export default {
// ); // );
this.targetBh = val.destbarcode; this.targetBh = val.destbarcode;
let self = this; let self = this;
if (val.removeFlag == "1") {
// 存储目标条码号
sessionStorage.setItem("destbarcode", val.destbarcode);
// 存储目的数据序号
sessionStorage.setItem("destseqno", val.destseqno);
this.$bus.emit("targetDeleteMessage", {
msg: "该条数据已删除!",
delTime: self.$moment(val.removeTime).format("YYYY.MM.DD HH:mm"),
});
return;
} else {
self.$bus.emit("targetDeleteMessage", {
msg: null,
delTime: null,
});
}
if (self.isDelete) { if (self.isDelete) {
// 存储目标条码号 // 存储目标条码号
sessionStorage.setItem("destbarcode", val.destbarcode); sessionStorage.setItem("destbarcode", val.destbarcode);
...@@ -1054,7 +1079,6 @@ export default { ...@@ -1054,7 +1079,6 @@ export default {
sessionStorage.setItem("destbarcode", val.destbarcode); sessionStorage.setItem("destbarcode", val.destbarcode);
// 存储目的数据序号 // 存储目的数据序号
sessionStorage.setItem("destseqno", val.destseqno); sessionStorage.setItem("destseqno", val.destseqno);
self.$store.commit("loading/setLoading", true); self.$store.commit("loading/setLoading", true);
// 平面 --- 换压缩图 // 平面 --- 换压缩图
if (val.destseqno > 10) { if (val.destseqno > 10) {
......
...@@ -333,7 +333,6 @@ export default { ...@@ -333,7 +333,6 @@ export default {
sessionStorage.setItem("srcbarcode", val.barcode); sessionStorage.setItem("srcbarcode", val.barcode);
self.enumerate = []; self.enumerate = [];
self.fingerTotal = 0; self.fingerTotal = 0;
// 请求该条码号的案件指纹图片 // 请求该条码号的案件指纹图片
self.$axios self.$axios
.post("/api/org/caseBybarcode/barcode", { .post("/api/org/caseBybarcode/barcode", {
......
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:57:48 * @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-07 10:37:43 * @LastEditTime: 2021-12-08 13:58:13
* @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
...@@ -107,14 +107,14 @@ module.exports = { ...@@ -107,14 +107,14 @@ module.exports = {
} }
}, },
"/login": { "/login": {
target: "http://www.meetfood.cn:2390/", // 登录 // target: "http://www.meetfood.cn:2390/", // 登录
// target: "http://192.168.128.121:8764/", // 登录 target: "http://192.168.128.124:8764/", // 登录
// target: "http://192.168.128.114:8099", // 登录-马 // target: "http://192.168.128.114:8099", // 登录-马
ws: true, ws: true,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
// "^/login": "" "^/login": "" //本地
"^/login": "/login" // "^/login": "/login" //线上
} }
}, },
// "/system": { // "/system": {
...@@ -129,8 +129,8 @@ module.exports = { ...@@ -129,8 +129,8 @@ module.exports = {
"/security": { "/security": {
//target: "http://192.168.128.106:8765", // 湖南-王 //target: "http://192.168.128.106:8765", // 湖南-王
// target: "http://192.168.128.121:8764", // 湖南-张 target: "http://192.168.128.124:8764", // 湖南-张
target: "http://www.meetfood.cn:2390", // 湖南-王 // target: "http://www.meetfood.cn:2390", // 湖南-王
ws: true, ws: true,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
......
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