水务 自然资源

src/api/newResource/data.js

+import request from '@/utils/request'
+
+export default {
+  // 绑定我的
+  addMy: (iotMachine) => {
+    return request({
+      url: 'api/iot-machine/add/my',
+      method: 'post',
+      data: iotMachine
+    })
+  },
+  // 移除我的
+  removeMy: () => {
+    return request({
+      url: 'api/iot-machine/remove-all/my',
+      method: 'post'
+    })
+  },
+  // 查询我的
+  getDataList:(params) => {
+    return request({
+      url: 'data/mp/history',
+      method: 'get',
+      params
+    })
+  },
+  // 查询风速、温度
+    getDataList4windSpeed: (params) => {
+    return request({
+      url: 'data/sz/history',
+      method: 'get',
+      params
+    })
+  },
+    // 查询降雨量
+    getDataList4waterPrecipitation: (params) => {
+      return request({
+        url: 'data/rg/history',
+        method: 'get',
+        params
+      })
+    }
+}

src/api/newResource/machine.js

+import request from '@/utils/request'
+
+export default {
+  // 绑定我的
+  addMy: (iotMachine) => {
+    return request({
+      url: 'api/iot-machine/add/my',
+      method: 'post',
+      data: iotMachine
+    })
+  },
+  // 移除我的
+  removeMy: () => {
+    return request({
+      url: 'api/iot-machine/remove-all/my',
+      method: 'post'
+    })
+  },
+  // 查询我的
+  getDataList:(params) => {
+    return request({
+      url: 'tab/drybeachequipinfor',
+      method: 'get',
+      params
+    })
+  }
+}

src/views/newResource/displace/data.vue

