Skip to content

F
founder_vue
Commit 4e3b95ef by 米嘉伟
Options

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

parents 199aef2e b9f52178
Showing with 309 additions and 241 deletions
src/store/modules/test-module.js 0 → 100644
import _TEST_KEY from './test-types.js'
const state = {
state_xm: [],
state_age: [],
}
const mutations = {
[_RY_KEY._actionkey.SET_XM](state, res) {
state.state_xm = res
},
[_RY_KEY._actionkey.SET_AGE](state, res) {
state.state_xm = res
},
}
const actions = {
[_RY_KEY._mutationKey._XM](context, options) {// 获取人员逻辑库
//TODO... 需要根据业务补充
},
[_RY_KEY._mutationKey._AGE](context, options) {// 获取人员逻辑库
//TODO... 需要根据业务补充
},
}
export default {
namespaced: true,
state,
mutations,
actions
}
src/store/modules/test-types.js 0 → 100644
const _MODULE_NAME = 'ry'// 这个要和 Store注册modules里名称保持一致
const _ACTION_KEY = {
_XM: _MODULE_NAME + '/_xm',
_AGE: _MODULE_NAME + '/_age',
}
const _MUTATION_KEY = {
SET_XM: 'setXm',
SET_AGE: 'setAge',
}
export default {
_actionkey: _ACTION_KEY,
_mutationKey: _MUTATION_KEY,
}
src/views/Editor/modules/ajzwbjLeft.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-10-22 09:42:07 * @Date: 2021-10-22 09:42:07
* @LastEditTime: 2022-01-08 14:09:16 * @LastEditTime: 2022-01-14 16:25:06
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
...@@ -232,7 +232,6 @@ export default { ...@@ -232,7 +232,6 @@ export default {
// 指纹编辑区域发送指纹数据，替换指纹图片 // 指纹编辑区域发送指纹数据，替换指纹图片
console.log(finger); console.log(finger);
this.$bus.emit('ajzwbjImage', { finger_image: finger.image, finger_dealFlag: finger.dealFlag, finger_position: finger.finger_position }) this.$bus.emit('ajzwbjImage', { finger_image: finger.image, finger_dealFlag: finger.dealFlag, finger_position: finger.finger_position })
}, },
/** /**
* 获取案件指纹原图 * 获取案件指纹原图
...@@ -299,6 +298,7 @@ export default { ...@@ -299,6 +298,7 @@ export default {
}) })
} }
} }
self.$bus.emit('', self.fingers)
// //console.log(self.fingers); // //console.log(self.fingers);
// 自动获取第一个 // 自动获取第一个
if (self.fingers.length > 0) { if (self.fingers.length > 0) {
......
src/views/Editor/modules/imageEdAJ.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-10-22 11:36:10 * @Date: 2021-10-22 11:36:10
* @LastEditTime: 2022-01-10 21:19:18 * @LastEditTime: 2022-01-14 16:09:52
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
...@@ -300,7 +300,7 @@ ...@@ -300,7 +300,7 @@
</div> </div>
<div class="tjxh"> <div class="tjxh">
<span>推荐序号</span> <span>推荐序号</span>
<input v-if="zwType=='指纹'" type="text" v-model="tjxh" oninput="if(value>99)value=99;if(value<1)value=1" /> <input v-if="zwType=='指纹'" type="text" v-model="tjxh" oninput="if(value>99)value=99;if(value<0)value=0" />
<input v-else type="text" v-model="tjxh" oninput="if(value<101)value=101" /> <input v-else type="text" v-model="tjxh" oninput="if(value<101)value=101" />
</div> </div>
</div> </div>
......
src/views/bzxxgl/scss/BzxxsfOpt.scss deleted 100644 → 0
.root-div {
position: relative;
display: inline-block;
}
.opt-select-right-svg {
width: 16px;
height: 16px;
}
.item-svg-red {
color: red;
}
.btn-sh {
cursor: pointer;
width: 72px;
height: 28px;
border-radius: 4px;
border: 1px solid #fe0000;
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
color: #fe0000;
display: flex;
align-items: center;
justify-content: center;
}
.select-left {
float: left;
width: 94px;
height: 32px;
border-radius: 4px 0px 0px 4px;
border: 1px solid #D5E5FC;
border-right: 0px;
z-index: 501;
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
color: #333333;
line-height: 32px;
padding-left: 16px;
/*display: flex;*/
/*align-items: center;*/
/*justify-content: left;*/
}
.select-right-normal {
float: left;
width: 32px;
height: 32px;
background: #E1EDFF;
border: 1px solid #D5E5FC;
border-radius: 0px 4px 4px 0px;
display: flex;
align-items: center;
justify-content: center;
}
.select-right-focus {
float: left;
width: 32px;
height: 32px;
background: #D5E5FC;
box-shadow: 2px 2px 2px 0px rgba(2, 122, 255, 0.41);
border-radius: 0px 4px 4px 0px;
display: flex;
align-items: center;
justify-content: center;
}
.select-opt-list-content {
margin-top: 0px;
margin-left: 0px;
width: 126px;
/*height: 100px;*/
display: block;
padding: 10px 0px;
/*margin-top: 32px;*/
/*clear: left;*/
z-index: 499;
background: #FFFFFF;
/*background: black;*/
border-radius: 0px 0px 4px 4px;
border: 1px solid #D5E5FC;
position: absolute;
&.el-popper[x-placement^=bottom] .popper__arrow::after {
boder-style: none;
}
&.el-popper[x-placement^=bottom] .popper__arrow {
boder-style: none;
}
}
.select-opt-list-content-item {
width: 126px;
height: 32px;
display: inline-block;
position: relative;
z-index: 500;
/*background: red;*/
margin-left: 0px;
padding-left: 16px;
display: flex;
align-items: center;
justify-content: left;
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
color: #333333;
line-height: 32px;
}
.select-opt-list-content-item:hover {
background: #F5F5F7;
}
.ysb-left {
float: left;
width: 94px;
height: 32px;
background: #FFFFFF;
border-radius: 4px 0px 0px 4px;
border: 1px solid #D9DCE2;
border-right: 0px;
font-family: HarmonyOS_Sans_SC;
color: #666666;
line-height: 14px;
display: flex;
align-items: center;
justify-content: center;
}
.ysb-right {
float: left;
width: 32px;
height: 32px;
background: #ECEDF1;
border: 1px solid #D9DCE2;
border-radius: 0px 4px 4px 0px;
display: flex;
align-items: center;
justify-content: center;
}
src/views/xtfkgl/AjXtljfkView.vue
...@@ -14,62 +14,62 @@ ...@@ -14,62 +14,62 @@
<el-table-column prop="sjkyh" label="数据库用户组/用户" :width="width2"> <el-table-column prop="sjkyh" label="数据库用户组/用户" :width="width2">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="tagsBox"> <div class="tagsBox">
<div <div v-for="item in strArr(scope.row.groups)" :key="item.logicId"
v-for="item in strArr(scope.row.groups)" v-show="item !== ''">
:class="{ tags: true, tagszu: item.type === 1 }"
:key="item.logicId"
v-show="item !== ''">
<div v-if="item.type === 1 && item.user && item.user.length >0"> <div v-if="item.type === 1 && item.user && item.user.length >0">
<el-tooltip <el-tooltip
class="item"
effect="dark" effect="dark"
placement="bottom" placement="bottom"
:open-delay="300" :open-delay="300">
style="width: auto !important"> <div :class="{ tags: true, tagszu: item.type === 1 }">{{ item.name }}</div>
<span>{{ item.name }}</span> <div slot="content" class="tooTipBtn" style="padding: 10px;">
<div slot="content" class="tooTipBtn"> <div v-for="it in item.user"
<div :title="it.name"
v-for="it in item.user" :key="it.id">
:title="it.name"
:key="it.id"
>
{{ it.name }} {{ it.name }}
</div> </div>
</div> </div>
</el-tooltip> </el-tooltip>
</div> </div>
<div v-else> <div v-else class="tags">
{{ item.name }} {{ item.name }}
</div> </div>
</div> </div>
<el-tooltip <el-tooltip
class="item" class="item"
effect="dark" effect="dark"
placement="right" placement="right"
style="width: auto !important" :manual="true"
v-if="scope.row.groups && scope.row.groups.length > 4" :open-delay="300"
> v-model="scope.row.disabled"
<span style="margin-left: 5px">...</span> v-if="scope.row.groups && scope.row.groups.length > 4">
<div slot="content" class="tooTipBtn">
<div <span style="margin-left: 5px" @mouseover="groupItemFocus(scope.$index)">...</span>
v-for="item in scope.row.groups"
:class="{divtext:item.type === 1}" <div slot="content" class="tooTipBtn" @mouseleave="groupItemNoFocus()">
:title="item.name" <div v-for="(item,index) in scope.row.groups">
:key="item.id">
<div v-if="item.type === 1 && item.user && item.user.length >0"> <div v-if="item.type === 1 && item.user && item.user.length >0">
<el-tooltip <el-tooltip
class="item" class="two-tooltip"
effect="dark" effect="dark"
placement="right" placement="right"
style="width: auto !important"> :manual="true"
<span>{{ item.name }}</span> v-model="item.disabled"
<div slot="content" class="tooTipBtn"> style="transform: translateX(10px);">
<div :class="{divtext:item.type === 1}"
style="padding-right: 10px"
@mouseover="twItemFocus(scope.$index,index)">
{{item.name }}
</div>
<div slot="content" class="tooTipBtn"
@mouseover="twItemFocus(scope.$index,index)"
@mouseleave="twoItemNoFocus(scope.$index,index)">
<div <div
v-for="it in item.user" v-for="it in item.user"
:title="it.name" :title="it.name"
:key="it.id" :key="it.id">
>
{{ it.name }} {{ it.name }}
</div> </div>
</div> </div>
...@@ -79,6 +79,7 @@ ...@@ -79,6 +79,7 @@
{{ item.name }} {{ item.name }}
</div> </div>
</div> </div>
</div> </div>
</el-tooltip> </el-tooltip>
</div> </div>
...@@ -160,7 +161,7 @@ ...@@ -160,7 +161,7 @@
class="paging" class="paging"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page="currPage" :current-page="currPage"
:page-sizes="[10, 20, 30, 40]" :page-size="pageSize"
background background
layout="prev, pager, next" layout="prev, pager, next"
:total="total" :total="total"
...@@ -183,14 +184,16 @@ export default { ...@@ -183,14 +184,16 @@ export default {
width4: 136, //启用状态 width4: 136, //启用状态
width5: 260, //逻辑库说明 width5: 260, //逻辑库说明
width6: 120, // 操作 width6: 120, // 操作
height: 550, height: '42rem',
tableDate: [], tableDate: [],
currPage: 1, // 当前页数 currPage: 1, // 当前页数
pageSize: 10, // 每页的数据条数 pageSize: 13, // 每页的数据条数
total: 0, // 数据总条数 total: 0, // 数据总条数
totalPage: 0, // 总共页数 totalPage: 0, // 总共页数
curOneGradeIndex: -1,
curTwoGradeIndex: -1,
} }
}, },
created() { created() {
...@@ -209,6 +212,42 @@ export default { ...@@ -209,6 +212,42 @@ export default {
// this.getList() // this.getList()
}, },
methods: { methods: {
twoItemNoFocus(gindex, cindex) {
this.tableDate[gindex].groups[cindex].disabled = false
this.tableDate[gindex].disabled = false
this.curOneGradeIndex = -1
},
twItemFocus(gindex, cindex) {
if (cindex >= 0 && gindex >= 0) {
if (this.curTwoGradeIndex !== cindex && this.curTwoGradeIndex >= 0) {
this.tableDate[gindex].groups[this.curTwoGradeIndex].disabled = false
}
this.tableDate[gindex].groups[cindex].disabled = true
this.tableDate[gindex].disabled = true
this.curOneGradeIndex = gindex
this.curTwoGradeIndex = cindex
}
},
groupItemNoFocus() {
if (this.curOneGradeIndex >= 0) {
this.tableDate[this.curOneGradeIndex].disabled = false
}
if (this.curOneGradeIndex >= 0 && this.curTwoGradeIndex >= 0) {
this.tableDate[this.curOneGradeIndex].groups[this.curTwoGradeIndex].disabled = false
}
this.curOneGradeIndex = -1
this.curTwoGradeIndex = -1
},
groupItemFocus(index) {
if (this.curOneGradeIndex !== index && this.curOneGradeIndex >= 0) {
this.tableDate[this.curOneGradeIndex].disabled = false
}
if (this.curOneGradeIndex >= 0 && this.curTwoGradeIndex >= 0) {
this.tableDate[this.curOneGradeIndex].groups[this.curTwoGradeIndex].disabled = false
}
this.tableDate[index].disabled = true
this.curOneGradeIndex = index
},
getRowKeys(row) { getRowKeys(row) {
return row.logicId return row.logicId
}, },
...@@ -287,7 +326,7 @@ export default { ...@@ -287,7 +326,7 @@ export default {
var _that = this var _that = this
_that.getList(page) _that.getList(page)
}, },
getList(page = 1, limit = 10) { getList(page = 1, limit = this.pageSize) {
let _that = this let _that = this
let ruleForm = {} let ruleForm = {}
this.currPage = page this.currPage = page
......
src/views/xtfkgl/RyXtljfkView.vue
...@@ -16,51 +16,57 @@ ...@@ -16,51 +16,57 @@
<div class="tagsBox"> <div class="tagsBox">
<div v-for="item in strArr(scope.row.groups)" :key="item.logicId" <div v-for="item in strArr(scope.row.groups)" :key="item.logicId"
:class="{ tags: true, tagszu: item.type === 1 }"
v-show="item !== ''"> v-show="item !== ''">
<div v-if="item.type === 1 && item.user && item.user.length >0"> <div v-if="item.type === 1 && item.user && item.user.length >0">
<el-tooltip <el-tooltip
class="item"
effect="dark" effect="dark"
placement="bottom" placement="bottom"
:open-delay="300" :open-delay="300">
style="width: auto !important"> <div :class="{ tags: true, tagszu: item.type === 1 }">{{ item.name }}</div>
<span>{{ item.name }}</span> <div slot="content" class="tooTipBtn" style="padding: 10px;">
<div slot="content" class="tooTipBtn"> <div v-for="it in item.user"
<div :title="it.name"
v-for="it in item.user" :key="it.id">
:title="it.name"
:key="it.id"
>
{{ it.name }} {{ it.name }}
</div> </div>
</div> </div>
</el-tooltip> </el-tooltip>
</div> </div>
<div v-else> <div v-else class="tags">
{{ item.name }} {{ item.name }}
</div> </div>
</div> </div>
<el-tooltip <el-tooltip
class="item" class="item"
effect="dark" effect="dark"
placement="right" placement="right"
style="width: auto !important" :manual="true"
:open-delay="300"
v-model="scope.row.disabled"
v-if="scope.row.groups && scope.row.groups.length > 4"> v-if="scope.row.groups && scope.row.groups.length > 4">
<span style="margin-left: 0.3125rem">...</span> <span style="margin-left: 5px" @mouseover="groupItemFocus(scope.$index)">...</span>
<div slot="content" class="tooTipBtn">
<div v-for="item in scope.row.groups"> <div slot="content" class="tooTipBtn" @mouseleave="groupItemNoFocus()">
<div v-for="(item,index) in scope.row.groups">
<div v-if="item.type === 1 && item.user && item.user.length >0"> <div v-if="item.type === 1 && item.user && item.user.length >0">
<el-tooltip <el-tooltip
class="item" class="two-tooltip"
effect="dark" effect="dark"
placement="right" placement="right"
style="width: auto !important;"> :manual="true"
<div :class="{divtext:item.type === 1}"> v-model="item.disabled"
<span>{{ item.name }}</span> style="transform: translateX(10px);">
<div :class="{divtext:item.type === 1}"
style="padding-right: 10px"
@mouseover="twItemFocus(scope.$index,index)">
{{item.name }}
</div> </div>
<div slot="content" class="tooTipBtn"> <div slot="content" class="tooTipBtn"
@mouseover="twItemFocus(scope.$index,index)"
@mouseleave="twoItemNoFocus(scope.$index,index)">
<div <div
v-for="it in item.user" v-for="it in item.user"
:title="it.name" :title="it.name"
...@@ -74,8 +80,10 @@ ...@@ -74,8 +80,10 @@
{{ item.name }} {{ item.name }}
</div> </div>
</div> </div>
</div> </div>
</el-tooltip> </el-tooltip>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -149,7 +157,7 @@ ...@@ -149,7 +157,7 @@
</el-table> </el-table>
</div> </div>
<div class="line-botttom"></div> <!-- <div class="line-botttom"></div>-->
<!-- 分页--> <!-- 分页-->
<div class="footer"> <div class="footer">
<span class="count">共&nbsp;{{ total }}&nbsp;条记录 第{{ currPage }}/{{totalPage}}页</span> <span class="count">共&nbsp;{{ total }}&nbsp;条记录 第{{ currPage }}/{{totalPage}}页</span>
...@@ -158,7 +166,7 @@ ...@@ -158,7 +166,7 @@
class="paging" class="paging"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page="currPage" :current-page="currPage"
:page-sizes="[10, 20, 30, 40]" :page-size="pageSize"
background background
layout="prev, pager, next" layout="prev, pager, next"
:total="total" :total="total"
...@@ -181,14 +189,16 @@ export default { ...@@ -181,14 +189,16 @@ export default {
width4: 136, //启用状态 width4: 136, //启用状态
width5: 260, //逻辑库说明 width5: 260, //逻辑库说明
width6: 120, // 操作 width6: 120, // 操作
height: "33rem", height: '42rem',
tableDate: [], tableDate: [],
currPage: 1, // 当前页数 currPage: 1, // 当前页数
pageSize: 10, // 每页的数据条数 pageSize: 13, // 每页的数据条数
total: 0, // 数据总条数 total: 0, // 数据总条数
totalPage: 0, // 总共页数 totalPage: 0, // 总共页数
curOneGradeIndex: -1,
curTwoGradeIndex: -1,
} }
}, },
created() { created() {
...@@ -206,6 +216,42 @@ export default { ...@@ -206,6 +216,42 @@ export default {
this.getList() this.getList()
}, },
methods: { methods: {
twoItemNoFocus(gindex, cindex) {
this.tableDate[gindex].groups[cindex].disabled = false
this.tableDate[gindex].disabled = false
this.curOneGradeIndex = -1
},
twItemFocus(gindex, cindex) {
if (cindex >= 0 && gindex >= 0) {
if (this.curTwoGradeIndex !== cindex && this.curTwoGradeIndex >= 0) {
this.tableDate[gindex].groups[this.curTwoGradeIndex].disabled = false
}
this.tableDate[gindex].groups[cindex].disabled = true
this.tableDate[gindex].disabled = true
this.curOneGradeIndex = gindex
this.curTwoGradeIndex = cindex
}
},
groupItemNoFocus() {
if (this.curOneGradeIndex >= 0) {
this.tableDate[this.curOneGradeIndex].disabled = false
}
if (this.curOneGradeIndex >= 0 && this.curTwoGradeIndex >= 0) {
this.tableDate[this.curOneGradeIndex].groups[this.curTwoGradeIndex].disabled = false
}
this.curOneGradeIndex = -1
this.curTwoGradeIndex = -1
},
groupItemFocus(index) {
if (this.curOneGradeIndex !== index && this.curOneGradeIndex >= 0) {
this.tableDate[this.curOneGradeIndex].disabled = false
}
if (this.curOneGradeIndex >= 0 && this.curTwoGradeIndex >= 0) {
this.tableDate[this.curOneGradeIndex].groups[this.curTwoGradeIndex].disabled = false
}
this.tableDate[index].disabled = true
this.curOneGradeIndex = index
},
getRowKeys(row) { getRowKeys(row) {
return row.logicId return row.logicId
}, },
...@@ -285,7 +331,7 @@ export default { ...@@ -285,7 +331,7 @@ export default {
var _that = this var _that = this
_that.getList(page) _that.getList(page)
}, },
getList(page = 1, limit = 10) { getList(page = 1, limit = this.pageSize) {
let _that = this let _that = this
let ruleForm = {} let ruleForm = {}
this.currPage = page this.currPage = page
......
src/views/xtfkgl/SjkyhSelect.vue
...@@ -107,6 +107,12 @@ export default { ...@@ -107,6 +107,12 @@ export default {
}, },
mounted() { mounted() {
this.updateSelectSet() this.updateSelectSet()
let _that = this
document.addEventListener('click', function (e) {
if (_that.isShowing) {
_that.isShowing = false
}
})
}, },
beforeDestroy() { beforeDestroy() {
this.isShowing = false this.isShowing = false
...@@ -298,7 +304,19 @@ export default { ...@@ -298,7 +304,19 @@ export default {
} }
} }
</script> </script>
<style lang="scss">
.el-popper[x-placement^="bottom-end"] {
border-style: none;
}
.el-popper[x-placement^="bottom-end"] .popper__arrow::after {
border-style: none;
}
.el-popper[x-placement^="bottom-end"] .popper__arrow {
border-style: none;
}
</style>
<style scoped lang="scss"> <style scoped lang="scss">
@import "../../../public/iconfont/iconfont.css"; @import "../../../public/iconfont/iconfont.css";
...@@ -433,9 +451,10 @@ export default { ...@@ -433,9 +451,10 @@ export default {
width: 264px; width: 264px;
height: 216px; height: 216px;
display: block; display: block;
padding-top: 10px; padding-top: 0px;
z-index: 999; z-index: 999;
background: #FFFFFF; background: #FFFFFF;
/*background: black;*/
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06); box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06);
border-radius: 4px; border-radius: 4px;
border: 1px solid #E6E6E8; border: 1px solid #E6E6E8;
...@@ -450,10 +469,12 @@ export default { ...@@ -450,10 +469,12 @@ export default {
width: 28%; width: 28%;
height: 216px; height: 216px;
/*height: 40px;*/ /*height: 40px;*/
background: #FFFFFF; /*background: #FFFFFF;*/
background: transparent;
border: 1px none #EEEEEE; /*border: 1px none #EEEEEE;*/
border-right-style: solid; /*border-right-style: solid;*/
border-right: 1px solid #EEEEEE;
.list-item { .list-item {
width: 100%; width: 100%;
...@@ -485,10 +506,11 @@ export default { ...@@ -485,10 +506,11 @@ export default {
width: 72%; width: 72%;
height: 216px; height: 216px;
/*background: black;*/ /*background: black;*/
background: transparent;
.top-div { .top-div {
width: 100%; width: 100%;
height: 170px; height: 160px;
overflow: scroll; overflow: scroll;
.top-item { .top-item {
...@@ -519,13 +541,14 @@ export default { ...@@ -519,13 +541,14 @@ export default {
.bottom-div { .bottom-div {
width: 100%; width: 100%;
height: 55px; height: 55px;
background: #FFFFFF; background: transparent;
box-shadow: 0px -2px 4px 0px rgba(0, 0, 0, 0.06); box-shadow: 0px -2px 4px 0px rgba(0, 0, 0, 0.06);
border-radius: 0px 0px 3px 3px; border-radius: 0px 0px 3px 3px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
/*line-height: 55px;*/
.queding { .queding {
width: 72px; width: 72px;
......
src/views/xtfkgl/XtfkAndGzlView.vue
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
<el-form-item class="info-item" label="数据库用户："> <el-form-item class="info-item" label="数据库用户：">
<sjkyh-select ref='sjkyhSelect' :params='ljfkRuleForm.usersOrUserGroups' <sjkyh-select ref='sjkyhSelect' :params='ljfkRuleForm.usersOrUserGroups'
@select="selectYh"></sjkyh-select> @select="selectYh"></sjkyh-select>
<div class="tip" style="margin-top: -18px;"><span class="iconfont">&#xe649;</span>提示：如果不选择，默认全部用户！</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -123,7 +124,7 @@ ...@@ -123,7 +124,7 @@
v-show="getDlmcArr() && getDlmcArr().length > 0" v-show="getDlmcArr() && getDlmcArr().length > 0"
:style="{marginLeft: gindex===0?'0px':'20px'}"> :style="{marginLeft: gindex===0?'0px':'20px'}">
<i v-if="!isBxCxdl(item.type)" <i v-if="!isBxCxdl(item.type)"
class="el-icon-circle-plus icon" style="color: #055fe7" class="el-icon-circle-plus icon" style="color: #055fe7;"
@click="updateGzdl(item,gindex,true)" /> @click="updateGzdl(item,gindex,true)" />
<div :key="item.type"> <div :key="item.type">
{{ item.name || '-'}} {{ item.name || '-'}}
......
src/views/xtfkgl/scss/dialog_table.scss
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
.fix-height { .fix-height {
min-height: 430px; min-height: 430px;
max-height: 600px; max-height: 690px;
overflow: scroll; overflow: scroll;
} }
} }
...@@ -397,6 +397,7 @@ ...@@ -397,6 +397,7 @@
> .icon { > .icon {
position: absolute; position: absolute;
color: #055fe7; color: #055fe7;
background: white;
top: -6px; top: -6px;
right: -6px; right: -6px;
cursor: pointer; cursor: pointer;
...@@ -458,13 +459,14 @@ ...@@ -458,13 +459,14 @@
.addbtns { .addbtns {
border-top: 1px solid #eeeeee; border-top: 1px solid #eeeeee;
padding-top: 20px; padding-top: 0px;
width: 100%; width: 100%;
text-align: center; text-align: center;
.add { .add {
width: 72px; width: 72px;
height: 40px; height: 40px;
margin-top: 10px;
background: #ffffff; background: #ffffff;
border-radius: 4px; border-radius: 4px;
border: 1px solid #aeb5c2; border: 1px solid #aeb5c2;
...@@ -478,6 +480,7 @@ ...@@ -478,6 +480,7 @@
.cancel { .cancel {
width: 72px; width: 72px;
height: 40px; height: 40px;
margin-top: 10px;
background: #055fe7; background: #055fe7;
border-radius: 4px; border-radius: 4px;
font-size: 14px; font-size: 14px;
...@@ -494,6 +497,17 @@ ...@@ -494,6 +497,17 @@
border: 1px solid #E6E6E8; border: 1px solid #E6E6E8;
} }
.tip {
margin-left: 0px;
color: #f8980a;
font-family: HarmonyOS_Sans_SC;
font-size: 13px;
span {
font-size: 13px;
margin-right: 5px;
}
}
.dialog /deep/ { .dialog /deep/ {
.el-form-item__content { .el-form-item__content {
...@@ -525,7 +539,7 @@ ...@@ -525,7 +539,7 @@
&::before { &::before {
position: absolute; position: absolute;
//left: -10px; left: -10px;
//transform: translateY(3px); //transform: translateY(3px);
} }
} }
......
src/views/xtfkgl/scss/xtfkgl_main.scss
.tooTipBtn { .tooTipBtn {
padding: 10px; padding: 10px 0;
max-height: 317px; max-height: 317px;
overflow: auto; overflow: auto;
// 滚动条的宽度 // 滚动条的宽度
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
word-wrap: break-word; word-wrap: break-word;
padding: 0 10px;
height: 24px; height: 24px;
background: #5e5e5e; background: #5e5e5e;
border-radius: 4px; border-radius: 4px;
...@@ -37,7 +36,7 @@ ...@@ -37,7 +36,7 @@
font-size: 12px; font-size: 12px;
font-family: HarmonyOS_Sans_SC; font-family: HarmonyOS_Sans_SC;
color: #FFFFFF; color: #FFFFFF;
line-height: 20px; line-height: 24px;
&:last-of-type { &:last-of-type {
margin-bottom: 0; margin-bottom: 0;
...@@ -50,6 +49,46 @@ ...@@ -50,6 +49,46 @@
} }
.two-tooltip{
.el-tooltip__popper{
//transform: translateX(20px);
//margin-left: 30px;
}
}
.tooTipBtn1 {
padding: 10px 0px;
max-height: 317px;
overflow: auto;
// 滚动条的宽度
&::-webkit-scrollbar {
width: 6px; /*高宽分别对应横竖滚动条的尺寸*/
height: 1px;
}
/* 滚动槽 */
&::-webkit-scrollbar-track {
height: 65px;
-webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.3);
border-radius: 10px;
}
/* 滚动条滑块 */
&::-webkit-scrollbar-thumb {
border-radius: 10px;
height: 65px;
background: #595a5a;
}
}
.manage-page { .manage-page {
width: 100%; width: 100%;
...@@ -129,18 +168,17 @@ ...@@ -129,18 +168,17 @@
.tagsBox { .tagsBox {
display: flex; display: flex;
.el-tooltip { //.el-tooltip {
width: auto !important; // width: auto !important;
} //}
} }
.tags { .tags {
flex-shrink: 0; //flex-shrink: 0;
width: 134px; width: 134px;
height: 24px; height: 24px;
background: #F0F3F6; background: #F0F3F6;
border-radius: 4px; border-radius: 4px;
padding: 0 13px;
text-align: center; text-align: center;
margin-right: 12px; margin-right: 12px;
overflow: hidden; overflow: hidden;
...@@ -151,7 +189,7 @@ ...@@ -151,7 +189,7 @@
font-size: 12px; font-size: 12px;
font-family: HarmonyOS_Sans_SC; font-family: HarmonyOS_Sans_SC;
color: #333333; color: #333333;
line-height: 20px; line-height: 24px;
} }
.tagszu { .tagszu {
...@@ -160,6 +198,13 @@ ...@@ -160,6 +198,13 @@
color: #FA9500; color: #FA9500;
} }
.yonghu-name {
//padding: 0 13px;
background: red;
width: 134px;
height: 24px;
}
.circle-red { .circle-red {
width: 8px; width: 8px;
height: 8px; height: 8px;
...@@ -178,6 +223,7 @@ ...@@ -178,6 +223,7 @@
-webkit-border-radius: 50%; -webkit-border-radius: 50%;
} }
} }
.line-botttom { .line-botttom {
height: 1px; height: 1px;
width: 1592px; width: 1592px;
......
src/views/zzwlr/htcj.vue
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
codeUrl="/api/code/sex" codeUrl="/api/code/sex"
:clearable="true" :clearable="true"
:multiple="false" :multiple="false"
:form="ruleForm" :form="liveCollectionTo"
class="xb" class="xb"
v-model="liveCollectionTo.sex" v-model="liveCollectionTo.sex"
id="sex" id="sex"
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<span>身份证号：</span> <span>身份证号：</span>
<el-input <el-input
placeholder="请输入身份证号" placeholder="请输入身份证号"
v-model="liveCollectionTo.idcard" v-model="liveCollectionTo.idCard"
@keyup.enter.native="search" @keyup.enter.native="search"
> >
</el-input> </el-input>
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<span>采集单位：</span> <span>采集单位：</span>
<Cascader <Cascader
ref="cascader" ref="cascader"
:form="ruleForm" :form="liveCollectionTo"
id="collectionDw" id="collectionDw"
class="cjdw" class="cjdw"
:width="17.1612" :width="17.1612"
...@@ -75,6 +75,7 @@ ...@@ -75,6 +75,7 @@
<div class="filter nysj"> <div class="filter nysj">
<span>捺印日期：</span> <span>捺印日期：</span>
<el-date-picker <el-date-picker
@change="getParam"
v-model="startEndDate" v-model="startEndDate"
style="display: flex; align-items: center" style="display: flex; align-items: center"
type="daterange" type="daterange"
...@@ -592,10 +593,14 @@ export default { ...@@ -592,10 +593,14 @@ export default {
deep: true, deep: true,
immediate: true, immediate: true,
handler: function (newV, oldV) { handler: function (newV, oldV) {
console.log(newV);
if(newV.barcode || newV.name || newV.sex || newV.idCard || newV.collectionDw || newV.collectionName || newV.printingTimeStart !== ''){ if(newV.barcode || newV.name || newV.sex || newV.idCard || newV.collectionDw || newV.collectionName || newV.printingTimeStart !== ''){
// console.log('不为空，有清空'); // console.log('不为空，有清空');
this.isActive = true this.isActive = true
this.isShow = false this.isShow = false
} else {
this.isActive = false
this.isShow = true
} }
} }
} }
......
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