From 7c81f4a2362ed845ce0d47e085a1294518d35a03 Mon Sep 17 00:00:00 2001 From: "DESKTOP-ESU4BDD\\WeiZhiQiang" <598748873@qq.com> Date: Sat, 7 Oct 2023 18:52:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../js/erpProducePage/departmentMachin.js | 59 ------------- .../erpProducePage/departmentPatchMaterial.js | 88 ------------------- .../erpProducePage/departmentPickMaterial.js | 88 ------------------- .../departmentReturnMaterial.js | 88 ------------------- .../tpl/erpProducePage/departmentMachin.html | 75 ---------------- .../departmentPatchMaterial.html | 77 ---------------- .../departmentPickMaterial.html | 77 ---------------- .../departmentReturnMaterial.html | 77 ---------------- 8 files changed, 629 deletions(-) delete mode 100644 gateway/src/main/resources/template/js/erpProducePage/departmentMachin.js delete mode 100644 gateway/src/main/resources/template/js/erpProducePage/departmentPatchMaterial.js delete mode 100644 gateway/src/main/resources/template/js/erpProducePage/departmentPickMaterial.js delete mode 100644 gateway/src/main/resources/template/js/erpProducePage/departmentReturnMaterial.js delete mode 100644 gateway/src/main/resources/template/tpl/erpProducePage/departmentMachin.html delete mode 100644 gateway/src/main/resources/template/tpl/erpProducePage/departmentPatchMaterial.html delete mode 100644 gateway/src/main/resources/template/tpl/erpProducePage/departmentPickMaterial.html delete mode 100644 gateway/src/main/resources/template/tpl/erpProducePage/departmentReturnMaterial.html diff --git a/gateway/src/main/resources/template/js/erpProducePage/departmentMachin.js b/gateway/src/main/resources/template/js/erpProducePage/departmentMachin.js deleted file mode 100644 index 495ec10e0..000000000 --- a/gateway/src/main/resources/template/js/erpProducePage/departmentMachin.js +++ /dev/null @@ -1,59 +0,0 @@ - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window', - echarts: '../echarts/echarts', - echartsTheme: '../echarts/echartsTheme' -}).define(['window', 'jquery', 'winui', 'form', 'echarts', 'laydate'], function (exports) { - winui.renderColor(); - var $ = layui.$, - laydate = layui.laydate, - form = layui.form; - var charts1; - - var myDate = new Date(); - year = myDate.getFullYear(); - laydate.render({ - elem: '#year', - type: 'year', - value: year, - trigger: 'click', - done: function(value, date){ - initCustomDocumentaryByType(value); - } - }); - - initCustomDocumentaryByType(year); - // 统计当前部门月度新建加工单图 - function initCustomDocumentaryByType(year){ - AjaxPostUtil.request({url: reqBasePath + "erpproduce004", params: {year: year}, type: 'json', callback: function (json) { - renderCharts1(json.rows); - matchingLanguage(); - }}); - } - - function renderCharts1(rows) { - charts1 = echarts.init(document.getElementById("charts1")); - var name = new Array(); - var num = new Array(); - $.each(rows, function(i, item) { - name.push(item.yearMonth); - num.push(item.orderNum); - }); - var option = getOption('当前部门新增加工单分析', '统计在指定年份当前部门新建加工单的数量分析', name, "部门新建加工单数量", num, 'line'); - charts1.setOption(option); - - // 加载表格 - $("#tHead").html(getDataUseHandlebars($("#tableHeader").html(), {rows: name})); - $("#tBody").html(getDataUseHandlebars($("#tableBody").html(), {rows: rows})); - form.render(); - } - - window.onresize = function(){ - charts1.resize(); - } - - exports('departmentMachin', {}); -}); diff --git a/gateway/src/main/resources/template/js/erpProducePage/departmentPatchMaterial.js b/gateway/src/main/resources/template/js/erpProducePage/departmentPatchMaterial.js deleted file mode 100644 index 70ea74624..000000000 --- a/gateway/src/main/resources/template/js/erpProducePage/departmentPatchMaterial.js +++ /dev/null @@ -1,88 +0,0 @@ - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window', - echarts: '../echarts/echarts', - echartsTheme: '../echarts/echartsTheme' -}).define(['window', 'jquery', 'winui', 'form', 'echarts', 'laydate'], function (exports) { - winui.renderColor(); - var $ = layui.$, - laydate = layui.laydate, - form = layui.form; - var charts1; - - var myDate = new Date(); - year = myDate.getFullYear(); - laydate.render({ - elem: '#year', - type: 'year', - value: year, - trigger: 'click', - done: function(value, date){ - initCustomDocumentaryByType(value); - } - }); - - initCustomDocumentaryByType(year); - // 统计当前部门月度补料图 - function initCustomDocumentaryByType(year){ - AjaxPostUtil.request({url: reqBasePath + "erpproduce002", params: {year: year}, type: 'json', callback: function (json) { - renderCharts1(json.rows); - matchingLanguage(); - }}); - } - - function renderCharts1(rows) { - charts1 = echarts.init(document.getElementById("charts1")); - var name = new Array(); - var num = new Array(); - var materialName = ""; - var materialNameList = new Array(); - $.each(rows, function(i, item) { - if(i == 0){ - materialName = item.materialName; - $.each(item.yearPatchMaterialNum, function(j, bean){ - name.push(bean.yearMonth); - num.push(bean.needNum); - }); - } - }); - materialNameList.push(materialName); - var option = getOption('当前部门补料分析', '统计在指定年份当前部门补料的数量分析', name, materialName, num, 'line'); - $.each(rows, function(i, item) { - if(i != 0){ - materialName = item.materialName; - materialNameList.push(materialName); - num = new Array(); - $.each(item.yearPatchMaterialNum, function(j, bean){ - num.push(bean.needNum); - }); - option.series.push({ - name: materialName, - type: 'line', - smooth: true, - data: [].concat(num) - }); - } - }); - - option["legend"] = { - data: materialNameList, - y: 'bottom' - }; - charts1.setOption(option); - - // 加载表格 - $("#tHead").html(getDataUseHandlebars($("#tableHeader").html(), {rows: name})); - $("#tBody").html(getDataUseHandlebars($("#tableBody").html(), {rows: rows})); - form.render(); - } - - window.onresize = function(){ - charts1.resize(); - } - - exports('departmentPatchMaterial', {}); -}); diff --git a/gateway/src/main/resources/template/js/erpProducePage/departmentPickMaterial.js b/gateway/src/main/resources/template/js/erpProducePage/departmentPickMaterial.js deleted file mode 100644 index 8cba8ede5..000000000 --- a/gateway/src/main/resources/template/js/erpProducePage/departmentPickMaterial.js +++ /dev/null @@ -1,88 +0,0 @@ - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window', - echarts: '../echarts/echarts', - echartsTheme: '../echarts/echartsTheme' -}).define(['window', 'jquery', 'winui', 'form', 'echarts', 'laydate'], function (exports) { - winui.renderColor(); - var $ = layui.$, - laydate = layui.laydate, - form = layui.form; - var charts1; - - var myDate = new Date(); - year = myDate.getFullYear(); - laydate.render({ - elem: '#year', - type: 'year', - value: year, - trigger: 'click', - done: function(value, date){ - initCustomDocumentaryByType(value); - } - }); - - initCustomDocumentaryByType(year); - // 统计当前部门月度领料图 - function initCustomDocumentaryByType(year){ - AjaxPostUtil.request({url: reqBasePath + "erpproduce001", params: {year: year}, type: 'json', callback: function (json) { - renderCharts1(json.rows); - matchingLanguage(); - }}); - } - - function renderCharts1(rows) { - charts1 = echarts.init(document.getElementById("charts1")); - var name = new Array(); - var num = new Array(); - var materialName = ""; - var materialNameList = new Array(); - $.each(rows, function(i, item) { - if(i == 0){ - materialName = item.materialName; - $.each(item.yearPickMaterialNum, function(j, bean){ - name.push(bean.yearMonth); - num.push(bean.needNum); - }); - } - }); - materialNameList.push(materialName); - var option = getOption('当前部门领料分析', '统计在指定年份当前部门领料的数量分析', name, materialName, num, 'line'); - $.each(rows, function(i, item) { - if(i != 0){ - materialName = item.materialName; - materialNameList.push(materialName); - num = new Array(); - $.each(item.yearPickMaterialNum, function(j, bean){ - num.push(bean.needNum); - }); - option.series.push({ - name: materialName, - type: 'line', - smooth: true, - data: [].concat(num) - }); - } - }); - - option["legend"] = { - data: materialNameList, - y: 'bottom' - }; - charts1.setOption(option); - - // 加载表格 - $("#tHead").html(getDataUseHandlebars($("#tableHeader").html(), {rows: name})); - $("#tBody").html(getDataUseHandlebars($("#tableBody").html(), {rows: rows})); - form.render(); - } - - window.onresize = function(){ - charts1.resize(); - } - - exports('departmentPickMaterial', {}); -}); diff --git a/gateway/src/main/resources/template/js/erpProducePage/departmentReturnMaterial.js b/gateway/src/main/resources/template/js/erpProducePage/departmentReturnMaterial.js deleted file mode 100644 index a5b1ba748..000000000 --- a/gateway/src/main/resources/template/js/erpProducePage/departmentReturnMaterial.js +++ /dev/null @@ -1,88 +0,0 @@ - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window', - echarts: '../echarts/echarts', - echartsTheme: '../echarts/echartsTheme' -}).define(['window', 'jquery', 'winui', 'form', 'echarts', 'laydate'], function (exports) { - winui.renderColor(); - var $ = layui.$, - laydate = layui.laydate, - form = layui.form; - var charts1; - - var myDate = new Date(); - year = myDate.getFullYear(); - laydate.render({ - elem: '#year', - type: 'year', - value: year, - trigger: 'click', - done: function(value, date){ - initCustomDocumentaryByType(value); - } - }); - - initCustomDocumentaryByType(year); - // 统计当前部门月度退料图 - function initCustomDocumentaryByType(year){ - AjaxPostUtil.request({url: reqBasePath + "erpproduce003", params: {year: year}, type: 'json', callback: function (json) { - renderCharts1(json.rows); - matchingLanguage(); - }}); - } - - function renderCharts1(rows) { - charts1 = echarts.init(document.getElementById("charts1")); - var name = new Array(); - var num = new Array(); - var materialName = ""; - var materialNameList = new Array(); - $.each(rows, function(i, item) { - if(i == 0){ - materialName = item.materialName; - $.each(item.yearReturnMaterialNum, function(j, bean){ - name.push(bean.yearMonth); - num.push(bean.needNum); - }); - } - }); - materialNameList.push(materialName); - var option = getOption('当前部门退料分析', '统计在指定年份当前部门退料的数量分析', name, materialName, num, 'line'); - $.each(rows, function(i, item) { - if(i != 0){ - materialName = item.materialName; - materialNameList.push(materialName); - num = new Array(); - $.each(item.yearReturnMaterialNum, function(j, bean){ - num.push(bean.needNum); - }); - option.series.push({ - name: materialName, - type: 'line', - smooth: true, - data: [].concat(num) - }); - } - }); - - option["legend"] = { - data: materialNameList, - y: 'bottom' - }; - charts1.setOption(option); - - // 加载表格 - $("#tHead").html(getDataUseHandlebars($("#tableHeader").html(), {rows: name})); - $("#tBody").html(getDataUseHandlebars($("#tableBody").html(), {rows: rows})); - form.render(); - } - - window.onresize = function(){ - charts1.resize(); - } - - exports('departmentReturnMaterial', {}); -}); diff --git a/gateway/src/main/resources/template/tpl/erpProducePage/departmentMachin.html b/gateway/src/main/resources/template/tpl/erpProducePage/departmentMachin.html deleted file mode 100644 index 98b84686c..000000000 --- a/gateway/src/main/resources/template/tpl/erpProducePage/departmentMachin.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - -
-
-
-
- -
- -
-
- -
-
-
部门月度新建加工单分析
-
-
- -
-
-
-
- -
-
-
部门月度新建加工单表格分析
-
- - - - - - - -
-
-
-
- -
-
-
- - - - - - - - - - \ No newline at end of file diff --git a/gateway/src/main/resources/template/tpl/erpProducePage/departmentPatchMaterial.html b/gateway/src/main/resources/template/tpl/erpProducePage/departmentPatchMaterial.html deleted file mode 100644 index ef0be88c2..000000000 --- a/gateway/src/main/resources/template/tpl/erpProducePage/departmentPatchMaterial.html +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - -
-
-
-
- -
- -
-
- -
-
-
部门月度补料分析
-
-
- -
-
-
-
- -
-
-
部门月度补料表格分析
-
- - - - - - - -
-
-
-
- -
-
-
- - - - - - - - - - \ No newline at end of file diff --git a/gateway/src/main/resources/template/tpl/erpProducePage/departmentPickMaterial.html b/gateway/src/main/resources/template/tpl/erpProducePage/departmentPickMaterial.html deleted file mode 100644 index ae273a7ad..000000000 --- a/gateway/src/main/resources/template/tpl/erpProducePage/departmentPickMaterial.html +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - -
-
-
-
- -
- -
-
- -
-
-
部门月度领料分析
-
-
- -
-
-
-
- -
-
-
部门月度领料表格分析
-
- - - - - - - -
-
-
-
- -
-
-
- - - - - - - - - - \ No newline at end of file diff --git a/gateway/src/main/resources/template/tpl/erpProducePage/departmentReturnMaterial.html b/gateway/src/main/resources/template/tpl/erpProducePage/departmentReturnMaterial.html deleted file mode 100644 index 748886b01..000000000 --- a/gateway/src/main/resources/template/tpl/erpProducePage/departmentReturnMaterial.html +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - -
-
-
-
- -
- -
-
- -
-
-
部门月度退料分析
-
-
- -
-
-
-
- -
-
-
部门月度退料表格分析
-
- - - - - - - -
-
-
-
- -
-
-
- - - - - - - - - - \ No newline at end of file -- GitLab