diff --git a/WebContent/WEB-INF/views/equipment/equipmentProportionDetail.jsp b/WebContent/WEB-INF/views/equipment/equipmentProportionDetail.jsp new file mode 100644 index 0000000..eaa39b2 --- /dev/null +++ b/WebContent/WEB-INF/views/equipment/equipmentProportionDetail.jsp @@ -0,0 +1,334 @@ +<%@ page contentType="text/html;charset=UTF-8" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + + + + <%@include file="../baseset.jsp" %> + <%@include file="../systemset.jsp" %> + + 入库占比 + + + + + + +
+ +
+
+
+
+
+ +
+
+<%--
--%> +<%--
--%> +<%-- --%> +<%--
--%> +<%--
--%> +
+
+ +
+
+
+
+ +
+
+
+ + + +
+
+
+
+ +
+ +
+ + + + + + + + \ No newline at end of file diff --git a/WebContent/WEB-INF/views/equipment/equipmentTypeDetail.jsp b/WebContent/WEB-INF/views/equipment/equipmentTypeDetail.jsp new file mode 100644 index 0000000..dc93088 --- /dev/null +++ b/WebContent/WEB-INF/views/equipment/equipmentTypeDetail.jsp @@ -0,0 +1,298 @@ +<%@ page contentType="text/html;charset=UTF-8" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + + + + <%@include file="../baseset.jsp" %> + <%@include file="../systemset.jsp" %> + + 机具类别 + + + + + + +
+ +
+
+
+<%--
--%> +<%--
--%> +<%-- --%> +<%--
--%> +<%--
--%> +
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+ + + +
+
+
+
+ +
+ +
+ + + + + + + + \ No newline at end of file diff --git a/WebContent/WEB-INF/views/index/indexHome.jsp b/WebContent/WEB-INF/views/index/indexHome.jsp index 0f906d6..41281f9 100644 --- a/WebContent/WEB-INF/views/index/indexHome.jsp +++ b/WebContent/WEB-INF/views/index/indexHome.jsp @@ -810,12 +810,12 @@
入库占比     /    机具类别
-
-
-
-
-
-
+
+
+
+
+
+
@@ -931,7 +931,7 @@ function showEquipmentTypes() { layer.open({ type: 2, - title: '机具类别明细', + title: '入库占比', area: ['1500px', '700px'], content: '${bonuspath}/backstage/indexHome/dataOverview/equipment/index', btn: ['关闭'], // 添加关闭按钮 @@ -941,6 +941,32 @@ }); } + function showEquipmentTypes1(name,type) { + layer.open({ + type: 2, + title: ''+name, + area: ['1500px', '700px'], + content: '${bonuspath}/backstage/indexHome/dataOverview/equipmentProportion/index?type='+type, + btn: ['关闭'], // 添加关闭按钮 + yes: function(index, layero) { + layer.close(index); // 关闭当前弹窗 + } + }); + } + + function showEquipmentTypes2(name,type) { + layer.open({ + type: 2, + title: ''+name, + area: ['1500px', '700px'], + content: '${bonuspath}/backstage/indexHome/dataOverview/equipmentType/index?type='+type, + btn: ['关闭'], // 添加关闭按钮 + yes: function(index, layero) { + layer.close(index); // 关闭当前弹窗 + } + }); + } + function showProjectDetail() { layer.open({ type: 2, diff --git a/WebContent/static/js/index/indexHome.js b/WebContent/static/js/index/indexHome.js index 5143c0a..b140bf5 100644 --- a/WebContent/static/js/index/indexHome.js +++ b/WebContent/static/js/index/indexHome.js @@ -1230,6 +1230,7 @@ $(function() { { key: 'repairStorage', index: 2, title: '修试后入库', color: '#36cfc9' }, { key: 'inventoryStorage', index: 3, title: '盘点入库', color: '#73d13d' }, { key: 'returnStorage', index: 4, title: '退料入库', color: '#ffc53d' }, + // { key: 'repairStorage', index: 4, title: '退料入库', color: '#ffc53d' }, { key: 'equipmentCount', index: 5, title: '机具数量', color: '#ff7a45' }, { key: 'deviceCount', index: 6, title: '编码数量', color: '#722ed1' } ]; @@ -1241,7 +1242,10 @@ $(function() { continue; } - const chartData = data[config.key] || { value: 0, total: 100 }; + let chartData = data[config.key] || { value: 0, total: 100 }; + if(config.key=='returnStorage'){ + chartData=data['repairStorage'] || { value: 0, total: 100 }; + } const option = createCircleChartOption(chartData, config.title, config.color); try { diff --git a/resources/mybatis/index/IndexHomeDetailsMapper.xml b/resources/mybatis/index/IndexHomeDetailsMapper.xml index 03f7af0..c7a1580 100644 --- a/resources/mybatis/index/IndexHomeDetailsMapper.xml +++ b/resources/mybatis/index/IndexHomeDetailsMapper.xml @@ -272,9 +272,7 @@ and mat2.`NAME` like concat ('%',#{maType},'%') - - and rs.isCount = #{isCount} - + GROUP BY rs.typeId ) a WHERE @@ -287,6 +285,9 @@ mt.`LEVEL` = 4 AND mt.IS_ACTIVE = 1 ) + + and a.isCount = #{isCount} +