Merge remote-tracking branch 'origin/master'

20240205
e 3 years ago
commit 53b658066c
  1. 18
      src/components/case/index.vue
  2. 2
      src/main.js
  3. 79
      src/pages/counter/list/index.vue
  4. 62
      src/pages/manage/index/index.vue
  5. 22
      src/pages/manage/list/acceptanceDraft/invoice.vue
  6. 22
      src/pages/manage/list/business/deposit.vue
  7. 22
      src/pages/manage/list/business/openAccount.vue
  8. 22
      src/pages/manage/list/business/transfer.vue
  9. 22
      src/pages/manage/list/business/withdrawal.vue
  10. 25
      src/pages/manage/list/client/corporateClient.vue
  11. 22
      src/pages/manage/list/personal/currentAccount/accountCancellation.vue
  12. 22
      src/pages/manage/list/personal/currentAccount/deposit.vue
  13. 22
      src/pages/manage/list/personal/currentAccount/index.vue
  14. 22
      src/pages/manage/list/personal/currentAccount/openAccount.vue
  15. 22
      src/pages/manage/list/personal/currentAccount/settle.vue
  16. 22
      src/pages/manage/list/personal/currentAccount/transferAccounts.vue
  17. 22
      src/pages/manage/list/personal/currentAccount/withdrawal.vue
  18. 2
      src/pages/manage/list/personal/usefulPhrases/accountClosed.vue
  19. 6
      src/styles/system.scss
  20. 14
      test.txt

