需求更新

.env.development

@@ -8,8 +8,8 @@ ENV = 'development'
 #VUE_APP_CAMERA_API = '192.168.99.107'
 
 # 许镇-本地服地址
-VUE_APP_BASE_API  = 'http://192.168.99.67:8080'
-VUE_APP_WS_API = 'ws://192.168.99.67:8081'
+VUE_APP_BASE_API  = 'http://192.168.99.72:8080'
+VUE_APP_WS_API = 'ws://192.168.99.72:8081'
 
 # 是否启用 babel-plugin-dynamic-import-node插件
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/api/library.js

@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-// import qs from 'qs'
+import qs from 'qs'
 
 // 总借阅量
 export function FetchHalfYearBorrowNum(params) {
@@ -83,6 +83,33 @@ export function FetchCoverByISBN(params) {
   })
 }
 
+// 获取当日每小时借还信息
+export function FetchTodayJH(params) {
+  return request({
+    url: '/qyzt/getTodayJH' + '?' + qs.stringify(params, { indices: false }),
+    method: 'get',
+    urlType: 'local'
+  })
+}
+
+// 借阅排行榜
+export function FetchSync36(params) {
+  return request({
+    url: '/qyzt/sync36' + '?' + qs.stringify(params, { indices: false }),
+    method: 'get',
+    urlType: 'local'
+  })
+}
+
+// page2 读者借阅排行榜
+export function FetchReadRanking(params) {
+  return request({
+    url: '/qyzt/sync37' + '?' + qs.stringify(params, { indices: false }),
+    method: 'get',
+    urlType: 'local'
+  })
+}
+
 export default {
   FetchHalfYearBorrowNum,
   FetchBorrowRank,
@@ -91,5 +118,8 @@ export default {
   FetchInitNotice,
   FetchInitIntoNum,
   FetchHalfYearBRNum,
-  FetchShowFileList
+  FetchShowFileList,
+  FetchTodayJH,
+  FetchSync36,
+  FetchReadRanking
 }

src/components/echart/lineChartService.vue

@@ -59,8 +59,8 @@ export default {
       this.chart = echarts.init(dom, 'dark')
       this.setOptions(this.chartData)
     },
-    setOptions({ returnData, borrowedData } = {}) {
-      const time = ['00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00', '20:00', '21:00', '22:00', '23:00', '24:00']
+    setOptions({ timeData, returnData, borrowedData } = {}) {
+      // const time = ['00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00', '20:00', '21:00', '22:00', '23:00', '24:00']
       this.chart.setOption({
         backgroundColor: '#010326',
         tooltip: {
@@ -92,11 +92,10 @@ export default {
         },
         xAxis: [{
           type: 'category',
-          data: time.map(function(item) {
-            return item
-          }),
+          data: timeData,
           axisLabel: {
-            interval: 5,
+            show: true,
+            // interval: 5,
             formatter: function(value, idx) {
               return value
             },

src/main.js

@@ -19,6 +19,13 @@ import './assets/fonts/fonts.css'
 import { Message } from 'element-ui'
 Vue.prototype.$message = Message
 
+// 全局注册过滤 - 时间
+import { parseTime, getFormattedDate } from '@/utils/index.js'
+Vue.filter('parseTime', function(time, cFormat) {
+  return parseTime(time, cFormat)
+})
+Vue.prototype.getFormattedDate = getFormattedDate
+
 // 馆代码 1201为东西湖馆代码 / 本地测试用FTZN
 // Vue.prototype.libcode = 'FTZN'
 Vue.prototype.libcode = '1201'

src/utils/index.js

@@ -1,92 +1,100 @@
-export function debounce(func, wait, immediate) {
-  let timeout, args, context, timestamp, result
-
-  const later = function() {
-    // 据上一次触发时间间隔
-    const last = +new Date() - timestamp
-
-    // 上次被包装函数被调用时间间隔 last 小于设定时间间隔 wait
-    if (last < wait && last > 0) {
-      timeout = setTimeout(later, wait - last)
-    } else {
-      timeout = null
-      // 如果设定为immediate===true，因为开始边界已经调用过了此处无需调用
-      if (!immediate) {
-        result = func.apply(context, args)
-        if (!timeout) context = args = null
-      }
-    }
-  }
-
-  return function(...args) {
-    context = this
-    timestamp = +new Date()
-    const callNow = immediate && !timeout
-    // 如果延时不存在，重新设定延时
-    if (!timeout) timeout = setTimeout(later, wait)
-    if (callNow) {
-      result = func.apply(context, args)
-      context = args = null
-    }
-
-    return result
-  }
-}
-
-/**
- * Parse the time to string
- * @param {(Object|string|number)} time
- * @param {string} cFormat
- * @returns {string}
- */
-export function parseTime(time, cFormat) {
-  if (arguments.length === 0) {
-    return null
-  }
-  const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}'
-  let date
-  if (typeof time === 'undefined' || time === null || time === 'null') {
-    return ''
-  } else if (typeof time === 'object') {
-    date = time
-  } else {
-    if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
-      time = parseInt(time)
-    }
-    if ((typeof time === 'number') && (time.toString().length === 10)) {
-      time = time * 1000
-    }
-    date = new Date(time)
-  }
-  const formatObj = {
-    y: date.getFullYear(),
-    m: date.getMonth() + 1,
-    d: date.getDate(),
-    h: date.getHours(),
-    i: date.getMinutes(),
-    s: date.getSeconds(),
-    a: date.getDay()
-  }
-  const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
-    let value = formatObj[key]
-    // Note: getDay() returns 0 on Sunday
-    if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value ] }
-    if (result.length > 0 && value < 10) {
-      value = '0' + value
-    }
-    return value || 0
-  })
-  return time_str
-}
-
-// 获取当前日期时间
-export function getCurrentTime() {
-  const yy = new Date().getFullYear()
-  const mm = new Date().getMonth() + 1
-  const dd = new Date().getDate()
-  const hh = new Date().getHours()
-  const mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes() : new Date().getMinutes()
-  const ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds() : new Date().getSeconds()
-  const time = yy + '年' + mm + '月' + dd + '日 ' + hh + ':' + mf + ':' + ss
-  return time
-}
+export function debounce(func, wait, immediate) {
+  let timeout, args, context, timestamp, result
+
+  const later = function() {
+    // 据上一次触发时间间隔
+    const last = +new Date() - timestamp
+
+    // 上次被包装函数被调用时间间隔 last 小于设定时间间隔 wait
+    if (last < wait && last > 0) {
+      timeout = setTimeout(later, wait - last)
+    } else {
+      timeout = null
+      // 如果设定为immediate===true，因为开始边界已经调用过了此处无需调用
+      if (!immediate) {
+        result = func.apply(context, args)
+        if (!timeout) context = args = null
+      }
+    }
+  }
+
+  return function(...args) {
+    context = this
+    timestamp = +new Date()
+    const callNow = immediate && !timeout
+    // 如果延时不存在，重新设定延时
+    if (!timeout) timeout = setTimeout(later, wait)
+    if (callNow) {
+      result = func.apply(context, args)
+      context = args = null
+    }
+
+    return result
+  }
+}
+
+/**
+ * Parse the time to string
+ * @param {(Object|string|number)} time
+ * @param {string} cFormat
+ * @returns {string}
+ */
+export function parseTime(time, cFormat) {
+  if (arguments.length === 0) {
+    return null
+  }
+  const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}'
+  let date
+  if (typeof time === 'undefined' || time === null || time === 'null') {
+    return ''
+  } else if (typeof time === 'object') {
+    date = time
+  } else {
+    if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
+      time = parseInt(time)
+    }
+    if ((typeof time === 'number') && (time.toString().length === 10)) {
+      time = time * 1000
+    }
+    date = new Date(time)
+  }
+  const formatObj = {
+    y: date.getFullYear(),
+    m: date.getMonth() + 1,
+    d: date.getDate(),
+    h: date.getHours(),
+    i: date.getMinutes(),
+    s: date.getSeconds(),
+    a: date.getDay()
+  }
+  const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+    let value = formatObj[key]
+    // Note: getDay() returns 0 on Sunday
+    if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value ] }
+    if (result.length > 0 && value < 10) {
+      value = '0' + value
+    }
+    return value || 0
+  })
+  return time_str
+}
+
+// 获取当前日期时间
+export function getCurrentTime() {
+  const yy = new Date().getFullYear()
+  const mm = new Date().getMonth() + 1
+  const dd = new Date().getDate()
+  const hh = new Date().getHours()
+  const mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes() : new Date().getMinutes()
+  const ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds() : new Date().getSeconds()
+  const time = yy + '年' + mm + '月' + dd + '日 ' + hh + ':' + mf + ':' + ss
+  return time
+}
+
+export function getFormattedDate(date, yearOffset = 0) {
+  date.setFullYear(date.getFullYear() + yearOffset)
+  const year = date.getFullYear()
+  const month = (date.getMonth() + 1).toString().padStart(2, '0')
+  const day = date.getDate().toString().padStart(2, '0')
+  return `${year}-${month}-${day}`
+}

