Skip to content

F
founder_vue
Commit 14143e81 by 张超军
Options

禅道bug

parent 72bbbd62
Showing with 240 additions and 48 deletions
package.json
......@@ -28,7 +28,7 @@
"sass-resources-loader": "^2.1.1",
"serve": "^12.0.0",
"tui-image-editor": "^3.15.0",
"video.js": "^7.0.3",
"video.js": "^7.17.0",
"vue": "^2.6.11",
"vue-awesome-swiper": "^3.1.3",
"vue-bus": "^1.2.1",
......
src/components/ImageEd.scss
......@@ -110,6 +110,12 @@ div {
.bzd {
margin-right: 40px;
}
.slt_disabled {
img {
width: 100%;
height: 100%;
}
}
.size,
.line {
&::after {
......@@ -1110,6 +1116,9 @@ div {
width: 40px;
height: 40px;
margin-right: 20px;
img {
cursor: pointer;
}
}
}
.lt_main_middle .lt_main_footer {
......
src/components/ImageEd.vue
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/AllPersonnelBase/qbalk.vue
......@@ -403,10 +403,10 @@
</template>
<script>
import moment from "moment";
import tjddl from "./modules/tjddl.vue" // 添加到队列弹窗
import tjddl from "./modules/tjddl.vue" // 添加到队列弹窗
import gz from "./modules/gz.vue" // 关注
import dcfptxAj from "./modules/dcfptxAj.vue" //导出FPTX弹窗
import fztm from "./modules/fztm.vue" // 复制数据弹窗
import fztm from "./modules/fztm.vue" // 复制数据弹窗
import dcftpx from "./modules/dcftpx.vue" //导出FTPX弹窗
import ggrytm from "./modules/ggrytm.vue"// 更改人员条码弹窗
import fcx from "./modules/fcx.vue" // 发查询弹窗
......@@ -814,7 +814,12 @@ export default {
}
},
mounted () {
// console.log(this.$route);
this.search();
// 从门户中进来，直接打开新增案件弹出框
if(this.$route.query.xzaj === 'true') {
this.isShowXzaj = true
}
},
computed: {
/**
......
src/views/Editor/modules/ajzwbjLeft.scss
......@@ -26,6 +26,8 @@
}
.desc {
color: #055fe7;
font-weight: normal;
font-family: MicrosoftYaHei;
}
}
.ryzwbj-content {
......
src/views/Editor/modules/imageEd.scss
......@@ -29,7 +29,6 @@ $transOrigin: var(--transOrigin, 0px, 0px);
display: flex;
align-items: center;
position: relative;
z-index: 99999;
.size-options {
z-index: 10;
position: absolute;
......@@ -65,6 +64,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
justify-content: center;
cursor: pointer;
img {
cursor: pointer;
width: 20px;
height: 20px;
object-fit: contain;
......@@ -91,7 +91,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
.history,
.rubber {
margin-right: 8px;
z-index: 999999;
//z-index: 999999;
}
.download {
margin-right: 40px;
......@@ -150,7 +150,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
}
.lineOptions {
padding: 14px 24px;
z-index: 9999;
//z-index: 9999;
position: absolute;
top: 35px;
left: 0;
......@@ -689,6 +689,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
justify-content: center;
cursor: pointer;
img {
cursor: pointer;
width: 20px;
height: 20px;
object-fit: contain;
......@@ -1019,7 +1020,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
align-items: center;
padding: 0 16px;
background: #e9f3fd;
box-shadow: 0px 1px 3px 0px rgba(5, 95, 231, 0.4);
box-shadow: inset 0px 1px 3px 0px rgba(5, 95, 231, 0.4);
border-radius: 4px 4px 0px 0px;
.top-title-left {
font-size: 16px;
......@@ -1171,6 +1172,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
img {
width: 25px;
height: 25px;
cursor: pointer;
}
.number {
position: absolute;
......@@ -1186,6 +1188,17 @@ $transOrigin: var(--transOrigin, 0px, 0px);
color: #ffffff;
}
}
.tzd-d {
position: relative;
cursor: pointer;
width: 40px;
height: 40px;
img {
width: 40px;
height: 40px;
cursor: pointer;
}
}
.bzd {
margin-left: 24px;
cursor: pointer;
......@@ -1198,10 +1211,22 @@ $transOrigin: var(--transOrigin, 0px, 0px);
justify-content: center;
align-items: center;
img {
cursor: pointer;
width: 25px;
height: 25px;
}
}
.bzd-d {
margin-left: 24px;
cursor: pointer;
width: 40px;
height: 40px;
img {
cursor: pointer;
width: 40px;
height: 40px;
}
}
}
.xstz,
.xszyqy {
......@@ -1256,10 +1281,22 @@ $transOrigin: var(--transOrigin, 0px, 0px);
justify-content: center;
align-items: center;
img {
cursor: pointer;
width: 25px;
height: 25px;
}
}
.dp-d {
cursor: pointer;
margin-right: 24px;
width: 40px;
height: 40px;
img {
cursor: pointer;
width: 40px;
height: 40px;
}
}
.clearConfirm {
z-index: 10;
position: absolute;
......@@ -1386,7 +1423,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
width: 336px;
height: 32px;
background: #e9f3fd;
box-shadow: 0px 1px 3px 0px rgba(5, 95, 231, 0.39);
box-shadow: inset 0px 1px 3px 0px rgba(5, 95, 231, 0.39);
border-radius: 4px 4px 0px 0px;
line-height: 32px;
}
......@@ -1517,6 +1554,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
background: #ffffff;
border-radius: 2px;
border: 1px solid #e6e9ec;
text-align: center;
}
.range-narrow {
margin-right: 10px;
......
src/views/Editor/modules/imageEd.vue
......@@ -11,31 +11,31 @@
<div class="imageEd">
<div class="imageEd_header">
<div class="center">
<el-tooltip class="item" effect="dark" content="撤销">
<el-tooltip class="item" effect="dark" content="撤销" :open-delay="500">
<div class="icon back disabled disabled2" id="btn-undo" @mousedown="mouseDownBack" @mouseup="mouseUpBack">
<img src="@/assets/img/zcedit/back.png" alt="" v-show="!back_active">
<img src="@/assets/img/zcedit/back_a.png" alt="" v-show="back_active">
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="恢复">
<el-tooltip class="item" effect="dark" content="恢复" :open-delay="500">
<div class="icon go disabled disabled2" id="btn-redo" @mousedown="mouseDownGo" @mouseup="mouseUpGo">
<img src="@/assets/img/zcedit/go.png" alt="" v-show="!go_active">
<img src="@/assets/img/zcedit/go_a.png" alt="" v-show="go_active">
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="移动">
<el-tooltip class="item" effect="dark" content="移动" :open-delay="500">
<div class="icon drag" @click="hand">
<img v-if="!isHand" src="@/assets/img/zcedit/drag.png" alt="">
<img v-else src="@/assets/img/zcedit/drag_a.png" alt="">
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="放大">
<el-tooltip class="item" effect="dark" content="放大" :open-delay="500">
<div class="icon enlarge" @click="enlarge">
<img v-if="!isEnlarge" src="@/assets/img/zcedit/enlarge.png" alt="">
<img v-else src="@/assets/img/zcedit/enlarge_a.png" alt="">
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="原尺寸显示">
<el-tooltip class="item" effect="dark" content="原尺寸显示" :open-delay="500">
<div class="size_mix">
<div class="icon_size" @click="sizeChange">
<img class="size" v-if="!isActive" src="@/assets/img/zcedit/size.png" alt="">
......@@ -46,12 +46,14 @@
</div>
</el-tooltip>
<div class="rotate_mix">
<div class="icon_rotate" @click="rotateChange">
<img class="rotate" v-if="!isActive_rotate" src="@/assets/img/zcedit/rotate.png" alt="">
<img class="rotate" v-else src="@/assets/img/zcedit/rotate_a.png" alt="">
<img class="arrow" v-if="!isActive_rotate" src="@/assets/img/zcedit/arrow.png" alt="">
<img class="arrow" v-else src="@/assets/img/zcedit/arrow_a.png" alt="">
</div>
<el-tooltip class="item" effect="dark" content="旋转" :open-delay="500">
<div class="icon_rotate" @click="rotateChange">
<img class="rotate" v-if="!isActive_rotate" src="@/assets/img/zcedit/rotate.png" alt="">
<img class="rotate" v-else src="@/assets/img/zcedit/rotate_a.png" alt="">
<img class="arrow" v-if="!isActive_rotate" src="@/assets/img/zcedit/arrow.png" alt="">
<img class="arrow" v-else src="@/assets/img/zcedit/arrow_a.png" alt="">
</div>
</el-tooltip>
<div class="rotateOptions" v-show="isRotateOptions">
<!-- <div class="rotateOptions" v-show="true"> -->
<div class="top">
......@@ -115,12 +117,12 @@
<div class="item-name">适中</div>
</div>
</div>
<el-tooltip class="item" effect="dark" content="下载">
<el-tooltip class="item" effect="dark" content="下载" :open-delay="500">
<div class="icon download" id="btn-download">
<img src="@/assets/img/zcedit/download.png" alt="">
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="缩略图">
<el-tooltip class="item" effect="dark" content="缩略图" :open-delay="500">
<div class="icon bzd" @click="onchangePreview" v-if="zwType=='掌纹'">
<img src="@/assets/img/zcedit/bzd.png" alt="">
</div>
......@@ -189,13 +191,19 @@
<div class="item-name">圆形绘制</div>
</div>
</div> -->
<div class="tzd" @click="tzdChange">
<div class="tzd" @click="tzdChange" v-show="isHandTZD">
<img src="@/assets/img/rybj/tzd.png" alt="">
<div class="number">{{ tzdnumber }}</div>
</div>
<div class="bzd" @click="directionChange">
<div class="tzd-d" @click="tzdChange" v-show="!isHandTZD">
<img src="@/assets/img/rybj/tzd_d.png" alt="">
</div>
<div class="bzd" @click="directionChange" v-show="isdirection">
<img src="@/assets/img/rybj/bzd.png" alt="">
</div>
<div class="bzd-d" @click="directionChange" v-show="!isdirection">
<img src="@/assets/img/rybj/bzd_d.png" alt="">
</div>
</div>
<div class="xstz">
<el-checkbox v-model="isTZ">显示特征</el-checkbox>
......@@ -205,7 +213,13 @@
</div> -->
<div class="zdtq-line"></div>
<div class="btns-bottom">
<div class="dp" @click="getAutoTzd(true)"><img src="@/assets/img/rybj/dp.png" alt=""></div>
<!-- <div class="dp" @click="getAutoTzd(true)"><img src="@/assets/img/rybj/dp.png" alt=""></div>-->
<div class="dp" v-if="isAutoTzd" @mouseup="isAutoTzd=false;">
<img src="@/assets/img/rybj/dp.png" alt="" />
</div>
<div class="dp-d" @mousedown="getAutoTzd(true)" v-else>
<img src="@/assets/img/rybj/dp_d.png" alt="" />
</div>
<!-- <div class="clear" @click="clearChange"><img src="@/assets/img/rybj/clear.png" alt=""></div>-->
<!-- <div class="clearConfirm" v-show="isShowClearDialog">-->
<!-- <div class="tips">确认要清空操作吗？该操作无法撤消！</div>-->
......@@ -316,6 +330,8 @@ import "@/icons/direction.svg";
export default {
data() {
return {
// 是否点击了自动提取
isAutoTzd: false,
// 是否点击了返回
go_active: false,
// 是否点击了撤销
......@@ -1226,6 +1242,10 @@ export default {
imageEditor.resetZoom();
self.sourceImage = sourceImage;
imageEditor.loadImageFromURL("data:image/jpeg;base64," + sourceImage, "SampleImage").then(function(sizeValue) {
// 更新工具栏的优先级
setTimeout(() => {
$(".center").css('z-index', '99999')
}, 1200)
// 更新newHeight和newWidth
self.newHeight = sizeValue.newHeight;
self.newWidth = sizeValue.newWidth;
......@@ -1794,6 +1814,7 @@ export default {
}
// 从数据库中获取数据
if (flag) {
this.isAutoTzd = true
let res = await this.$axios({
method: "get",
url: "/api/export/trait/xml/person/" + this.barcode + "/" + this.seq,
......@@ -2057,6 +2078,7 @@ export default {
* @return {*}
*/
async directionChange() {
this.isdirection = !this.isdirection;
let res = await this.$axios({
method: "get",
url: "/api/traint/export/xml/trait/" + this.barcode + "/" + this.seq,
......@@ -2065,7 +2087,6 @@ export default {
console.log(res);
let deg = res.data.fpt5FingerMsg.zwfx_tzfx;
console.log(5555);
this.isdirection = !this.isdirection;
if (this.isdirection) {
// 通过接口获取角度
document.getElementsByTagName("body")[0].style.setProperty("--directionRotate", deg + "deg");
......
src/views/Editor/modules/ryzwbjLeft.scss
.ryzwbjLeft {
width: 340px;
height: 100%;
padding: 24px;
padding: 24px 20px 24px 24px;
box-sizing: border-box;
.title {
font-size: 16px;
......@@ -9,6 +9,30 @@
font-weight: bold;
color: #333333;
}
.rybh {
font-size: 14px;
font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
font-weight: bold;
color: #282f3c;
display: flex;
align-items: center;
span {
margin-right: 10px;
}
img {
cursor: pointer;
width: 16px;
height: 16px;
margin-right: 5px;
}
.desc {
cursor: pointer;
cursor: pointer;
color: #055fe7;
font-weight: normal;
font-family: MicrosoftYaHei;
}
}
.ryzwbj-content {
margin-top: 20px;
height: 100%;
......@@ -160,6 +184,24 @@
background: #ECEDF1;
color: #AEAFB4;
}
.finger-total {
position: absolute;
bottom: 30px;
display: flex;
align-items: center;
justify-content: center;
width: 260px;
height: 40px;
background: #f6f8fa;
box-shadow: 0px -4px 6px 0px rgba(0, 0, 0, 0.06);
font-size: 12px;
font-family: MicrosoftYaHei;
color: #999999;
span {
color: #666666;
padding: 0 4px;
}
}
}
}
}
src/views/Editor/modules/ryzwbjLeft.vue
......@@ -8,7 +8,12 @@
-->
<template>
<div class="ryzwbjLeft">
<div class="title">人员指纹编辑</div>
<div class="title">人员编号：</div>
<div class="rybh">
<span>{{barcode}}</span>
<img src="@/assets/img/message.png" alt="">
<div class="desc">档案信息</div>
</div>
<div class="ryzwbj-content">
<div class="zzw">
<div class="zzw-select" @click="zzwChange($event)">
......@@ -17,6 +22,8 @@
<div class="select-item" :class="{active: zwSelect==='平面指纹', isHasData: !PainFingerFlag}">平面指纹</div>
<div class="select-line"></div>
<div class="select-item" :class="{active: zwSelect==='掌纹'}">掌纹</div>
<div class="select-line"></div>
<div class="select-item" :class="{active: zwSelect==='人像'}">人像</div>
</div>
<div class="left-right-hand" v-if="zwSelect==='滚动指纹'">
<el-tabs v-model="activeRollHand" @tab-click="handleRollClick">
......@@ -82,6 +89,9 @@
</el-tab-pane>
</el-tabs>
</div>
<div class="finger-total">
共计<span>{{rollFingersLeft.length+rollFingersRight.length+painFingersLeft.length+painFingersRight.length}}枚</span>指纹
</div>
</div>
</div>
</div>
......
src/views/Home/Home.vue
......@@ -78,12 +78,12 @@
<div class="todolist">
<!-- 第一列 -->
<div class="list l1">
<div class="import_images">
<div class="import_images" @click="goQBAJK">
<img
src="../../assets/img/Home/import_images.svg"
alt=""
/>
<div>图片导入</div>
<div>案件图片导入</div>
</div>
<div
@click="godrFPTX"
......@@ -159,6 +159,14 @@ export default {
};
},
methods: {
goQBAJK () {
this.$router.push({
path: '/qbalk',
query: {
xzaj: true
}
})
},
godrFPTX () {
this.$router.push("/drFPTX");
},
......
src/views/cxyrd/modules/LTCandidate.vue
......@@ -1226,9 +1226,10 @@ const candidates = [
<style lang="scss">
.lt_candidate {
position: relative;
box-sizing: border-box;
width: 100%;
height: calc(100% - 20px);
height: calc(100% - 40px);
background: #f6f8fa;
border-radius: 8px;
div {
......@@ -1240,18 +1241,18 @@ const candidates = [
// height: 60px;
background: #ffffff;
.label {
width: 60px;
width: 32px;
height: 24px;
font-size: 16px;
font-family: MicrosoftYaHei;
color: #1a1a1a;
color: #1A1A1A;
line-height: 24px;
i {
margin: 0;
}
}
.input {
width: 270px;
width: 292px;
height: 32px;
background: #ffffff;
border-top-left-radius: 4px;
......@@ -1281,6 +1282,9 @@ const candidates = [
.slide-fade-enter, .slide-fade-leave-to{transform: translateX(5px);opacity: 0;}
.fingerName {
margin-right: 15px;
font-size: 16px;
font-family: MicrosoftYaHei;
color: #1A1A1A;
}
.dropdown-options {
height: 64px;
......@@ -1323,13 +1327,14 @@ const candidates = [
width: 100%;
}
.lt_candidate_bottom {
position: fixed;
bottom: 0;
right: 40px;
position: absolute;
bottom: 12px;
left: 20px;
text-align: center;
height: 40px;
width: 352px;
color: #999;
font-size: 12px;
font-family: MicrosoftYaHei;
color: #999999;
span {
span {
color: #666;
......@@ -1483,4 +1488,8 @@ const candidates = [
font-weight: normal;
}
}
// 在表格显示暂无数据时，去掉白色背景
/deep/.el-table, /deep/.el-table__expanded-cell {
background: none;
}
</style>
src/views/cxyrd/modules/TLCandidate.vue
......@@ -15,6 +15,9 @@
<el-table-column label="序号" prop="destseqno" :width="width1"></el-table-column>
<el-table-column prop="destbarcode" label="目标条码号" width="auto"></el-table-column>
</el-table>
<div class="lt_candidate_bottom">
<span>共计<span>{{ total }}条</span>数据</span>
</div>
</div>
</template>
......@@ -166,9 +169,10 @@ export default {
<style lang="scss">
.tl-candidate {
width: 100%;
height: 100%;
height: calc(100% - 40px);
background: #f6f8fa;
border-radius: 8px;
position: relative;
//div {
// display: inline-block;
......@@ -177,7 +181,7 @@ export default {
.tl-search {
// width: 352px;
width: 100%;
height: 60px;
//height: 60px;
background: #ffffff;
display: flex;
align-items: center;
......@@ -186,7 +190,7 @@ export default {
height: 24px;
font-size: 16px;
font-family: MicrosoftYaHei;
color: #1a1a1a;
color: #1A1A1A;
line-height: 24px;
}
......@@ -203,7 +207,7 @@ export default {
.btn {
cursor: pointer;
width: 44px;
height: 32px;
height: 34px;
background: #006aff;
border-radius: 0px 4px 4px 0px;
line-height: 32px;
......@@ -215,6 +219,22 @@ export default {
display: flex;
justify-content: flex-end;
background-color: #FFFFFF;
padding: 5px 0;
}
.lt_candidate_bottom {
position: absolute;
bottom: 12px;
left: 20px;
text-align: center;
width: 352px;
font-size: 12px;
font-family: MicrosoftYaHei;
color: #999999;
span {
span {
color: #666;
}
}
}
}
......@@ -287,4 +307,9 @@ export default {
font-weight: normal;
}
}
// 在表格显示暂无数据时，去掉白色背景
/deep/.el-table, /deep/.el-table__expanded-cell {
background: none;
}
</style>
src/views/cxyrd/modules/TLSrc.vue
......@@ -25,8 +25,12 @@
<div class="finger-print" v-show="isShowPrint">
<div class="btns">
<div class="btn" @click="switchRoll" :class="{active: fingerShowType == 'roll'}">滚动</div>
<div class="line"></div>
<div class="btn" @click="switchPain" :class="{active: fingerShowType == 'pain', isHasData: !painFlag}">平面
</div>
<div class="line"></div>
<div class="btn" @click="switchZw" :class="{active: fingerShowType == 'zhangwen'}">掌纹
</div>
</div>
<!-- 滚动 -->
<div class="fingers" v-if="fingerShowType=='roll'">
......@@ -142,7 +146,7 @@
</div>
</div>
<!-- 平面 -->
<div class="fingers" v-else>
<div class="fingers" v-else-if="fingerShowType=='pain'">
<div class="outside">
<label>右手</label><br />
<div class="fingersImg">
......@@ -255,6 +259,10 @@
</div>
</div>
<!-- 掌纹-->
<div class="fingers" v-else>
掌纹
</div>
<div class="bottom">
<span>该查询ID共计<b>{{ fingerTotal }}</b>枚指纹</span>
</div>
......@@ -389,6 +397,12 @@ export default {
}
},
/**
* 切换到掌纹
*/
switchZw() {
this.fingerShowType = "zhangwen";
},
/**
* @description: 切换到平面
* @param {*}
* @return {*}
......@@ -1081,17 +1095,20 @@ label {
.finger-print {
width: 352px;
height: 621px;
height: 600px;
background: #f6f8fa;
.btns {
width: 260px;
width: 272px;
height: 32px;
margin: 12px 0 12px 46px;
margin: 12px 0 12px 41px;
background-color: #FFFFFF;
display: flex;
align-items: center;
.btn {
cursor: pointer;
width: 129px;
width: 90px;
height: 32px;
line-height: 32px;
background: #ffffff;
......@@ -1108,6 +1125,11 @@ label {
color: #ffffff;
}
}
.line {
width: 1px;
height: 16px;
background-color: #EEEEEE;
}
.isHasData {
background-color: #ECEDF1;
......@@ -1121,6 +1143,7 @@ label {
overflow-y: auto;
width: 100%;
height: 500px;
padding-left: 8px;
.outside {
bottom: 6px;
......@@ -1337,7 +1360,7 @@ label {
.bottom {
text-align: center;
background: #f6f8fa;
height: 40px;
//height: 40px;
width: 100%;
font-size: 12px;
font-family: MicrosoftYaHei;
......
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