Merge branch 'master' of ssh://git.czcyedu.com:222/huoran/FE_bankTeaching

20240205
yujialong 3 years ago
commit e5370a3dcd
  1. 34
      src/App.vue
  2. 46
      src/components/case/index.vue
  3. 14
      src/components/selectBusiness/index.vue
  4. 36
      src/pages/counter/list/index.vue
  5. 4
      src/store/modules/system.js

@ -1,10 +1,9 @@
<template> <template>
<div id="app" > <div id="app" >
<select-business class="selectBusiness" :showIt.sync="showIt" /> <select-business class="selectBusiness" :showIt.sync="showIt" v-show="!showIt && showBusiness" />
<router-view></router-view> <router-view></router-view>
<vCase :showIt.sync="showIt"></vCase> <vCase :showIt.sync="showIt"></vCase>
<tip-dialog />
</div> </div>
</template> </template>
<script> <script>
@ -12,12 +11,14 @@
import Setting from '@/setting'; import Setting from '@/setting';
import util from '@/libs/util'; import util from '@/libs/util';
import selectBusiness from '@/components/selectBusiness' import selectBusiness from '@/components/selectBusiness'
import TipDialog from '@/components/tipDialog'
import { mapState, mapMutations } from 'vuex' import { mapState, mapMutations } from 'vuex'
export default { export default {
name: 'App', name: 'App',
components: { components: {
vCase, vCase,
selectBusiness selectBusiness,
TipDialog
}, },
created () { created () {
//localStorage //localStorage
@ -34,24 +35,42 @@
}, },
data() { data() {
return { return {
showIt: true showIt: true,
showSelect: false
} }
}, },
methods: { methods: {
...mapMutations({ ...mapMutations({
setShowBusiness: 'system/setShowBusiness' setShowBusiness: 'system/setShowBusiness',
setTipsOperate: 'system/setTipsOperate'
}), }),
}, },
watch: { watch: {
showIt(newVal) { showIt: {
handler(newVal) {
if(!newVal && !this.businessKey) { if(!newVal && !this.businessKey) {
this.setShowBusiness(true) this.setShowBusiness(true)
}else {
if(!newVal) {
//
if(!this.businessKey) {
this.$nextTick(() => { this.setShowBusiness(true) })
}else {
// this.setTipsOperate('' + this.businessKey + ',');
}
}else {
this.$nextTick(() => { this.setShowBusiness(false) })
} }
} }
}, },
immediate: true
}
},
computed: { computed: {
...mapState({ ...mapState({
businessKey: state => state.system.businessKey,
showBusiness: state => state.system.showBusiness,
businessKey: state => state.system.businessKey businessKey: state => state.system.businessKey
}) })
}, },
@ -61,6 +80,7 @@
<style scoped> <style scoped>
#app { #app {
min-width: 1300px; min-width: 1300px;
min-height: 800px;
} }
.selectBusiness { .selectBusiness {
width: 100%; width: 100%;

@ -1,6 +1,8 @@
<template> <template>
<div> <div>
<el-container class="scrollbar animate__animated animate__bounceInLeft" v-show="showIt"> <transition name="slide-fade" enter-active-class="animate__animated animate__bounceInLeft" leave-active-class=" animate__animated animate__bounceOutLeft">
<el-container v-show="showIt">
<el-header> <el-header>
<div class="flex a-center j-between"> <div class="flex a-center j-between">
<div class="flex a-center" style="width: 28%"> <div class="flex a-center" style="width: 28%">
@ -51,7 +53,7 @@
</div> </div>
<div class="font_css"> <div class="font_css">
<div class="experimentalGoal"> <div class="experimentalGoal">
<div class="break-all" v-html="projectManage.experimentTarget"> <div class="break-all" v-html="projectManage.experimentTarget" style="font-size: 0.875rem;">
</div> </div>
</div> </div>
</div> </div>
@ -74,12 +76,12 @@
<i <i
v-if="scope.row.right==true" v-if="scope.row.right==true"
class="el-icon-check" class="el-icon-check"
style="color:green;font-size:16px" style="color:green;"
></i> ></i>
<i <i
v-else-if="scope.row.right==false" v-else-if="scope.row.right==false"
class="el-icon-close" class="el-icon-close"
style="color:red;font-size:16px" style="color:red;"
></i> ></i>
</template> </template>
</el-table-column> </el-table-column>
@ -99,13 +101,13 @@
<el-tab-pane label="实验要求" name="second"> <el-tab-pane label="实验要求" name="second">
<el-collapse :value="activeNames" accordion > <el-collapse :value="activeNames" accordion >
<el-collapse-item v-for="(item,index) in requires" :key="index" :name="item.id"> <el-collapse-item v-for="(item,index) in requires" :key="index" :name="item.id">
<template slot="title" style='line-height: 0px;font-size: 16px'> <template slot="title" style='line-height: 0px;'>
<i class='el-icon-s-ticket'></i> <i class='el-icon-s-ticket'></i>
<span style="margin: 0px 10px;font-size: 16px">{{ item.name }}</span> <span style="margin: 0px 10px;font-size: 1rem;">{{ item.name }}</span>
</template> </template>
<div class="break-all" style="font-size: 16px" v-html="item.experimentalRequirements"></div> <div class="break-all" v-html="item.experimentalRequirements"></div>
</el-collapse-item> </el-collapse-item>
<p ref="scrollTag"></p> <!-- <p ref="scrollTag" style="font-size:16px;"></p> -->
</el-collapse> </el-collapse>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="实验提示" name="fifth" v-if="hintOpen == 0"> <el-tab-pane label="实验提示" name="fifth" v-if="hintOpen == 0">
@ -115,6 +117,7 @@
</el-main> </el-main>
</el-container> </el-container>
</el-container> </el-container>
</transition>
<!-- </div> --> <!-- </div> -->
<div class="panel" :class="{active: showIt}"> <div class="panel" :class="{active: showIt}">
<div @click="toggleCase"> <div @click="toggleCase">
@ -122,11 +125,14 @@
<img src="../../assets/img/case/right.png" alt v-else /> <img src="../../assets/img/case/right.png" alt v-else />
</div> </div>
</div> </div>
<div class='popContainer' v-if='popContainer'></div>
<div class='popContainer' v-if='popContainer'></div>
<!-- 遮罩层 -->
<div class="absolute z-50 w-screen h-screen bg-transparent inset-0" v-show="showIt"></div> <div class="absolute z-50 w-screen h-screen bg-transparent inset-0" v-show="showIt"></div>
</div> </div>
</template> </template>
@ -828,6 +834,10 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
$togetherFontSize: 16px; $togetherFontSize: 16px;
/deep/ .el-tab-pane {
font-size: 1rem!important;
}
.scrollbar { .scrollbar {
z-index: 100000000; z-index: 100000000;
} }
@ -895,6 +905,7 @@ $togetherFontSize: 16px;
.aside-header { .aside-header {
margin: 0px 10px 10px 10px; margin: 0px 10px 10px 10px;
background-color: #fff; background-color: #fff;
font-size: .875rem;
} }
.aside-footer { .aside-footer {
margin: 0px 10px 10px 10px; margin: 0px 10px 10px 10px;
@ -990,7 +1001,8 @@ $togetherFontSize: 16px;
} }
.el-table{ .el-table{
font-size: $togetherFontSize; // font-size: $togetherFontSize;
font-size: .75rem;
color: #202020; color: #202020;
.el-table--striped .el-table__body tr.el-table__row--striped td { .el-table--striped .el-table__body tr.el-table__row--striped td {
background: #eef7ff; background: #eef7ff;
@ -1008,8 +1020,7 @@ $togetherFontSize: 16px;
} }
th > .cell{ th > .cell{
font-weight: 100; font-weight: 100;
font-size: togetherFontSize; font-size: .875rem;
font-size: $togetherFontSize;
} }
th,tr{ th,tr{
background-color: #fff; background-color: #fff;
@ -1018,7 +1029,7 @@ $togetherFontSize: 16px;
.el-table__header-wrapper{ .el-table__header-wrapper{
thead{ thead{
color: #ffffff; color: #ffffff;
font-size: 10px; font-size: .875rem;
font-size: $togetherFontSize; font-size: $togetherFontSize;
th{ th{
padding: 5px 0; padding: 5px 0;
@ -1037,7 +1048,7 @@ $togetherFontSize: 16px;
} }
} }
/deep/ .el-collapse{ /deep/ .el-collapse{
font-size: $togetherFontSize; font-size: .875rem;
} }
.el-collapse-item__content{ .el-collapse-item__content{
padding-left: 10px; padding-left: 10px;
@ -1047,8 +1058,8 @@ $togetherFontSize: 16px;
.el-collapse-item__wrap { .el-collapse-item__wrap {
border-bottom: none; border-bottom: none;
} }
.el-collapse-item__header { /deep/.el-collapse-item__header {
font-size: togetherFontSize; font-size: 1rem;
border-bottom: none; border-bottom: none;
} }
@ -1106,8 +1117,7 @@ $togetherFontSize: 16px;
} }
} }
.break-all{ .break-all{
font-size: 14px; font-size: 1rem;
font-size: $togetherFontSize;
word-break: break-all; word-break: break-all;
} }
.panel{ .panel{

@ -1,5 +1,5 @@
<template> <template>
<el-dialog :visible="showBusiness" class="" @close="closeData" :close-on-click-modal="false" :show-close="false" custom-class="animate__animated animate__bounceIn data-dia 2xl:w-7/12 xl:w-9/12 lg:w-full h-9/12"> <el-dialog :visible="true" class="" :modal="false" @close="closeData" :close-on-click-modal="false" :show-close="false" custom-class="animate__animated animate__bounceIn data-dia 2xl:w-7/12 xl:w-9/12 lg:w-full h-9/12">
<div slot="title" class="dia-header2"> <div slot="title" class="dia-header2">
<div class="data-title2">请选择业务</div> <div class="data-title2">请选择业务</div>
<div class="close"><img v-lazy="closeImg" alt="" @click="showBusinessSelect(false)" /></div> <div class="close"><img v-lazy="closeImg" alt="" @click="showBusinessSelect(false)" /></div>
@ -32,7 +32,7 @@ export default {
// } // }
// default: '' // default: ''
}, },
created() { mounted() {
if(this.businessKey) { if(this.businessKey) {
// //
this.takeCheck = this.businessKey this.takeCheck = this.businessKey
@ -164,12 +164,13 @@ export default {
methods: { methods: {
...mapMutations({ ...mapMutations({
setBusinessKey: 'system/setBusinessKey', setBusinessKey: 'system/setBusinessKey',
setShowBusiness: 'system/setShowBusiness' setShowBusiness: 'system/setShowBusiness',
setTipsOperate: 'system/setTipsOperate',
}), }),
closeData() { closeData() {
this.checkList = []; this.checkList = [];
}, },
async showBusinessSelect (judge) { showBusinessSelect (judge) {
if(!judge && !this.businessKey) { if(!judge && !this.businessKey) {
// this.$confirm(', ?', '', { // this.$confirm(', ?', '', {
// confirmButtonText: '', // confirmButtonText: '',
@ -184,7 +185,7 @@ export default {
// message: '' // message: ''
// }); // });
// }); // });
await this.$confirm('由于您未选择一个业务,这将回到项目列表,是否继续?', '提示', { this.$confirm('由于您未选择一个业务,这将回到项目列表,是否继续?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
center: true, center: true,
@ -201,6 +202,7 @@ export default {
return return
} }
this.setShowBusiness(judge) this.setShowBusiness(judge)
this.setTipsOperate('您正在进行' + this.businessKey + ',加油!');
}, },
checkTake(myKey){ checkTake(myKey){
if(this.takeCheck === myKey) { if(this.takeCheck === myKey) {
@ -242,7 +244,7 @@ export default {
this.takeCheck = this.businessKey this.takeCheck = this.businessKey
} }
} }
}, }
} }
</script> </script>

@ -8,7 +8,7 @@
<img class="sth glass" v-lazy="lazyImg[2]" alt="" @click="changePeopleJudge"/> <img class="sth glass" v-lazy="lazyImg[2]" alt="" @click="changePeopleJudge"/>
<!-- 系统录入 height: 178px;position:relative;top:-450px;right:20px--> <!-- 系统录入 height: 178px;position:relative;top:-450px;right:20px-->
<el-tooltip placement="top" popper-class="sth-popper"> <el-tooltip placement="top" popper-class="sth-popper animate-bounce">
<div slot="content" class="computerContent" style="" @click="showManage"> <div slot="content" class="computerContent" style="" @click="showManage">
<img style="height: 150px;" v-lazy="lazyImg[3]" alt="" /> <img style="height: 150px;" v-lazy="lazyImg[3]" alt="" />
</div> </div>
@ -17,84 +17,84 @@
</div> </div>
</el-tooltip> </el-tooltip>
<!-- 点击打开传票栏--> <!-- 点击打开传票栏-->
<el-tooltip placement="top" popper-class="sth-popper" offset="50"> <el-tooltip placement="top" popper-class="sth-popper animate-bounce" offset="50">
<div slot="content"> <div slot="content">
<img v-lazy="lazyImg[5]" alt="" /> <img v-lazy="lazyImg[5]" alt="" />
</div> </div>
<img class="sth summons cp" v-lazy="lazyImg[6]" alt="" @click="showData('传票栏',1)" /> <img class="sth summons cp" v-lazy="lazyImg[6]" alt="" @click="showData('传票栏',1)" />
</el-tooltip> </el-tooltip>
<!-- 点击打开普通凭证箱--> <!-- 点击打开普通凭证箱-->
<el-tooltip placement="top-start" popper-class="sth-popper" offset="250"> <el-tooltip placement="top-start" popper-class="sth-popper animate-bounce" offset="250">
<div slot="content"> <div slot="content">
<img v-lazy="lazyImg[7]" alt="" /> <img v-lazy="lazyImg[7]" alt="" />
</div> </div>
<img class="sth voucher-box cp" v-lazy="lazyImg[8]" alt="" @click="showData('普通凭证箱',2)" /> <img class="sth voucher-box cp" v-lazy="lazyImg[8]" alt="" @click="showData('普通凭证箱',2)" />
</el-tooltip> </el-tooltip>
<!-- 点击打开重要凭证箱--> <!-- 点击打开重要凭证箱-->
<el-tooltip placement="top-start" popper-class="sth-popper" offset="250"> <el-tooltip placement="top-start" popper-class="sth-popper animate-bounce" offset="250">
<div slot="content"> <div slot="content">
<img v-lazy="lazyImg[9]" alt="" /> <img v-lazy="lazyImg[9]" alt="" />
</div> </div>
<img class="sth important cp" v-lazy="lazyImg[10]" alt="" @click="showData('重要空白凭证箱',3)" /> <img class="sth important cp" v-lazy="lazyImg[10]" alt="" @click="showData('重要空白凭证箱',3)" />
</el-tooltip> </el-tooltip>
<!-- 点击打开钱箱--> <!-- 点击打开钱箱-->
<el-tooltip placement="left-start" popper-class="sth-popper"> <el-tooltip placement="left-start" popper-class="sth-popper animate-bounce">
<div slot="content"> <div slot="content">
<img v-lazy="lazyImg[11]" alt="" /> <img v-lazy="lazyImg[11]" alt="" />
</div> </div>
<img class="sth money-box cp" v-lazy="lazyImg[12]" alt="" @click="showData('钱箱',4)" /> <img class="sth money-box cp" v-lazy="lazyImg[12]" alt="" @click="showData('钱箱',4)" />
</el-tooltip> </el-tooltip>
<!-- 点击打开印章盒--> <!-- 点击打开印章盒-->
<el-tooltip placement="top" popper-class="sth-popper" offset="-100"> <el-tooltip placement="top" popper-class="sth-popper animate-bounce" offset="-100">
<div slot="content"> <div slot="content">
<img v-lazy="lazyImg[13]" alt="" /> <img v-lazy="lazyImg[13]" alt="" />
</div> </div>
<img class="sth seal-box cp" v-lazy="lazyImg[14]" @click="showData('印章盒',5)" alt="" /> <img class="sth seal-box cp" v-lazy="lazyImg[14]" @click="showData('印章盒',5)" alt="" />
</el-tooltip> </el-tooltip>
<!-- 点击打开验钞机--> <!-- 点击打开验钞机-->
<el-tooltip placement="top" popper-class="sth-popper" offset="-100"> <el-tooltip placement="top" popper-class="sth-popper animate-bounce" offset="-100">
<div slot="content"> <div slot="content">
<img v-lazy="lazyImg[15]" alt="" /> <img v-lazy="lazyImg[15]" alt="" />
</div> </div>
<img class="sth currency-detector cp" v-lazy="lazyImg[16]" @click="showData('验钞机',6)" alt="" /> <img class="sth currency-detector cp" v-lazy="lazyImg[16]" @click="showData('验钞机',6)" alt="" />
</el-tooltip> </el-tooltip>
<!-- 点击打开打印机--> <!-- 点击打开打印机-->
<el-tooltip placement="top" popper-class="sth-popper" offset="-400"> <el-tooltip placement="top" popper-class="sth-popper animate-bounce" offset="-400">
<div slot="content"> <div slot="content">
<img v-lazy="lazyImg[17]" alt="" /> <img v-lazy="lazyImg[17]" alt="" />
</div> </div>
<img class="sth printer cp" v-lazy="lazyImg[18]" alt="" @click="showData('打印机',7)" /> <img class="sth printer cp" v-lazy="lazyImg[18]" alt="" @click="showData('打印机',7)" />
</el-tooltip> </el-tooltip>
<!-- 点击打开密码器--> <!-- 点击打开密码器-->
<el-tooltip placement="top" popper-class="sth-popper" offset="50"> <el-tooltip placement="top" popper-class="sth-popper animate-bounce" offset="50">
<div slot="content"> <div slot="content">
<img v-lazy="lazyImg[19]" alt="" /> <img v-lazy="lazyImg[19]" alt="" />
</div> </div>
<img class="sth cipher-machine cp" v-lazy="lazyImg[20]" @click="showData('密码器',8)" alt="" /> <img class="sth cipher-machine cp" v-lazy="lazyImg[20]" @click="showData('密码器',8)" alt="" />
</el-tooltip> </el-tooltip>
<el-tooltip placement="top" popper-class="sth-popper" offset="50"> <el-tooltip placement="top" popper-class="sth-popper animate-bounce" offset="50">
<div slot="content"> <div slot="content" style="margin-left: -250px">
<!-- <img v-lazy="this.lazyImg[29]" alt="" /> --> <!-- <img v-lazy="this.lazyImg[29]" alt="" /> -->
</div> </div>
<img class="sth employee" v-lazy="lazyImg[21]" @click="setShowBusiness(true)" alt="" /> <img class="sth employee" v-lazy="lazyImg[21]" @click="setShowBusiness(true)" alt="" />
</el-tooltip> </el-tooltip>
<el-tooltip placement="top" popper-class="sth-popper" offset="-50"> <el-tooltip placement="top" popper-class="sth-popper animate-bounce" offset="-50">
<div slot="content"> <div slot="content">
<img v-lazy="lazyImg[22]" alt="" /> <img v-lazy="lazyImg[22]" alt="" />
</div> </div>
<p class="employeeText" @click="showData('资料',9)">资料</p> <p class="employeeText" @click="showData('资料',9)">资料</p>
</el-tooltip> </el-tooltip>
<!-- 点击打开刷卡器--> <!-- 点击打开刷卡器-->
<el-tooltip placement="top" popper-class="sth-popper" offset="00"> <el-tooltip placement="top" popper-class="sth-popper animate-bounce" offset="00">
<div slot="content"> <div slot="content">
<img v-lazy="lazyImg[23]" alt="" /> <img v-lazy="lazyImg[23]" alt="" />
</div> </div>
<img class="sth card-machine cp" v-lazy="lazyImg[24]" alt="" @click="showData('刷卡器',10)" /> <img class="sth card-machine cp" v-lazy="lazyImg[24]" alt="" @click="showData('刷卡器',10)" />
</el-tooltip> </el-tooltip>
<!-- 点击打开身份证--> <!-- 点击打开身份证-->
<el-tooltip placement="top" popper-class="sth-popper" offset="-100"> <el-tooltip placement="top" popper-class="sth-popper animate-bounce" offset="-100">
<div slot="content"> <div slot="content">
<img v-lazy="lazyImg[25]" alt="" /> <img v-lazy="lazyImg[25]" alt="" />
</div> </div>
@ -297,7 +297,7 @@
</div> </div>
</el-dialog> </el-dialog>
<tip-dialog /> <!-- <tip-dialog /> -->
@ -325,14 +325,14 @@ import { addOperation, getOperation } from '@/api/http';
import backButton from '@/components/backButton' import backButton from '@/components/backButton'
import { myConfig } from './myConfig.js' import { myConfig } from './myConfig.js'
import saveSystemModule from '@/mixins/saveSystemModule' import saveSystemModule from '@/mixins/saveSystemModule'
import TipDialog from '@/components/tipDialog' // import TipDialog from '@/components/tipDialog'
export default { export default {
name: 'index', name: 'index',
components: { components: {
manage: manage, manage: manage,
backButton, backButton,
TipDialog // TipDialog
}, },
mixins: [saveSystemModule], mixins: [saveSystemModule],
data() { data() {
@ -3038,6 +3038,8 @@ export default {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
overflow-x: hidden;
text-overflow: ellipsis;
line-height: 40px; line-height: 40px;
text-align: center; text-align: center;
font-size: 18px; font-size: 18px;

@ -2524,6 +2524,10 @@ export default {
}).catch((error)=>{ }).catch((error)=>{
}) })
}else { }else {
this.commit('system/pushThingsGoods', [...state.businessSelect[state.businessKey].sealBox])
state.businessSelect[state.businessKey].sealBox.splice(0, 1)
this.commit('system/setTipsOperate', '该证不能改这种章哦!')
} }
// Message.success({ // Message.success({
// center: true, // center: true,

Loading…
Cancel
Save