@@ -123,6 +123,8 @@ export default {
         .then((response) => {
           this.loading = false;
           this.tableData = response.body.list;
+          this.totalElement = response.body.total;
+
         })
         .catch(() => {
           this.loading = false;

src/views/newResource/temperature/data.vue

 <template>
   <div class="app-container">
     <!--工具栏-->
-      <!-- <span style="color: red;font-size: 10px;">* 原型图菜单叫监控数据，但其他2处监控叫实时数据，此页面查询的也是最新的测点数据，为措辞统一，这里也叫实时数据了。</span>
-      <span style="color: red;font-size: 10px;">* 测点类型在新增时是填写的，在这里是选择的？在填过的内容里选择吗？等对接了硬件可能会更清楚这个类型是干什么用的。</span> -->
     <div class="head-container">
       <div>
-          <el-input clearable size="small" placeholder="测点名称" style="width: 200px;" class="filter-item" />
-          <el-select v-model="value" placeholder="测点类型？" style="width: 200px;" class="filter-item">
-            <el-option label="测点类型？" value="1" />
-          </el-select>
-          <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="$message('等待硬件对接中')">搜索</el-button>
-          <el-button class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left">重置</el-button>
+        <el-input
+          v-model="equipname"
+          clearable
+          size="small"
+          placeholder="测点名称"
+          style="width: 200px"
+          class="filter-item"
+        />
+        <date-range-picker v-model="datarealtime" class="date-item" />
+        <el-button
+          class="filter-item"
+          size="mini"
+          type="success"
+          icon="el-icon-search"
+          @click="search"
+          >搜索</el-button
+        >
+        <el-button
+          class="filter-item"
+          size="mini"
+          type="warning"
+          icon="el-icon-refresh-left"
+          @click="clearSearch"
+          >重置</el-button
+        >
       </div>
     </div>
+
     <!--表格-->
-      <el-table ref="table" v-loading="searching" :data="tableData" row-key="id">
-        <el-table-column :show-overflow-tooltip="true" prop="id" label="编号" width="100px" align="center" />
-        <el-table-column :show-overflow-tooltip="true" prop="mineName" label="测点名称" align="center" />
-        <el-table-column :show-overflow-tooltip="true" prop="name" label="测点编号" align="center" />
-        <el-table-column :show-overflow-tooltip="true" prop="code" label="监测值" align="center" />
-        <el-table-column :show-overflow-tooltip="true" prop="monitoringType" label="监测时间" align="center" />
-        <el-table-column :show-overflow-tooltip="true" prop="unit" label="报警状态" align="center" />
+    <el-table ref="table" v-loading="loading" :data="tableData" row-key="id">
+      <el-table-column
+        :show-overflow-tooltip="true"
+        prop="sensorid"
+        label="站点编号"
+        width="130px"
+        align="center"
+      />
+      <el-table-column
+        :show-overflow-tooltip="true"
+        prop="sensorname"
+        label="测站名称"
+        align="center"
+      />
+      <el-table-column
+        :show-overflow-tooltip="true"
+        prop="svalue"
+        label="温度"
+        align="center"
+      />
+      <el-table-column
+        :show-overflow-tooltip="true"
+        prop="time"
+        label="监测时间"
+        align="center"
+      >
+      </el-table-column>
     </el-table>
     <el-pagination
       :page-sizes="[10, 20, 50, 100]"
-        :current-page.sync="searchParam.page"
-        :page-size.sync="searchParam.count"
-        :total="searchResult.total"
+      :current-page.sync="page"
+      :page-size.sync="size"
+      :total="totalElement"
       layout="total, sizes, prev, pager, next, jumper"
-        @size-change="searchSubmit"
-        @current-change="searchSubmit"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
     />
   </div>
-  </template>
+</template>
 
-  <script>
-  export default {
-    name: 'EIotEnvironmentData', // 本页面名
+<script>
+import API from "@/api/newResource/data.js";
+import DateRangePicker from '@/components/DateRangePicker'
+
+export default {
+  name: "newResourceDisplaceMachine", // 本页面名
   data() {
     return {
-        searching: false,
-        searchParam: {},
-        searchResult: {
-          results: []
-        }
-      }
-    },
-    computed: {
-      tableData() {
-        // 此处对返回值进行算法重组
-        return this.searchResult.results
-      }
+      equipname: '',
+      datarealtime: '',
+      loading: false,
+      tableData: [],
+      // 总的个数
+      totalElement: 0,
+      // 当前页的条数
+      size: 10,
+      // 当前页码
+      page: 1,
+    };
   },
+  components: { DateRangePicker },
   mounted() {
+    this.search()
   },
   methods: {
-    }
-  }
-  </script>
+    getData() {
+      this.loading = true;
+      API.getDataList4windSpeed({
+        page: this.page,
+        size: this.size,
+        time: this.datarealtime && this.datarealtime.join(',') || '',
+        sensorname: this.equipname,
+        different: '温度'
 
-  <style rel="stylesheet/scss" lang="scss" scoped>
-    ::v-deep .el-input-number .el-input__inner {
+      })
+        .then((response) => {
+          this.loading = false;
+          this.tableData = response.body.list;
+          this.totalElement = response.body.total;
+
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+     // 模糊搜索
+     search() {
+      this.getData();
+    },
+    clearSearch() {
+      this.equipname = ''
+      this.datarealtime =  ''
+      this.size = 10;
+      this.page = 0;
+      this.getData();
+    },
+    // 当前页的条数变化
+    handleSizeChange(val) {
+      this.size = val;
+      this.getData();
+    },
+    // 当前第几页
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getData();
+    },
+   
+  },
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-input-number .el-input__inner {
   text-align: left;
-    }
-    ::v-deep .vue-treeselect__control,::v-deep .vue-treeselect__placeholder,::v-deep .vue-treeselect__single-value {
+}
+::v-deep .vue-treeselect__control,
+::v-deep .vue-treeselect__placeholder,
+::v-deep .vue-treeselect__single-value {
   height: 30px;
   line-height: 30px;
-    }
-  </style>
-  
+}
+</style>
\ No newline at end of file

src/views/newResource/windspeed/data.vue

 <template>
   <div class="app-container">
     <!--工具栏-->
-      <!-- <span style="color: red;font-size: 10px;">* 原型图菜单叫监控数据，但其他2处监控叫实时数据，此页面查询的也是最新的测点数据，为措辞统一，这里也叫实时数据了。</span>
-      <span style="color: red;font-size: 10px;">* 测点类型在新增时是填写的，在这里是选择的？在填过的内容里选择吗？等对接了硬件可能会更清楚这个类型是干什么用的。</span> -->
     <div class="head-container">
       <div>
-          <el-input clearable size="small" placeholder="测点名称" style="width: 200px;" class="filter-item" />
-          <el-select v-model="value" placeholder="测点类型？" style="width: 200px;" class="filter-item">
-            <el-option label="测点类型？" value="1" />
-          </el-select>
-          <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="$message('等待硬件对接中')">搜索</el-button>
-          <el-button class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left">重置</el-button>
+        <el-input
+          v-model="equipname"
+          clearable
+          size="small"
+          placeholder="测点名称"
+          style="width: 200px"
+          class="filter-item"
+        />
+        <date-range-picker v-model="datarealtime" class="date-item" />
+        <el-button
+          class="filter-item"
+          size="mini"
+          type="success"
+          icon="el-icon-search"
+          @click="search"
+          >搜索</el-button
+        >
+        <el-button
+          class="filter-item"
+          size="mini"
+          type="warning"
+          icon="el-icon-refresh-left"
+          @click="clearSearch"
+          >重置</el-button
+        >
       </div>
     </div>
+
     <!--表格-->
-      <el-table ref="table" v-loading="searching" :data="tableData" row-key="id">
-        <el-table-column :show-overflow-tooltip="true" prop="id" label="编号" width="100px" align="center" />
-        <el-table-column :show-overflow-tooltip="true" prop="mineName" label="测点名称" align="center" />
-        <el-table-column :show-overflow-tooltip="true" prop="name" label="测点编号" align="center" />
-        <el-table-column :show-overflow-tooltip="true" prop="code" label="监测值" align="center" />
-        <el-table-column :show-overflow-tooltip="true" prop="monitoringType" label="监测时间" align="center" />
-        <el-table-column :show-overflow-tooltip="true" prop="unit" label="报警状态" align="center" />
+    <el-table ref="table" v-loading="loading" :data="tableData" row-key="id">
+      <el-table-column
+        :show-overflow-tooltip="true"
+        prop="sensorid"
+        label="站点编号"
+        width="130px"
+        align="center"
+      />
+      <el-table-column
+        :show-overflow-tooltip="true"
+        prop="sensorname"
+        label="测站名称"
+        align="center"
+      />
+      <el-table-column
+        :show-overflow-tooltip="true"
+        prop="svalue"
+        label="风速"
+        align="center"
+      />
+      <el-table-column
+        :show-overflow-tooltip="true"
+        prop="time"
+        label="监测时间"
+        align="center"
+      >
+      </el-table-column>
     </el-table>
     <el-pagination
       :page-sizes="[10, 20, 50, 100]"
-        :current-page.sync="searchParam.page"
-        :page-size.sync="searchParam.count"
-        :total="searchResult.total"
+      :current-page.sync="page"
+      :page-size.sync="size"
+      :total="totalElement"
       layout="total, sizes, prev, pager, next, jumper"
-        @size-change="searchSubmit"
-        @current-change="searchSubmit"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
     />
   </div>
-  </template>
+</template>
 
-  <script>
-  export default {
-    name: 'EIotEnvironmentData', // 本页面名
+<script>
+import API from "@/api/newResource/data.js";
+import DateRangePicker from '@/components/DateRangePicker'
+
+export default {
+  name: "newResourceDisplaceMachine", // 本页面名
   data() {
     return {
-        searching: false,
-        searchParam: {},
-        searchResult: {
-          results: []
-        }
-      }
-    },
-    computed: {
-      tableData() {
-        // 此处对返回值进行算法重组
-        return this.searchResult.results
-      }
+      equipname: '',
+      datarealtime: '',
+      loading: false,
+      tableData: [],
+      // 总的个数
+      totalElement: 0,
+      // 当前页的条数
+      size: 10,
+      // 当前页码
+      page: 1,
+    };
   },
+  components: { DateRangePicker },
   mounted() {
+    this.search()
   },
   methods: {
-    }
-  }
-  </script>
+    getData() {
+      this.loading = true;
+      API.getDataList4windSpeed({
+        page: this.page,
+        size: this.size,
+        time: this.datarealtime && this.datarealtime.join(',') || '',
+        sensorname: this.equipname,
+        different: '风速'
 
-  <style rel="stylesheet/scss" lang="scss" scoped>
-    ::v-deep .el-input-number .el-input__inner {
+      })
+        .then((response) => {
+          this.loading = false;
+          this.tableData = response.body.list;
+          this.totalElement = response.body.total;
+
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+     // 模糊搜索
+     search() {
+      this.getData();
+    },
+    clearSearch() {
+      this.equipname = ''
+      this.datarealtime =  ''
+      this.size = 10;
+      this.page = 0;
+      this.getData();
+    },
+    // 当前页的条数变化
+    handleSizeChange(val) {
+      this.size = val;
+      this.getData();
+    },
+    // 当前第几页
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getData();
+    },
+   
+  },
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-input-number .el-input__inner {
   text-align: left;
-    }
-    ::v-deep .vue-treeselect__control,::v-deep .vue-treeselect__placeholder,::v-deep .vue-treeselect__single-value {
+}
+::v-deep .vue-treeselect__control,
+::v-deep .vue-treeselect__placeholder,
+::v-deep .vue-treeselect__single-value {
   height: 30px;
   line-height: 30px;
-    }
-  </style>
-  
+}
+</style>
\ No newline at end of file

src/views/newWater/precipitation/data.vue

 <template>
   <div class="app-container">
     <!--工具栏-->
-      <!-- <span style="color: red;font-size: 10px;">* 原型图菜单叫监控数据，但其他2处监控叫实时数据，此页面查询的也是最新的测点数据，为措辞统一，这里也叫实时数据了。</span>
-      <span style="color: red;font-size: 10px;">* 测点类型在新增时是填写的，在这里是选择的？在填过的内容里选择吗？等对接了硬件可能会更清楚这个类型是干什么用的。</span> -->
     <div class="head-container">
       <div>
-          <el-input clearable size="small" placeholder="测点名称" style="width: 200px;" class="filter-item" />
-          <el-select v-model="value" placeholder="测点类型？" style="width: 200px;" class="filter-item">
-            <el-option label="测点类型？" value="1" />
-          </el-select>
-          <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="$message('等待硬件对接中')">搜索</el-button>
-          <el-button class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left">重置</el-button>
+        <el-input
+          v-model="equipname"
+          clearable
+          size="small"
+          placeholder="测点名称"
+          style="width: 200px"
+          class="filter-item"
+        />
+        <date-range-picker v-model="datarealtime" class="date-item" />
+        <el-button
+          class="filter-item"
+          size="mini"
+          type="success"
+          icon="el-icon-search"
+          @click="search"
+          >搜索</el-button
+        >
+        <el-button
+          class="filter-item"
+          size="mini"
+          type="warning"
+          icon="el-icon-refresh-left"
+          @click="clearSearch"
+          >重置</el-button
+        >
       </div>
     </div>
+
     <!--表格-->
-      <el-table ref="table" v-loading="searching" :data="tableData" row-key="id">
-        <el-table-column :show-overflow-tooltip="true" prop="id" label="编号" width="100px" align="center" />
-        <el-table-column :show-overflow-tooltip="true" prop="mineName" label="测点名称" align="center" />
-        <el-table-column :show-overflow-tooltip="true" prop="name" label="测点编号" align="center" />
-        <el-table-column :show-overflow-tooltip="true" prop="code" label="监测值" align="center" />
-        <el-table-column :show-overflow-tooltip="true" prop="monitoringType" label="监测时间" align="center" />
-        <el-table-column :show-overflow-tooltip="true" prop="unit" label="报警状态" align="center" />
+    <el-table ref="table" v-loading="loading" :data="tableData" row-key="id">
+      <el-table-column
+        :show-overflow-tooltip="true"
+        prop="sensorid"
+        label="站点编号"
+        width="130px"
+        align="center"
+      />
+      <el-table-column
+        :show-overflow-tooltip="true"
+        prop="sensorname"
+        label="测站名称"
+        align="center"
+      />
+      <el-table-column
+        :show-overflow-tooltip="true"
+        prop="rainfall"
+        label="实时雨量"
+        align="center"
+      />
+      <el-table-column
+        :show-overflow-tooltip="true"
+        prop="zongliang"
+        label="累计雨量"
+        align="center"
+      />
+      <el-table-column
+        :show-overflow-tooltip="true"
+        prop="time"
+        label="监测时间"
+        align="center"
+      >
+      </el-table-column>
     </el-table>
     <el-pagination
       :page-sizes="[10, 20, 50, 100]"
-        :current-page.sync="searchParam.page"
-        :page-size.sync="searchParam.count"
-        :total="searchResult.total"
+      :current-page.sync="page"
+      :page-size.sync="size"
+      :total="totalElement"
       layout="total, sizes, prev, pager, next, jumper"
-        @size-change="searchSubmit"
-        @current-change="searchSubmit"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
     />
   </div>
-  </template>
+</template>
+
+<script>
+import API from "@/api/newResource/data.js";
+import DateRangePicker from '@/components/DateRangePicker'
 
-  <script>
-  export default {
-    name: 'EIotEnvironmentData', // 本页面名
+export default {
+  name: "waterPrecipitation", // 本页面名
   data() {
     return {
-        searching: false,
-        searchParam: {},
-        searchResult: {
-          results: []
-        }
-      }
-    },
-    computed: {
-      tableData() {
-        // 此处对返回值进行算法重组
-        return this.searchResult.results
-      }
+      equipname: '',
+      datarealtime: '',
+      loading: false,
+      tableData: [],
+      // 总的个数
+      totalElement: 0,
+      // 当前页的条数
+      size: 10,
+      // 当前页码
+      page: 1,
+    };
   },
+  components: { DateRangePicker },
   mounted() {
+    this.search()
   },
   methods: {
-    }
-  }
-  </script>
+    getData() {
+      this.loading = true;
+      API.getDataList4waterPrecipitation({
+        page: this.page,
+        size: this.size,
+        time: this.datarealtime && this.datarealtime.join(',') || '',
+        sensorname: this.equipname,
+        different: '温度'
 
-  <style rel="stylesheet/scss" lang="scss" scoped>
-    ::v-deep .el-input-number .el-input__inner {
+      })
+        .then((response) => {
+          this.loading = false;
+          this.tableData = response.body.list;
+          this.totalElement = response.body.total;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+     // 模糊搜索
+     search() {
+      this.getData();
+    },
+    clearSearch() {
+      this.equipname = ''
+      this.datarealtime =  ''
+      this.size = 10;
+      this.page = 0;
+      this.getData();
+    },
+    // 当前页的条数变化
+    handleSizeChange(val) {
+      this.size = val;
+      this.getData();
+    },
+    // 当前第几页
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getData();
+    },
+   
+  },
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-input-number .el-input__inner {
   text-align: left;
-    }
-    ::v-deep .vue-treeselect__control,::v-deep .vue-treeselect__placeholder,::v-deep .vue-treeselect__single-value {
+}
+::v-deep .vue-treeselect__control,
+::v-deep .vue-treeselect__placeholder,
+::v-deep .vue-treeselect__single-value {
   height: 30px;
   line-height: 30px;
-    }
-  </style>
-  
+}
+</style>
\ No newline at end of file