Merge remote-tracking branch 'origin/master'

src/main/resources/mappers/backstage/SynthesisQueryMapper.xml

@@ -97,10 +97,10 @@
         COUNT(IF(tcq.upload_type = '3', 1, NULL)) AS safetyMeasNum,
         COUNT(IF(tcq.upload_type = '4', 1, NULL)) AS coordinatedPhotoNum,
         COUNT(IF(tcq.upload_type = '5', 1, NULL)) AS importIssuesAndPublicityNum
-        FROM tb_comprehensive_query tcq
-        LEFT JOIN sys_file_resource sfr ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND
-        sfr.is_active = '1'
-        WHERE tcq.is_active = '1'
+        FROM sys_file_resource sfr
+        LEFT JOIN tb_comprehensive_query tcq ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND
+        tcq.is_active = '1'
+        WHERE sfr.is_active = '1'
         <if test="roleLevel = '0' and proIds != null and proIds.size() > 0">
             AND tcq.pro_id IN
             <foreach collection="proIds" item="proId" open="(" separator="," close=")">
@@ -127,9 +127,9 @@
         IF(tpc.file_resource_id IS NULL,'0','1') AS collectStatus,
         tcq.title,
         tcq.pro_name AS proName
-        FROM tb_comprehensive_query tcq
-        LEFT JOIN sys_file_resource sfr ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND
-        sfr.is_active = '1'
+        FROM sys_file_resource sfr
+        LEFT JOIN tb_comprehensive_query tcq ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND
+        tcq.is_active = '1'
         LEFT JOIN tb_photo_collect tpc ON sfr.id = tpc.file_resource_id AND tpc.collect_user_id = #{userId}
         LEFT JOIN (
         SELECT sd.dict_value,sd.dict_name
@@ -228,7 +228,7 @@
             <if test="id!=null">
                 AND tcq.pro_id = #{id}
             </if>
-            AND tcq.is_active = '1'
+            AND sfr.is_active = '1'
         </where>
         ORDER BY sfr.create_time DESC
     </select>
@@ -250,10 +250,10 @@
         tp.name AS proName,
         tcq.pro_id AS proId,
         MAX(sfr.create_time) AS lastUpdateTime
-        FROM tb_comprehensive_query tcq
+        FROM sys_file_resource sfr
+        LEFT JOIN tb_comprehensive_query tcq ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND
+        tcq.is_active = '1'
         LEFT JOIN tb_project tp ON tcq.pro_id = tp.id
-        LEFT JOIN sys_file_resource sfr ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND
-        sfr.is_active = '1'
         <where>
             <if test="roleLevel = '0' and proIds != null and proIds.size() > 0">
                 AND tcq.pro_id IN
@@ -264,7 +264,7 @@
             <if test="id!=null">
                 AND tcq.pro_id = #{id}
             </if>
-            AND tcq.is_active = '1'
+            AND sfr.is_active = '1'
         </where>
         GROUP BY tcq.pro_id
     </select>
@@ -283,9 +283,9 @@
         IF(tpc.file_resource_id IS NULL,'0','1') AS collectStatus,
         tcq.title,
         tcq.pro_name AS proName
-        FROM tb_comprehensive_query tcq
-        LEFT JOIN sys_file_resource sfr ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND
-        sfr.is_active = '1'
+        FROM sys_file_resource sfr
+        LEFT JOIN tb_comprehensive_query tcq ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND
+        tcq.is_active = '1'
         LEFT JOIN tb_photo_collect tpc ON sfr.id = tpc.file_resource_id AND tpc.collect_user_id = #{userId}
         LEFT JOIN (
         SELECT sd.dict_value,sd.dict_name
@@ -317,7 +317,7 @@
             <if test="uploadType!=null and uploadType!=0">
                 AND tcq.upload_type = #{uploadType}
             </if>
-            AND tcq.is_active = '1'
+            AND sfr.is_active = '1'
         </where>
         ORDER BY sfr.create_time DESC
     </select>

src/main/resources/static/js/imageUpload/importantMatter/child/importantMatterForm.js

@@ -24,90 +24,6 @@ layui.use(['laydate', 'upload'], function () {
         sourceTypeName: "重要事项及宣传照片" // 来源类型名称
     })
 
-    // 已上传图片计数
-    var uploadedCount = 0;
-    // 最大允许上传数量
-    var maxCount = 9;
-    // 渲染上传组件
-    upload.render({
-        elem: '#uploadBtn',        // 绑定按钮
-        url: '/imgTool/sys/file/uploadFile?token=' + tokens, // 上传接口地址
-        accept: 'images',          // 只允许上传图片
-        multiple: true,            // 允许多文件上传
-        auto: true,                // 选择文件后自动上传
-        number: 9,                 // 每次最多选择3个文件
-        field: 'files',
-        data: {params: violation},
-        choose: function(obj){     // 选择文件后的回调
-            debugger;
-            // 检查已上传数量
-            var files  = obj.pushFile();
-            console.log(files)
-            alert(uploadedCount)
-            // 如果已上传+新选择的数量超过限制
-            alert(files.length)
-            if(uploadedCount + files.length > maxCount){
-                var canUpload = maxCount - uploadedCount;
-                layer.msg('最多上传'+maxCount+'张图片，还可上传'+canUpload+'张');
-                // 截断文件数组，只保留可上传数量
-                this.files = files.slice(0, canUpload);
-                // 如果已经没有可上传数量，则阻止上传
-                if(canUpload <= 0){
-                    return false;
-                }
-            }
-
-            // 预览图片
-            obj.preview(function(index, file, result){
-                $('#previewBox').append(
-                    '<div class="img-item" data-index="'+ index +'" style="display: inline-block; position: relative; margin: 5px 5px" >' +
-                    '<img src="'+ result +'" alt="'+ file.name +'" class="layui-upload-img" style="width: 90px; height: 90px;" >' +
-                    '<div class="img-operate">' +
-                    '<i class="layui-icon layui-icon-close" onclick="deleteImg('+ index +')"></i>' +
-                    '</div>' +
-                    '</div>'
-                );
-            });
-        },
-        before: function(obj){
-            // 上传前可以做一些处理
-        },
-        done: function(res, index, upload){
-            // 上传成功回调
-            uploadedCount++;
-
-            // 如果已达到最大数量，禁用上传按钮
-            if(uploadedCount >= maxCount){
-                $('#uploadBtn').addClass('layui-btn-disabled').prop('disabled', true);
-            }
-
-            // 在实际应用中，这里可以处理服务器返回的数据
-            console.log(res);
-        },
-        error: function(index, upload){
-            // 上传失败回调
-            layer.msg('第'+(index+1)+'张图片上传失败');
-        },
-        allDone: function(obj){
-            // 全部上传完成回调
-            console.log('全部上传完成');
-        }
-    });
-
-    // 删除图片函数
-    window.deleteImg = function(index){
-        // 这里应该添加删除服务器上图片的逻辑
-        // 例如通过AJAX请求删除接口
-        // 从预览中移除
-        $('.img-item[data-index="'+ index +'"]').remove();
-        // 减少计数
-        uploadedCount--;
-        // 重新启用上传按钮
-        $('#uploadBtn').removeClass('layui-btn-disabled').prop('disabled', false);
-    }
-
-
-
     // 多图片上传
     var uploadcom1 = upload.render({
         elem: '#test1',

src/main/resources/static/js/synthesisQuery/synthesisQuery.js

@@ -31,6 +31,7 @@ function dataFlow(queryParams) {
             console.error(page);
             pageNum = page;
             let lis = [];
+            queryParams.pageNum = page;
             let returnData = loadData(queryParams);
             if (returnData != null) {
                 lis = initImgData(returnData.data.list)
@@ -64,6 +65,7 @@ function changeType(type, that) {
         $(that).addClass("checkedElement");
         $(that).prev().removeClass("checkedElement").addClass("noCheckedElement");
     }
+    initImgNum();
     searchData({
         pageNum: pageNum,
         pageSize: pageSize,

src/main/resources/static/pages/imageUpload/importantMatter/child/importantMatterForm.html

@@ -104,7 +104,7 @@
             </div>
         </div>
 
-        <!--<div class="layui-form-item">
+        <div class="layui-form-item">
             <label class="layui-form-label"><i style="padding: 0 10px;">*</i>照片:</label>
             <div class="layui-input-block">
                 <div class="layui-upload">
@@ -118,14 +118,14 @@
                 </div>
                 <button id="hideUpload1" type="button" style="display: none"></button>
             </div>
-        </div>-->
+        </div>
 
-        <div class="layui-upload">
+        <!--<div class="layui-upload">
             <button type="button" class="layui-btn" id="uploadBtn">选择图片</button>
             <div class="layui-upload-list">
                 <div id="previewBox"></div>
             </div>
-        </div>
+        </div>-->
 
         <button type="submit" id="formSubmit" class="layui-btn" lay-submit="" lay-filter="formData"
                 style="display: none;"></button>

src/main/resources/static/pages/imageUpload/safetyViolations/child/safetyViolationsForm.html

@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <link rel="stylesheet" href="../../../../js/layui-v2.6.8/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../../js/layui-v2.9.14/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../../css/dataForm.css">
     <style>
         .section-title {
@@ -44,7 +44,8 @@
         }
     </style>
     <script src="../../../../js/libs/jquery-3.7.0.min.js" charset="UTF-8" type="text/javascript"></script>
-    <script src="../../../../js/layui-v2.6.8/layui.js" charset="UTF-8" type="text/javascript"></script>
+<!--    <script src="../../../../js/layui-v2.6.8/layui.js" charset="UTF-8" type="text/javascript"></script>-->
+    <script src="../../../../js/layui-v2.9.14/layui/layui.js" charset="UTF-8" type="text/javascript"></script>
     <script src="../../../../js/publicJs.js"></script>
     <script src="../../../../js/select.js"></script>
     <script src="../../../../js/dict.js"></script>