@ -602,11 +602,23 @@ export default {
this.minutes = `${m > 9 ? m : `0${m}`}`;
this.seconds = `${s > 9 ? s : `0${s}`}`;
} else {
this.$alert('考试已结束,已自动为您提交。', '提示', {
this.$confirm('此操作将视为结束考试, 是否继续?', '提示', {
confirmButtonText: '确定',
type: 'warning',
center: true
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.sureSubmit(true)
}).catch(() => {
// this.$message({
// type: "info",
// message: ""
// });
});
// this.$alert('', '', {
// confirmButtonText: '',
// type: 'warning',
// center: true
// });
this.sss = 0
this.sureSubmit(true)
this.day = '00';

@ -45,7 +45,7 @@ Vue.use(plugins);
Vue.use(VueLazyload, {
preLoad: 1.3,
// loading: require('@/assets/img/loading.gif'),
loading: require('@/assets/img/loading.gif'),
attempt: 2
})

@ -111,7 +111,7 @@
<div class="dia-header">
<div class="data-title">{{ popText }}</div>
<img class="close" v-lazy="lazyImg[28]" alt="" @click="closePop" />
</div>
</div>ko
<p v-if="popText=='密码器'" class="tips"></p>
<p v-else-if="popText=='重要空白凭证箱'||popText=='普通凭证箱'" class="tips">- 请从以下物品中选取所需材料 -</p>
<p v-else class="tips">- 请从物品栏选中或拖拽所需材料 -</p>
@ -141,9 +141,9 @@
</div>
</div>
<div v-else-if="popText==='重要空白凭证箱'" class="seal" style="width:1200px;">
<div v-else-if="popText==='重要空白凭证箱'" class="seal" style="width:1200px;" ref="popUpImportanceArr">
<div class="left else">
<div v-for="(item, index) in importanceArr" :key="index" :class="{ checked: importantChecked.includes(item.id),file:true }" @click="dblClickFn(item)">
<div v-for="(item, index) in importanceArr" :key="index" :class="{ checked: importantChecked.includes(item.id),file:true, importanceArrClass: true }" @click="dblClickFn(item)">
<img :src="item.src" alt="" />
<p>{{item.name}}</p>
</div>
@ -759,6 +759,77 @@ export default {
if(newVal === false) {
this.changeShowGoods(false)
}
},
showPop(newVal) {
if(newVal) {
this.$nextTick(() => {
const importanceArrClassArr = document.getElementsByClassName('importanceArrClass')
new Sortable(this.$refs.popUpImportanceArr, {
animation: 150,
group: {
name:'shared',
pull:'clone',//
put:true
},
sort: false,//
//
onAdd: evt => {
if(!importanceArrClassArr.length) return that.$message.warning('非可拖拽的交互!')
console.log('what the fuck')
console.log(this.goodsShelfTotalData)
},
});
// popUpImportanceArr
for(let i=0;i<this.importanceArr.length;i++) {
new Sortable(importanceArrClassArr[i], {
animation: 150,
group: {
name:'shared',
pull:'clone',//
put:false//
},
sort: false,//
onEnd: evt => { //
console.log('???')
//
if(!this.$refs.popUpImportanceArr) return this.$message.warning('非可拖拽的交互!')
let targetDom = this.$refs.popUpImportanceArr.getBoundingClientRect()
if(evt.originalEvent.pageX<targetDom.right&&evt.originalEvent.pageX>targetDom.left){
if(evt.originalEvent.pageY<targetDom.bottom&&evt.originalEvent.pageY>targetDom.top){
/* oldindex识别是拖拽了哪个文件 */
console.log(this.goodsShelfTotalData[evt.oldIndex].name,'执行拖拽2');
this.checkList.push(this.goodsShelfTotalData[evt.oldIndex].name)
let ifElse = 0;
for(var i=0;i<this.popArr.length;i++){
if (this.goodsShelfTotalData[evt.oldIndex].name == this.popArr[i].name){
if (this.receptionList == null){
this.receptionList = []
}
if (this.receptionList.length){
for(var j=0;j< this.receptionList.length;j++){
if (this.receptionList[j].name == this.goodsShelfTotalData[evt.oldIndex].name){
ifElse = ifElse+1
}
}
if(ifElse > 0){
}else{
this.receptionList.push(this.popArr[i])
}
}else{
this.receptionList.push(this.popArr[i])
}
}
}
}
}
},
});
}
})
}
}
},
created() {
@ -768,6 +839,7 @@ export default {
} else {
this.manageVisible = false;
}
console.log('what?')
},
mounted(){
let that = this
@ -815,6 +887,7 @@ export default {
}
},
});
// (item, index) in importanceArr" :ref="'importanceArr'+index
// -
new Sortable(this.$refs.popUp, {
animation: 150,

@ -66,6 +66,34 @@ export default {
</script>
<style lang="scss" scoped>
$font_size_All: 16px; //
$submenu_padding_left: 25px; // padding-left
@media screen and (min-width: 1920px) {
/deep/.el-form {
// height: 42vh;
min-height: 45vh;
// overflow: auto;
}
/deep/.submitBtn{
max-width: 10vw!important;
}
}
@media screen and (min-width: 1200px) and (max-width: 1700px) {
/deep/.el-form {
min-height: 40vh;
}
/deep/.submitBtn{
max-width: 12vw!important;
}
}
.box{
display: flex;
min-width: 1300px;
@ -88,6 +116,9 @@ export default {
border-top-left-radius: 15px;
color: #B3B3B3;
background: #222428;
p{
font-size: 21px;
}
}
.body{
flex: 1;
@ -149,15 +180,33 @@ export default {
border-color: #f40!important;;
}
$font_size_16: 16px;
/deep/ .text-xl p {
font-size: $font_size_16!important;
font-size: $font_size_All!important;
}
/deep/ .el-form-item .el-form-item__label {
font-size: $font_size_16!important;
font-size: $font_size_All!important;
}
/deep/ .el-submenu{
padding-left: $submenu_padding_left!important;
}
/deep/ .el-menu-item {
font-size: $font_size_16;
/deep/ .el-submenu .el-menu-item {
padding-left: $submenu_padding_left + 25px!important;
font-size: $font_size_All!important;
}
// /deep/ .el-menu-item {
// padding-left: $submenu_padding_left + 25px!important;
// font-size: $font_size_All!important;
// }
/deep/ .el-menu span{
font-size: $font_size_All!important;
}
/deep/ .title p {
font-size: $font_size_All!important;
}
/deep/ .idCard p {
font-size: $font_size_All!important;
}
// /deep/ .el-form-item__error {
// top: 105%;
@ -167,6 +216,9 @@ export default {
// }
@media screen and (min-width: 1200px) and (max-width: 1700px) {
/deep/.el-input {
width: 15vw!important;
}
/deep/ .idCard {
width: 15vw;
}
}

@ -329,16 +329,16 @@ export default {
.body{
margin-top: 50px;
}
.submitBtn{
position: relative;
width: 300px;
font-size: 18px;
height: 68px;
margin-top: 50px;
border-radius: 10px;
bottom: 10px;
left: 50%;
transform: translate(-50%,-20%);
}
// .submitBtn{
// position: relative;
// width: 300px;
// font-size: 18px;
// height: 68px;
// margin-top: 50px;
// border-radius: 10px;
// bottom: 10px;
// left: 50%;
// transform: translate(-50%,-20%);
// }
}
</style>

@ -263,17 +263,17 @@ export default {
}
}
}
.submitBtn{
position: relative;
width: 300px;
font-size: 18px;
height: 68px;
margin-top: 50px;
border-radius: 10px;
bottom: 10px;
left: 50%;
transform: translate(-50%,-0%);
}
// .submitBtn{
// position: relative;
// width: 300px;
// font-size: 18px;
// height: 68px;
// margin-top: 50px;
// border-radius: 10px;
// bottom: 10px;
// left: 50%;
// transform: translate(-50%,-0%);
// }
.popBody{
min-height: 200px;
display: flex;

@ -381,17 +381,17 @@ export default {
}
}
}
.submitBtn{
position: relative;
width: 300px;
font-size: 18px;
height: 68px;
margin-top: 50px;
border-radius: 10px;
bottom: 10px;
left: 50%;
transform: translate(-50%,-50%);
}
// .submitBtn{
// position: relative;
// width: 300px;
// font-size: 18px;
// height: 68px;
// margin-top: 50px;
// border-radius: 10px;
// bottom: 10px;
// left: 50%;
// transform: translate(-50%,-50%);
// }
.popBody{
min-height: 200px;
display: flex;

@ -313,17 +313,17 @@ export default {
}
}
}
.submitBtn{
position: relative;
width: 300px;
font-size: 18px;
height: 68px;
margin-top: 50px;
border-radius: 10px;
bottom: 10px;
left: 50%;
transform: translate(-50%,-50%);
}
// .submitBtn{
// position: relative;
// width: 300px;
// font-size: 18px;
// height: 68px;
// margin-top: 50px;
// border-radius: 10px;
// bottom: 10px;
// left: 50%;
// transform: translate(-50%,-50%);
// }
.popBody{
min-height: 200px;
display: flex;

@ -345,17 +345,17 @@ export default {
}
}
}
.submitBtn{
position: relative;
width: 300px;
font-size: 18px;
height: 68px;
margin-top: 50px;
border-radius: 10px;
bottom: 10px;
left: 50%;
transform: translate(-50%,-50%);
}
// .submitBtn{
// position: relative;
// width: 300px;
// font-size: 18px;
// height: 68px;
// margin-top: 50px;
// border-radius: 10px;
// bottom: 10px;
// left: 50%;
// transform: translate(-50%,-50%);
// }
.popBody{
min-height: 200px;
display: flex;

@ -241,8 +241,10 @@ export default {
</script>
<style lang="scss" scoped>
.body{
margin-top: 50px;
margin-bottom: 50px;
.idCard{
cursor: pointer;
border-radius: 5px;
@ -254,14 +256,19 @@ export default {
color: #6191FF;
}
}
.submitBtn{
position: absolute;
width: 300px;
font-size: 18px;
height: 68px;
border-radius: 10px;
bottom: 10px;
left: 50%;
transform: translate(-50%,-50%);
@media screen and (min-width: 1200px) and (max-width: 1700px) {
.body {
margin-bottom: 50px;
}
}
// .submitBtn{
// position: absolute;
// width: 300px;
// font-size: 18px;
// height: 68px;
// border-radius: 10px;
// bottom: 10px;
// left: 50%;
// transform: translate(-50%,-50%);
// }
</style>

@ -139,16 +139,16 @@ export default{
color: #6191FF;
cursor: pointer;
}
.submitBtn{
position: relative;
width: 300px;
font-size: 18px;
height: 68px;
margin-top: 50px;
border-radius: 10px;
bottom: 10px;
left: 50%;
transform: translate(-50%,-20%);
}
// .submitBtn{
// position: relative;
// width: 300px;
// font-size: 18px;
// height: 68px;
// margin-top: 50px;
// border-radius: 10px;
// bottom: 10px;
// left: 50%;
// transform: translate(-50%,-20%);
// }
}
</style>

@ -178,16 +178,16 @@ export default{
color: #6191FF;
cursor: pointer;
}
.submitBtn{
position: relative;
width: 300px;
font-size: 18px;
height: 68px;
margin-top: 50px;
border-radius: 10px;
bottom: 10px;
left: 50%;
transform: translate(-50%,-50%);
}
// .submitBtn{
// position: relative;
// width: 300px;
// font-size: 18px;
// height: 68px;
// margin-top: 50px;
// border-radius: 10px;
// bottom: 10px;
// left: 50%;
// transform: translate(-50%,-50%);
// }
}
</style>

@ -184,17 +184,17 @@ export default {
}
}
}
.submitBtn{
position: relative;
width: 300px;
font-size: 18px;
height: 68px;
margin-top: 50px;
border-radius: 10px;
bottom: 10px;
left: 50%;
transform: translate(-50%,-50%);
}
// .submitBtn{
// position: relative;
// width: 300px;
// font-size: 18px;
// height: 68px;
// margin-top: 50px;
// border-radius: 10px;
// bottom: 10px;
// left: 50%;
// transform: translate(-50%,-50%);
// }
.popBody{
min-height: 200px;
display: flex;

@ -574,17 +574,17 @@ export default {
}
}
}
.submitBtn{
position: relative;
width: 300px;
font-size: 18px;
height: 68px;
margin-top: 50px;
border-radius: 10px;
bottom: 10px;
left: 50%;
transform: translate(-50%,-50%);
}
// .submitBtn{
// position: relative;
// width: 300px;
// font-size: 18px;
// height: 68px;
// margin-top: 50px;
// border-radius: 10px;
// bottom: 10px;
// left: 50%;
// transform: translate(-50%,-50%);
// }
.popBody{
min-height: 200px;
display: flex;

@ -186,16 +186,16 @@ export default{
color: #6191FF;
cursor: pointer;
}
.submitBtn{
position: relative;
width: 300px;
font-size: 18px;
height: 68px;
margin-top: 50px;
border-radius: 10px;
bottom: 10px;
left: 50%;
transform: translate(-50%,-20%);
}
// .submitBtn{
// position: relative;
// width: 300px;
// font-size: 18px;
// height: 68px;
// margin-top: 50px;
// border-radius: 10px;
// bottom: 10px;
// left: 50%;
// transform: translate(-50%,-20%);
// }
}
</style>

@ -194,16 +194,16 @@ export default{
color: #6191FF;
cursor: pointer;
}
.submitBtn{
position: relative;
width: 300px;
font-size: 18px;
height: 68px;
margin-top: 50px;
border-radius: 10px;
bottom: 10px;
left: 50%;
transform: translate(-50%,-50%);
}
// .submitBtn{
// position: relative;
// width: 300px;
// font-size: 18px;
// height: 68px;
// margin-top: 50px;
// border-radius: 10px;
// bottom: 10px;
// left: 50%;
// transform: translate(-50%,-50%);
// }
}
</style>

