diff --git a/src/components/case/index.vue b/src/components/case/index.vue
index ce6b93b..3bf5046 100644
--- a/src/components/case/index.vue
+++ b/src/components/case/index.vue
@@ -602,11 +602,23 @@ export default {
this.minutes = `${m > 9 ? m : `0${m}`}`;
this.seconds = `${s > 9 ? s : `0${s}`}`;
} else {
- this.$alert('考试已结束,已自动为您提交。', '提示', {
- confirmButtonText: '确定',
- type: 'warning',
- center: true
- });
+ this.$confirm('此操作将视为结束考试, 是否继续?', '提示', {
+ confirmButtonText: '确定',
+ 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';
diff --git a/src/main.js b/src/main.js
index aecbd88..584953f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -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
})
diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index ae3f654..a81c6c7 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -111,7 +111,7 @@
+ ko
- 请从以下物品中选取所需材料 -
- 请从物品栏选中或拖拽所需材料 -
@@ -141,9 +141,9 @@
-
+
-
+
{{item.name}}
@@ -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
{ // 结束拖拽
+ console.log('???')
+ // 判断拖拽的地址
+ if(!this.$refs.popUpImportanceArr) return this.$message.warning('非可拖拽的交互!')
+ let targetDom = this.$refs.popUpImportanceArr.getBoundingClientRect()
+ if(evt.originalEvent.pageXtargetDom.left){
+ if(evt.originalEvent.pageYtargetDom.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 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,
diff --git a/src/pages/manage/index/index.vue b/src/pages/manage/index/index.vue
index 24937a8..692246f 100644
--- a/src/pages/manage/index/index.vue
+++ b/src/pages/manage/index/index.vue
@@ -66,6 +66,34 @@ export default {
diff --git a/src/pages/manage/list/business/deposit.vue b/src/pages/manage/list/business/deposit.vue
index 7dc1541..7b59ce8 100644
--- a/src/pages/manage/list/business/deposit.vue
+++ b/src/pages/manage/list/business/deposit.vue
@@ -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;
diff --git a/src/pages/manage/list/business/openAccount.vue b/src/pages/manage/list/business/openAccount.vue
index d48bf71..76a510e 100644
--- a/src/pages/manage/list/business/openAccount.vue
+++ b/src/pages/manage/list/business/openAccount.vue
@@ -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;
diff --git a/src/pages/manage/list/business/transfer.vue b/src/pages/manage/list/business/transfer.vue
index 1e58058..53ba8e1 100644
--- a/src/pages/manage/list/business/transfer.vue
+++ b/src/pages/manage/list/business/transfer.vue
@@ -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;
diff --git a/src/pages/manage/list/business/withdrawal.vue b/src/pages/manage/list/business/withdrawal.vue
index 66c93fd..d34fcc1 100644
--- a/src/pages/manage/list/business/withdrawal.vue
+++ b/src/pages/manage/list/business/withdrawal.vue
@@ -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;
diff --git a/src/pages/manage/list/client/corporateClient.vue b/src/pages/manage/list/client/corporateClient.vue
index 41e3d6a..d2d278a 100644
--- a/src/pages/manage/list/client/corporateClient.vue
+++ b/src/pages/manage/list/client/corporateClient.vue
@@ -241,8 +241,10 @@ export default {
\ No newline at end of file
diff --git a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
index cf64a18..e1d70bb 100644
--- a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
+++ b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
@@ -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%);
+ // }
}
\ No newline at end of file
diff --git a/src/pages/manage/list/personal/currentAccount/deposit.vue b/src/pages/manage/list/personal/currentAccount/deposit.vue
index 345bf5c..f81253e 100644
--- a/src/pages/manage/list/personal/currentAccount/deposit.vue
+++ b/src/pages/manage/list/personal/currentAccount/deposit.vue
@@ -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%);
+ // }
}
\ No newline at end of file
diff --git a/src/pages/manage/list/personal/currentAccount/index.vue b/src/pages/manage/list/personal/currentAccount/index.vue
index 87e77ed..f1789ef 100644
--- a/src/pages/manage/list/personal/currentAccount/index.vue
+++ b/src/pages/manage/list/personal/currentAccount/index.vue
@@ -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;
diff --git a/src/pages/manage/list/personal/currentAccount/openAccount.vue b/src/pages/manage/list/personal/currentAccount/openAccount.vue
index f272e24..1bf7c7e 100644
--- a/src/pages/manage/list/personal/currentAccount/openAccount.vue
+++ b/src/pages/manage/list/personal/currentAccount/openAccount.vue
@@ -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;
diff --git a/src/pages/manage/list/personal/currentAccount/settle.vue b/src/pages/manage/list/personal/currentAccount/settle.vue
index 2c6ed74..92fec22 100644
--- a/src/pages/manage/list/personal/currentAccount/settle.vue
+++ b/src/pages/manage/list/personal/currentAccount/settle.vue
@@ -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%);
+ // }
}
\ No newline at end of file
diff --git a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
index 268fdb7..784e6d9 100644
--- a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
+++ b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
@@ -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%);
+ // }
}
\ No newline at end of file
diff --git a/src/pages/manage/list/personal/currentAccount/withdrawal.vue b/src/pages/manage/list/personal/currentAccount/withdrawal.vue
index 6289703..7b326a2 100644
--- a/src/pages/manage/list/personal/currentAccount/withdrawal.vue
+++ b/src/pages/manage/list/personal/currentAccount/withdrawal.vue
@@ -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%);
+ // }
}
\ No newline at end of file
diff --git a/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue b/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue
index a05b76c..7c6d868 100644
--- a/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue
+++ b/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue
@@ -10,7 +10,7 @@
-
+
diff --git a/src/styles/system.scss b/src/styles/system.scss
index 6a3ce6c..62c0a0a 100644
--- a/src/styles/system.scss
+++ b/src/styles/system.scss
@@ -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;
diff --git a/test.txt b/test.txt
index e3fe3bc..e69de29 100644
--- a/test.txt
+++ b/test.txt
@@ -1,14 +0,0 @@
-作用域链是从当前作用域逐层查找的,一直查找到window,那么这样一个查找是要花费时间的,如果我们让他马上查到这个变量。
-我们是不是就节省了这个时间。所以我们可以把我们要使用的变量,作为参数传入方法,或者再方法里进行缓存,来提升速度。
-晚上我们会具体的和大家讲到这个点
-
-Vue3的架构方案是函数式编程,这种编程方式再早期的时候,就是lodash和underscore这样工具的方案,而vue2的方案是一种建造者模式。
-好处在于
-1, 更有利于tree-shaking。这也是vue3为什么要改成函数式编程的最大原因。
-2, 函数式编程可扩张性更好。
-
-设计模式分为
-1, 创建型设计模式,用来指导对象的创建,用在我们设计需求的架构时。
-2, 结构型,用来指导功能模块的结构,就像我们设计公司的组织结构一样。
-3, 行为型设计模式,用来解决模块间行为的问题,设计模块间如何沟通
-4, 技巧型设计模式,一些优化代码的技巧
\ No newline at end of file