Skip to content

F
founder_vue
Commit d97acfca by 张超军
Options

合并

parents 3eeb38d2 3a2153fc
Showing with 163 additions and 60 deletions
src/views/AllPersonnelBase/qbalk.vue
......@@ -112,11 +112,10 @@
tooltip-effect="dark"
style="width: 100%;"
@selection-change="handleSelectionChange"
:class="{delSelection: !selectBoo}"
>
<el-table-column
type="selection"
width="auto"
v-if="isSelected"
:reserve-selection="true"
>
</el-table-column>
......@@ -172,7 +171,7 @@
width="auto"
>
<template slot-scope="scope">
<div class="ops">
<div class="ops" @click="closeSelected">
<el-tooltip
class="item"
effect="dark"
......@@ -460,7 +459,7 @@ export default {
}
},
ysxtAsjbh: null,
isSelected: false, // 是否批量操作
selectBoo: false, // 是否批量操作
tableDate: [],
rowData: {}, // 单行数据
// tableDate: datas1,
......@@ -469,6 +468,10 @@ export default {
};
},
methods: {
closeSelected() {
this.selectBoo = false;
this.toggleSelection();
},
// 获取案件数据
search () {
// console.info("案件请求===>", this.reqParam);
......@@ -498,7 +501,7 @@ export default {
// 检查table选择的数据 如果没有选择则不可以删除
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要删除的数据！");
this.isSelected = true
this.selectBoo = true
return;
}
// 封装删除的psns为数组
......@@ -561,7 +564,7 @@ export default {
this.ysxtAsjbh = [];
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要复制条码号的数据！");
this.isSelected = true
this.selectBoo = true
} else {
self.multipleSelection.forEach(item => {
self.ysxtAsjbh.push(item.ysxtAsjbh);
......@@ -578,7 +581,7 @@ export default {
dcFptx () {
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要导出FPTX的数据！");
this.isSelected = true
this.selectBoo = true
} else if (this.multipleSelection.length === 1) {
this.rowData = this.multipleSelection;
this.isShowDcfptx = true;
......@@ -607,7 +610,7 @@ export default {
console.log('添加到队列')
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要添加到队列的数据！");
this.isSelected = true
this.selectBoo = true
} else {
this.rowData = this.multipleSelection
this.isShowTjddl = true;
......@@ -623,7 +626,7 @@ export default {
let newarr = [];
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要关注的数据！");
this.isSelected = true
this.selectBoo = true
} else {
let arr = this.multipleSelection
for (var i = 0; i < arr.length; i++) {
......@@ -694,7 +697,7 @@ export default {
isShowFcxBtn () {
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要发查询的数据！");
this.isSelected = true
this.selectBoo = true
} else {
this.rowData = this.multipleSelection
this.isShowFcx = true;
......@@ -728,7 +731,7 @@ export default {
*/
batch () {
this.disabled = !this.disabled
this.isSelected = !this.isSelected;
this.selectBoo = !this.selectBoo;
this.toggleSelection()
},
/**
......@@ -831,6 +834,11 @@ const datas1 = [
background-color: #dadde0;
border-radius: 3px;
}
.delSelection /deep/ .el-table-column--selection .cell{
display: none;
}
.delSelection /deep/ .el-table-column--selection{
}
.AllPersonnelBase {
height: 100%;
box-sizing: border-box;
......
src/views/Editor/modules/imageEd.vue
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-11-13 14:36:31
* @LastEditTime: 2021-11-13 14:38:39
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
......@@ -536,7 +536,10 @@ export default {
// 特征点全部数组
tzdall: [],
// 之前的手动特征点
pretzdall: []
pretzdall: [],
//特征点原点的x和y的坐标
originX: 0,
originY: 0,
};
},
computed: {
......@@ -1230,7 +1233,7 @@ export default {
$('.tzdDom').css('display', 'flex')
$('.tzdDom').css('align-items', 'center')
$('.tzdDom').css('position', 'absolute')
$('.tzdDom').css('transform-origin', 'left center')
$('.tzdDom').css('transform-origin', '4px center')
$('.tzdDom .head').css('width', '8px')
$('.tzdDom .head').css('height', '8px')
......@@ -1308,6 +1311,8 @@ export default {
// 鼠标左击
if (e.which === 1) {
self.tzdFlag = true;
this.originX = e.clientX;
this.originY = e.clientY;
ins.setStart({
x: e.clientX,
y: e.clientY,
......@@ -1325,7 +1330,7 @@ export default {
$('.tzdDom').css('display', 'flex')
$('.tzdDom').css('align-items', 'center')
$('.tzdDom').css('position', 'absolute')
$('.tzdDom').css('transform-origin', 'left center')
$('.tzdDom').css('transform-origin', '4px center')
$('.tzdDom .head').css('width', '8px')
$('.tzdDom .head').css('height', '8px')
......@@ -1505,20 +1510,49 @@ export default {
}
if (self.isHandTZD) {
if (self.tzdFlag) {
// console.log(e);
if (!ins.startPoint) {
return;
}
console.log($("#tzd" + self.tzdId).width());
// console.log(this.originX,this.originY,e.clientX,e.clientY)
obj = ins.getDegInfo({
x: e.clientX,
y: e.clientY,
});
// console.log(obj);
if (obj) {
// console.log(
// `角度为:${obj.deg}; x方向位移:${obj.missX}; y方向位移:${obj.missY} ;两点之间的距离为:${obj.distance}`
// );
$("#tzd" + self.tzdId).css("transform", `rotate(${obj.deg}deg)`);
let width = $("#tzd" + self.tzdId).width();
let distance = self.getDistance(
{
x: this.originX,
y: this.originY,
},
{
x: e.clientX,
y: e.clientY,
}
);
//邻边
let heng = Math.abs(this.originX - e.clientX);
//cos
let cos = heng / distance;
//角度
let deg = (Math.acos(cos) * 180) / Math.PI;
//根据象限判断
if (e.clientX >= this.originX && e.clientY <= this.originY) {
deg = -deg;
} else if (e.clientX <= this.originX && e.clientY >= this.originY) {
deg = 90 + (90 - deg);
} else if (e.clientX <= this.originX && e.clientY <= this.originY) {
deg = -(90 + (90 - deg));
}
if (deg === NaN) {
deg = 0
}
console.log(self.startPlace,'原点 ');
if (deg) {
$("#tzd" + self.tzdId).css("transform", `rotate(${deg - self.startPlace}deg)`);
} else {
// console.log("无效的移动");
}
......@@ -1672,7 +1706,7 @@ export default {
$('.auto_tzdDom').css('display', 'flex')
$('.auto_tzdDom').css('align-items', 'center')
$('.auto_tzdDom').css('position', 'absolute')
$('.auto_tzdDom').css('transform-origin', 'left center')
$('.auto_tzdDom').css('transform-origin', '4px center')
$('.auto_tzdDom .head').css('width', '8px')
$('.auto_tzdDom .head').css('height', '8px')
......@@ -1705,7 +1739,7 @@ export default {
$('.auto_tzdDom').css('display', 'flex')
$('.auto_tzdDom').css('align-items', 'center')
$('.auto_tzdDom').css('position', 'absolute')
$('.auto_tzdDom').css('transform-origin', 'left center')
$('.auto_tzdDom').css('transform-origin', '4px center')
$('.auto_tzdDom .head').css('width', '8px')
$('.auto_tzdDom .head').css('height', '8px')
......@@ -1736,6 +1770,16 @@ export default {
// return
// }
},
getDistance (origin, target) {
let originX = origin.x;
let originY = origin.y;
let targetX = target.x;
let targetY = target.y;
let a = originX - targetX;
let b = originY - targetY;
return Math.round(Math.sqrt(a * a + b * b));
},
/**
* @description: 打开旋转操作
* @param {*}
......
src/views/Editor/modules/imageEdAJ.vue
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-11-13 14:30:07
* @LastEditTime: 2021-11-13 14:37:32
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
......@@ -2178,9 +2178,9 @@ export default {
deg = 0
}
console.log(deg);
console.log(self.startPlace,'原点 ');
if (deg) {
$("#tzd" + self.tzdId).css("transform", `rotate(${deg}deg)`);
$("#tzd" + self.tzdId).css("transform", `rotate(${deg - self.startPlace}deg)`);
} else {
// console.log("无效的移动");
}
......
src/views/Home.vue
......@@ -3,19 +3,47 @@
<el-container class="layout-container">
<transition name="slide">
<el-aside :width="isCollapse ? '4rem' : '17.5rem'" class="aside">
<div class="logo" :class="{ minLogo: isCollapse }" @click="$router.push('/Home/Home')">
<div
class="logo"
:class="{ minLogo: isCollapse }"
@click="$router.push('/Home/Home')"
>
<img class="jh" src="../assets/img/Home/jh.png" alt="" />
<img v-show="!isCollapse" class="title" src="../assets/img/Home/title.png" alt="" />
<img
v-show="!isCollapse"
class="title"
src="../assets/img/Home/title.png"
alt=""
/>
</div>
<!-- <div class="search">
<el-input v-if="!isCollapse" @keyup.enter.native="goSearch()" class="searchTxt" prefix-icon="el-icon-search" v-model="searchTxt" placeholder="搜索"></el-input>
<i class="search-icon el-icon-search" v-else></i>
</div> -->
<el-menu :collapse-transition="false" ref="menu" :default-active="menuActive" text-color="#CCCCCC" active-text-color="#ffffff" background-color="#1F2D45" class="el-menu-vertical-demo" @open="handleOpen" @close="handleClose" :collapse="isCollapse" @select="selectPath">
<el-menu
:collapse-transition="false"
ref="menu"
:default-active="menuActive"
text-color="#CCCCCC"
active-text-color="#ffffff"
background-color="#1F2D45"
class="el-menu-vertical-demo"
@open="handleOpen"
@close="handleClose"
:collapse="isCollapse"
@select="selectPath"
>
<div v-for="(menu, i) in routes" :key="i">
<el-submenu :index="menu.name" v-if="menu.children && !menu.hidden">
<el-submenu
:index="menu.name"
v-if="menu.children && !menu.hidden"
>
<template slot="title">
<img v-if="$route.path != menu.path" :src="menu.icon_d" alt="" />
<img
v-if="$route.path != menu.path"
:src="menu.icon_d"
alt=""
/>
<img v-else :src="menu.icon_a" alt="" />
<span v-show="!isCollapse">{{ menu.meta.title }}</span>
</template>
......@@ -25,8 +53,15 @@
}}</el-menu-item>
</div>
</el-submenu>
<el-menu-item :index="menu.name" v-else-if="!menu.children && !menu.hidden">
<img v-if="$route.path != menu.path" :src="menu.icon_d" alt="" />
<el-menu-item
:index="menu.name"
v-else-if="!menu.children && !menu.hidden"
>
<img
v-if="$route.path != menu.path"
:src="menu.icon_d"
alt=""
/>
<img v-else :src="menu.icon_a" alt="" />
<span slot="title">{{ menu.meta.title }}</span>
</el-menu-item>
......@@ -53,8 +88,18 @@
</div>
<div class="quit" @click="$router.push('/Home/Home')"></div>
<div class="logout" @click="logout">
<svg-icon v-show="!isHoverLogout" icon-class="logout_d" class="icon" @mouseover="isHoverLogout = true" @mouseleave="isHoverLogout = false" />
<svg-icon v-show="isHoverLogout" icon-class="logout_a" class="icon" />
<svg-icon
v-show="!isHoverLogout"
icon-class="logout_d"
class="icon"
@mouseover="isHoverLogout = true"
@mouseleave="isHoverLogout = false"
/>
<svg-icon
v-show="isHoverLogout"
icon-class="logout_a"
class="icon"
/>
</div>
</div>
</el-header>
......@@ -68,7 +113,7 @@
>
<el-tab-pane
:label="item.name"
:name="item.path"
:name="item.routeName"
v-for="item in paths"
:key="item.routeName"
></el-tab-pane>
......@@ -99,7 +144,7 @@ import indexRoutes from "@/router/modules/index";
import { mapGetters } from "vuex";
export default {
name: "Home",
data () {
data() {
return {
searchTxt: "",
routes: this.$store.getters["layout/leftMenuData"],
......@@ -112,7 +157,7 @@ export default {
routePath: "",
};
},
mounted () {
mounted() {
this.menuActive = this.$route.name;
// console.log(this.$route);
// zoom('home')
......@@ -120,7 +165,7 @@ export default {
// zoom('home')
// })
},
updated () {
updated() {
this.menuActive = this.$route.name;
},
computed: {
......@@ -136,7 +181,7 @@ export default {
* @return {*}
*/
logout () {
logout() {
// console.log('退出登录');
// this.$router.replace('/login1')
this.$axios
......@@ -159,22 +204,22 @@ export default {
* @return {*}
*/
goSearch () {
goSearch() {
this.searchTxt = "";
console.log(this.searchTxt);
},
handleClick ({ name }) {
handleClick({ name }) {
if (name == "/Home/htzwcj") {
this.$router.push(name);
this.menuActive = "";
} else {
this.$router.push(name);
let routerObj = this.paths.find((i) => i.path == name);
let routerObj = this.paths.find((i) => i.routeName == name);
this.$router.push(routerObj.path);
this.menuActive = routerObj.routeName;
}
},
tabRemove (name) {
let routerObj = this.paths.find((i) => i.path == name);
tabRemove(name) {
let routerObj = this.paths.find((i) => i.routeName == name);
if (routerObj) {
let pathName = routerObj.name;
let res = this.paths.filter((item) => {
......@@ -185,7 +230,7 @@ export default {
if (pathName == this.$route.meta.title) {
if (this.paths.length > 0) {
this.$router.push(this.paths[0].path);
this.routePath = this.paths[0].path;
this.routePath = this.paths[0].routeName;
}
}
}
......@@ -208,7 +253,7 @@ export default {
* @param {*}
* @return {*}
*/
goManager () {
goManager() {
this.$router.push("/Home/htzwcj");
this.menuActive = "";
},
......@@ -218,7 +263,7 @@ export default {
* @param {*} path
* @return {*}
*/
selectPath (index, path) {
selectPath(index, path) {
this.$router.push({ name: index });
},
/**
......@@ -226,7 +271,7 @@ export default {
* @param {*}
* @return {*}
*/
closePaths (pathName) {
closePaths(pathName) {
let res = this.paths.filter((item) => {
return item.name != pathName;
});
......@@ -242,7 +287,7 @@ export default {
* @param {*}
* @return {*}
*/
changeRouter (route) {
changeRouter(route) {
this.$router.push(route.path);
this.menuActive = route.routeName;
},
......@@ -251,20 +296,22 @@ export default {
* @param {*}
* @return {*}
*/
switchCollapse () {
switchCollapse() {
this.isCollapse = !this.isCollapse;
},
handleOpen (key, keyPath) {
handleOpen(key, keyPath) {
console.log(key, keyPath);
},
handleClose (key, keyPath) {
handleClose(key, keyPath) {
console.log(key, keyPath);
},
},
watch: {
$route: {
handler (newValue, oldValue) {
this.routePath = newValue.path;
handler(newValue, oldValue) {
console.log(this.routePath,11111111111)
console.log(newValue,11111111111)
this.routePath = newValue.name;
setTimeout(() => {
console.log(1);
if (newValue.path != "/Home/htzwcj") {
......@@ -275,15 +322,19 @@ export default {
routeName: newValue.name,
});
} else {
console.log(7777777111111111111111111)
let obj = {
name: newValue.meta.title,
path: newValue.path,
routeName: newValue.name,
};
if (
JSON.stringify(this.paths).indexOf(JSON.stringify(obj)) === -1
this.paths.findIndex((i) => i.routeName == newValue.name) === -1
) {
this.paths.push(obj);
}else{
this.paths.findIndex((i) => i.routeName == newValue.name) === -1
console.log(obj)
}
}
}
......@@ -445,8 +496,8 @@ export default {
background-color: #006aff;
display: none;
}
.el-tabs__nav-wrap::after{
height: 1px!important;
.el-tabs__nav-wrap::after {
height: 1px !important;
}
.el-tabs__item {
position: relative;
......
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