src/views/lengingRanking/index.vue

@@ -17,8 +17,8 @@
           <img :src="item.cover" :onerror="defaultImg">
         </div>
         <div class="book-info">
-          <h4 class="title-item">{{ item.bookName }}</h4>
-          <p>{{ item.author }}</p>
+          <h4 class="title-item">{{ item.TITLE }}</h4>
+          <p>{{ item.AUTHOR }}</p>
         </div>
         <div class="ranking-num">
           <svg v-if="index === 0" class="icon" aria-hidden="true">
@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import { FetchBorrowRank, FetchCoverByISBN } from '@/api/library'
+import { FetchBorrowRank, FetchCoverByISBN, FetchSync36 } from '@/api/library'
 
 export default {
   name: 'LengingRanking',
@@ -60,7 +60,7 @@ export default {
     }
   },
   created() {
-    this.getBorrowRank()
+    this.getBookRanking()
   },
   mounted() {
   },
@@ -77,6 +77,35 @@ export default {
         }
       })
     },
+    getBookRanking() {
+      const currentDate = new Date() // 获取当前日期
+      currentDate.setDate(currentDate.getDate() - 30) // 将当前日期减去30天
+      const year = currentDate.getFullYear() // 获取年份
+      const month = currentDate.getMonth() + 1 // 获取月份（注意月份从0开始，需要加1）
+      const day = currentDate.getDate() // 获取日期
+      const formattedDate = `${year}-${month < 10 ? '0' + month : month}-${day < 10 ? '0' + day : day}`
+
+      const params = {
+        'libcode': this.libcode,
+        'starttime': formattedDate,
+        'endtime': this.getFormattedDate(new Date()),
+        'rownum': 10
+      }
+      FetchSync36(params).then(res => {
+        const result = JSON.parse(res.data)
+        if (result.success && result.resultlist.length > 0) {
+          let data = []
+          data = result.resultlist.sort((a, b) => b.TOTALNUM - a.TOTALNUM).slice(0, 10)
+          data.forEach(item => {
+            this.getCoverByISBN(item.ISBN.replace(/\-/g, ''), item)
+          })
+        } else {
+          throw new Error('Failed' + this.libcode)
+        }
+      }).catch(error => {
+        console.error('Error', error)
+      })
+    },
     getCoverByISBN(isbn, item) {
       const params = {
         isbn: isbn
@@ -84,12 +113,13 @@ export default {
       FetchCoverByISBN(params).then((res) => {
         console.log('RES', res)
         if (res) {
-          // item.cover = window.URL.createObjectURL(res)
           item.cover = res
         } else {
           item.cover = ''
         }
         console.log(item.cover)
+        this.rankingList.push(item)
+        console.log('this.rankingList', this.rankingList)
         this.$refs.listData.reset()
       })
     }

src/views/newBookRecommend/index.vue

@@ -123,16 +123,6 @@ export default {
   height: 6rem !important;
   margin: .4rem 0;
   overflow: hidden;
-  .swiper-wrapper{
-    // display: flex;
-    // flex-wrap: wrap;
-    // flex-direction: row !important;
-    // justify-content: flex-start;
-
-  }
-  &.gallery-thumbs {
-    // margin: 0.4rem 0;
-  }
   &.gallery-thumbs .swiper-slide {
     width: calc(100% / 3);
     height: 2.8rem !important;

src/views/readStar/index.vue

@@ -14,7 +14,7 @@
           <use xlink:href="#icon-a-3" />
         </svg>
         <span v-else class="star-num">{{ index+1 }}</span>
-        <p class="star-info title-item"> 读者{{ item.readerName }}上周借阅图书{{ item.borrowNum }}册</p>
+        <p class="star-info title-item"> 读者{{ item.RDNAME }}上周借阅图书{{ item.TOTALNUM }}册</p>
         <p class="star-date">{{ mondayDate }}</p>
       </div>
     </div>
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import { FetchBorrowStar } from '@/api/library'
+import { FetchBorrowStar, FetchReadRanking } from '@/api/library'
 // import { parseTime } from '@/utils/index.js'
 export default {
   name: 'ReadStar',
@@ -35,9 +35,44 @@ export default {
   created() {
   },
   mounted() {
-    this.getBorrowStar()
+    this.getReadRanking()
   },
   methods: {
+    getReadRanking() {
+      const currentDate = new Date() // 获取当前日期
+      currentDate.setDate(currentDate.getDate() - 30) // 将当前日期减去30天
+      const year = currentDate.getFullYear() // 获取年份
+      const month = currentDate.getMonth() + 1 // 获取月份（注意月份从0开始，需要加1）
+      const day = currentDate.getDate() // 获取日期
+      const formattedDate = `${year}-${month < 10 ? '0' + month : month}-${day < 10 ? '0' + day : day}`
+
+      const params = {
+        'libcode': this.libcode,
+        'starttime': formattedDate,
+        'endtime': this.getFormattedDate(new Date()),
+        'rownum': 6,
+        'nordtype': 'JXTSG_E'
+      }
+      FetchReadRanking(params).then(res => {
+        const result = JSON.parse(res.data)
+
+        if (result.success && result.resultlist.length > 0) {
+          this.readstarList = result.resultlist.sort((a, b) => b.TOTALNUM - a.TOTALNUM).slice(0, 10)
+          // this.rankingDataComputed()
+
+          // this.rankInterval = setInterval(() => {
+          //   this.currentHover = (this.currentHover + 1) % this.rankingData.length
+          // }, 1000)
+          console.log('this.readstarList', this.readstarList)
+          this.getMondayDate()
+        } else {
+          throw new Error('Failed' + this.libcode)
+        }
+      }).catch(error => {
+        console.error('Error', error)
+        return null
+      })
+    },
     // 获取list
     getBorrowStar() {
       FetchBorrowStar().then(res => {

src/views/todayBorrowed/index.vue

@@ -1,51 +1,79 @@
-<template>
-  <!-- 今日图书借还 -->
-  <div class="screen-item total-lending">
-    <div class="common-title">今日图书借还</div>
-    <div class="small-module module-content">
-      <div class="chart-wrapper" style="height: calc(100%);">
-        <LineChartService :chart-data="chartData" />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import LineChartService from '@/components/echart/lineChartService'
-import { FetchHalfYearBRNum } from '@/api/library'
-export default {
-  name: 'TodayBorrowed',
-  components: {
-    LineChartService
-  },
-  data() {
-    return {
-      chartData: {
-        returnData: [],
-        borrowedData: []
-      }
-    }
-  },
-  created() {
-  },
-  mounted() {
-    this.getHalfYearBRNum()
-  },
-  methods: {
-    getHalfYearBRNum() {
-      FetchHalfYearBRNum().then(res => {
-        if (res.errCode === 0) {
-          this.chartData.borrowedData = res.data.borrow
-          this.chartData.returnData = res.data.return
-        } else {
-          this.$message.error('接口错误')
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-@import "~@/assets/styles/index.scss";
-</style>
+<template>
+  <!-- 今日图书借还 -->
+  <div class="screen-item total-lending">
+    <div class="common-title">今日图书借还</div>
+    <div class="small-module module-content">
+      <div class="chart-wrapper" style="height: calc(100%);">
+        <LineChartService :chart-data="chartData" />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import LineChartService from '@/components/echart/lineChartService'
+import { FetchHalfYearBRNum, FetchTodayJH } from '@/api/library'
+export default {
+  name: 'TodayBorrowed',
+  components: {
+    LineChartService
+  },
+  data() {
+    return {
+      chartData: {
+        returnData: [],
+        borrowedData: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+    this.getTodayJH()
+  },
+  methods: {
+    getHalfYearBRNum() {
+      FetchHalfYearBRNum().then(res => {
+        if (res.errCode === 0) {
+          this.chartData.borrowedData = res.data.borrow
+          this.chartData.returnData = res.data.return
+        } else {
+          this.$message.error('接口错误')
+        }
+      })
+    },
+    getTodayJH() {
+      FetchTodayJH().then(res => {
+        this.chartData = {
+          timeData: [],
+          returnData: [],
+          borrowedData: []
+        }
+        const result = res.data
+        const time = ['07:00', '08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00']
+        time.forEach((hour, index) => {
+          // 查找 result 中是否有对应的 logHour
+          const foundItem = result.find(item => item.logHour === index + 7) // 因为 logHour 是从 7 开始，所以需要加上 7
+          if (foundItem) {
+            // 如果找到了对应的 logHour，则将数据加入 chartDayData
+            this.chartData.timeData.push(`${foundItem.logHour}:00`)
+            this.chartData.returnData.push(foundItem.hccDay)
+            this.chartData.borrowedData.push(foundItem.jccDay)
+          } else {
+            // 如果没找到对应的 logHour，则将默认值加入 chartDayData
+            this.chartData.timeData.push(`${hour}`)
+            this.chartData.returnData.push(0) // 默认值为 0
+            this.chartData.borrowedData.push(0) // 默认值为 0
+          }
+        })
+      }).catch(error => {
+        console.error('Error', error)
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+@import "~@/assets/styles/index.scss";
+</style>

vue.config.js

@@ -1,61 +1,68 @@
-const path = require('path')
-const resolve = dir => {
-  return path.join(__dirname, dir)
-}
-const name = '智慧大屏'
-module.exports = {
-  publicPath: process.env.NODE_ENV === 'development' ? '/' : './',
-  outputDir: 'dist',
-  assetsDir: 'static',
-  lintOnSave: process.env.NODE_ENV === 'development',
-  productionSourceMap: false,
-  devServer: {
-    port: 8080,
-    open: true,
-    overlay: {
-      warnings: false,
-      errors: true
-    },
-    proxy: {
-      '/dxhtsg/': {
-        target: process.env.VUE_APP_BASE_API,
-        changeOrigin: true,
-        pathRewrite: {
-          '^/dxhtsg': 'dxhtsg'
-        }
-      },
-      '/auth/': {
-        target: process.env.VUE_APP_BASE_API,
-        changeOrigin: true,
-        pathRewrite: {
-          '^/auth': 'auth'
-        }
-      }
-    }
-  },
-  configureWebpack: {
-    name: name,
-    resolve: {
-      alias: {
-        '@': resolve('src')
-      }
-    },
-    performance: {
-      hints: 'warning',
-      // 入口起点的最大体积
-      maxEntrypointSize: 50000000,
-      // 生成文件的最大体积
-      maxAssetSize: 30000000
-    }
-  },
-  chainWebpack: config => {
-    config.resolve
-      .alias.set('_c', resolve('src/components'))
-
-    config.plugin('html')
-      .tap(args => {
-        args[0].title = '智慧大屏'
-        return args
-      })
-  }
-}
+const path = require('path')
+const resolve = dir => {
+  return path.join(__dirname, dir)
+}
+const name = '智慧大屏'
+module.exports = {
+  publicPath: process.env.NODE_ENV === 'development' ? '/' : './',
+  outputDir: 'dist',
+  assetsDir: 'static',
+  lintOnSave: process.env.NODE_ENV === 'development',
+  productionSourceMap: false,
+  devServer: {
+    port: 8080,
+    open: true,
+    overlay: {
+      warnings: false,
+      errors: true
+    },
+    proxy: {
+      '/dxhtsg/': {
+        target: process.env.VUE_APP_BASE_API,
+        changeOrigin: true,
+        pathRewrite: {
+          '^/dxhtsg': 'dxhtsg'
+        }
+      },
+      '/qyzt/': {
+        target: process.env.VUE_APP_BASE_API,
+        changeOrigin: true,
+        pathRewrite: {
+          '^/qyzt': 'qyzt'
+        }
+      },
+      '/auth/': {
+        target: process.env.VUE_APP_BASE_API,
+        changeOrigin: true,
+        pathRewrite: {
+          '^/auth': 'auth'
+        }
+      }
+    }
+  },
+  configureWebpack: {
+    name: name,
+    resolve: {
+      alias: {
+        '@': resolve('src')
+      }
+    },
+    performance: {
+      hints: 'warning',
+      // 入口起点的最大体积
+      maxEntrypointSize: 50000000,
+      // 生成文件的最大体积
+      maxAssetSize: 30000000
+    }
+  },
+  chainWebpack: config => {
+    config.resolve
+      .alias.set('_c', resolve('src/components'))
+
+    config.plugin('html')
+      .tap(args => {
+        args[0].title = '智慧大屏'
+        return args
+      })
+  }
+}