Merge branch 'V2' of http://47.92.161.104:10080/zq/jp-housekeeper-portal into V2

src/views/base/alarmInfo-alert-list.vue

@@ -13,14 +13,23 @@
     <!--
       要resetFields起作用，必须配置:model和prop
     -->
-    <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
-      <el-form-item label="报警时间" prop="createTime">
+    <el-form
+      ref="queryForm"
+      :model="queryModel"
+      inline
+      class="demo-form-inline"
+    >
+      <el-form-item label="报警时间" prop="queryTimeRange">
         <el-date-picker
-          v-model="queryModel.createTime"
+          v-model="queryModel.queryTimeRange"
           type="daterange"
           range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          placeholder="选择时间范围"
+          value-format="yyyy-MM-dd"
+          :clearable="false"
+          style="width: 300px"
         ></el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -30,27 +39,38 @@
           icon="ios-search"
           @click="changePage(1)"
           :loading="loading"
-        >查询</el-button>&nbsp;
+          >查询</el-button
+        >&nbsp;
         <el-button
           type="info"
           size="mini"
           style="margin-left: 8px"
           @click="handleReset('queryForm')"
-        >重置</el-button>&nbsp;
+          >重置</el-button
+        >&nbsp;
       </el-form-item>
     </el-form>
     <el-divider></el-divider>
     <el-row class="button-group"></el-row>
     <el-table
       :data="tableData"
-      style="min-height:400px;"
+      style="min-height: 400px"
       v-loading="loading"
       stripe
       @sort-change="sortChange"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column prop="createTime" sort-by="create_time" label="报警时间" width="180"></el-table-column>
-      <el-table-column prop="message" sort-by="message_" label="报警信息"></el-table-column>
+      <el-table-column
+        prop="createTime"
+        sort-by="create_time"
+        label="报警时间"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="message"
+        sort-by="message_"
+        label="报警信息"
+      ></el-table-column>
       <!-- <el-table-column label="操作">
         <template slot-scope="{row}">
           <el-button size="mini" disabled type="primary" icon="el-icon-video-camera" @click="handleOpenVideo(row)">查看回放</el-button>
