Merge branch 'V0.0.6_iot' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.6_iot

src/views/iot/sensorData/dialog.detail.vue

@@ -0,0 +1,112 @@
+<template>
+  <DialogCom
+    title="上报历史"
+    :visible.sync="isShow"
+    class="g-dialog-select-safe-check"
+    :close-on-click-modal="false"
+    width="55%"
+    top="10vh"
+    append-to-body
+  >
+    <div class="el-dialog-div" style="margin-bottom:20px">
+      <g-search-table
+        ref="st"
+        url="/iot/sensor/find/log"
+        method="post"
+        :search-data="search"
+        :pageable="true"
+        :select="true"
+        :select-default="selectList"
+        :drag="false"
+        @select="onSelect"
+      >
+        <!-- 搜索 -->
+        <template slot="searchs">
+          <el-form-item class="searchTitle" label="上报时间">
+            <DataRangePicker
+              v-model="search.dateRange"
+              key="daterange"
+              type="daterange"
+              :clearable="timeClearable"
+            />
+          </el-form-item>
+        </template>
+
+        <!-- 表格 -->
+        <template slot="columns">
+          <el-table-column label="设备名称" align="center" prop="deviceName" width="300"/>
+          <el-table-column label="上报时间" prop="info" width="300"/>
+          <el-table-column label="上报内容" prop="updateTime" width="300"/>
+        </template>
+      </g-search-table>
+    </div>
+
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="onHide">关 闭</el-button>
+    </div>
+  </DialogCom>
+</template>
+<script>
+import GSearchTable from "@/components/table/gx.search.table.vue";
+import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
+
+export default {
+  components: {GSearchTable, DataRangePicker},
+  data() {
+    return {
+      isShow: false,
+      selectList: [],
+      search: null,
+      timeClearable: true,
+    };
+  },
+  computed: {},
+  watch: {
+    orgId(newval) {
+      this.search.orgId = newval;
+    },
+    dateRange(newval) {
+      this.search.dateRange = newval;
+    },
+  },
+  props: {
+    defaultSelect: {
+      type: Array
+    },
+    orgId: {},
+    dateRange: [],
+  },
+  methods: {
+    show(row) {
+      this.search = this.initSearchData(row);
+      this.isShow = true;
+      this.selectList = this.defaultSelect;
+    },
+    onHide() {
+      this.isShow = false;
+    },
+    onSelect(item) {
+      this.selectList = item;
+    },
+    initSearchData(row) {
+      let data = {"deviceCode": row.deviceCode, "orgId": row.orgId, "dateRange": []};
+      return data;
+    },
+    emptySearch() {
+      return {
+        deviceCode: null,
+        orgId: this.$store.getters.orgId,
+      };
+    },
+
+  },
+  mounted() {
+
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-dialog-div {
+  overflow: auto;
+}
+</style>

src/views/iot/sensorData/index.vue

@@ -26,7 +26,14 @@
                   v-model="queryParams.deviceName"
                   clearable
                   placeholder="请输入关键字"
-                  @keyup.enter.native="handleQuery"
+                  @keyup.enter.native="handleQuery"/>
+              </el-form-item>
+              <el-form-item class="searchTitle" label="上报时间">
+                <DataRangePicker
+                  v-model="queryParams.dateRange"
+                  key="daterange"
+                  type="daterange"
+                  :clearable="timeClearable"
                 />
               </el-form-item>
             </el-form>
@@ -72,7 +79,7 @@
 
           <el-table
             v-loading="loading"
-            :data="taskList"
+            :data="dataList"
             border
             height="600"
             size="small"
@@ -82,12 +89,13 @@
             <el-table-column label="设备类型" align="center" prop="categoryType"/>
             <el-table-column label="所属机构" align="center" prop="orgName" width="220"/>
             <el-table-column label="上报时间" align="center" prop="updateTime" width="220"/>
-            <el-table-column label="上报内容" align="center" prop="info" width="220" show-overflow-tooltip="true"/>
+            <el-table-column label="上报内容" align="center" prop="info" width="220" show-overflow-tooltip="showOverflowTooltip"/>
             <el-table-column
               label="操作"
-              fixed="right"
-              width="300"
               align="center"
+              fixed="right"
+              width="200"
+              class-name="small-padding fixed-width"
             >
               <template slot-scope="scope">
                 <el-button
@@ -100,7 +108,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <dialog-info ref="infoDialog" @success="refresh(true)"></dialog-info>
+          <DetailDialog ref="detailDialog" @success="refresh(true)"></DetailDialog>
           <pagination
             v-show="total > 0"
             :total="total"
@@ -116,11 +124,12 @@
 
 <script>
 import { list } from "@/api/iot/sensorData";
+import  DetailDialog  from "./dialog.detail.vue";
 import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
 import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
 import { mapGetters } from "vuex";
 export default {
-  components: { OrgTree, DataRangePicker },
+  components: { OrgTree, DataRangePicker,DetailDialog },
   name: "Task",
   dicts: ["sys_org_type"],
   data() {
@@ -148,13 +157,15 @@ export default {
         dateRange: [],
         checkSub: true,
       },
-      selectedOrgName: "",
       // 表单参数
       form: {},
       // 表单校验
       rules: {},
+      timeClearable: true,
+      showOverflowTooltip:true,
+      dateRange:[],
+      dataList:[],
 
-      orgName: "",
     };
   },
   created() {
@@ -162,14 +173,14 @@ export default {
     this.getList();
   },
   computed: {
-    ...mapGetters(["orgId", "orgName"]),
+    ...mapGetters(["orgId"]),
   },
   methods: {
     /** 查询列表 */
     getList() {
       this.loading = true;
       list(this.queryParams).then((response) => {
-        this.taskList = response.rows;
+        this.dataList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
@@ -230,7 +241,7 @@ export default {
       this.queryParams.orgId = this.orgId;
       this.selectedOrgName = this.orgName;
       this.queryParams.checkSub = true;
-      this.queryParams.dateRange = ["", ""];
+      this.queryParams.dateRange = [];
       this.queryParams.planStartTime = null;
       this.$refs["orgTree"].setCheckSub(this.queryParams.checkSub);
       this.handleQuery();
@@ -238,11 +249,11 @@ export default {
 
     /** 修改按钮操作 */
     lookView(row) {
-      this.$refs["infoDialog"].show(row.id, {});
+      this.$refs["detailDialog"].show(row);
     },
 
     /** 导出按钮操作 */
-    // handleExport() {
+     handleExport() {
     //   console.log(this);
     //   this.download(
     //     "core/retrievalTask/export",
@@ -253,7 +264,7 @@ export default {
     //       this.selectedOrgName
     //     }-${this.$tab.getCurrentTabName()}-${dayjs().format("YYYYMMDD")}.xlsx`
     //   );
-    // },
+     },
   },
 };
 </script>