Merge remote-tracking branch 'gitlab/main'

lab-admin/src/main/java/com/ruoyi/asset/controller/TbAssetBorrowRecordController.java

@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import cn.hutool.core.util.StrUtil;
 import com.ruoyi.asset.domain.dto.TbBorrowRecordDTO;
+import com.ruoyi.asset.domain.dto.TbCountAssetDTO;
 import com.ruoyi.asset.utils.RegexUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -110,6 +111,18 @@ public class TbAssetBorrowRecordController extends BaseController
     }
 
     /**
+     * 根据分类统计借用次数
+     */
+    @ApiOperation("各分类借用统计")
+    @PreAuthorize("@ss.hasPermi('asset:borrow:list')")
+    @GetMapping("/countList")
+    public AjaxResult countList()
+    {
+        List<TbCountAssetDTO> countAssetDto = tbAssetBorrowRecordService.countAssetDto();
+        return new AjaxResult().success(countAssetDto);
+    }
+
+    /**
      * 小程序：新增设备借用记录
      */
     @PreAuthorize("@ss.hasPermi('asset:borrow:add')")

lab-admin/src/main/java/com/ruoyi/asset/domain/dto/TbCountAssetDTO.java

@@ -0,0 +1,13 @@
+package com.ruoyi.asset.domain.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class TbCountAssetDTO {
+    private String typeName;
+    private String countNum;
+}

lab-admin/src/main/java/com/ruoyi/asset/mapper/TbAssetBorrowRecordMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.asset.domain.TbAssetBorrowRecord;
+import com.ruoyi.asset.domain.dto.TbCountAssetDTO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -62,4 +63,10 @@ public interface TbAssetBorrowRecordMapper extends BaseMapper<TbAssetBorrowRecor
      * @return 结果
      */
     public int deleteTbAssetBorrowRecordByIds(Long[] ids);
+
+    /**
+     * 根据分类统计借用次数
+     * @return
+     */
+    public List<TbCountAssetDTO> countAssetDto();
 }

lab-admin/src/main/java/com/ruoyi/asset/service/ITbAssetBorrowRecordService.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.asset.domain.TbAssetBorrowRecord;
 import com.ruoyi.asset.domain.dto.TbBorrowRecordDTO;
+import com.ruoyi.asset.domain.dto.TbCountAssetDTO;
 import com.ruoyi.common.core.domain.AjaxResult;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -114,6 +115,11 @@ public interface ITbAssetBorrowRecordService extends IService<TbAssetBorrowRecor
     AjaxResult countMeTbAssetBorrowRecord(Long status);
 
     /**
+     * 根据分类统计借用次数
+     */
+    List<TbCountAssetDTO> countAssetDto();
+
+    /**
      * 通知未归还借用人
      */
     void informNotReturnUser();

lab-admin/src/main/java/com/ruoyi/asset/service/impl/TbAssetBorrowRecordServiceImpl.java

@@ -12,6 +12,7 @@ import com.ruoyi.asset.domain.TbAsset;
 import com.ruoyi.asset.domain.TbAssetStatusRecord;
 import com.ruoyi.asset.domain.TbPlace;
 import com.ruoyi.asset.domain.dto.TbBorrowRecordDTO;
+import com.ruoyi.asset.domain.dto.TbCountAssetDTO;
 import com.ruoyi.asset.mapper.TbAssetMapper;
 import com.ruoyi.asset.mapper.TbAssetStatusRecordMapper;
 import com.ruoyi.asset.mapper.TbPlaceMapper;
@@ -270,6 +271,12 @@ public class TbAssetBorrowRecordServiceImpl extends ServiceImpl<TbAssetBorrowRec
         return AjaxResult.success("查询成功", count);
     }
 
+    @Override
+    public List<TbCountAssetDTO> countAssetDto() {
+        List<TbCountAssetDTO> dto = tbAssetBorrowRecordMapper.countAssetDto();
+        return dto;
+    }
+
     @Resource
     private EmailUtils emailUtils;
 

