Merge branch 'master' of http://h.gemho.cn:7099/18963165066/ziboyingji

src/views/kd/c/enterprise/index.vue

@@ -88,9 +88,10 @@
       </el-row>
       <el-row :gutter="100">
         <el-col :span="12">
-          <el-form-item label="矿山类别：" prop="dict3">
-            <el-select   v-model="mainDataEditing.dict3" placeholder="请选择" style="width: 100%;">
-              <el-option v-for="item in dict3List" :key="item.id" :label="item.value" :value="item.id" />
+          
+          <el-form-item label="矿山类别：" prop="category">
+            <el-select   v-model="mainDataEditing.category" placeholder="请选择" style="width: 100%;">
+              <el-option v-for="item in dictNewMine" :key="item.id" :label="item.value" :value="item.id" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -336,7 +337,7 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="矿山类别：" prop="dict3">
+            <el-form-item label="矿山类别：" prop="category">
               <span>{{ dialog1Data.dict3Name }}</span>
             </el-form-item>
           </el-col>
@@ -615,6 +616,22 @@ export default {
       dict6List: [],
       dict7List: [],
       dict41List: [], // 企业类型
+      dictNewMine: [{
+        id: 1,
+        value: '地下矿'
+      },{
+        id: 2,
+        value: '露天矿'
+      },{
+        id: 3,
+        value: '尾矿库'
+      },{
+        id: 4,
+        value: '停产矿'
+      },{
+        id: 5,
+        value: '企业'
+      }],
       administrativeAreaList: [],
       options4enterpriseIdList: [],
       dialog1FormRules: {
@@ -627,7 +644,7 @@ export default {
         // address: [{ required: true, message: '请输入' }],
         // dict1: [{ required: true, message: '请选择' }],
         // dict2: [{ required: true, message: '请选择' }],
-        dict3: [{ required: true, message: '请选择' }],
+        category: [{ required: true, message: '请选择' }],
         // hasRegisteredCapital: [{ required: true, message: '请选择' }],
         // registeredCapital: [{ required: true, message: '请输入' }],
         // businessScope: [{ required: true, message: '请输入' }],

src/views/newResource/building.vue

+<template>
+    <div class="app-container">
+        <div>
+            <img src="@/assets/images/building.png" alt="">
+        </div>
+  
+
+ 
+    </div>
+  </template>
+  
+  <script>
+
+  </script>
+  
+  <style rel="stylesheet/scss" lang="scss" scoped>
+    .app-container{
+        width: 100%;
+        height: calc(100vh - 50px);
+        background: #eeeeee;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        img{
+            width: 320px;
+            height: 200px;
+        }
+
+    }
+  </style>
+  
\ No newline at end of file

src/views/newResource/displace/alert.vue

@@ -229,7 +229,9 @@ export default {
       this.getData();
     },
     getsensorList(){
-      API.sensorList().then(res=>{
+      API.sensorList({
+        source: 'WARNIING'
+      }).then(res=>{
         this.equipnoData = res.body;
       })
     },

src/views/newResource/displace/data.vue

@@ -28,6 +28,9 @@
           @click="clearSearch"
           >重置</el-button
         >
+        <el-tooltip class="item" effect="dark" content="按当前查询条件导出" placement="top">
+          <el-button :loading="exporting" class="filter-item" size="mini" type="info" plain icon="el-icon-download" @click="exportSubmit">导出</el-button>
+        </el-tooltip>
       </div>
     </div>
 
@@ -89,6 +92,8 @@ import API from "@/api/newResource/data.js";
 import { getToken } from "@/utils/auth";
 import { mapGetters } from "vuex";
 import DateRangePicker from '@/components/DateRangePicker'
+import { downloadFile } from '@/utils'
+import request from '@/utils/request'
 
 export default {
   name: "newResourceDisplaceMachine", // 本页面名
@@ -104,6 +109,7 @@ export default {
       size: 10,
       // 当前页码
       page: 1,
+      exporting:false
     };
   },
   components: { DateRangePicker },
@@ -111,6 +117,26 @@ export default {
     this.search()
   },
   methods: {
+    exportSubmit() {
+      if(this.exporting){
+        return
+      }
+      this.exporting = true
+      request({
+        url: 'data/mp/download',
+        method: 'get',
+        params: {
+          time: this.datarealtime && this.datarealtime.join(',') || '',
+          sensorname: this.equipname,
+        },
+        responseType: 'blob'
+      }).then(response => {
+        downloadFile(response, '边坡监测', 'xlsx')
+        this.exporting = false
+      }).catch(() => {
+        this.exporting = false
+      })
+    },
     getData() {
       this.loading = true;
       API.getDataList({

src/views/newResource/temperature/alert.vue

@@ -230,7 +230,9 @@ export default {
       this.getData();
     },
     getsensorList(){
-      API.sensorListwen().then(res=>{
+      API.sensorListwen({
+        source: 'WARNIING'
+      }).then(res=>{
         this.equipnoData = res.body;
       })
     },

src/views/newResource/temperature/data.vue

@@ -28,6 +28,9 @@
           @click="clearSearch"
           >重置</el-button
         >
+        <el-tooltip class="item" effect="dark" content="按当前查询条件导出" placement="top">
+          <el-button :loading="exporting" class="filter-item" size="mini" type="info" plain icon="el-icon-download" @click="exportSubmit">导出</el-button>
+        </el-tooltip>
       </div>
     </div>
 
@@ -75,6 +78,8 @@
 <script>
 import API from "@/api/newResource/data.js";
 import DateRangePicker from '@/components/DateRangePicker'
+import { downloadFile } from '@/utils'
+import request from '@/utils/request'
 
 export default {
   name: "newResourceDisplaceMachine", // 本页面名
@@ -90,6 +95,7 @@ export default {
       size: 10,
       // 当前页码
       page: 1,
+      exporting:false
     };
   },
   components: { DateRangePicker },
@@ -97,6 +103,27 @@ export default {
     this.search()
   },
   methods: {
+    exportSubmit() {
+      if(this.exporting){
+        return
+      }
+      this.exporting = true
+      request({
+        url: 'data/sz/download/wen',
+        method: 'get',
+        params: {
+          time: this.datarealtime && this.datarealtime.join(',') || '',
+          sensorname: this.equipname,
+          different: '温度'
+        },
+        responseType: 'blob'
+      }).then(response => {
+        downloadFile(response, '温度监测', 'xlsx')
+        this.exporting = false
+      }).catch(() => {
+        this.exporting = false
+      })
+    },
     getData() {
       this.loading = true;
       API.getDataList4windSpeed({

src/views/newResource/windspeed/alert.vue

@@ -230,7 +230,9 @@ export default {
       this.getData();
     },
     getsensorList(){
-      API.sensorListfeng().then(res=>{
+      API.sensorListfeng({
+        source: 'WARNIING'
+      }).then(res=>{
         this.equipnoData = res.body;
       })
     },

src/views/newResource/windspeed/data.vue

@@ -28,6 +28,9 @@
           @click="clearSearch"
           >重置</el-button
         >
+        <el-tooltip class="item" effect="dark" content="按当前查询条件导出" placement="top">
+          <el-button :loading="exporting" class="filter-item" size="mini" type="info" plain icon="el-icon-download" @click="exportSubmit">导出</el-button>
+        </el-tooltip>
       </div>
     </div>
 
@@ -75,6 +78,8 @@
 <script>
 import API from "@/api/newResource/data.js";
 import DateRangePicker from '@/components/DateRangePicker'
+import { downloadFile } from '@/utils'
+import request from '@/utils/request'
 
 export default {
   name: "newResourceDisplaceMachine", // 本页面名
@@ -90,6 +95,7 @@ export default {
       size: 10,
       // 当前页码
       page: 1,
+      exporting:false
     };
   },
   components: { DateRangePicker },
@@ -97,6 +103,27 @@ export default {
     this.search()
   },
   methods: {
+    exportSubmit() {
+      if(this.exporting){
+        return
+      }
+      this.exporting = true
+      request({
+        url: 'data/sz/download/feng',
+        method: 'get',
+        params: {
+          time: this.datarealtime && this.datarealtime.join(',') || '',
+          sensorname: this.equipname,
+          different: '风速'
+        },
+        responseType: 'blob'
+      }).then(response => {
+        downloadFile(response, '风速监测', 'xlsx')
+        this.exporting = false
+      }).catch(() => {
+        this.exporting = false
+      })
+    },
     getData() {
       this.loading = true;
       API.getDataList4windSpeed({

src/views/newWater/precipitation/alert.vue

@@ -229,7 +229,9 @@ export default {
       this.getData();
     },
     getsensorList(){
-      API.sensorListrg().then(res=>{
+      API.sensorListrg({
+        source: 'WARNIING'
+      }).then(res=>{
         this.equipnoData = res.body;
       })
     },

src/views/newWater/precipitation/data.vue

@@ -28,6 +28,9 @@
           @click="clearSearch"
           >重置</el-button
         >
+        <el-tooltip class="item" effect="dark" content="按当前查询条件导出" placement="top">
+          <el-button :loading="exporting" class="filter-item" size="mini" type="info" plain icon="el-icon-download" @click="exportSubmit">导出</el-button>
+        </el-tooltip>
       </div>
     </div>
 
@@ -81,6 +84,8 @@
 <script>
 import API from "@/api/newResource/data.js";
 import DateRangePicker from '@/components/DateRangePicker'
+import { downloadFile } from '@/utils'
+import request from '@/utils/request'
 
 export default {
   name: "waterPrecipitation", // 本页面名
@@ -96,6 +101,7 @@ export default {
       size: 10,
       // 当前页码
       page: 1,
+      exporting:false
     };
   },
   components: { DateRangePicker },
@@ -103,6 +109,27 @@ export default {
     this.search()
   },
   methods: {
+    exportSubmit() {
+      if(this.exporting){
+        return
+      }
+      this.exporting = true
+      request({
+        url: 'data/rg/download',
+        method: 'get',
+        params: {
+          time: this.datarealtime && this.datarealtime.join(',') || '',
+          sensorname: this.equipname,
+          different: '温度'
+        },
+        responseType: 'blob'
+      }).then(response => {
+        downloadFile(response, '降水监测', 'xlsx')
+        this.exporting = false
+      }).catch(() => {
+        this.exporting = false
+      })
+    },
     getData() {
       this.loading = true;
       API.getDataList4waterPrecipitation({