@ -193,16 +193,16 @@ export default{
color: #6191FF;
cursor: pointer;
}
.submitBtn{
position: relative;
width: 300px;
font-size: 18px;
height: 68px;
margin-top: 50px;
border-radius: 10px;
bottom: 10px;
left: 50%;
transform: translate(-50%,-50%);
}
// .submitBtn{
// position: relative;
// width: 300px;
// font-size: 18px;
// height: 68px;
// margin-top: 50px;
// border-radius: 10px;
// bottom: 10px;
// left: 50%;
// transform: translate(-50%,-50%);
// }
}
</style>

@ -10,7 +10,7 @@
</el-select>
</el-form-item>
<el-form-item label="凭证号码" prop="voucherNumber">
<div class="idCard" @click="popUp('身份证扫描仪')">
<div class="idCard" @click="popUp('银行卡扫描仪')">
<p>请刷银行卡</p>
</div>
</el-form-item>

@ -1,12 +1,12 @@
.submitBtn{
position: absolute;
width: 300px;
position: relative;
width: 10vw;
font-size: 18px;
height: 68px;
border-radius: 10px;
bottom: 10px;
left: 50%;
transform: translate(-50%,-50%);
transform: translate(-50%,0);
}
.popBody{
min-height: 200px;

@ -1,14 +0,0 @@
作用域链是从当前作用域逐层查找的,一直查找到window,那么这样一个查找是要花费时间的,如果我们让他马上查到这个变量。
我们是不是就节省了这个时间。所以我们可以把我们要使用的变量,作为参数传入方法,或者再方法里进行缓存,来提升速度。
晚上我们会具体的和大家讲到这个点
Vue3的架构方案是函数式编程,这种编程方式再早期的时候,就是lodash和underscore这样工具的方案,而vue2的方案是一种建造者模式。
好处在于
1, 更有利于tree-shaking。这也是vue3为什么要改成函数式编程的最大原因。
2, 函数式编程可扩张性更好。
设计模式分为
1, 创建型设计模式,用来指导对象的创建,用在我们设计需求的架构时。
2, 结构型,用来指导功能模块的结构,就像我们设计公司的组织结构一样。
3, 行为型设计模式,用来解决模块间行为的问题,设计模块间如何沟通
4, 技巧型设计模式,一些优化代码的技巧
Loading…
Cancel
Save