lab-admin/src/main/resources/mapper/asset/TbAssetBorrowRecordMapper.xml

@@ -90,4 +90,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <select id="countAssetDto" resultType="com.ruoyi.asset.domain.dto.TbCountAssetDTO">
+        SELECT SUM(a.borrow_number) countNum , b.name typeName
+        FROM
+            tb_asset_status_record a
+                LEFT JOIN
+            tb_asset c
+            ON
+                a.asset_bar_code = c.bar_code
+                LEFT JOIN
+            tb_asset_category b
+            ON
+                c.category_number = b.number
+        GROUP BY
+            b.name
+    </select>
 </mapper>

lab-ui/package.json

@@ -40,7 +40,7 @@
     "axios": "0.24.0",
     "clipboard": "2.0.8",
     "core-js": "3.19.1",
-    "echarts": "4.9.0",
+    "echarts": "^4.9.0",
     "element-ui": "2.15.8",
     "file-saver": "2.0.5",
     "fuse.js": "6.4.3",

lab-ui/src/api/asset/borrow.js

@@ -42,3 +42,11 @@ export function delBorrow(id) {
     method: 'delete'
   })
 }
+
+//统计常借用设备
+export function countNumber(){
+  return request({
+    url: '/asset/borrow/countList',
+    method: 'get'
+  })
+}

lab-ui/src/main.js

@@ -37,6 +37,10 @@ import DictTag from '@/components/DictTag'
 import VueMeta from 'vue-meta'
 // 字典数据组件
 import DictData from '@/components/DictData'
+// 引入echarts
+import echarts from 'echarts'
+
+
 
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts
@@ -48,6 +52,7 @@ Vue.prototype.selectDictLabel = selectDictLabel
 Vue.prototype.selectDictLabels = selectDictLabels
 Vue.prototype.download = download
 Vue.prototype.handleTree = handleTree
+Vue.prototype.$echarts = echarts
 
 // 全局组件挂载
 Vue.component('DictTag', DictTag)

lab-ui/src/views/index.vue

@@ -1,13 +1,231 @@
 <template>
   <div class="app-container home">
-    广州医科大学首页
+    <div class="showImg">
+      <img
+        @mouseover="changeInterval(true)"
+        @mouseleave="changeInterval(false)"
+        v-for="item in imgArr"
+        :key="item.id"
+        :src="require(item.url)"
+        v-show="item.id === currentIndex"
+      />
+      <!-- <div @click="clickIcon('up')" class="iconDiv icon-left">
+        <i class="el-icon-caret-left"></i>
+      </div>
+      <div @click="clickIcon('down')" class="iconDiv icon-right">
+        <i class="el-icon-caret-right"></i>
+      </div> -->
+      <div class="banner-circle">
+        <ul>
+          <li
+            @click="changeImg(item.id)"
+            v-for="item in imgArr"
+            :key="item.id"
+            :class="item.id === currentIndex ? 'active' : ''"
+          ></li>
+        </ul>
+      </div>
+    </div>
+    <div ref="chartp" style="width: 50%; height: 400px"></div>
   </div>
 </template>
 
 <script>
