修改bug

zh-baseversion-system/src/main/java/com/zehong/system/domain/TEnterpriseSystem.java

@@ -66,6 +66,26 @@ public class TEnterpriseSystem extends BaseEntity
     @Excel(name = "是否删除(0正常，1删除)")
     private String isDel;
 
+    private String beginTime;
+
+    private String endTime;
+
+    public String getBeginTime() {
+        return beginTime;
+    }
+
+    public void setBeginTime(String beginTime) {
+        this.beginTime = beginTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
     public void setSystemId(Long systemId)
     {
         this.systemId = systemId;

zh-baseversion-system/src/main/resources/mapper/system/TEmergencyDrillsMapper.xml

@@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fIsDel != null  and fIsDel != ''"> and f_is_del = #{fIsDel}</if>
             <if test="fRemarks != null  and fRemarks != ''"> and f_remarks = #{fRemarks}</if>
         </where>
+        order by  f_create_time desc
     </select>
     
     <select id="selectTEmergencyDrillsById" parameterType="Long" resultMap="TEmergencyDrillsResult">

zh-baseversion-system/src/main/resources/mapper/system/TEnterpriseSystemMapper.xml

@@ -43,6 +43,12 @@
             <if test="fileName != null  and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
             <if test="fileUrl != null  and fileUrl != ''"> and file_url = #{fileUrl}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="beginTime !=null and beginTime !=''">
+                and create_time &gt; #{beginTime}
+            </if>
+            <if test="endTime !=null and endTime !=''">
+                and create_time &lt;  concat(#{endTime}," 23:59:59")
+            </if>
         </where>
     </select>
 

zh-baseversion-web/src/views/space/archive/index.vue

@@ -735,6 +735,20 @@ export default {
         }
       });
     },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除密闭空间和人员密集场所编号为"' + ids + '"的数据项？', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return delSpace(ids);
+      }).then(() => {
+        this.getList();
+      this.msgSuccess("删除成功");
+    }).catch(() => {});
+    },
     /**关联设备添加方法*/
     addDetailInfo(){
       this.$refs["formDetailInfo"].validate(valid => {

zh-baseversion-web/src/views/supervise/laws/index.vue

@@ -306,7 +306,15 @@ export default {
     /** 查询法律法规管理列表 */
     getList() {
       this.loading = true;
-      listEnterpriseSystem(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      var dateRange = this.dateRange;
+      if (null != dateRange && '' != dateRange) {
+        this.queryParams.beginTime = dateRange[0];
+        this.queryParams.endTime = dateRange[1];
+      }else{
+        this.queryParams.beginTime = null;
+        this.queryParams.endTime = null;
+      }
+      listEnterpriseSystem(this.queryParams).then(response => {
         this.enterpriseSystemList = response.rows;
         console.log("enterpriseSystemList", this.enterpriseSystemList)
         this.total = response.total;