Merge remote-tracking branch 'origin/master'

zh-baseversion-web/src/api/govermentdata/GovermentData.js

@@ -8,3 +8,12 @@ export function getTask(query) {
     params: query
   })
 }
+
+//获取隐患分类标准
+export function getStandard(query) {
+  return request({
+    url: '/government/supervision/getStandard',
+    method: 'get',
+    params: query
+  })
+}

zh-baseversion-web/src/views/supervision/hideType/index.vue

@@ -84,6 +84,14 @@
           @click="handleExport"
         >导出</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          plain
+          size="mini"
+          type="info"
+          @click="getGovernmentHiddenInfo"
+        >从省平台获取数据</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -351,6 +359,8 @@
 <script>
 import { listInfor, getInfor, delInfor, addInfor, updateInfor, exportInfor } from "@/api/supervision/hideType";
 import DetailInfo from "./components/DetailInfo";
+import { getStandard } from "@/api/govermentdata/GovermentData";
+import moment from "moment";
 export default {
   name: "Infor",
   components: {
@@ -571,6 +581,19 @@ export default {
     handleDetail(row){
       this.$refs.detail.getDetailInfo(row.fInsStaInforId);
     },
+    //获取数据
+    getGovernmentHiddenInfo(){
+      this.$confirm('是否确认从省平台获取数据?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return getStandard({updateTime:moment().format('YYYY-MM-DD HH:mm:ss'),pageIndex: 1,pageSize: 1000});
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("从省平台获取数据成功");
+      }).catch(() => {});
+    }
   }
 };
 </script>