@@ -88,15 +108,8 @@ export default {
     return {
       queryModel: {
         id: "",
-        createBy: "",
-        createTime: "",
-        updateBy: "",
-        updateTime: "",
-        delFlag: "",
-        deviceNo: "",
-        channelName: "",
-        alertType: "",
-        type: "2"
+        queryTimeRange: ["", ""],
+        type: "2",
       },
       loading: false,
       tableData: [],
@@ -110,7 +123,7 @@ export default {
       multipleSelection: [],
       showModal: false,
       modalTitle: "",
-      businessKey: ""
+      businessKey: "",
     };
   },
   methods: {
@@ -126,16 +139,17 @@ export default {
       formData.append("pageSize", self.pageSize);
 
       formData.append("id", self.queryModel.id);
-      formData.append("createBy", self.queryModel.createBy);
       formData.append("createTime", self.queryModel.createTime);
-      formData.append("updateBy", self.queryModel.updateBy);
-      formData.append("updateTime", self.queryModel.updateTime);
-      formData.append("delFlag", self.queryModel.delFlag);
-      formData.append("deviceNo", self.queryModel.deviceNo);
-      formData.append("channelName", self.queryModel.channelName);
-      formData.append("alertType", self.queryModel.alertType);
       formData.append("type", self.queryModel.type);
 
+      if (self.queryModel.queryTimeRange[0] != null) {
+        formData.append("queryStartTime", self.queryModel.queryTimeRange[0]);
+      }
+
+      if (self.queryModel.queryTimeRange[1] != null) {
+        formData.append("queryEndTime", self.queryModel.queryTimeRange[1]);
+      }
+
       if (this.field != null) {
         formData.append("field", this.field);
       }
@@ -146,7 +160,7 @@ export default {
 
       alarmInfoApi
         .pageList(formData)
-        .then(function(response) {
+        .then(function (response) {
           self.loading = false;
 
           var jsonData = response.data.data;
@@ -155,7 +169,7 @@ export default {
           self.totalPages = jsonData.totalPages;
           self.totalElements = jsonData.recordsTotal;
         })
-        .catch(error => {
+        .catch((error) => {
           self.loading = false;
           // self.$message.error(error + "");
         });
@@ -192,10 +206,10 @@ export default {
         .$confirm("是否确认删除?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
+          type: "warning",
         })
         .then(() => {
-          alarmInfoApi.remove(record.id).then(function(response) {
+          alarmInfoApi.remove(record.id).then(function (response) {
             var jsonData = response.data;
 
             if (jsonData.result) {
@@ -205,7 +219,7 @@ export default {
 
               self.$message({
                 type: "success",
-                message: "删除成功!"
+                message: "删除成功!",
               });
             }
           });
@@ -214,16 +228,16 @@ export default {
     handleBatchDelete() {
       var self = this;
 
-      var idList = this.multipleSelection.map(record => {
+      var idList = this.multipleSelection.map((record) => {
         return record.id;
       });
 
       this.$confirm("是否确认删除选中项？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       }).then(() => {
-        alarmInfoApi.batchRemove(idList).then(function(response) {
+        alarmInfoApi.batchRemove(idList).then(function (response) {
           var jsonData = response.data;
 
           if (jsonData.result) {
@@ -231,7 +245,7 @@ export default {
 
             self.$message({
               type: "success",
-              message: "删除成功!"
+              message: "删除成功!",
             });
           }
         });
@@ -252,7 +266,7 @@ export default {
       var self = this;
       var formData = new FormData();
       formData.append("type", 2);
-      alarmInfoApi.queryNotify(formData).then(function(response) {
+      alarmInfoApi.queryNotify(formData).then(function (response) {
         var jsonData = response;
         if (jsonData.data.result) {
           self.$notify({
@@ -260,21 +274,21 @@ export default {
             message: jsonData.data.data,
             position: "bottom-right",
             type: "warning",
-            duration: 0
+            duration: 0,
           });
         }
       });
-    }
+    },
   },
-  mounted: function() {
+  mounted: function () {
     this.changePage(1);
-    window.setInterval(() => {
-      setTimeout(this.queryNotify(), 0);
-    }, 10000);
+    // window.setInterval(() => {
+    //   setTimeout(this.queryNotify(), 0);
+    // }, 10000);
   },
   components: {
-    "alarmInfo-detail": AlarmInfoDetail
-  }
+    "alarmInfo-detail": AlarmInfoDetail,
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/base/businessOut-list.vue

@@ -75,11 +75,12 @@
             end-placeholder="结束时间"
             placeholder="选择时间范围"
             value-format="yyyy-MM-dd"
+            :clearable="false"
            style="width:300px"
             >
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="审核时间">
+      <el-form-item label="审核时间" prop="auditTimeRange">
         <el-date-picker
             v-model="queryModel.auditTimeRange"
             type="daterange"
@@ -89,6 +90,7 @@
             end-placeholder="结束时间"
             placeholder="选择时间范围"
             value-format="yyyy-MM-dd"
+            :clearable="false"
            style="width:300px"
             >
         </el-date-picker>

src/views/business/fillAttendance-list.vue

@@ -13,9 +13,18 @@
     <!--
       要resetFields起作用，必须配置:model和prop
     -->
-    <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
+    <el-form
+      ref="queryForm"
+      :model="queryModel"
+      inline
+      class="demo-form-inline"
+    >
       <el-form-item label="申请人姓名" prop="personName">
-        <el-input type="text" size="mini" v-model="queryModel.personName"></el-input>
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.personName"
+        ></el-input>
       </el-form-item>
       <el-form-item label="单位" prop="parentId">
         <el-select-tree
@@ -24,8 +33,11 @@
           :options="companyResult"
           v-model="queryModel.parentId"
           height="200"
-        ></el-select-tree>&nbsp;
-        <el-checkbox v-model="queryModel.subordinate">是否包含下级单位</el-checkbox>
+        ></el-select-tree
+        >&nbsp;
+        <el-checkbox v-model="queryModel.subordinate"
+          >是否包含下级单位</el-checkbox
+        >
       </el-form-item>
       <el-form-item label="申请类型" prop="type">
         <el-select
@@ -33,13 +45,22 @@
           size="mini"
           filterable
           placeholder="请选择"
-          style="width:100px"
+          style="width: 100px"
         >
-          <el-option v-for="type in typeData" :key="type.value" :label="type.name" :value="type.value"></el-option>
+          <el-option
+            v-for="type in typeData"
+            :key="type.value"
+            :label="type.name"
+            :value="type.value"
+          ></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="审批状态" prop="status">
-        <el-input type="text" size="mini" v-model="queryModel.status"></el-input>
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.status"
+        ></el-input>
       </el-form-item>
       <el-form-item>
         <el-button
@@ -48,13 +69,15 @@
           icon="ios-search"
           @click="changePage(1)"
           :loading="loading"
-        >查询</el-button>&nbsp;
+          >查询</el-button
+        >&nbsp;
         <el-button
           type="info"
           size="mini"
           style="margin-left: 8px"
           @click="handleReset('queryForm')"
-        >重置</el-button>&nbsp;
+          >重置</el-button
+        >&nbsp;
       </el-form-item>
       <el-form-item label="补卡日" prop="fillDayRange">
         <el-date-picker
@@ -64,33 +87,83 @@
           range-separator="至"
           placeholder="选择时间范围"
           value-format="yyyy-MM-dd"
-           style="width:300px"
+          :clearable="false"
+          style="width: 300px"
         >
         </el-date-picker>
       </el-form-item>
     </el-form>
     <el-divider></el-divider>
     <el-row class="button-group"></el-row>
-    <el-table 
+    <el-table
       ref="formTable"
       :data="tableData"
-      :height="tableHeight" 
-      v-loading="loading" 
-      stripe>
-      <el-table-column type="index" label="序号" :index="indexMethod" width="50"></el-table-column>
-      <el-table-column prop="personId" label="申请人编号" width="120"></el-table-column>
-      <el-table-column prop="personName" label="申请人" width="120"></el-table-column>
-      <el-table-column prop="companyName" label="申请单位" width="180"></el-table-column>
-      <el-table-column prop="typeN" label="申请类型" width="80"></el-table-column>
-      <el-table-column prop="fillDay" label="补卡日" width="120"></el-table-column>
-      <el-table-column prop="fillAttendanceTime" label="补卡时间" width="120"></el-table-column>
-      <el-table-column prop="content" label="内容" width="180" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="approvalPersonName" label="审批人" width="120"></el-table-column>
-      <el-table-column prop="statusN" label="审批状态" width="80"></el-table-column>
-      <el-table-column prop="createTime" label="创建时间" width="160"></el-table-column>
+      :height="tableHeight"
+      v-loading="loading"
+      stripe
+    >
+      <el-table-column
+        type="index"
+        label="序号"
+        :index="indexMethod"
+        width="50"
+      ></el-table-column>
+      <el-table-column
+        prop="personId"
+        label="申请人编号"
+        width="120"
+      ></el-table-column>
+      <el-table-column
+        prop="personName"
+        label="申请人"
+        width="120"
+      ></el-table-column>
+      <el-table-column
+        prop="companyName"
+        label="申请单位"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="typeN"
+        label="申请类型"
+        width="80"
+      ></el-table-column>
+      <el-table-column
+        prop="fillDay"
+        label="补卡日"
+        width="120"
+      ></el-table-column>
+      <el-table-column
+        prop="fillAttendanceTime"
+        label="补卡时间"
+        width="120"
+      ></el-table-column>
+      <el-table-column
+        prop="content"
+        label="内容"
+        width="180"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="approvalPersonName"
+        label="审批人"
+        width="120"
+      ></el-table-column>
+      <el-table-column
+        prop="statusN"
+        label="审批状态"
+        width="80"
+      ></el-table-column>
+      <el-table-column
+        prop="createTime"
+        label="创建时间"
+        width="160"
+      ></el-table-column>
       <el-table-column label fixed="right">
-        <template slot-scope="{row}">
-          <el-button size="mini" type="warning" @click="handleOpenFiles(row)">查看附件</el-button>
+        <template slot-scope="{ row }">
+          <el-button size="mini" type="warning" @click="handleOpenFiles(row)"
+            >查看附件</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -130,10 +203,10 @@ export default {
       queryModel: {
         personName: "",
         parentId: "",
-        subordinate:false,
+        subordinate: false,
         type: "",
         status: "",
-        fillDayRange:["",""],
+        fillDayRange: ["", ""],
       },
       loading: false,
       tableData: [],
@@ -155,22 +228,22 @@ export default {
         // 配置项（必选）
         value: "id",
         label: "name",
-        children: "children"
+        children: "children",
       },
-      tableHeight: 400
+      tableHeight: 400,
     };
   },
   created() {
     var formData = new FormData();
     formData.append("catalogName", "补卡类型");
-    dataDictionaryApi.findByCatalogName(formData).then(response => {
+    dataDictionaryApi.findByCatalogName(formData).then((response) => {
       var jsonData = response.data;
       this.typeData = jsonData.data;
     });
 
-    companyInfoApi.treeList().then((response)=>{
+    companyInfoApi.treeList().then((response) => {
       var jsonData = response.data;
-      
+
       if (jsonData.result) {
         if (jsonData.data != null && jsonData.data != "") {
           this.companyResult = jsonData.data;
@@ -180,9 +253,9 @@ export default {
 
     this.loadTree();
 
-    setTimeout(()=>{
+    setTimeout(() => {
       this.tableHeight = pageUtil.autoAdjustHeight(this.$refs.formTable.$el);
-    },1000);
+    }, 1000);
   },
   methods: {
     getSelectedValue(value) {
@@ -191,7 +264,7 @@ export default {
     loadTree() {
       var formData = new FormData();
 
-      companyInfoApi.loadChildren(formData).then(resp => {
+      companyInfoApi.loadChildren(formData).then((resp) => {
         var jsonData = resp.data;
 
         if (jsonData.result) {
@@ -205,7 +278,7 @@ export default {
       var formData = new FormData();
       formData.append("parentId", tree.id);
 
-      companyInfoApi.loadChildren(formData).then(resp => {
+      companyInfoApi.loadChildren(formData).then((resp) => {
         var jsonData = resp.data;
 
         if (jsonData.result) {
@@ -236,15 +309,13 @@ export default {
       formData.append("type", self.queryModel.type);
       formData.append("status", self.queryModel.status);
 
-
-      if(self.queryModel.fillDayRange[0] != null){
+      if (self.queryModel.fillDayRange[0] != null) {
         formData.append("startTime", self.queryModel.fillDayRange[0]);
       }
 
-      if(self.queryModel.fillDayRange[1] != null){
+      if (self.queryModel.fillDayRange[1] != null) {
         formData.append("endTime", self.queryModel.fillDayRange[1]);
       }
-      
 
       if (this.field != null) {
         formData.append("field", this.field);
@@ -256,7 +327,7 @@ export default {
 
       fillAttendanceApi
         .pageList(formData)
-        .then(function(response) {
+        .then(function (response) {
           self.loading = false;
 
           var jsonData = response.data.data;
@@ -265,7 +336,7 @@ export default {
           self.totalPages = jsonData.totalPages;
           self.totalElements = jsonData.recordsTotal;
         })
-        .catch(error => {
+        .catch((error) => {
           self.loading = false;
           // self.$message.error(error + "");
         });
@@ -297,15 +368,15 @@ export default {
       if (refreshed) {
         this.changePage(this.pageIndex);
       }
-    }
+    },
   },
   components: {
     "fillAttendanceFiles-list": FillAttendanceFilesList,
-    "el-select-tree": SelectTree
+    "el-select-tree": SelectTree,
   },
-  mounted: function() {
+  mounted: function () {
     this.changePage(1);
-  }
+  },
 };
 </script>
 <style lang="scss" scoped>