diff --git a/src/assets/icons/svg/danganjieyue.svg b/src/assets/icons/svg/danganjieyue.svg new file mode 100644 index 0000000..f6e3d4f --- /dev/null +++ b/src/assets/icons/svg/danganjieyue.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/danganleibie.svg b/src/assets/icons/svg/danganleibie.svg new file mode 100644 index 0000000..54bb6c7 --- /dev/null +++ b/src/assets/icons/svg/danganleibie.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/zaijieshuliang.svg b/src/assets/icons/svg/zaijieshuliang.svg new file mode 100644 index 0000000..7b3f160 --- /dev/null +++ b/src/assets/icons/svg/zaijieshuliang.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/environmentalScreen/index.vue b/src/views/environmentalScreen/index.vue index 769e134..e1a9d52 100644 --- a/src/views/environmentalScreen/index.vue +++ b/src/views/environmentalScreen/index.vue @@ -192,7 +192,7 @@
  • - +
    在借数量
    @@ -244,16 +244,16 @@ @@ -264,7 +264,7 @@
    -

    档案借阅

    +

    档案借阅

    @@ -272,7 +272,7 @@
    -

    档案类型

    +

    档案类型

    @@ -371,9 +371,13 @@ export default { waterLeakageText4: '' }, daylend: 'daylend', + daylendnum: 1234, dayreturn: 'dayreturn', + dayreturnnum: 4567, monlend: 'monlend', - monreturn: 'monreturn' + monlendnum: 1001, + monreturn: 'monreturn', + monreturnnum: 123456 } }, async created() { @@ -876,11 +880,12 @@ export default { color: #339CFF ; font-size: 14px; justify-content: space-between; - height: calc(100% - 198px); + height: calc(50% - 192px); .middle-bottom-l{ display: flex; justify-content: space-between; width: 60%; + height:calc(100% - 22px) !important; ul{ width: 59%; padding: 25px 20px; @@ -914,6 +919,7 @@ export default { } .middle-bottom-r{ width: 38%; + height:calc(100% - 22px) !important; ul{ width: 100%; height: 100%; diff --git a/src/views/environmentalScreen/module/numFlip.vue b/src/views/environmentalScreen/module/numFlip.vue index 4d4b1c4..1657145 100644 --- a/src/views/environmentalScreen/module/numFlip.vue +++ b/src/views/environmentalScreen/module/numFlip.vue @@ -2,7 +2,7 @@
    -
  • 0123456789
  • +
  • 0123456789
  • @@ -14,11 +14,18 @@ export default { tnum: { type: String, default: null + }, + chartnum: { + type: Array, + default: function() { + return 0 + } } }, data() { return { - chartNum: ['0', '0', '0', '0', '0', '0', '0', '0'] + echartnum: this.chartnum, + flipNum: [0, 0, 0, 0, 0, 0, 0, 0] } }, mounted() { @@ -28,36 +35,37 @@ export default { }, methods: { start() { - var strHtml = '' - for (var i = 0; i < this.chartNum.length; i++) { - strHtml += '
  • \n' + - ' 0123456789\n' + - '
  • ' - } - document.getElementById(this.tnum).innerHTML = strHtml + // let strHtml = '' + // for (var i = 0; i < this.chartnum.length; i++) { + // strHtml += '
  • \n' + + // ' 0123456789\n' + + // '
  • ' + // } + // document.getElementById(this.tnum).innerHTML = strHtml // 定时改变数字 const _this = this setInterval(() => { - _this.toOrderNum('123456') + // _this.toOrderNum('123456') + _this.toOrderNum(this.chartnum) _this.setNumberTransform() }, 1000) }, toOrderNum(num) { num = num.toString() // 数字变成字符串 - if (num.length < 6) { // 如未满位数,添加"0"补位 + if (num.length < 8) { // 如未满位数,添加"0"补位 num = '0' + num this.toOrderNum(num) // 递归添加"0"补位 - } else if (num.length === 6) { // 数中加入逗号 - this.chartNum = num.split('') // 将其便变成数据 + } else if (num.length === 8) { // 数中加入逗号 + this.flipNum = num.split('') // 将其便变成数据 } else { alert('显示异常') } }, setNumberTransform() { - var numberItems = document.getElementsByClassName('item') + const numberItems = document.getElementsByClassName(this.tnum) // console.log(numberItems) - const numberArr = this.chartNum.filter(item => !isNaN(item)) - for (var index = 0; index < numberItems.length; index++) { + const numberArr = this.flipNum.filter(item => !isNaN(item)) + for (let index = 0; index < numberItems.length; index++) { const elem = numberItems[index] elem.style.transform = 'translate(-50%, -' + numberArr[index] * 10 + '%)' }