-
+import { countNumber } from "@/api/asset/borrow";
+export default {
+  data() {
+    return {
+      currentIndex: 0, //当前所在图片下标
+      timer: null, //定时轮询
+      imgArr: [
+        { id: 0, url: "@/assets/images/1.jpg" }
+      ],
+      countData: [
+        {countNum: '', typeName: ''}
+      ],
+    };
+  },
+  mounted() {
+    this.startInterval();
+    this.getEchartPicture();
+  },
+  methods: {
+    //开启定时器
+    startInterval() {
+      // 事件里定时器应该先清除在设置，防止多次点击直接生成多个定时器
+      clearInterval(this.timer);
+      this.timer = setInterval(() => {
+        this.currentIndex++;
+        if (this.currentIndex > this.imgArr.length - 1) {
+          this.currentIndex = 0;
+        }
+      }, 3000);
+    },
+    // 点击左右箭头
+    clickIcon(val) {
+      if (val === "down") {
+        this.currentIndex++;
+        if (this.currentIndex === this.imgArr.length) {
+          this.currentIndex = 0;
+        }
+      } else {
+        /* 第一种写法
+					this.currentIndex--;
+					if(this.currentIndex < 0){
+						this.currentIndex = this.imgArr.length-1;
+					} */
+        // 第二种写法
+        if (this.currentIndex === 0) {
+          this.currentIndex = this.imgArr.length;
+        }
+        this.currentIndex--;
+      }
+    },
+    // 点击控制圆点
+    changeImg(index) {
+      this.currentIndex = index;
+    },
+    //鼠标移入移出控制
+    changeInterval(val) {
+      if (val) {
+        clearInterval(this.timer);
+      } else {
+        this.startInterval();
+      }
+    },
+    async getEchartPicture() {
+      const chartp = this.$refs.chartp;
+      if (chartp) {
+        const myChart = this.$echarts.init(chartp);
+        await countNumber().then(response => {
+        this.countData = response.data;
+      })
+        let arr = []
+        this.countData.forEach(item=>{
+          arr.push({name:item.typeName,value:item.countNum})
+        })
+        let option = {
+          title: {
+            text: "常用设备数据分析图",
+            left: "center",
+            padding: [0, 0, "5px", 0],
+          },
+          tooltip: {
+            trigger: "item",
+          },
+          legend: {
+            top: "5%",
+            left: "center",
+          },
+          series: [
+            {
+              name: "Access From",
+              type: "pie",
+              radius: ["40%", "70%"],
+              avoidLabelOverlap: false,
+              itemStyle: {
+                borderRadius: 10,
+                borderColor: "#fff",
+                borderWidth: 2,
+              },
+              label: {
+                show: false,
+                position: "center",
+              },
+              emphasis: {
+                label: {
+                  show: true,
+                  fontSize: 20,
+                  fontWeight: "bold",
+                },
+              },
+              labelLine: {
+                show: false,
+              },
+              data: arr,
+            },
+          ],
+        };
+        myChart.setOption(option);
+        window.addEventListener("resize", function () {
+          myChart.resize();
+        });
+      }
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
+* {
+  padding: 0;
+  margin: 0;
+}
+/* 清除li前面的圆点 */
+li {
+  list-style-type: none;
+}
+.showImg {
+  position: relative;
+  width: 80%;
+  height: 250px;
+  margin: 30px auto;
+  overflow: hidden;
+}
+/* 轮播图片 */
+.showImg img {
+  width: 100%;
+  height: 100%;
+}
+
+/* 箭头图标 */
+.iconDiv {
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+  width: 30px;
+  height: 30px;
+  border: 1px solid #666;
+  border-radius: 15px;
+  background-color: rgba(125, 125, 125, 0.2);
+  line-height: 30px;
+  text-align: center;
+  font-size: 25px;
+  cursor: pointer;
+}
+.iconDiv:hover {
+  background-color: white;
+}
+.icon-left {
+  left: 10px;
+}
+.icon-right {
+  right: 10px;
+}
+
+/* 控制圆点 */
+.banner-circle {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  height: 20px;
+}
+.banner-circle ul {
+  margin: 0 50px;
+  height: 100%;
+  text-align: right;
+}
+.banner-circle ul li {
+  display: inline-block;
+  width: 14px;
+  height: 14px;
+  margin: 0 5px;
+  border-radius: 7px;
+  background-color: rgba(125, 125, 125, 0.8);
+  cursor: pointer;
+}
+.active {
+  background-color: black !important;
+}
 </style>