feat: Echarts模型修改

report/src/main/resources/template/js/pageReportDesign/pageReportDesign.js

@@ -17,7 +17,7 @@ layui.config({
 
     var echartsModel = {};
     // 获取echarts模型配置
-    AjaxPostUtil.request({url: reportBasePath + "reportimporthistory003", params: {}, type: 'json', method: "GET", callback: function(json) {
+    AjaxPostUtil.request({url: reportBasePath + "queryAllMaxVersionReportModel", params: {}, type: 'json', method: "GET", callback: function(json) {
         echartsModel = json.rows;
     }, async: false});
 

report/src/main/resources/template/js/reportImportHistory/reportImportHistoryList.js

@@ -10,13 +10,15 @@ layui.config({
         form = layui.form,
         table = layui.table;
 
+    var objectId = GetUrlParam("objectId");
+
     authBtn('1624176433377');
     // 数据源列表
     table.render({
         id: 'messageTable',
         elem: '#messageTable',
         method: 'post',
-        url: reportBasePath + 'reportimporthistory001',
+        url: sysMainMation.reportBasePath + 'queryReportImportHistoryList',
         where: getTableParams(),
         even: true,
         page: true,
@@ -24,78 +26,31 @@ layui.config({
         limit: getLimit(),
         cols: [[
             { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
-            { field: 'fileName', title: '文件名称', align: 'left', width: 200},
-            { field: 'fileSize', title: '文件大小', align: 'left', width: 100 },
-            { field: 'createName', title: '上传人', align: 'left', width: 100 },
-            { field: 'createTime', title: '上传时间', align: 'center', width: 140 }
+            { field: 'name', title: '文件名称', align: 'left', width: 200},
+            { field: 'size', title: '文件大小', align: 'left', width: 100 },
+            { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 },
+            { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
+            { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
+            { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 }
         ]],
         done: function(json) {
             matchingLanguage();
+            initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入文件名称", function () {
+                table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+            });
         }
     });
 
     form.render();
-    form.on('submit(formSearch)', function (data) {
-        if (winui.verifyForm(data.elem)) {
-            refreshloadTable();
-        }
-        return false;
-    });
-
-    // 导入数据
-    $("body").on("click", "#addBean", function() {
-        $("#upfile").val("");
-        $("#upfile").click();
-    });
-
-    // 上传
-    $("body").on("change", "#upfile", function() {
-        var formData = new FormData();
-        var name = $("#upfile").val();
-        formData.append("file", $("#upfile")[0].files[0]);
-        formData.append("name", name);
-        $.ajax({
-            url : reportBasePath + 'reportimporthistory002',
-            type : 'POST',
-            async : false,
-            data : formData,
-            headers: getRequestHeaders(),
-            // 告诉jQuery不要去处理发送的数据
-            processData : false,
-            // 告诉jQuery不要去设置Content-Type请求头
-            contentType : false,
-            dataType:"json",
-            beforeSend:function(){
-                winui.window.msg("正在进行，请稍候", { shift: 1 });
-            },
-            success : function(json) {
-                if(json.returnCode == "0"){
-                    winui.window.msg("成功导入", { shift: 1 });
-                    loadTable();
-                } else {
-                    winui.window.msg("导入失败", {icon: 2, time: 2000});
-                }
-            }
-        });
-    });
-
-    // 刷新数据
     $("body").on("click", "#reloadTable", function() {
         loadTable();
     });
-
     function loadTable() {
         table.reloadData("messageTable", {where: getTableParams()});
     }
 
-    function refreshloadTable() {
-        table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
-    }
-
     function getTableParams() {
-        return {
-            fileName: $("#fileName").val()
-        };
+        return $.extend(true, {objectId: objectId}, initTableSearchUtil.getSearchValue("messageTable"));
     }
 
     exports('reportImportHistoryList', {});

report/src/main/resources/template/js/reportImportModel/reportImportModelAdd.js

-
-layui.config({
-    base: basePath,
-    version: skyeyeVersion
-}).extend({
-    window: 'js/winui.window'
-}).define(['window', 'jquery', 'winui'], function (exports) {
-    winui.renderColor();
-    layui.use(['form'], function (form) {
-        var index = parent.layer.getFrameIndex(window.name);
-        var $ = layui.$;
-
-        reportModelTypeUtil.showModelTypeOperator(form, "typeBox", null, null);
-
-        matchingLanguage();
-        form.render();
-        form.on('submit(formAddBean)', function (data) {
-            if (winui.verifyForm(data.elem)) {
-                var params = {
-                    fileName: $("#fileName").val(),
-                    modelId: $("#modelId").val(),
-                    firstTypeId: $("#firstTypeId").val(),
-                    secondTypeId: $("#secondTypeId").val(),
-                };
-                AjaxPostUtil.request({url: reportBasePath + "reportimportmodel002", params: params, type: 'json', method: "POST", callback: function(json) {
-                    parent.layer.close(index);
-                    parent.refreshCode = '0';
-                }});
-            }
-            return false;
-        });
-
-        $("body").on("click", "#cancle", function() {
-            parent.layer.close(index);
-        });
-    });
-});
\ No newline at end of file

report/src/main/resources/template/js/reportImportModel/reportImportModelEdit.js

-
-layui.config({
-    base: basePath,
-    version: skyeyeVersion
-}).extend({
-    window: 'js/winui.window'
-}).define(['window', 'jquery', 'winui'], function (exports) {
-    winui.renderColor();
-    layui.use(['form'], function (form) {
-        var index = parent.layer.getFrameIndex(window.name);
-        var $ = layui.$;
-
-        showGrid({
-            id: "showForm",
-            url: reportBasePath + "reportimportmodel005",
-            params: {id: parent.rowId},
-            pagination: false,
-            method: "GET",
-            template: $("#showBaseTemplate").html(),
-            ajaxSendLoadBefore: function(hdb) {
-            },
-            ajaxSendAfter:function(j){
-
-                reportModelTypeUtil.showModelTypeOperator(form, "typeBox", j.bean.firstTypeId, j.bean.secondTypeId);
-
-                matchingLanguage();
-                form.render();
-                form.on('submit(formEditBean)', function (data) {
-                    if (winui.verifyForm(data.elem)) {
-                        var params = {
-                            fileName: $("#fileName").val(),
-                            modelId: $("#modelId").val(),
-                            firstTypeId: $("#firstTypeId").val(),
-                            secondTypeId: $("#secondTypeId").val(),
-                            id: parent.rowId
-                        };
-                        AjaxPostUtil.request({url: reportBasePath + "reportimportmodel004", params: params, type: 'json', method: "PUT", callback: function(json) {
-                            parent.layer.close(index);
-                            parent.refreshCode = '0';
-                        }});
-                    }
-                    return false;
-                });
-            }
-        });
-
-        $("body").on("click", "#cancle", function() {
-            parent.layer.close(index);
-        });
-    });
-});
\ No newline at end of file

report/src/main/resources/template/js/reportImportModel/reportImportModelList.js

 
-var rowId = "";
-
 layui.config({
     base: basePath,
     version: skyeyeVersion
@@ -18,7 +16,7 @@ layui.config({
         id: 'messageTable',
         elem: '#messageTable',
         method: 'post',
-        url: reportBasePath + 'reportimportmodel001',
+        url: sysMainMation.reportBasePath + 'queryReportImportModelList',
         where: getTableParams(),
         toolbar: true,
         even: true,
@@ -27,18 +25,20 @@ layui.config({
         limit: getLimit(),
         cols: [[
             { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
-            { field: 'fileName', title: 'Echarts名称', align: 'left', width: 250},
-            { field: 'modelId', title: '模型ID', align: 'left', width: 250 },
-            { field: 'firstTypeName', title: '一级分类', align: 'left', width: 120 },
-            { field: 'secondTypeName', title: '二级分类', align: 'left', width: 120 },
+            { field: 'name', title: 'Echarts名称', align: 'left', width: 250},
+            { field: 'modelCode', title: '模型编码', align: 'left', width: 250 },
+            { field: 'typeName', title: '分类', align: 'left', width: 120 },
             { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 },
             { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
             { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
             { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
-            { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'}
+            { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, toolbar: '#tableBar'}
         ]],
         done: function(json) {
             matchingLanguage();
+            initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入名称，模型编码", function () {
+                table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+            });
         }
     });
 
@@ -49,13 +49,17 @@ layui.config({
             edit(data);
         } else if (layEvent === 'delet') { //删除
             delet(data);
+        } else if (layEvent === 'uploadHistory') { //上传历史
+            uploadHistory(data);
+        } else if (layEvent === 'upload') { //上传
+            upload(data);
         }
     });
 
     // 添加
     $("body").on("click", "#addBean", function() {
         _openNewWindows({
-            url: "../../tpl/reportImportModel/reportImportModelAdd.html",
+            url: systemCommonUtil.getUrl('FP2024040300001', null),
             title: systemLanguage["com.skyeye.addPageTitle"][languageType],
             pageId: "reportImportModelAdd",
             area: ['90vw', '90vh'],
@@ -69,7 +73,7 @@ layui.config({
     function delet(data) {
         layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
             layer.close(index);
-            AjaxPostUtil.request({url: reportBasePath + "reportimportmodel003", params: {rowId: data.id}, type: 'json', method: "DELETE", callback: function(json) {
+            AjaxPostUtil.request({url: sysMainMation.reportBasePath + "delReportImportModelById", params: {id: data.id}, type: 'json', method: "DELETE", callback: function(json) {
                 winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
                 loadTable();
             }});
@@ -78,9 +82,8 @@ layui.config({
 
     // 编辑
     function edit(data) {
-        rowId = data.id;
         _openNewWindows({
-            url: "../../tpl/reportImportModel/reportImportModelEdit.html",
+            url: systemCommonUtil.getUrl('FP2024040300002&id=' + data.id, null),
             title: systemLanguage["com.skyeye.editPageTitle"][languageType],
             pageId: "reportImportModelEdit",
             area: ['90vw', '90vh'],
@@ -91,32 +94,67 @@ layui.config({
         });
     }
 
-    form.render();
-    form.on('submit(formSearch)', function (data) {
-        if (winui.verifyForm(data.elem)) {
-            refreshloadTable();
-        }
-        return false;
+    // 上传历史
+    function uploadHistory(data) {
+        _openNewWindows({
+            url: "../../tpl/reportImportHistory/reportImportHistoryList.html?objectId=" + data.modelCode,
+            title: '上传历史',
+            pageId: "reportImportModelHistoryList",
+            area: ['90vw', '90vh'],
+            callBack: function (refreshCode) {
+            }
+        });
+    }
+
+    // 上传
+    function upload(data) {
+        modelId = data.id
+        $("#upfile").val("");
+        $("#upfile").click();
+    }
+
+    var modelId = '';
+    $("body").on("change", "#upfile", function() {
+        var formData = new FormData();
+        var name = $("#upfile").val();
+        formData.append("file", $("#upfile")[0].files[0]);
+        formData.append("name", name);
+        formData.append("modelId", modelId);
+        $.ajax({
+            url: sysMainMation.reportBasePath + 'importReportImportModel',
+            type: 'POST',
+            async: false,
+            data: formData,
+            headers: getRequestHeaders(),
+            // 告诉jQuery不要去处理发送的数据
+            processData: false,
+            // 告诉jQuery不要去设置Content-Type请求头
+            contentType: false,
+            dataType: "json",
+            beforeSend: function(){
+                winui.window.msg("正在进行，请稍候", {shift: 1});
+            },
+            success: function(json) {
+                if (json.returnCode == "0") {
+                    winui.window.msg("成功导入", {shift: 1});
+                    loadTable();
+                } else {
+                    winui.window.msg("导入失败", {icon: 2, time: 2000});
+                }
+            }
+        });
     });
 
-    // 刷新数据
+    form.render();
     $("body").on("click", "#reloadTable", function() {
         loadTable();
     });
-
     function loadTable() {
         table.reloadData("messageTable", {where: getTableParams()});
     }
 
-    function refreshloadTable() {
-        table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
-    }
-
     function getTableParams() {
-        return {
-            fileName: $("#fileName").val(),
-            modelId: $("#modelId").val()
-        };
+        return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
     }
 
     exports('reportImportModelList', {});

report/src/main/resources/template/tpl/reportImportHistory/reportImportHistoryList.html

@@ -7,33 +7,12 @@
     <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
 </head>
 <body>
-    <div class="txtcenter" style="margin:0 auto;padding-top:10px;">
-        <form class="layui-form layui-form-pane" action="" autocomplete="off">
-            <div class="layui-form-item">
-                <div class="layui-inline">
-                    <label class="layui-form-label">文件名称</label>
-                    <div class="layui-input-inline">
-                        <input type="text" id="fileName" name="fileName" placeholder="请输入文件名称" class="layui-input" />
-                    </div>
-                    <button type="reset" class="layui-btn layui-btn-primary list-form-search"><language showName="com.skyeye.reset"></language></button>
-                    <button class="layui-btn list-form-search" lay-submit lay-filter="formSearch"><language showName="com.skyeye.search2"></language></button>
-                </div>
-            </div>
-        </form>
-    </div>
     <div class="winui-toolbar">
         <div class="winui-tool">
-            <button id="reloadTable" class="winui-toolbtn">
-                <i class="fa fa-refresh" aria-hidden="true"></i>
-                <language showName="com.skyeye.refreshDataBtn"></language>
-            </button>
-            <input type="file" id="upfile" name="upfile" placeholder="" style="display: none;"/>
-            <button id="addBean" class="winui-toolbtn" auth="1624176433377">
-                <i class="fa fa-plus" aria-hidden="true"></i>
-                上传
-            </button>
+            <button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
         </div>
     </div>
+
     <div style="margin:auto 10px;">
         <table id="messageTable" lay-filter="messageTable"></table>
     </div>

report/src/main/resources/template/tpl/reportImportModel/reportImportModelAdd.html

-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title></title>
-    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
-    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
-</head>
-<body>
-    <div style="margin:0 auto;padding:20px;">
-        <form class="layui-form" action="" id="showForm" autocomplete="off">
-            <div class="layui-form-item layui-col-xs12">
-                <span class="hr-title">基础信息</span><hr>
-            </div>
-            <div class="layui-form-item layui-col-xs12">
-                <label class="layui-form-label">Echarts名称<i class="red">*</i></label>
-                <div class="layui-input-block">
-                    <input type="text" id="fileName" name="fileName" win-verify="required" placeholder="请输入Echarts名称" class="layui-input" maxlength="50"/>
-                </div>
-            </div>
-            <div class="layui-form-item layui-col-xs12">
-                <label class="layui-form-label">模型ID<i class="red">*</i></label>
-                <div class="layui-input-block">
-                    <input type="text" id="modelId" name="modelId" win-verify="required" placeholder="请输入模型ID" class="layui-input" maxlength="100"/>
-                </div>
-            </div>
-            <div class="layui-form-item layui-col-xs12" id="typeBox">
-
-            </div>
-
-            <div class="layui-form-item layui-col-xs12">
-                <div class="layui-input-block">
-                    <button class="winui-btn" id="cancle"><language showName="com.skyeye.cancel"></language></button>
-                    <button class="winui-btn" lay-submit lay-filter="formAddBean"><language showName="com.skyeye.save"></language></button>
-                </div>
-            </div>
-        </form>
-    </div>
-
-    <script src="../../assets/lib/layui/layui.js"></script>
-    <script src="../../assets/lib/layui/custom.js"></script>
-    <script type="text/javascript">
-        layui.config({base: '../../js/reportImportModel/'}).use('reportImportModelAdd');
-    </script>
-</body>
-</html>
\ No newline at end of file

report/src/main/resources/template/tpl/reportImportModel/reportImportModelEdit.html

-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title></title>
-    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
-    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
-</head>
-<body>
-    <div style="margin:0 auto;padding:20px;">
-        <form class="layui-form" action="" id="showForm" autocomplete="off">
-
-        </form>
-    </div>
-
-    <script type="text/x-handlebars-template" id="showBaseTemplate">
-        {{#bean}}
-        <div class="layui-form-item layui-col-xs12">
-            <span class="hr-title">基础信息</span><hr>
-        </div>
-        <div class="layui-form-item layui-col-xs12">
-            <label class="layui-form-label">Echarts名称<i class="red">*</i></label>
-            <div class="layui-input-block">
-                <input type="text" id="fileName" name="fileName" win-verify="required" placeholder="请输入Echarts名称" class="layui-input" maxlength="50" value="{{fileName}}"/>
-            </div>
-        </div>
-        <div class="layui-form-item layui-col-xs12">
-            <label class="layui-form-label">模型ID<i class="red">*</i></label>
-            <div class="layui-input-block">
-                <input type="text" id="modelId" name="modelId" win-verify="required" placeholder="请输入模型ID" class="layui-input" maxlength="100" value="{{modelId}}"/>
-            </div>
-        </div>
-        <div class="layui-form-item layui-col-xs12" id="typeBox">
-
-        </div>
-        <div class="layui-form-item layui-col-xs12">
-            <div class="layui-input-block">
-                <button class="winui-btn" id="cancle"><language showName="com.skyeye.cancel"></language></button>
-                <button class="winui-btn" lay-submit lay-filter="formEditBean"><language showName="com.skyeye.save"></language></button>
-            </div>
-        </div>
-        {{/bean}}
-    </script>
-
-    <script src="../../assets/lib/layui/layui.js"></script>
-    <script src="../../assets/lib/layui/custom.js"></script>
-    <script type="text/javascript">
-        layui.config({base: '../../js/reportImportModel/'}).use('reportImportModelEdit');
-    </script>
-</body>
-</html>
\ No newline at end of file

report/src/main/resources/template/tpl/reportImportModel/reportImportModelList.html

@@ -7,45 +7,25 @@
     <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
 </head>
 <body>
-    <div class="txtcenter" style="margin:0 auto;padding-top:10px;">
-        <form class="layui-form layui-form-pane" action="" autocomplete="off">
-            <div class="layui-form-item">
-                <div class="layui-inline">
-                    <label class="layui-form-label">Echarts名称</label>
-                    <div class="layui-input-inline">
-                        <input type="text" id="fileName" name="fileName" placeholder="请输入Echarts名称" class="layui-input" />
-                    </div>
-                    <label class="layui-form-label">模型ID</label>
-                    <div class="layui-input-inline">
-                        <input type="text" id="modelId" name="modelId" placeholder="请输入模型ID" class="layui-input" />
-                    </div>
-                    <button type="reset" class="layui-btn layui-btn-primary list-form-search"><language showName="com.skyeye.reset"></language></button>
-                    <button class="layui-btn list-form-search" lay-submit lay-filter="formSearch"><language showName="com.skyeye.search2"></language></button>
-                </div>
-            </div>
-        </form>
-    </div>
     <div class="winui-toolbar">
         <div class="winui-tool">
-            <button id="reloadTable" class="winui-toolbtn">
-                <i class="fa fa-refresh" aria-hidden="true"></i>
-                <language showName="com.skyeye.refreshDataBtn"></language>
-            </button>
-            <button id="addBean" class="winui-toolbtn" auth="1621139557781">
-                <i class="fa fa-plus" aria-hidden="true"></i>
-                <language showName="com.skyeye.addBtn"></language>
-            </button>
+            <button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
+            <button id="addBean" class="winui-toolbtn search-table-btn-right" auth="1621139557781"><i class="fa fa-plus" aria-hidden="true"></i>新增</button>
         </div>
     </div>
-    <div style="margin:auto 10px;">
+
+    <input type="file" id="upfile" name="upfile" placeholder="" style="display: none;"/>
+    <div style="margin: auto 10px;">
         <table id="messageTable" lay-filter="messageTable"></table>
         <script type="text/html" id="tableBar">
-            {{# if(auth('1621139574586')){ }}
+            {{# if (auth('1621139557781')) { }}
                 <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
             {{# } }}
-            {{# if(auth('1621139567392')){ }}
+            {{# if (auth('1621139567392')) { }}
                 <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="delet"><language showName="com.skyeye.deleteBtn"></language></a>
             {{# } }}
+            <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="uploadHistory">上传历史</a>
+            <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="upload">上传</a>
         </script>
     </div>
     <script src="../../assets/lib/layui/layui.js"></script>