diff --git a/config/index.js b/config/index.js
index 1bb3a4b..68765b2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -87,7 +87,7 @@
     },
 
     // Various Dev Server settings
-    host: "localhost"    , // can be overwritten by process.env.HOST
+    host: "192.168.30.113", // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

diff --git a/config/index.js b/config/index.js
index 1bb3a4b..68765b2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -87,7 +87,7 @@
     },
 
     // Various Dev Server settings
-    host: "localhost"    , // can be overwritten by process.env.HOST
+    host: "192.168.30.113", // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,
diff --git a/package.json b/package.json
index c41fff4..a58d9d6 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "axios": "^0.19.2",
     "echarts": "^4.7.0",
     "element-ui": "^2.13.1",
+    "ol": "^6.4.3",
     "esri-loader": "^2.14.0",
     "html2canvas": "^1.0.0-rc.7",
     "js-file-download": "^0.4.12",

diff --git a/config/index.js b/config/index.js
index 1bb3a4b..68765b2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -87,7 +87,7 @@
     },
 
     // Various Dev Server settings
-    host: "localhost"    , // can be overwritten by process.env.HOST
+    host: "192.168.30.113", // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,
diff --git a/package.json b/package.json
index c41fff4..a58d9d6 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "axios": "^0.19.2",
     "echarts": "^4.7.0",
     "element-ui": "^2.13.1",
+    "ol": "^6.4.3",
     "esri-loader": "^2.14.0",
     "html2canvas": "^1.0.0-rc.7",
     "js-file-download": "^0.4.12",
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 801c3b3..eb85612 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -135,6 +135,11 @@
                 ><el-input size="small" v-model="ruleForm.lat"></el-input
               ></el-form-item>
             </el-col>
+               <!-- 坐标拾取  -->
+                <el-col :span="5">
+           <el-button type="primary" @click="pickLngLat()">坐标拾取</el-button>
+            </el-col>
+              <!-- 坐标拾取  -->
           </el-form-item>
           <el-form-item label="站点安装位置" prop="address">
             <el-input
@@ -217,15 +222,11 @@
             size="medium"
           >
             <el-form-item label="">
-<<<<<<< HEAD
-              <el-input v-model="deviceRelatedQuery.searchStr" placeholder="请输入设备名称/厂家" clearable></el-input>
-=======
               <el-input
                 v-model="deviceRelatedQuery.searchStr"
                 placeholder="请输入设备编号/厂家"
                 clearable
               ></el-input>
->>>>>>> ad620ef3af4de08b199e1d1c6c52489a965e9a0a
             </el-form-item>
             <el-form-item>
               <el-button
@@ -298,14 +299,29 @@
         </div>
       </template>
     </page-dialog>
+    <el-dialog
+      title="坐标拾取"
+      :visible.sync="dialogFormVisible"
+      :append-to-body="true"
+      :before-close="handleDialogClose"
+      customClass="addDialog"
+     
+    >
+     <markMap ref="markMap" v-on:SendLngLat="SendLngLat" style="height: 600px;width:1050px;" />
+    </el-dialog>
   </div>
 </template>
 <script>
 import axios from "axios";
 import { mapGetters } from "vuex";
+import markMap from "./markMap.vue";
 export default {
+   components: {
+        markMap
+    },
   data() {
     return {
+      dialogFormVisible:false,
       //站点搜索相关
       siteFilterInfo: {
         query: {
@@ -520,8 +536,18 @@
         refresh: 1,
         initCurpage: 1,
         fieldList: [
-          { label: "设备名称", value: "equipDesc", minWidth: 100, tooltip: true },
-          { label: "设备厂家", value: "equipFactory", minWidth: 150, tooltip: true },
+          {
+            label: "设备名称",
+            value: "equipDesc",
+            minWidth: 100,
+            tooltip: true
+          },
+          {
+            label: "设备厂家",
+            value: "equipFactory",
+            minWidth: 150,
+            tooltip: true
+          }
         ]
       },
       //已关联设备表格相关
@@ -596,19 +622,40 @@
       }
     },
     "deviceRelatedQuery.searchStr"(val) {
-      Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
-      Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+      Object.assign(
+        this.isRelatedDeviceTableInfo.query,
+        this.deviceRelatedQuery
+      );
+      Object.assign(
+        this.unRelatedDeviceTableInfo.query,
+        this.deviceRelatedQuery
+      );
     },
     platformCode(val) {
-      console.log(777,val);
+      console.log(777, val);
       this.ruleForm.platformCode = val;
     }
   },
   methods: {
+      //响应地图组件的确定，拾取坐标
+    SendLngLat(lonlat) {
+      this.dialogFormVisible=false;
+      this.ruleForm.lon=lonlat[0]
+      this.ruleForm.lat=lonlat[1]
+
+    },
+    //坐标拾取地图控件打开
+    pickLngLat(){
+      this.dialogFormVisible=true
+    },
+    //监听面板直接叉叉掉事件
+    handleDialogClose() {
+       this.dialogFormVisible = false;
+    },
     //上传头像
     fileChange(file) {
       this.loading = true;
-      const isLt1M = file.size / 1024 / 1024 < 1;
+      const isLt1M = file.size / 1024 / 1024 < 5;
       if (file.raw.type != "image/jpeg" && file.raw.type != "image/png") {
         this.loading = false;
         this.$message.error("上传图片只能是JPG或PNG格式!");
@@ -616,7 +663,7 @@
       }
       if (!isLt1M) {
         this.loading = false;
-        this.$message.error("上传图片大小不能超过 1MB!");
+        this.$message.error("上传图片大小不能超过 5MB!");
         return;
       }
       var formdata = new FormData();
@@ -960,6 +1007,10 @@
 };
 </script>
 <style lang="scss" scoped>
+.addDialog {
+  width:1050px;
+  height: 650px;
+}
 .imgtype {
   width: 150px;
   height: 100px;

diff --git a/config/index.js b/config/index.js
index 1bb3a4b..68765b2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -87,7 +87,7 @@
     },
 
     // Various Dev Server settings
-    host: "localhost"    , // can be overwritten by process.env.HOST
+    host: "192.168.30.113", // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,
diff --git a/package.json b/package.json
index c41fff4..a58d9d6 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "axios": "^0.19.2",
     "echarts": "^4.7.0",
     "element-ui": "^2.13.1",
+    "ol": "^6.4.3",
     "esri-loader": "^2.14.0",
     "html2canvas": "^1.0.0-rc.7",
     "js-file-download": "^0.4.12",
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 801c3b3..eb85612 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -135,6 +135,11 @@
                 ><el-input size="small" v-model="ruleForm.lat"></el-input
               ></el-form-item>
             </el-col>
+               <!-- 坐标拾取  -->
+                <el-col :span="5">
+           <el-button type="primary" @click="pickLngLat()">坐标拾取</el-button>
+            </el-col>
+              <!-- 坐标拾取  -->
           </el-form-item>
           <el-form-item label="站点安装位置" prop="address">
             <el-input
@@ -217,15 +222,11 @@
             size="medium"
           >
             <el-form-item label="">
-<<<<<<< HEAD
-              <el-input v-model="deviceRelatedQuery.searchStr" placeholder="请输入设备名称/厂家" clearable></el-input>
-=======
               <el-input
                 v-model="deviceRelatedQuery.searchStr"
                 placeholder="请输入设备编号/厂家"
                 clearable
               ></el-input>
->>>>>>> ad620ef3af4de08b199e1d1c6c52489a965e9a0a
             </el-form-item>
             <el-form-item>
               <el-button
@@ -298,14 +299,29 @@
         </div>
       </template>
     </page-dialog>
+    <el-dialog
+      title="坐标拾取"
+      :visible.sync="dialogFormVisible"
+      :append-to-body="true"
+      :before-close="handleDialogClose"
+      customClass="addDialog"
+     
+    >
+     <markMap ref="markMap" v-on:SendLngLat="SendLngLat" style="height: 600px;width:1050px;" />
+    </el-dialog>
   </div>
 </template>
 <script>
 import axios from "axios";
 import { mapGetters } from "vuex";
+import markMap from "./markMap.vue";
 export default {
+   components: {
+        markMap
+    },
   data() {
     return {
+      dialogFormVisible:false,
       //站点搜索相关
       siteFilterInfo: {
         query: {
@@ -520,8 +536,18 @@
         refresh: 1,
         initCurpage: 1,
         fieldList: [
-          { label: "设备名称", value: "equipDesc", minWidth: 100, tooltip: true },
-          { label: "设备厂家", value: "equipFactory", minWidth: 150, tooltip: true },
+          {
+            label: "设备名称",
+            value: "equipDesc",
+            minWidth: 100,
+            tooltip: true
+          },
+          {
+            label: "设备厂家",
+            value: "equipFactory",
+            minWidth: 150,
+            tooltip: true
+          }
         ]
       },
       //已关联设备表格相关
@@ -596,19 +622,40 @@
       }
     },
     "deviceRelatedQuery.searchStr"(val) {
-      Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
-      Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+      Object.assign(
+        this.isRelatedDeviceTableInfo.query,
+        this.deviceRelatedQuery
+      );
+      Object.assign(
+        this.unRelatedDeviceTableInfo.query,
+        this.deviceRelatedQuery
+      );
     },
     platformCode(val) {
-      console.log(777,val);
+      console.log(777, val);
       this.ruleForm.platformCode = val;
     }
   },
   methods: {
+      //响应地图组件的确定，拾取坐标
+    SendLngLat(lonlat) {
+      this.dialogFormVisible=false;
+      this.ruleForm.lon=lonlat[0]
+      this.ruleForm.lat=lonlat[1]
+
+    },
+    //坐标拾取地图控件打开
+    pickLngLat(){
+      this.dialogFormVisible=true
+    },
+    //监听面板直接叉叉掉事件
+    handleDialogClose() {
+       this.dialogFormVisible = false;
+    },
     //上传头像
     fileChange(file) {
       this.loading = true;
-      const isLt1M = file.size / 1024 / 1024 < 1;
+      const isLt1M = file.size / 1024 / 1024 < 5;
       if (file.raw.type != "image/jpeg" && file.raw.type != "image/png") {
         this.loading = false;
         this.$message.error("上传图片只能是JPG或PNG格式!");
@@ -616,7 +663,7 @@
       }
       if (!isLt1M) {
         this.loading = false;
-        this.$message.error("上传图片大小不能超过 1MB!");
+        this.$message.error("上传图片大小不能超过 5MB!");
         return;
       }
       var formdata = new FormData();
@@ -960,6 +1007,10 @@
 };
 </script>
 <style lang="scss" scoped>
+.addDialog {
+  width:1050px;
+  height: 650px;
+}
 .imgtype {
   width: 150px;
   height: 100px;
diff --git a/src/components/ConfigManager/markMap.vue b/src/components/ConfigManager/markMap.vue
new file mode 100644
index 0000000..ba8030e
--- /dev/null
+++ b/src/components/ConfigManager/markMap.vue
@@ -0,0 +1,162 @@
+<template>
+  <div id="rootMap">
+    <div id="map" ref="map">
+      <el-button type="primary" style=" position: absolute;
+    left: 869px;
+    bottom: 9px;
+    z-index: 99" @click="SendLngLat()">确定</el-button>
+    </div>
+  </div>
+</template>
+<script>
+
+import "ol/ol.css";
+
+import { Map, View, Feature, color } from "ol";
+import { DEVICE_PIXEL_RATIO } from "ol/has";
+import Circle from "ol/style/Circle";
+import * as layer from "ol/layer.js";
+import * as source from "ol/source.js";
+import * as geom from "ol/geom.js";
+import * as style from "ol/style.js";
+import Overlay from "ol/Overlay.js";
+import TileLayer from "ol/layer/Tile";
+
+import SourceVector from "ol/source/Vector";
+import LayerVector from "ol/layer/Vector";
+
+import Style from "ol/style/Style";
+import Fill from "ol/style/Fill";
+import Text from "ol/style/Text";
+
+import Stroke from "ol/style/Stroke";
+import Draw from "ol/interaction/Draw";
+import Icon from "ol/style/Icon";
+import Select from "ol/interaction/Select";
+import Modify from "ol/interaction/Modify";
+import FormatWKT from "ol/format/WKT";
+
+import ImageWMS from "ol/source/ImageWMS";
+import Image from "ol/layer/Image";
+import GeoJSON from "ol/format/GeoJSON";
+import LineString from "ol/geom/LineString";
+
+import { OSM, TileArcGISRest, XYZ } from "ol/source";
+import { defaults } from "ol/control";
+import ImageArcGISRest from "ol/source/ImageArcGISRest";
+import ImageLayer from "ol/layer/Image";
+import tagPng from "./../../../static/img/yjznewpng.png";
+import Point from "ol/geom/Point";
+export default {
+  data() {
+    return {
+      map: "",
+      currentLonLat:[]
+    };
+  },
+  mounted() {
+    this.initMap();
+  },
+
+  methods: {
+    //点击确定后关闭此地图面板，然后把经纬度传给父vue
+    SendLngLat(){
+    
+      //删除entity模型
+      this.$emit("SendLngLat", this.currentLonLat);
+    },
+    //初始化地图
+    initMap() {
+      this.map = new Map({
+        controls: defaults({
+          attribution: false,
+          zoom: false,
+          rotate: false
+        }),
+
+        target: this.$refs.map,
+        layers: [
+        new TileLayer({
+          source: new XYZ({
+            url:
+              "http://map.geoq.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}"
+            //"http://cache1.arcgisonline.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}"
+          })
+        })
+        ],
+        view: new View({
+          projection: "EPSG:4326", //使用这个坐标系
+          center: [114.217, 30.828], //武汉
+          zoom: 9
+        })
+      });
+
+            this.vectorSource = new SourceVector({
+     
+            });
+            this.vector = new LayerVector({
+
+                source: this.vectorSource
+
+            });
+            this.map.addLayer(this.vector);
+
+            //初始化一个点
+            this.initPoint(114.30,30.28)
+
+
+      //鼠标移动事件
+      this.map.on("pointermove", function(evt) {
+        if (evt.map.hasFeatureAtPixel(evt.pixel)) {
+          evt.map.getTargetElement().style.cursor = "pointer";
+        } else {
+          evt.map.getTargetElement().style.cursor = "";
+        }
+      });
+      //鼠标点击事件
+      this.map.on("click", (evt)=> {
+        this.currentLonLat=evt.coordinate
+       this.initPoint(evt.coordinate[0],evt.coordinate[1])
+      });
+    },
+    initPoint(lng, lat) {
+      if (lng && lat) {
+          //清除所有feature
+           if (this.vectorSource) {
+                  this.vectorSource.clear();
+                }
+        //添加feature图标
+       this.Marker = new Feature({
+        geometry: new Point([parseFloat(lng), parseFloat(lat)])
+      });
+
+      //设置style
+      this.Marker.setStyle(
+        new Style({
+              image: new Icon({
+                src: tagPng,
+              
+              })
+            })
+            )
+
+       this.vectorSource.addFeature(this.Marker)
+        //重置中心点
+      /*   this.map.getView().setCenter([parseFloat(lng), parseFloat(lat)]);
+        this.map.getView().setZoom(12); */
+      }
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+#rootMap {
+  width: 100%;
+  height: 100%;
+}
+#map {
+     width: 88%;
+    height: 99%;
+}
+
+</style>

diff --git a/config/index.js b/config/index.js
index 1bb3a4b..68765b2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -87,7 +87,7 @@
     },
 
     // Various Dev Server settings
-    host: "localhost"    , // can be overwritten by process.env.HOST
+    host: "192.168.30.113", // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,
diff --git a/package.json b/package.json
index c41fff4..a58d9d6 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "axios": "^0.19.2",
     "echarts": "^4.7.0",
     "element-ui": "^2.13.1",
+    "ol": "^6.4.3",
     "esri-loader": "^2.14.0",
     "html2canvas": "^1.0.0-rc.7",
     "js-file-download": "^0.4.12",
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 801c3b3..eb85612 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -135,6 +135,11 @@
                 ><el-input size="small" v-model="ruleForm.lat"></el-input
               ></el-form-item>
             </el-col>
+               <!-- 坐标拾取  -->
+                <el-col :span="5">
+           <el-button type="primary" @click="pickLngLat()">坐标拾取</el-button>
+            </el-col>
+              <!-- 坐标拾取  -->
           </el-form-item>
           <el-form-item label="站点安装位置" prop="address">
             <el-input
@@ -217,15 +222,11 @@
             size="medium"
           >
             <el-form-item label="">
-<<<<<<< HEAD
-              <el-input v-model="deviceRelatedQuery.searchStr" placeholder="请输入设备名称/厂家" clearable></el-input>
-=======
               <el-input
                 v-model="deviceRelatedQuery.searchStr"
                 placeholder="请输入设备编号/厂家"
                 clearable
               ></el-input>
->>>>>>> ad620ef3af4de08b199e1d1c6c52489a965e9a0a
             </el-form-item>
             <el-form-item>
               <el-button
@@ -298,14 +299,29 @@
         </div>
       </template>
     </page-dialog>
+    <el-dialog
+      title="坐标拾取"
+      :visible.sync="dialogFormVisible"
+      :append-to-body="true"
+      :before-close="handleDialogClose"
+      customClass="addDialog"
+     
+    >
+     <markMap ref="markMap" v-on:SendLngLat="SendLngLat" style="height: 600px;width:1050px;" />
+    </el-dialog>
   </div>
 </template>
 <script>
 import axios from "axios";
 import { mapGetters } from "vuex";
+import markMap from "./markMap.vue";
 export default {
+   components: {
+        markMap
+    },
   data() {
     return {
+      dialogFormVisible:false,
       //站点搜索相关
       siteFilterInfo: {
         query: {
@@ -520,8 +536,18 @@
         refresh: 1,
         initCurpage: 1,
         fieldList: [
-          { label: "设备名称", value: "equipDesc", minWidth: 100, tooltip: true },
-          { label: "设备厂家", value: "equipFactory", minWidth: 150, tooltip: true },
+          {
+            label: "设备名称",
+            value: "equipDesc",
+            minWidth: 100,
+            tooltip: true
+          },
+          {
+            label: "设备厂家",
+            value: "equipFactory",
+            minWidth: 150,
+            tooltip: true
+          }
         ]
       },
       //已关联设备表格相关
@@ -596,19 +622,40 @@
       }
     },
     "deviceRelatedQuery.searchStr"(val) {
-      Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
-      Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+      Object.assign(
+        this.isRelatedDeviceTableInfo.query,
+        this.deviceRelatedQuery
+      );
+      Object.assign(
+        this.unRelatedDeviceTableInfo.query,
+        this.deviceRelatedQuery
+      );
     },
     platformCode(val) {
-      console.log(777,val);
+      console.log(777, val);
       this.ruleForm.platformCode = val;
     }
   },
   methods: {
+      //响应地图组件的确定，拾取坐标
+    SendLngLat(lonlat) {
+      this.dialogFormVisible=false;
+      this.ruleForm.lon=lonlat[0]
+      this.ruleForm.lat=lonlat[1]
+
+    },
+    //坐标拾取地图控件打开
+    pickLngLat(){
+      this.dialogFormVisible=true
+    },
+    //监听面板直接叉叉掉事件
+    handleDialogClose() {
+       this.dialogFormVisible = false;
+    },
     //上传头像
     fileChange(file) {
       this.loading = true;
-      const isLt1M = file.size / 1024 / 1024 < 1;
+      const isLt1M = file.size / 1024 / 1024 < 5;
       if (file.raw.type != "image/jpeg" && file.raw.type != "image/png") {
         this.loading = false;
         this.$message.error("上传图片只能是JPG或PNG格式!");
@@ -616,7 +663,7 @@
       }
       if (!isLt1M) {
         this.loading = false;
-        this.$message.error("上传图片大小不能超过 1MB!");
+        this.$message.error("上传图片大小不能超过 5MB!");
         return;
       }
       var formdata = new FormData();
@@ -960,6 +1007,10 @@
 };
 </script>
 <style lang="scss" scoped>
+.addDialog {
+  width:1050px;
+  height: 650px;
+}
 .imgtype {
   width: 150px;
   height: 100px;
diff --git a/src/components/ConfigManager/markMap.vue b/src/components/ConfigManager/markMap.vue
new file mode 100644
index 0000000..ba8030e
--- /dev/null
+++ b/src/components/ConfigManager/markMap.vue
@@ -0,0 +1,162 @@
+<template>
+  <div id="rootMap">
+    <div id="map" ref="map">
+      <el-button type="primary" style=" position: absolute;
+    left: 869px;
+    bottom: 9px;
+    z-index: 99" @click="SendLngLat()">确定</el-button>
+    </div>
+  </div>
+</template>
+<script>
+
+import "ol/ol.css";
+
+import { Map, View, Feature, color } from "ol";
+import { DEVICE_PIXEL_RATIO } from "ol/has";
+import Circle from "ol/style/Circle";
+import * as layer from "ol/layer.js";
+import * as source from "ol/source.js";
+import * as geom from "ol/geom.js";
+import * as style from "ol/style.js";
+import Overlay from "ol/Overlay.js";
+import TileLayer from "ol/layer/Tile";
+
+import SourceVector from "ol/source/Vector";
+import LayerVector from "ol/layer/Vector";
+
+import Style from "ol/style/Style";
+import Fill from "ol/style/Fill";
+import Text from "ol/style/Text";
+
+import Stroke from "ol/style/Stroke";
+import Draw from "ol/interaction/Draw";
+import Icon from "ol/style/Icon";
+import Select from "ol/interaction/Select";
+import Modify from "ol/interaction/Modify";
+import FormatWKT from "ol/format/WKT";
+
+import ImageWMS from "ol/source/ImageWMS";
+import Image from "ol/layer/Image";
+import GeoJSON from "ol/format/GeoJSON";
+import LineString from "ol/geom/LineString";
+
+import { OSM, TileArcGISRest, XYZ } from "ol/source";
+import { defaults } from "ol/control";
+import ImageArcGISRest from "ol/source/ImageArcGISRest";
+import ImageLayer from "ol/layer/Image";
+import tagPng from "./../../../static/img/yjznewpng.png";
+import Point from "ol/geom/Point";
+export default {
+  data() {
+    return {
+      map: "",
+      currentLonLat:[]
+    };
+  },
+  mounted() {
+    this.initMap();
+  },
+
+  methods: {
+    //点击确定后关闭此地图面板，然后把经纬度传给父vue
+    SendLngLat(){
+    
+      //删除entity模型
+      this.$emit("SendLngLat", this.currentLonLat);
+    },
+    //初始化地图
+    initMap() {
+      this.map = new Map({
+        controls: defaults({
+          attribution: false,
+          zoom: false,
+          rotate: false
+        }),
+
+        target: this.$refs.map,
+        layers: [
+        new TileLayer({
+          source: new XYZ({
+            url:
+              "http://map.geoq.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}"
+            //"http://cache1.arcgisonline.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}"
+          })
+        })
+        ],
+        view: new View({
+          projection: "EPSG:4326", //使用这个坐标系
+          center: [114.217, 30.828], //武汉
+          zoom: 9
+        })
+      });
+
+            this.vectorSource = new SourceVector({
+     
+            });
+            this.vector = new LayerVector({
+
+                source: this.vectorSource
+
+            });
+            this.map.addLayer(this.vector);
+
+            //初始化一个点
+            this.initPoint(114.30,30.28)
+
+
+      //鼠标移动事件
+      this.map.on("pointermove", function(evt) {
+        if (evt.map.hasFeatureAtPixel(evt.pixel)) {
+          evt.map.getTargetElement().style.cursor = "pointer";
+        } else {
+          evt.map.getTargetElement().style.cursor = "";
+        }
+      });
+      //鼠标点击事件
+      this.map.on("click", (evt)=> {
+        this.currentLonLat=evt.coordinate
+       this.initPoint(evt.coordinate[0],evt.coordinate[1])
+      });
+    },
+    initPoint(lng, lat) {
+      if (lng && lat) {
+          //清除所有feature
+           if (this.vectorSource) {
+                  this.vectorSource.clear();
+                }
+        //添加feature图标
+       this.Marker = new Feature({
+        geometry: new Point([parseFloat(lng), parseFloat(lat)])
+      });
+
+      //设置style
+      this.Marker.setStyle(
+        new Style({
+              image: new Icon({
+                src: tagPng,
+              
+              })
+            })
+            )
+
+       this.vectorSource.addFeature(this.Marker)
+        //重置中心点
+      /*   this.map.getView().setCenter([parseFloat(lng), parseFloat(lat)]);
+        this.map.getView().setZoom(12); */
+      }
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+#rootMap {
+  width: 100%;
+  height: 100%;
+}
+#map {
+     width: 88%;
+    height: 99%;
+}
+
+</style>
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index d230b2e..0eb5a75 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -364,7 +364,7 @@
           width: "240",
           btList: [
             { label: "添加用户", size: "small", type: "text", event: "addUser", show: true },
-            { label: "查看用户", size: "small", type: "text", event: "detail", show: true },
+            { label: "关联用户", size: "small", type: "text", event: "detail", show: true },
             { label: "删除用户组", size: "small", type: "text", event: "delGroup", show: true }
           ]
         }

diff --git a/config/index.js b/config/index.js
index 1bb3a4b..68765b2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -87,7 +87,7 @@
     },
 
     // Various Dev Server settings
-    host: "localhost"    , // can be overwritten by process.env.HOST
+    host: "192.168.30.113", // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,
diff --git a/package.json b/package.json
index c41fff4..a58d9d6 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "axios": "^0.19.2",
     "echarts": "^4.7.0",
     "element-ui": "^2.13.1",
+    "ol": "^6.4.3",
     "esri-loader": "^2.14.0",
     "html2canvas": "^1.0.0-rc.7",
     "js-file-download": "^0.4.12",
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 801c3b3..eb85612 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -135,6 +135,11 @@
                 ><el-input size="small" v-model="ruleForm.lat"></el-input
               ></el-form-item>
             </el-col>
+               <!-- 坐标拾取  -->
+                <el-col :span="5">
+           <el-button type="primary" @click="pickLngLat()">坐标拾取</el-button>
+            </el-col>
+              <!-- 坐标拾取  -->
           </el-form-item>
           <el-form-item label="站点安装位置" prop="address">
             <el-input
@@ -217,15 +222,11 @@
             size="medium"
           >
             <el-form-item label="">
-<<<<<<< HEAD
-              <el-input v-model="deviceRelatedQuery.searchStr" placeholder="请输入设备名称/厂家" clearable></el-input>
-=======
               <el-input
                 v-model="deviceRelatedQuery.searchStr"
                 placeholder="请输入设备编号/厂家"
                 clearable
               ></el-input>
->>>>>>> ad620ef3af4de08b199e1d1c6c52489a965e9a0a
             </el-form-item>
             <el-form-item>
               <el-button
@@ -298,14 +299,29 @@
         </div>
       </template>
     </page-dialog>
+    <el-dialog
+      title="坐标拾取"
+      :visible.sync="dialogFormVisible"
+      :append-to-body="true"
+      :before-close="handleDialogClose"
+      customClass="addDialog"
+     
+    >
+     <markMap ref="markMap" v-on:SendLngLat="SendLngLat" style="height: 600px;width:1050px;" />
+    </el-dialog>
   </div>
 </template>
 <script>
 import axios from "axios";
 import { mapGetters } from "vuex";
+import markMap from "./markMap.vue";
 export default {
+   components: {
+        markMap
+    },
   data() {
     return {
+      dialogFormVisible:false,
       //站点搜索相关
       siteFilterInfo: {
         query: {
@@ -520,8 +536,18 @@
         refresh: 1,
         initCurpage: 1,
         fieldList: [
-          { label: "设备名称", value: "equipDesc", minWidth: 100, tooltip: true },
-          { label: "设备厂家", value: "equipFactory", minWidth: 150, tooltip: true },
+          {
+            label: "设备名称",
+            value: "equipDesc",
+            minWidth: 100,
+            tooltip: true
+          },
+          {
+            label: "设备厂家",
+            value: "equipFactory",
+            minWidth: 150,
+            tooltip: true
+          }
         ]
       },
       //已关联设备表格相关
@@ -596,19 +622,40 @@
       }
     },
     "deviceRelatedQuery.searchStr"(val) {
-      Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
-      Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+      Object.assign(
+        this.isRelatedDeviceTableInfo.query,
+        this.deviceRelatedQuery
+      );
+      Object.assign(
+        this.unRelatedDeviceTableInfo.query,
+        this.deviceRelatedQuery
+      );
     },
     platformCode(val) {
-      console.log(777,val);
+      console.log(777, val);
       this.ruleForm.platformCode = val;
     }
   },
   methods: {
+      //响应地图组件的确定，拾取坐标
+    SendLngLat(lonlat) {
+      this.dialogFormVisible=false;
+      this.ruleForm.lon=lonlat[0]
+      this.ruleForm.lat=lonlat[1]
+
+    },
+    //坐标拾取地图控件打开
+    pickLngLat(){
+      this.dialogFormVisible=true
+    },
+    //监听面板直接叉叉掉事件
+    handleDialogClose() {
+       this.dialogFormVisible = false;
+    },
     //上传头像
     fileChange(file) {
       this.loading = true;
-      const isLt1M = file.size / 1024 / 1024 < 1;
+      const isLt1M = file.size / 1024 / 1024 < 5;
       if (file.raw.type != "image/jpeg" && file.raw.type != "image/png") {
         this.loading = false;
         this.$message.error("上传图片只能是JPG或PNG格式!");
@@ -616,7 +663,7 @@
       }
       if (!isLt1M) {
         this.loading = false;
-        this.$message.error("上传图片大小不能超过 1MB!");
+        this.$message.error("上传图片大小不能超过 5MB!");
         return;
       }
       var formdata = new FormData();
@@ -960,6 +1007,10 @@
 };
 </script>
 <style lang="scss" scoped>
+.addDialog {
+  width:1050px;
+  height: 650px;
+}
 .imgtype {
   width: 150px;
   height: 100px;
diff --git a/src/components/ConfigManager/markMap.vue b/src/components/ConfigManager/markMap.vue
new file mode 100644
index 0000000..ba8030e
--- /dev/null
+++ b/src/components/ConfigManager/markMap.vue
@@ -0,0 +1,162 @@
+<template>
+  <div id="rootMap">
+    <div id="map" ref="map">
+      <el-button type="primary" style=" position: absolute;
+    left: 869px;
+    bottom: 9px;
+    z-index: 99" @click="SendLngLat()">确定</el-button>
+    </div>
+  </div>
+</template>
+<script>
+
+import "ol/ol.css";
+
+import { Map, View, Feature, color } from "ol";
+import { DEVICE_PIXEL_RATIO } from "ol/has";
+import Circle from "ol/style/Circle";
+import * as layer from "ol/layer.js";
+import * as source from "ol/source.js";
+import * as geom from "ol/geom.js";
+import * as style from "ol/style.js";
+import Overlay from "ol/Overlay.js";
+import TileLayer from "ol/layer/Tile";
+
+import SourceVector from "ol/source/Vector";
+import LayerVector from "ol/layer/Vector";
+
+import Style from "ol/style/Style";
+import Fill from "ol/style/Fill";
+import Text from "ol/style/Text";
+
+import Stroke from "ol/style/Stroke";
+import Draw from "ol/interaction/Draw";
+import Icon from "ol/style/Icon";
+import Select from "ol/interaction/Select";
+import Modify from "ol/interaction/Modify";
+import FormatWKT from "ol/format/WKT";
+
+import ImageWMS from "ol/source/ImageWMS";
+import Image from "ol/layer/Image";
+import GeoJSON from "ol/format/GeoJSON";
+import LineString from "ol/geom/LineString";
+
+import { OSM, TileArcGISRest, XYZ } from "ol/source";
+import { defaults } from "ol/control";
+import ImageArcGISRest from "ol/source/ImageArcGISRest";
+import ImageLayer from "ol/layer/Image";
+import tagPng from "./../../../static/img/yjznewpng.png";
+import Point from "ol/geom/Point";
+export default {
+  data() {
+    return {
+      map: "",
+      currentLonLat:[]
+    };
+  },
+  mounted() {
+    this.initMap();
+  },
+
+  methods: {
+    //点击确定后关闭此地图面板，然后把经纬度传给父vue
+    SendLngLat(){
+    
+      //删除entity模型
+      this.$emit("SendLngLat", this.currentLonLat);
+    },
+    //初始化地图
+    initMap() {
+      this.map = new Map({
+        controls: defaults({
+          attribution: false,
+          zoom: false,
+          rotate: false
+        }),
+
+        target: this.$refs.map,
+        layers: [
+        new TileLayer({
+          source: new XYZ({
+            url:
+              "http://map.geoq.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}"
+            //"http://cache1.arcgisonline.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}"
+          })
+        })
+        ],
+        view: new View({
+          projection: "EPSG:4326", //使用这个坐标系
+          center: [114.217, 30.828], //武汉
+          zoom: 9
+        })
+      });
+
+            this.vectorSource = new SourceVector({
+     
+            });
+            this.vector = new LayerVector({
+
+                source: this.vectorSource
+
+            });
+            this.map.addLayer(this.vector);
+
+            //初始化一个点
+            this.initPoint(114.30,30.28)
+
+
+      //鼠标移动事件
+      this.map.on("pointermove", function(evt) {
+        if (evt.map.hasFeatureAtPixel(evt.pixel)) {
+          evt.map.getTargetElement().style.cursor = "pointer";
+        } else {
+          evt.map.getTargetElement().style.cursor = "";
+        }
+      });
+      //鼠标点击事件
+      this.map.on("click", (evt)=> {
+        this.currentLonLat=evt.coordinate
+       this.initPoint(evt.coordinate[0],evt.coordinate[1])
+      });
+    },
+    initPoint(lng, lat) {
+      if (lng && lat) {
+          //清除所有feature
+           if (this.vectorSource) {
+                  this.vectorSource.clear();
+                }
+        //添加feature图标
+       this.Marker = new Feature({
+        geometry: new Point([parseFloat(lng), parseFloat(lat)])
+      });
+
+      //设置style
+      this.Marker.setStyle(
+        new Style({
+              image: new Icon({
+                src: tagPng,
+              
+              })
+            })
+            )
+
+       this.vectorSource.addFeature(this.Marker)
+        //重置中心点
+      /*   this.map.getView().setCenter([parseFloat(lng), parseFloat(lat)]);
+        this.map.getView().setZoom(12); */
+      }
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+#rootMap {
+  width: 100%;
+  height: 100%;
+}
+#map {
+     width: 88%;
+    height: 99%;
+}
+
+</style>
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index d230b2e..0eb5a75 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -364,7 +364,7 @@
           width: "240",
           btList: [
             { label: "添加用户", size: "small", type: "text", event: "addUser", show: true },
-            { label: "查看用户", size: "small", type: "text", event: "detail", show: true },
+            { label: "关联用户", size: "small", type: "text", event: "detail", show: true },
             { label: "删除用户组", size: "small", type: "text", event: "delGroup", show: true }
           ]
         }
diff --git a/src/components/Engineering/HistoricalFault.vue b/src/components/Engineering/HistoricalFault.vue
index 91c52d6..3312a76 100644
--- a/src/components/Engineering/HistoricalFault.vue
+++ b/src/components/Engineering/HistoricalFault.vue
@@ -3,6 +3,7 @@
     <div id="HFTopSearchBox">
       <span class="SelectTitle">平台：</span>
       <el-select
+        clearable
         class="widthinput"
         v-model="Project"
         filterable
@@ -18,6 +19,7 @@
       </el-select>
       <span class="SelectTitle">站点：</span>
       <el-select
+        clearable
         v-model="Site"
         filterable
         placeholder="请选择"
@@ -89,6 +91,8 @@
   data: function() {
     return {
       condition: "",
+      platCode: "",
+      userNo: "",
       HistoryTableData: [], //历史数据表格数据
       Page: 1, //分页默认显示页
       DataLength: 0, //分页上显示的数据总条数
@@ -136,7 +140,7 @@
         {
           platformName: "全部",
           platformCode: "",
-          dropSiteList: []
+          dropSiteList: ""
         }
       ], //平台的数据源
       Site: "", //平台
@@ -168,7 +172,8 @@
           st: this.TimeValue[0],
           et: this.TimeValue[1],
           pageNo: this.Page,
-          pageSize: this.Size
+          pageSize: this.Size,
+          userNo: this.userNo
         })
         .then(response => {
           this.loading = false;
@@ -232,6 +237,8 @@
     }
   },
   mounted: function() {
+    this.userNo = window.localStorage.getItem("USERNO");
+
     this.loadAllProject();
   }
 };

diff --git a/config/index.js b/config/index.js
index 1bb3a4b..68765b2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -87,7 +87,7 @@
     },
 
     // Various Dev Server settings
-    host: "localhost"    , // can be overwritten by process.env.HOST
+    host: "192.168.30.113", // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,
diff --git a/package.json b/package.json
index c41fff4..a58d9d6 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "axios": "^0.19.2",
     "echarts": "^4.7.0",
     "element-ui": "^2.13.1",
+    "ol": "^6.4.3",
     "esri-loader": "^2.14.0",
     "html2canvas": "^1.0.0-rc.7",
     "js-file-download": "^0.4.12",
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 801c3b3..eb85612 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -135,6 +135,11 @@
                 ><el-input size="small" v-model="ruleForm.lat"></el-input
               ></el-form-item>
             </el-col>
+               <!-- 坐标拾取  -->
+                <el-col :span="5">
+           <el-button type="primary" @click="pickLngLat()">坐标拾取</el-button>
+            </el-col>
+              <!-- 坐标拾取  -->
           </el-form-item>
           <el-form-item label="站点安装位置" prop="address">
             <el-input
@@ -217,15 +222,11 @@
             size="medium"
           >
             <el-form-item label="">
-<<<<<<< HEAD
-              <el-input v-model="deviceRelatedQuery.searchStr" placeholder="请输入设备名称/厂家" clearable></el-input>
-=======
               <el-input
                 v-model="deviceRelatedQuery.searchStr"
                 placeholder="请输入设备编号/厂家"
                 clearable
               ></el-input>
->>>>>>> ad620ef3af4de08b199e1d1c6c52489a965e9a0a
             </el-form-item>
             <el-form-item>
               <el-button
@@ -298,14 +299,29 @@
         </div>
       </template>
     </page-dialog>
+    <el-dialog
+      title="坐标拾取"
+      :visible.sync="dialogFormVisible"
+      :append-to-body="true"
+      :before-close="handleDialogClose"
+      customClass="addDialog"
+     
+    >
+     <markMap ref="markMap" v-on:SendLngLat="SendLngLat" style="height: 600px;width:1050px;" />
+    </el-dialog>
   </div>
 </template>
 <script>
 import axios from "axios";
 import { mapGetters } from "vuex";
+import markMap from "./markMap.vue";
 export default {
+   components: {
+        markMap
+    },
   data() {
     return {
+      dialogFormVisible:false,
       //站点搜索相关
       siteFilterInfo: {
         query: {
@@ -520,8 +536,18 @@
         refresh: 1,
         initCurpage: 1,
         fieldList: [
-          { label: "设备名称", value: "equipDesc", minWidth: 100, tooltip: true },
-          { label: "设备厂家", value: "equipFactory", minWidth: 150, tooltip: true },
+          {
+            label: "设备名称",
+            value: "equipDesc",
+            minWidth: 100,
+            tooltip: true
+          },
+          {
+            label: "设备厂家",
+            value: "equipFactory",
+            minWidth: 150,
+            tooltip: true
+          }
         ]
       },
       //已关联设备表格相关
@@ -596,19 +622,40 @@
       }
     },
     "deviceRelatedQuery.searchStr"(val) {
-      Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
-      Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+      Object.assign(
+        this.isRelatedDeviceTableInfo.query,
+        this.deviceRelatedQuery
+      );
+      Object.assign(
+        this.unRelatedDeviceTableInfo.query,
+        this.deviceRelatedQuery
+      );
     },
     platformCode(val) {
-      console.log(777,val);
+      console.log(777, val);
       this.ruleForm.platformCode = val;
     }
   },
   methods: {
+      //响应地图组件的确定，拾取坐标
+    SendLngLat(lonlat) {
+      this.dialogFormVisible=false;
+      this.ruleForm.lon=lonlat[0]
+      this.ruleForm.lat=lonlat[1]
+
+    },
+    //坐标拾取地图控件打开
+    pickLngLat(){
+      this.dialogFormVisible=true
+    },
+    //监听面板直接叉叉掉事件
+    handleDialogClose() {
+       this.dialogFormVisible = false;
+    },
     //上传头像
     fileChange(file) {
       this.loading = true;
-      const isLt1M = file.size / 1024 / 1024 < 1;
+      const isLt1M = file.size / 1024 / 1024 < 5;
       if (file.raw.type != "image/jpeg" && file.raw.type != "image/png") {
         this.loading = false;
         this.$message.error("上传图片只能是JPG或PNG格式!");
@@ -616,7 +663,7 @@
       }
       if (!isLt1M) {
         this.loading = false;
-        this.$message.error("上传图片大小不能超过 1MB!");
+        this.$message.error("上传图片大小不能超过 5MB!");
         return;
       }
       var formdata = new FormData();
@@ -960,6 +1007,10 @@
 };
 </script>
 <style lang="scss" scoped>
+.addDialog {
+  width:1050px;
+  height: 650px;
+}
 .imgtype {
   width: 150px;
   height: 100px;
diff --git a/src/components/ConfigManager/markMap.vue b/src/components/ConfigManager/markMap.vue
new file mode 100644
index 0000000..ba8030e
--- /dev/null
+++ b/src/components/ConfigManager/markMap.vue
@@ -0,0 +1,162 @@
+<template>
+  <div id="rootMap">
+    <div id="map" ref="map">
+      <el-button type="primary" style=" position: absolute;
+    left: 869px;
+    bottom: 9px;
+    z-index: 99" @click="SendLngLat()">确定</el-button>
+    </div>
+  </div>
+</template>
+<script>
+
+import "ol/ol.css";
+
+import { Map, View, Feature, color } from "ol";
+import { DEVICE_PIXEL_RATIO } from "ol/has";
+import Circle from "ol/style/Circle";
+import * as layer from "ol/layer.js";
+import * as source from "ol/source.js";
+import * as geom from "ol/geom.js";
+import * as style from "ol/style.js";
+import Overlay from "ol/Overlay.js";
+import TileLayer from "ol/layer/Tile";
+
+import SourceVector from "ol/source/Vector";
+import LayerVector from "ol/layer/Vector";
+
+import Style from "ol/style/Style";
+import Fill from "ol/style/Fill";
+import Text from "ol/style/Text";
+
+import Stroke from "ol/style/Stroke";
+import Draw from "ol/interaction/Draw";
+import Icon from "ol/style/Icon";
+import Select from "ol/interaction/Select";
+import Modify from "ol/interaction/Modify";
+import FormatWKT from "ol/format/WKT";
+
+import ImageWMS from "ol/source/ImageWMS";
+import Image from "ol/layer/Image";
+import GeoJSON from "ol/format/GeoJSON";
+import LineString from "ol/geom/LineString";
+
+import { OSM, TileArcGISRest, XYZ } from "ol/source";
+import { defaults } from "ol/control";
+import ImageArcGISRest from "ol/source/ImageArcGISRest";
+import ImageLayer from "ol/layer/Image";
+import tagPng from "./../../../static/img/yjznewpng.png";
+import Point from "ol/geom/Point";
+export default {
+  data() {
+    return {
+      map: "",
+      currentLonLat:[]
+    };
+  },
+  mounted() {
+    this.initMap();
+  },
+
+  methods: {
+    //点击确定后关闭此地图面板，然后把经纬度传给父vue
+    SendLngLat(){
+    
+      //删除entity模型
+      this.$emit("SendLngLat", this.currentLonLat);
+    },
+    //初始化地图
+    initMap() {
+      this.map = new Map({
+        controls: defaults({
+          attribution: false,
+          zoom: false,
+          rotate: false
+        }),
+
+        target: this.$refs.map,
+        layers: [
+        new TileLayer({
+          source: new XYZ({
+            url:
+              "http://map.geoq.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}"
+            //"http://cache1.arcgisonline.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}"
+          })
+        })
+        ],
+        view: new View({
+          projection: "EPSG:4326", //使用这个坐标系
+          center: [114.217, 30.828], //武汉
+          zoom: 9
+        })
+      });
+
+            this.vectorSource = new SourceVector({
+     
+            });
+            this.vector = new LayerVector({
+
+                source: this.vectorSource
+
+            });
+            this.map.addLayer(this.vector);
+
+            //初始化一个点
+            this.initPoint(114.30,30.28)
+
+
+      //鼠标移动事件
+      this.map.on("pointermove", function(evt) {
+        if (evt.map.hasFeatureAtPixel(evt.pixel)) {
+          evt.map.getTargetElement().style.cursor = "pointer";
+        } else {
+          evt.map.getTargetElement().style.cursor = "";
+        }
+      });
+      //鼠标点击事件
+      this.map.on("click", (evt)=> {
+        this.currentLonLat=evt.coordinate
+       this.initPoint(evt.coordinate[0],evt.coordinate[1])
+      });
+    },
+    initPoint(lng, lat) {
+      if (lng && lat) {
+          //清除所有feature
+           if (this.vectorSource) {
+                  this.vectorSource.clear();
+                }
+        //添加feature图标
+       this.Marker = new Feature({
+        geometry: new Point([parseFloat(lng), parseFloat(lat)])
+      });
+
+      //设置style
+      this.Marker.setStyle(
+        new Style({
+              image: new Icon({
+                src: tagPng,
+              
+              })
+            })
+            )
+
+       this.vectorSource.addFeature(this.Marker)
+        //重置中心点
+      /*   this.map.getView().setCenter([parseFloat(lng), parseFloat(lat)]);
+        this.map.getView().setZoom(12); */
+      }
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+#rootMap {
+  width: 100%;
+  height: 100%;
+}
+#map {
+     width: 88%;
+    height: 99%;
+}
+
+</style>
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index d230b2e..0eb5a75 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -364,7 +364,7 @@
           width: "240",
           btList: [
             { label: "添加用户", size: "small", type: "text", event: "addUser", show: true },
-            { label: "查看用户", size: "small", type: "text", event: "detail", show: true },
+            { label: "关联用户", size: "small", type: "text", event: "detail", show: true },
             { label: "删除用户组", size: "small", type: "text", event: "delGroup", show: true }
           ]
         }
diff --git a/src/components/Engineering/HistoricalFault.vue b/src/components/Engineering/HistoricalFault.vue
index 91c52d6..3312a76 100644
--- a/src/components/Engineering/HistoricalFault.vue
+++ b/src/components/Engineering/HistoricalFault.vue
@@ -3,6 +3,7 @@
     <div id="HFTopSearchBox">
       <span class="SelectTitle">平台：</span>
       <el-select
+        clearable
         class="widthinput"
         v-model="Project"
         filterable
@@ -18,6 +19,7 @@
       </el-select>
       <span class="SelectTitle">站点：</span>
       <el-select
+        clearable
         v-model="Site"
         filterable
         placeholder="请选择"
@@ -89,6 +91,8 @@
   data: function() {
     return {
       condition: "",
+      platCode: "",
+      userNo: "",
       HistoryTableData: [], //历史数据表格数据
       Page: 1, //分页默认显示页
       DataLength: 0, //分页上显示的数据总条数
@@ -136,7 +140,7 @@
         {
           platformName: "全部",
           platformCode: "",
-          dropSiteList: []
+          dropSiteList: ""
         }
       ], //平台的数据源
       Site: "", //平台
@@ -168,7 +172,8 @@
           st: this.TimeValue[0],
           et: this.TimeValue[1],
           pageNo: this.Page,
-          pageSize: this.Size
+          pageSize: this.Size,
+          userNo: this.userNo
         })
         .then(response => {
           this.loading = false;
@@ -232,6 +237,8 @@
     }
   },
   mounted: function() {
+    this.userNo = window.localStorage.getItem("USERNO");
+
     this.loadAllProject();
   }
 };
diff --git a/src/components/Engineering/Nowfault.vue b/src/components/Engineering/Nowfault.vue
index e2b4b89..bf4aba9 100644
--- a/src/components/Engineering/Nowfault.vue
+++ b/src/components/Engineering/Nowfault.vue
@@ -1,15 +1,46 @@
 <template>
   <div id="Nowfault">
     <div id="NFTopSearchBox">
-      <span class="SelectTitle">站点查询：</span>
-      <el-input
+      <span class="SelectTitle">请选择项目：</span>
+      <el-select
+        class="widthinput"
+        v-model="Project"
+        filterable
+        clearable
+        placeholder="请选择"
+        @change="loadProjectUser(Project)"
+      >
+        <el-option
+          v-for="item in ProjectOptions"
+          :key="item.index"
+          :label="item.platformName"
+          :value="item.platformCode"
+        ></el-option>
+      </el-select>
+      <span class="SelectTitle">请选择站点：</span>
+      <el-select
+        clearable
+        v-model="Site"
+        filterable
+        placeholder="请选择"
+        class="widthinput"
+      >
+        <el-option
+          v-for="item in SiteOptions"
+          :key="item.index"
+          :label="item.siteName"
+          :value="item.siteNo"
+        ></el-option>
+      </el-select>
+      <!-- <span class="SelectTitle">站点查询：</span> -->
+      <!-- <el-input
         v-model="condition"
         placeholder="请输入站点名称/编号"
-      ></el-input>
+      ></el-input> -->
       <el-button
         type="primary"
         icon="el-icon-search"
-        @click="loadDataGridData"
+        @click="searcher"
         v-has="'Search'"
         >搜索</el-button
       >
@@ -56,7 +87,26 @@
       Page: 1, //分页默认显示页
       DataLength: 0, //分页上显示的数据总条数
       Size: 10, //分页上显示的每页的条数
-      loading: false
+      loading: false,
+      Project: "", //平台
+      userNo: "",
+      platCode: "",
+      // searchnum: 1,
+      ProjectOptions: [
+        {
+          platformName: "全部",
+          platformCode: "",
+          dropSiteList: ""
+        }
+      ],
+      Site: "", //平台
+
+      SiteOptions: [
+        // {
+        //   siteName: "全部",
+        //   siteNo: ""
+        // }
+      ] //平台的数据源
     };
   },
   methods: {
@@ -70,13 +120,68 @@
       this.Page = val;
       this.loadDataGridData();
     },
+    // 获取平台的站点
+    loadProjectUser(CODE) {
+      this.platCode = CODE;
+      this.SiteOptions = [
+        {
+          siteName: "请先选择项目",
+          siteNo: ""
+        }
+      ];
+      this.Site = "";
+      for (var i = 0; i < this.ProjectOptions.length; i++) {
+        if (this.ProjectOptions[i].platformCode == CODE) {
+          this.SiteOptions = this.SiteOptions.concat(
+            this.ProjectOptions[i].dropSiteList
+          );
+          return;
+        }
+      }
+    },
+    // 获取所有平台
+    loadAllProject() {
+      this.$http
+        .get(this.nozzle.StationBaseControllerGetPlatFormSiteTree)
+        .then(response => {
+          if (response.data.data.length > 0) {
+            this.ProjectOptions = this.ProjectOptions.concat(
+              response.data.data
+            );
+            this.Project = this.ProjectOptions[0].platformCode;
+            this.loadProjectUser(this.ProjectOptions[0].dropSiteList);
+          } else {
+            this.$message({
+              showClose: true,
+              message: "无项目",
+              type: "warning"
+            });
+          }
+          // this.loadDataGridData();
+        })
+        .catch(response => {
+          this.$message({
+            showClose: true,
+            message: "请求平台失败",
+            type: "warning"
+          });
+        });
+    },
+    // 搜索的请求方法
+    searcher() {
+      this.Page = 1;
+      this.loadDataGridData();
+    },
+
     loadDataGridData() {
       this.loading = true;
       this.$http
         .post(this.nozzle.faultInfoGetTempInfo, {
-          condition: this.condition,
+          siteNo: this.Site,
           pageNo: this.Page,
-          pageSize: this.Size
+          pageSize: this.Size,
+          platCode: this.platCode,
+          userNo: this.userNo
         })
         .then(response => {
           this.loading = false;
@@ -94,6 +199,8 @@
     }
   },
   mounted: function() {
+    this.userNo = window.localStorage.getItem("USERNO");
+    this.loadAllProject();
     this.loadDataGridData();
   }
 };

diff --git a/config/index.js b/config/index.js
index 1bb3a4b..68765b2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -87,7 +87,7 @@
     },
 
     // Various Dev Server settings
-    host: "localhost"    , // can be overwritten by process.env.HOST
+    host: "192.168.30.113", // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,
diff --git a/package.json b/package.json
index c41fff4..a58d9d6 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "axios": "^0.19.2",
     "echarts": "^4.7.0",
     "element-ui": "^2.13.1",
+    "ol": "^6.4.3",
     "esri-loader": "^2.14.0",
     "html2canvas": "^1.0.0-rc.7",
     "js-file-download": "^0.4.12",
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 801c3b3..eb85612 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -135,6 +135,11 @@
                 ><el-input size="small" v-model="ruleForm.lat"></el-input
               ></el-form-item>
             </el-col>
+               <!-- 坐标拾取  -->
+                <el-col :span="5">
+           <el-button type="primary" @click="pickLngLat()">坐标拾取</el-button>
+            </el-col>
+              <!-- 坐标拾取  -->
           </el-form-item>
           <el-form-item label="站点安装位置" prop="address">
             <el-input
@@ -217,15 +222,11 @@
             size="medium"
           >
             <el-form-item label="">
-<<<<<<< HEAD
-              <el-input v-model="deviceRelatedQuery.searchStr" placeholder="请输入设备名称/厂家" clearable></el-input>
-=======
               <el-input
                 v-model="deviceRelatedQuery.searchStr"
                 placeholder="请输入设备编号/厂家"
                 clearable
               ></el-input>
->>>>>>> ad620ef3af4de08b199e1d1c6c52489a965e9a0a
             </el-form-item>
             <el-form-item>
               <el-button
@@ -298,14 +299,29 @@
         </div>
       </template>
     </page-dialog>
+    <el-dialog
+      title="坐标拾取"
+      :visible.sync="dialogFormVisible"
+      :append-to-body="true"
+      :before-close="handleDialogClose"
+      customClass="addDialog"
+     
+    >
+     <markMap ref="markMap" v-on:SendLngLat="SendLngLat" style="height: 600px;width:1050px;" />
+    </el-dialog>
   </div>
 </template>
 <script>
 import axios from "axios";
 import { mapGetters } from "vuex";
+import markMap from "./markMap.vue";
 export default {
+   components: {
+        markMap
+    },
   data() {
     return {
+      dialogFormVisible:false,
       //站点搜索相关
       siteFilterInfo: {
         query: {
@@ -520,8 +536,18 @@
         refresh: 1,
         initCurpage: 1,
         fieldList: [
-          { label: "设备名称", value: "equipDesc", minWidth: 100, tooltip: true },
-          { label: "设备厂家", value: "equipFactory", minWidth: 150, tooltip: true },
+          {
+            label: "设备名称",
+            value: "equipDesc",
+            minWidth: 100,
+            tooltip: true
+          },
+          {
+            label: "设备厂家",
+            value: "equipFactory",
+            minWidth: 150,
+            tooltip: true
+          }
         ]
       },
       //已关联设备表格相关
@@ -596,19 +622,40 @@
       }
     },
     "deviceRelatedQuery.searchStr"(val) {
-      Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
-      Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+      Object.assign(
+        this.isRelatedDeviceTableInfo.query,
+        this.deviceRelatedQuery
+      );
+      Object.assign(
+        this.unRelatedDeviceTableInfo.query,
+        this.deviceRelatedQuery
+      );
     },
     platformCode(val) {
-      console.log(777,val);
+      console.log(777, val);
       this.ruleForm.platformCode = val;
     }
   },
   methods: {
+      //响应地图组件的确定，拾取坐标
+    SendLngLat(lonlat) {
+      this.dialogFormVisible=false;
+      this.ruleForm.lon=lonlat[0]
+      this.ruleForm.lat=lonlat[1]
+
+    },
+    //坐标拾取地图控件打开
+    pickLngLat(){
+      this.dialogFormVisible=true
+    },
+    //监听面板直接叉叉掉事件
+    handleDialogClose() {
+       this.dialogFormVisible = false;
+    },
     //上传头像
     fileChange(file) {
       this.loading = true;
-      const isLt1M = file.size / 1024 / 1024 < 1;
+      const isLt1M = file.size / 1024 / 1024 < 5;
       if (file.raw.type != "image/jpeg" && file.raw.type != "image/png") {
         this.loading = false;
         this.$message.error("上传图片只能是JPG或PNG格式!");
@@ -616,7 +663,7 @@
       }
       if (!isLt1M) {
         this.loading = false;
-        this.$message.error("上传图片大小不能超过 1MB!");
+        this.$message.error("上传图片大小不能超过 5MB!");
         return;
       }
       var formdata = new FormData();
@@ -960,6 +1007,10 @@
 };
 </script>
 <style lang="scss" scoped>
+.addDialog {
+  width:1050px;
+  height: 650px;
+}
 .imgtype {
   width: 150px;
   height: 100px;
diff --git a/src/components/ConfigManager/markMap.vue b/src/components/ConfigManager/markMap.vue
new file mode 100644
index 0000000..ba8030e
--- /dev/null
+++ b/src/components/ConfigManager/markMap.vue
@@ -0,0 +1,162 @@
+<template>
+  <div id="rootMap">
+    <div id="map" ref="map">
+      <el-button type="primary" style=" position: absolute;
+    left: 869px;
+    bottom: 9px;
+    z-index: 99" @click="SendLngLat()">确定</el-button>
+    </div>
+  </div>
+</template>
+<script>
+
+import "ol/ol.css";
+
+import { Map, View, Feature, color } from "ol";
+import { DEVICE_PIXEL_RATIO } from "ol/has";
+import Circle from "ol/style/Circle";
+import * as layer from "ol/layer.js";
+import * as source from "ol/source.js";
+import * as geom from "ol/geom.js";
+import * as style from "ol/style.js";
+import Overlay from "ol/Overlay.js";
+import TileLayer from "ol/layer/Tile";
+
+import SourceVector from "ol/source/Vector";
+import LayerVector from "ol/layer/Vector";
+
+import Style from "ol/style/Style";
+import Fill from "ol/style/Fill";
+import Text from "ol/style/Text";
+
+import Stroke from "ol/style/Stroke";
+import Draw from "ol/interaction/Draw";
+import Icon from "ol/style/Icon";
+import Select from "ol/interaction/Select";
+import Modify from "ol/interaction/Modify";
+import FormatWKT from "ol/format/WKT";
+
+import ImageWMS from "ol/source/ImageWMS";
+import Image from "ol/layer/Image";
+import GeoJSON from "ol/format/GeoJSON";
+import LineString from "ol/geom/LineString";
+
+import { OSM, TileArcGISRest, XYZ } from "ol/source";
+import { defaults } from "ol/control";
+import ImageArcGISRest from "ol/source/ImageArcGISRest";
+import ImageLayer from "ol/layer/Image";
+import tagPng from "./../../../static/img/yjznewpng.png";
+import Point from "ol/geom/Point";
+export default {
+  data() {
+    return {
+      map: "",
+      currentLonLat:[]
+    };
+  },
+  mounted() {
+    this.initMap();
+  },
+
+  methods: {
+    //点击确定后关闭此地图面板，然后把经纬度传给父vue
+    SendLngLat(){
+    
+      //删除entity模型
+      this.$emit("SendLngLat", this.currentLonLat);
+    },
+    //初始化地图
+    initMap() {
+      this.map = new Map({
+        controls: defaults({
+          attribution: false,
+          zoom: false,
+          rotate: false
+        }),
+
+        target: this.$refs.map,
+        layers: [
+        new TileLayer({
+          source: new XYZ({
+            url:
+              "http://map.geoq.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}"
+            //"http://cache1.arcgisonline.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}"
+          })
+        })
+        ],
+        view: new View({
+          projection: "EPSG:4326", //使用这个坐标系
+          center: [114.217, 30.828], //武汉
+          zoom: 9
+        })
+      });
+
+            this.vectorSource = new SourceVector({
+     
+            });
+            this.vector = new LayerVector({
+
+                source: this.vectorSource
+
+            });
+            this.map.addLayer(this.vector);
+
+            //初始化一个点
+            this.initPoint(114.30,30.28)
+
+
+      //鼠标移动事件
+      this.map.on("pointermove", function(evt) {
+        if (evt.map.hasFeatureAtPixel(evt.pixel)) {
+          evt.map.getTargetElement().style.cursor = "pointer";
+        } else {
+          evt.map.getTargetElement().style.cursor = "";
+        }
+      });
+      //鼠标点击事件
+      this.map.on("click", (evt)=> {
+        this.currentLonLat=evt.coordinate
+       this.initPoint(evt.coordinate[0],evt.coordinate[1])
+      });
+    },
+    initPoint(lng, lat) {
+      if (lng && lat) {
+          //清除所有feature
+           if (this.vectorSource) {
+                  this.vectorSource.clear();
+                }
+        //添加feature图标
+       this.Marker = new Feature({
+        geometry: new Point([parseFloat(lng), parseFloat(lat)])
+      });
+
+      //设置style
+      this.Marker.setStyle(
+        new Style({
+              image: new Icon({
+                src: tagPng,
+              
+              })
+            })
+            )
+
+       this.vectorSource.addFeature(this.Marker)
+        //重置中心点
+      /*   this.map.getView().setCenter([parseFloat(lng), parseFloat(lat)]);
+        this.map.getView().setZoom(12); */
+      }
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+#rootMap {
+  width: 100%;
+  height: 100%;
+}
+#map {
+     width: 88%;
+    height: 99%;
+}
+
+</style>
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index d230b2e..0eb5a75 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -364,7 +364,7 @@
           width: "240",
           btList: [
             { label: "添加用户", size: "small", type: "text", event: "addUser", show: true },
-            { label: "查看用户", size: "small", type: "text", event: "detail", show: true },
+            { label: "关联用户", size: "small", type: "text", event: "detail", show: true },
             { label: "删除用户组", size: "small", type: "text", event: "delGroup", show: true }
           ]
         }
diff --git a/src/components/Engineering/HistoricalFault.vue b/src/components/Engineering/HistoricalFault.vue
index 91c52d6..3312a76 100644
--- a/src/components/Engineering/HistoricalFault.vue
+++ b/src/components/Engineering/HistoricalFault.vue
@@ -3,6 +3,7 @@
     <div id="HFTopSearchBox">
       <span class="SelectTitle">平台：</span>
       <el-select
+        clearable
         class="widthinput"
         v-model="Project"
         filterable
@@ -18,6 +19,7 @@
       </el-select>
       <span class="SelectTitle">站点：</span>
       <el-select
+        clearable
         v-model="Site"
         filterable
         placeholder="请选择"
@@ -89,6 +91,8 @@
   data: function() {
     return {
       condition: "",
+      platCode: "",
+      userNo: "",
       HistoryTableData: [], //历史数据表格数据
       Page: 1, //分页默认显示页
       DataLength: 0, //分页上显示的数据总条数
@@ -136,7 +140,7 @@
         {
           platformName: "全部",
           platformCode: "",
-          dropSiteList: []
+          dropSiteList: ""
         }
       ], //平台的数据源
       Site: "", //平台
@@ -168,7 +172,8 @@
           st: this.TimeValue[0],
           et: this.TimeValue[1],
           pageNo: this.Page,
-          pageSize: this.Size
+          pageSize: this.Size,
+          userNo: this.userNo
         })
         .then(response => {
           this.loading = false;
@@ -232,6 +237,8 @@
     }
   },
   mounted: function() {
+    this.userNo = window.localStorage.getItem("USERNO");
+
     this.loadAllProject();
   }
 };
diff --git a/src/components/Engineering/Nowfault.vue b/src/components/Engineering/Nowfault.vue
index e2b4b89..bf4aba9 100644
--- a/src/components/Engineering/Nowfault.vue
+++ b/src/components/Engineering/Nowfault.vue
@@ -1,15 +1,46 @@
 <template>
   <div id="Nowfault">
     <div id="NFTopSearchBox">
-      <span class="SelectTitle">站点查询：</span>
-      <el-input
+      <span class="SelectTitle">请选择项目：</span>
+      <el-select
+        class="widthinput"
+        v-model="Project"
+        filterable
+        clearable
+        placeholder="请选择"
+        @change="loadProjectUser(Project)"
+      >
+        <el-option
+          v-for="item in ProjectOptions"
+          :key="item.index"
+          :label="item.platformName"
+          :value="item.platformCode"
+        ></el-option>
+      </el-select>
+      <span class="SelectTitle">请选择站点：</span>
+      <el-select
+        clearable
+        v-model="Site"
+        filterable
+        placeholder="请选择"
+        class="widthinput"
+      >
+        <el-option
+          v-for="item in SiteOptions"
+          :key="item.index"
+          :label="item.siteName"
+          :value="item.siteNo"
+        ></el-option>
+      </el-select>
+      <!-- <span class="SelectTitle">站点查询：</span> -->
+      <!-- <el-input
         v-model="condition"
         placeholder="请输入站点名称/编号"
-      ></el-input>
+      ></el-input> -->
       <el-button
         type="primary"
         icon="el-icon-search"
-        @click="loadDataGridData"
+        @click="searcher"
         v-has="'Search'"
         >搜索</el-button
       >
@@ -56,7 +87,26 @@
       Page: 1, //分页默认显示页
       DataLength: 0, //分页上显示的数据总条数
       Size: 10, //分页上显示的每页的条数
-      loading: false
+      loading: false,
+      Project: "", //平台
+      userNo: "",
+      platCode: "",
+      // searchnum: 1,
+      ProjectOptions: [
+        {
+          platformName: "全部",
+          platformCode: "",
+          dropSiteList: ""
+        }
+      ],
+      Site: "", //平台
+
+      SiteOptions: [
+        // {
+        //   siteName: "全部",
+        //   siteNo: ""
+        // }
+      ] //平台的数据源
     };
   },
   methods: {
@@ -70,13 +120,68 @@
       this.Page = val;
       this.loadDataGridData();
     },
+    // 获取平台的站点
+    loadProjectUser(CODE) {
+      this.platCode = CODE;
+      this.SiteOptions = [
+        {
+          siteName: "请先选择项目",
+          siteNo: ""
+        }
+      ];
+      this.Site = "";
+      for (var i = 0; i < this.ProjectOptions.length; i++) {
+        if (this.ProjectOptions[i].platformCode == CODE) {
+          this.SiteOptions = this.SiteOptions.concat(
+            this.ProjectOptions[i].dropSiteList
+          );
+          return;
+        }
+      }
+    },
+    // 获取所有平台
+    loadAllProject() {
+      this.$http
+        .get(this.nozzle.StationBaseControllerGetPlatFormSiteTree)
+        .then(response => {
+          if (response.data.data.length > 0) {
+            this.ProjectOptions = this.ProjectOptions.concat(
+              response.data.data
+            );
+            this.Project = this.ProjectOptions[0].platformCode;
+            this.loadProjectUser(this.ProjectOptions[0].dropSiteList);
+          } else {
+            this.$message({
+              showClose: true,
+              message: "无项目",
+              type: "warning"
+            });
+          }
+          // this.loadDataGridData();
+        })
+        .catch(response => {
+          this.$message({
+            showClose: true,
+            message: "请求平台失败",
+            type: "warning"
+          });
+        });
+    },
+    // 搜索的请求方法
+    searcher() {
+      this.Page = 1;
+      this.loadDataGridData();
+    },
+
     loadDataGridData() {
       this.loading = true;
       this.$http
         .post(this.nozzle.faultInfoGetTempInfo, {
-          condition: this.condition,
+          siteNo: this.Site,
           pageNo: this.Page,
-          pageSize: this.Size
+          pageSize: this.Size,
+          platCode: this.platCode,
+          userNo: this.userNo
         })
         .then(response => {
           this.loading = false;
@@ -94,6 +199,8 @@
     }
   },
   mounted: function() {
+    this.userNo = window.localStorage.getItem("USERNO");
+    this.loadAllProject();
     this.loadDataGridData();
   }
 };
diff --git a/src/components/common/PageTable/index.vue b/src/components/common/PageTable/index.vue
index 01ba393..c22b21d 100644
--- a/src/components/common/PageTable/index.vue
+++ b/src/components/common/PageTable/index.vue
@@ -342,7 +342,7 @@
             if (this.tableType === "tree") {
               arr = this.$fn.handleTree(arr);
             }
-            if (arr) {
+            if (arr.length) {
               arr.forEach(item => {
                 item.createTime = this.$fn.switchTime(
                   item.createTime,

diff --git a/config/index.js b/config/index.js
index 1bb3a4b..68765b2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -87,7 +87,7 @@
     },
 
     // Various Dev Server settings
-    host: "localhost"    , // can be overwritten by process.env.HOST
+    host: "192.168.30.113", // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,
diff --git a/package.json b/package.json
index c41fff4..a58d9d6 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "axios": "^0.19.2",
     "echarts": "^4.7.0",
     "element-ui": "^2.13.1",
+    "ol": "^6.4.3",
     "esri-loader": "^2.14.0",
     "html2canvas": "^1.0.0-rc.7",
     "js-file-download": "^0.4.12",
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 801c3b3..eb85612 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -135,6 +135,11 @@
                 ><el-input size="small" v-model="ruleForm.lat"></el-input
               ></el-form-item>
             </el-col>
+               <!-- 坐标拾取  -->
+                <el-col :span="5">
+           <el-button type="primary" @click="pickLngLat()">坐标拾取</el-button>
+            </el-col>
+              <!-- 坐标拾取  -->
           </el-form-item>
           <el-form-item label="站点安装位置" prop="address">
             <el-input
@@ -217,15 +222,11 @@
             size="medium"
           >
             <el-form-item label="">
-<<<<<<< HEAD
-              <el-input v-model="deviceRelatedQuery.searchStr" placeholder="请输入设备名称/厂家" clearable></el-input>
-=======
               <el-input
                 v-model="deviceRelatedQuery.searchStr"
                 placeholder="请输入设备编号/厂家"
                 clearable
               ></el-input>
->>>>>>> ad620ef3af4de08b199e1d1c6c52489a965e9a0a
             </el-form-item>
             <el-form-item>
               <el-button
@@ -298,14 +299,29 @@
         </div>
       </template>
     </page-dialog>
+    <el-dialog
+      title="坐标拾取"
+      :visible.sync="dialogFormVisible"
+      :append-to-body="true"
+      :before-close="handleDialogClose"
+      customClass="addDialog"
+     
+    >
+     <markMap ref="markMap" v-on:SendLngLat="SendLngLat" style="height: 600px;width:1050px;" />
+    </el-dialog>
   </div>
 </template>
 <script>
 import axios from "axios";
 import { mapGetters } from "vuex";
+import markMap from "./markMap.vue";
 export default {
+   components: {
+        markMap
+    },
   data() {
     return {
+      dialogFormVisible:false,
       //站点搜索相关
       siteFilterInfo: {
         query: {
@@ -520,8 +536,18 @@
         refresh: 1,
         initCurpage: 1,
         fieldList: [
-          { label: "设备名称", value: "equipDesc", minWidth: 100, tooltip: true },
-          { label: "设备厂家", value: "equipFactory", minWidth: 150, tooltip: true },
+          {
+            label: "设备名称",
+            value: "equipDesc",
+            minWidth: 100,
+            tooltip: true
+          },
+          {
+            label: "设备厂家",
+            value: "equipFactory",
+            minWidth: 150,
+            tooltip: true
+          }
         ]
       },
       //已关联设备表格相关
@@ -596,19 +622,40 @@
       }
     },
     "deviceRelatedQuery.searchStr"(val) {
-      Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
-      Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+      Object.assign(
+        this.isRelatedDeviceTableInfo.query,
+        this.deviceRelatedQuery
+      );
+      Object.assign(
+        this.unRelatedDeviceTableInfo.query,
+        this.deviceRelatedQuery
+      );
     },
     platformCode(val) {
-      console.log(777,val);
+      console.log(777, val);
       this.ruleForm.platformCode = val;
     }
   },
   methods: {
+      //响应地图组件的确定，拾取坐标
+    SendLngLat(lonlat) {
+      this.dialogFormVisible=false;
+      this.ruleForm.lon=lonlat[0]
+      this.ruleForm.lat=lonlat[1]
+
+    },
+    //坐标拾取地图控件打开
+    pickLngLat(){
+      this.dialogFormVisible=true
+    },
+    //监听面板直接叉叉掉事件
+    handleDialogClose() {
+       this.dialogFormVisible = false;
+    },
     //上传头像
     fileChange(file) {
       this.loading = true;
-      const isLt1M = file.size / 1024 / 1024 < 1;
+      const isLt1M = file.size / 1024 / 1024 < 5;
       if (file.raw.type != "image/jpeg" && file.raw.type != "image/png") {
         this.loading = false;
         this.$message.error("上传图片只能是JPG或PNG格式!");
@@ -616,7 +663,7 @@
       }
       if (!isLt1M) {
         this.loading = false;
-        this.$message.error("上传图片大小不能超过 1MB!");
+        this.$message.error("上传图片大小不能超过 5MB!");
         return;
       }
       var formdata = new FormData();
@@ -960,6 +1007,10 @@
 };
 </script>
 <style lang="scss" scoped>
+.addDialog {
+  width:1050px;
+  height: 650px;
+}
 .imgtype {
   width: 150px;
   height: 100px;
diff --git a/src/components/ConfigManager/markMap.vue b/src/components/ConfigManager/markMap.vue
new file mode 100644
index 0000000..ba8030e
--- /dev/null
+++ b/src/components/ConfigManager/markMap.vue
@@ -0,0 +1,162 @@
+<template>
+  <div id="rootMap">
+    <div id="map" ref="map">
+      <el-button type="primary" style=" position: absolute;
+    left: 869px;
+    bottom: 9px;
+    z-index: 99" @click="SendLngLat()">确定</el-button>
+    </div>
+  </div>
+</template>
+<script>
+
+import "ol/ol.css";
+
+import { Map, View, Feature, color } from "ol";
+import { DEVICE_PIXEL_RATIO } from "ol/has";
+import Circle from "ol/style/Circle";
+import * as layer from "ol/layer.js";
+import * as source from "ol/source.js";
+import * as geom from "ol/geom.js";
+import * as style from "ol/style.js";
+import Overlay from "ol/Overlay.js";
+import TileLayer from "ol/layer/Tile";
+
+import SourceVector from "ol/source/Vector";
+import LayerVector from "ol/layer/Vector";
+
+import Style from "ol/style/Style";
+import Fill from "ol/style/Fill";
+import Text from "ol/style/Text";
+
+import Stroke from "ol/style/Stroke";
+import Draw from "ol/interaction/Draw";
+import Icon from "ol/style/Icon";
+import Select from "ol/interaction/Select";
+import Modify from "ol/interaction/Modify";
+import FormatWKT from "ol/format/WKT";
+
+import ImageWMS from "ol/source/ImageWMS";
+import Image from "ol/layer/Image";
+import GeoJSON from "ol/format/GeoJSON";
+import LineString from "ol/geom/LineString";
+
+import { OSM, TileArcGISRest, XYZ } from "ol/source";
+import { defaults } from "ol/control";
+import ImageArcGISRest from "ol/source/ImageArcGISRest";
+import ImageLayer from "ol/layer/Image";
+import tagPng from "./../../../static/img/yjznewpng.png";
+import Point from "ol/geom/Point";
+export default {
+  data() {
+    return {
+      map: "",
+      currentLonLat:[]
+    };
+  },
+  mounted() {
+    this.initMap();
+  },
+
+  methods: {
+    //点击确定后关闭此地图面板，然后把经纬度传给父vue
+    SendLngLat(){
+    
+      //删除entity模型
+      this.$emit("SendLngLat", this.currentLonLat);
+    },
+    //初始化地图
+    initMap() {
+      this.map = new Map({
+        controls: defaults({
+          attribution: false,
+          zoom: false,
+          rotate: false
+        }),
+
+        target: this.$refs.map,
+        layers: [
+        new TileLayer({
+          source: new XYZ({
+            url:
+              "http://map.geoq.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}"
+            //"http://cache1.arcgisonline.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}"
+          })
+        })
+        ],
+        view: new View({
+          projection: "EPSG:4326", //使用这个坐标系
+          center: [114.217, 30.828], //武汉
+          zoom: 9
+        })
+      });
+
+            this.vectorSource = new SourceVector({
+     
+            });
+            this.vector = new LayerVector({
+
+                source: this.vectorSource
+
+            });
+            this.map.addLayer(this.vector);
+
+            //初始化一个点
+            this.initPoint(114.30,30.28)
+
+
+      //鼠标移动事件
+      this.map.on("pointermove", function(evt) {
+        if (evt.map.hasFeatureAtPixel(evt.pixel)) {
+          evt.map.getTargetElement().style.cursor = "pointer";
+        } else {
+          evt.map.getTargetElement().style.cursor = "";
+        }
+      });
+      //鼠标点击事件
+      this.map.on("click", (evt)=> {
+        this.currentLonLat=evt.coordinate
+       this.initPoint(evt.coordinate[0],evt.coordinate[1])
+      });
+    },
+    initPoint(lng, lat) {
+      if (lng && lat) {
+          //清除所有feature
+           if (this.vectorSource) {
+                  this.vectorSource.clear();
+                }
+        //添加feature图标
+       this.Marker = new Feature({
+        geometry: new Point([parseFloat(lng), parseFloat(lat)])
+      });
+
+      //设置style
+      this.Marker.setStyle(
+        new Style({
+              image: new Icon({
+                src: tagPng,
+              
+              })
+            })
+            )
+
+       this.vectorSource.addFeature(this.Marker)
+        //重置中心点
+      /*   this.map.getView().setCenter([parseFloat(lng), parseFloat(lat)]);
+        this.map.getView().setZoom(12); */
+      }
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+#rootMap {
+  width: 100%;
+  height: 100%;
+}
+#map {
+     width: 88%;
+    height: 99%;
+}
+
+</style>
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index d230b2e..0eb5a75 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -364,7 +364,7 @@
           width: "240",
           btList: [
             { label: "添加用户", size: "small", type: "text", event: "addUser", show: true },
-            { label: "查看用户", size: "small", type: "text", event: "detail", show: true },
+            { label: "关联用户", size: "small", type: "text", event: "detail", show: true },
             { label: "删除用户组", size: "small", type: "text", event: "delGroup", show: true }
           ]
         }
diff --git a/src/components/Engineering/HistoricalFault.vue b/src/components/Engineering/HistoricalFault.vue
index 91c52d6..3312a76 100644
--- a/src/components/Engineering/HistoricalFault.vue
+++ b/src/components/Engineering/HistoricalFault.vue
@@ -3,6 +3,7 @@
     <div id="HFTopSearchBox">
       <span class="SelectTitle">平台：</span>
       <el-select
+        clearable
         class="widthinput"
         v-model="Project"
         filterable
@@ -18,6 +19,7 @@
       </el-select>
       <span class="SelectTitle">站点：</span>
       <el-select
+        clearable
         v-model="Site"
         filterable
         placeholder="请选择"
@@ -89,6 +91,8 @@
   data: function() {
     return {
       condition: "",
+      platCode: "",
+      userNo: "",
       HistoryTableData: [], //历史数据表格数据
       Page: 1, //分页默认显示页
       DataLength: 0, //分页上显示的数据总条数
@@ -136,7 +140,7 @@
         {
           platformName: "全部",
           platformCode: "",
-          dropSiteList: []
+          dropSiteList: ""
         }
       ], //平台的数据源
       Site: "", //平台
@@ -168,7 +172,8 @@
           st: this.TimeValue[0],
           et: this.TimeValue[1],
           pageNo: this.Page,
-          pageSize: this.Size
+          pageSize: this.Size,
+          userNo: this.userNo
         })
         .then(response => {
           this.loading = false;
@@ -232,6 +237,8 @@
     }
   },
   mounted: function() {
+    this.userNo = window.localStorage.getItem("USERNO");
+
     this.loadAllProject();
   }
 };
diff --git a/src/components/Engineering/Nowfault.vue b/src/components/Engineering/Nowfault.vue
index e2b4b89..bf4aba9 100644
--- a/src/components/Engineering/Nowfault.vue
+++ b/src/components/Engineering/Nowfault.vue
@@ -1,15 +1,46 @@
 <template>
   <div id="Nowfault">
     <div id="NFTopSearchBox">
-      <span class="SelectTitle">站点查询：</span>
-      <el-input
+      <span class="SelectTitle">请选择项目：</span>
+      <el-select
+        class="widthinput"
+        v-model="Project"
+        filterable
+        clearable
+        placeholder="请选择"
+        @change="loadProjectUser(Project)"
+      >
+        <el-option
+          v-for="item in ProjectOptions"
+          :key="item.index"
+          :label="item.platformName"
+          :value="item.platformCode"
+        ></el-option>
+      </el-select>
+      <span class="SelectTitle">请选择站点：</span>
+      <el-select
+        clearable
+        v-model="Site"
+        filterable
+        placeholder="请选择"
+        class="widthinput"
+      >
+        <el-option
+          v-for="item in SiteOptions"
+          :key="item.index"
+          :label="item.siteName"
+          :value="item.siteNo"
+        ></el-option>
+      </el-select>
+      <!-- <span class="SelectTitle">站点查询：</span> -->
+      <!-- <el-input
         v-model="condition"
         placeholder="请输入站点名称/编号"
-      ></el-input>
+      ></el-input> -->
       <el-button
         type="primary"
         icon="el-icon-search"
-        @click="loadDataGridData"
+        @click="searcher"
         v-has="'Search'"
         >搜索</el-button
       >
@@ -56,7 +87,26 @@
       Page: 1, //分页默认显示页
       DataLength: 0, //分页上显示的数据总条数
       Size: 10, //分页上显示的每页的条数
-      loading: false
+      loading: false,
+      Project: "", //平台
+      userNo: "",
+      platCode: "",
+      // searchnum: 1,
+      ProjectOptions: [
+        {
+          platformName: "全部",
+          platformCode: "",
+          dropSiteList: ""
+        }
+      ],
+      Site: "", //平台
+
+      SiteOptions: [
+        // {
+        //   siteName: "全部",
+        //   siteNo: ""
+        // }
+      ] //平台的数据源
     };
   },
   methods: {
@@ -70,13 +120,68 @@
       this.Page = val;
       this.loadDataGridData();
     },
+    // 获取平台的站点
+    loadProjectUser(CODE) {
+      this.platCode = CODE;
+      this.SiteOptions = [
+        {
+          siteName: "请先选择项目",
+          siteNo: ""
+        }
+      ];
+      this.Site = "";
+      for (var i = 0; i < this.ProjectOptions.length; i++) {
+        if (this.ProjectOptions[i].platformCode == CODE) {
+          this.SiteOptions = this.SiteOptions.concat(
+            this.ProjectOptions[i].dropSiteList
+          );
+          return;
+        }
+      }
+    },
+    // 获取所有平台
+    loadAllProject() {
+      this.$http
+        .get(this.nozzle.StationBaseControllerGetPlatFormSiteTree)
+        .then(response => {
+          if (response.data.data.length > 0) {
+            this.ProjectOptions = this.ProjectOptions.concat(
+              response.data.data
+            );
+            this.Project = this.ProjectOptions[0].platformCode;
+            this.loadProjectUser(this.ProjectOptions[0].dropSiteList);
+          } else {
+            this.$message({
+              showClose: true,
+              message: "无项目",
+              type: "warning"
+            });
+          }
+          // this.loadDataGridData();
+        })
+        .catch(response => {
+          this.$message({
+            showClose: true,
+            message: "请求平台失败",
+            type: "warning"
+          });
+        });
+    },
+    // 搜索的请求方法
+    searcher() {
+      this.Page = 1;
+      this.loadDataGridData();
+    },
+
     loadDataGridData() {
       this.loading = true;
       this.$http
         .post(this.nozzle.faultInfoGetTempInfo, {
-          condition: this.condition,
+          siteNo: this.Site,
           pageNo: this.Page,
-          pageSize: this.Size
+          pageSize: this.Size,
+          platCode: this.platCode,
+          userNo: this.userNo
         })
         .then(response => {
           this.loading = false;
@@ -94,6 +199,8 @@
     }
   },
   mounted: function() {
+    this.userNo = window.localStorage.getItem("USERNO");
+    this.loadAllProject();
     this.loadDataGridData();
   }
 };
diff --git a/src/components/common/PageTable/index.vue b/src/components/common/PageTable/index.vue
index 01ba393..c22b21d 100644
--- a/src/components/common/PageTable/index.vue
+++ b/src/components/common/PageTable/index.vue
@@ -342,7 +342,7 @@
             if (this.tableType === "tree") {
               arr = this.$fn.handleTree(arr);
             }
-            if (arr) {
+            if (arr.length) {
               arr.forEach(item => {
                 item.createTime = this.$fn.switchTime(
                   item.createTime,
diff --git a/src/components/site/previewOfSiteStatus.vue b/src/components/site/previewOfSiteStatus.vue
index 971875d..0d6deec 100644
--- a/src/components/site/previewOfSiteStatus.vue
+++ b/src/components/site/previewOfSiteStatus.vue
@@ -1004,7 +1004,7 @@
           ]) => {
             // create map with the given options at a DOM node w/ id 'mapNode'
             _this.map = new Map("previewOfSiteStatusMaps", {
-              center: [100, 35],
+              center: [114, 30],
               zoom: 5,
               logo: false,
               slider: false

diff --git a/config/index.js b/config/index.js
index 1bb3a4b..68765b2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -87,7 +87,7 @@
     },
 
     // Various Dev Server settings
-    host: "localhost"    , // can be overwritten by process.env.HOST
+    host: "192.168.30.113", // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,
diff --git a/package.json b/package.json
index c41fff4..a58d9d6 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "axios": "^0.19.2",
     "echarts": "^4.7.0",
     "element-ui": "^2.13.1",
+    "ol": "^6.4.3",
     "esri-loader": "^2.14.0",
     "html2canvas": "^1.0.0-rc.7",
     "js-file-download": "^0.4.12",
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 801c3b3..eb85612 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -135,6 +135,11 @@
                 ><el-input size="small" v-model="ruleForm.lat"></el-input
               ></el-form-item>
             </el-col>
+               <!-- 坐标拾取  -->
+                <el-col :span="5">
+           <el-button type="primary" @click="pickLngLat()">坐标拾取</el-button>
+            </el-col>
+              <!-- 坐标拾取  -->
           </el-form-item>
           <el-form-item label="站点安装位置" prop="address">
             <el-input
@@ -217,15 +222,11 @@
             size="medium"
           >
             <el-form-item label="">
-<<<<<<< HEAD
-              <el-input v-model="deviceRelatedQuery.searchStr" placeholder="请输入设备名称/厂家" clearable></el-input>
-=======
               <el-input
                 v-model="deviceRelatedQuery.searchStr"
                 placeholder="请输入设备编号/厂家"
                 clearable
               ></el-input>
->>>>>>> ad620ef3af4de08b199e1d1c6c52489a965e9a0a
             </el-form-item>
             <el-form-item>
               <el-button
@@ -298,14 +299,29 @@
         </div>
       </template>
     </page-dialog>
+    <el-dialog
+      title="坐标拾取"
+      :visible.sync="dialogFormVisible"
+      :append-to-body="true"
+      :before-close="handleDialogClose"
+      customClass="addDialog"
+     
+    >
+     <markMap ref="markMap" v-on:SendLngLat="SendLngLat" style="height: 600px;width:1050px;" />
+    </el-dialog>
   </div>
 </template>
 <script>
 import axios from "axios";
 import { mapGetters } from "vuex";
+import markMap from "./markMap.vue";
 export default {
+   components: {
+        markMap
+    },
   data() {
     return {
+      dialogFormVisible:false,
       //站点搜索相关
       siteFilterInfo: {
         query: {
@@ -520,8 +536,18 @@
         refresh: 1,
         initCurpage: 1,
         fieldList: [
-          { label: "设备名称", value: "equipDesc", minWidth: 100, tooltip: true },
-          { label: "设备厂家", value: "equipFactory", minWidth: 150, tooltip: true },
+          {
+            label: "设备名称",
+            value: "equipDesc",
+            minWidth: 100,
+            tooltip: true
+          },
+          {
+            label: "设备厂家",
+            value: "equipFactory",
+            minWidth: 150,
+            tooltip: true
+          }
         ]
       },
       //已关联设备表格相关
@@ -596,19 +622,40 @@
       }
     },
     "deviceRelatedQuery.searchStr"(val) {
-      Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
-      Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+      Object.assign(
+        this.isRelatedDeviceTableInfo.query,
+        this.deviceRelatedQuery
+      );
+      Object.assign(
+        this.unRelatedDeviceTableInfo.query,
+        this.deviceRelatedQuery
+      );
     },
     platformCode(val) {
-      console.log(777,val);
+      console.log(777, val);
       this.ruleForm.platformCode = val;
     }
   },
   methods: {
+      //响应地图组件的确定，拾取坐标
+    SendLngLat(lonlat) {
+      this.dialogFormVisible=false;
+      this.ruleForm.lon=lonlat[0]
+      this.ruleForm.lat=lonlat[1]
+
+    },
+    //坐标拾取地图控件打开
+    pickLngLat(){
+      this.dialogFormVisible=true
+    },
+    //监听面板直接叉叉掉事件
+    handleDialogClose() {
+       this.dialogFormVisible = false;
+    },
     //上传头像
     fileChange(file) {
       this.loading = true;
-      const isLt1M = file.size / 1024 / 1024 < 1;
+      const isLt1M = file.size / 1024 / 1024 < 5;
       if (file.raw.type != "image/jpeg" && file.raw.type != "image/png") {
         this.loading = false;
         this.$message.error("上传图片只能是JPG或PNG格式!");
@@ -616,7 +663,7 @@
       }
       if (!isLt1M) {
         this.loading = false;
-        this.$message.error("上传图片大小不能超过 1MB!");
+        this.$message.error("上传图片大小不能超过 5MB!");
         return;
       }
       var formdata = new FormData();
@@ -960,6 +1007,10 @@
 };
 </script>
 <style lang="scss" scoped>
+.addDialog {
+  width:1050px;
+  height: 650px;
+}
 .imgtype {
   width: 150px;
   height: 100px;
diff --git a/src/components/ConfigManager/markMap.vue b/src/components/ConfigManager/markMap.vue
new file mode 100644
index 0000000..ba8030e
--- /dev/null
+++ b/src/components/ConfigManager/markMap.vue
@@ -0,0 +1,162 @@
+<template>
+  <div id="rootMap">
+    <div id="map" ref="map">
+      <el-button type="primary" style=" position: absolute;
+    left: 869px;
+    bottom: 9px;
+    z-index: 99" @click="SendLngLat()">确定</el-button>
+    </div>
+  </div>
+</template>
+<script>
+
+import "ol/ol.css";
+
+import { Map, View, Feature, color } from "ol";
+import { DEVICE_PIXEL_RATIO } from "ol/has";
+import Circle from "ol/style/Circle";
+import * as layer from "ol/layer.js";
+import * as source from "ol/source.js";
+import * as geom from "ol/geom.js";
+import * as style from "ol/style.js";
+import Overlay from "ol/Overlay.js";
+import TileLayer from "ol/layer/Tile";
+
+import SourceVector from "ol/source/Vector";
+import LayerVector from "ol/layer/Vector";
+
+import Style from "ol/style/Style";
+import Fill from "ol/style/Fill";
+import Text from "ol/style/Text";
+
+import Stroke from "ol/style/Stroke";
+import Draw from "ol/interaction/Draw";
+import Icon from "ol/style/Icon";
+import Select from "ol/interaction/Select";
+import Modify from "ol/interaction/Modify";
+import FormatWKT from "ol/format/WKT";
+
+import ImageWMS from "ol/source/ImageWMS";
+import Image from "ol/layer/Image";
+import GeoJSON from "ol/format/GeoJSON";
+import LineString from "ol/geom/LineString";
+
+import { OSM, TileArcGISRest, XYZ } from "ol/source";
+import { defaults } from "ol/control";
+import ImageArcGISRest from "ol/source/ImageArcGISRest";
+import ImageLayer from "ol/layer/Image";
+import tagPng from "./../../../static/img/yjznewpng.png";
+import Point from "ol/geom/Point";
+export default {
+  data() {
+    return {
+      map: "",
+      currentLonLat:[]
+    };
+  },
+  mounted() {
+    this.initMap();
+  },
+
+  methods: {
+    //点击确定后关闭此地图面板，然后把经纬度传给父vue
+    SendLngLat(){
+    
+      //删除entity模型
+      this.$emit("SendLngLat", this.currentLonLat);
+    },
+    //初始化地图
+    initMap() {
+      this.map = new Map({
+        controls: defaults({
+          attribution: false,
+          zoom: false,
+          rotate: false
+        }),
+
+        target: this.$refs.map,
+        layers: [
+        new TileLayer({
+          source: new XYZ({
+            url:
+              "http://map.geoq.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}"
+            //"http://cache1.arcgisonline.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}"
+          })
+        })
+        ],
+        view: new View({
+          projection: "EPSG:4326", //使用这个坐标系
+          center: [114.217, 30.828], //武汉
+          zoom: 9
+        })
+      });
+
+            this.vectorSource = new SourceVector({
+     
+            });
+            this.vector = new LayerVector({
+
+                source: this.vectorSource
+
+            });
+            this.map.addLayer(this.vector);
+
+            //初始化一个点
+            this.initPoint(114.30,30.28)
+
+
+      //鼠标移动事件
+      this.map.on("pointermove", function(evt) {
+        if (evt.map.hasFeatureAtPixel(evt.pixel)) {
+          evt.map.getTargetElement().style.cursor = "pointer";
+        } else {
+          evt.map.getTargetElement().style.cursor = "";
+        }
+      });
+      //鼠标点击事件
+      this.map.on("click", (evt)=> {
+        this.currentLonLat=evt.coordinate
+       this.initPoint(evt.coordinate[0],evt.coordinate[1])
+      });
+    },
+    initPoint(lng, lat) {
+      if (lng && lat) {
+          //清除所有feature
+           if (this.vectorSource) {
+                  this.vectorSource.clear();
+                }
+        //添加feature图标
+       this.Marker = new Feature({
+        geometry: new Point([parseFloat(lng), parseFloat(lat)])
+      });
+
+      //设置style
+      this.Marker.setStyle(
+        new Style({
+              image: new Icon({
+                src: tagPng,
+              
+              })
+            })
+            )
+
+       this.vectorSource.addFeature(this.Marker)
+        //重置中心点
+      /*   this.map.getView().setCenter([parseFloat(lng), parseFloat(lat)]);
+        this.map.getView().setZoom(12); */
+      }
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+#rootMap {
+  width: 100%;
+  height: 100%;
+}
+#map {
+     width: 88%;
+    height: 99%;
+}
+
+</style>
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index d230b2e..0eb5a75 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -364,7 +364,7 @@
           width: "240",
           btList: [
             { label: "添加用户", size: "small", type: "text", event: "addUser", show: true },
-            { label: "查看用户", size: "small", type: "text", event: "detail", show: true },
+            { label: "关联用户", size: "small", type: "text", event: "detail", show: true },
             { label: "删除用户组", size: "small", type: "text", event: "delGroup", show: true }
           ]
         }
diff --git a/src/components/Engineering/HistoricalFault.vue b/src/components/Engineering/HistoricalFault.vue
index 91c52d6..3312a76 100644
--- a/src/components/Engineering/HistoricalFault.vue
+++ b/src/components/Engineering/HistoricalFault.vue
@@ -3,6 +3,7 @@
     <div id="HFTopSearchBox">
       <span class="SelectTitle">平台：</span>
       <el-select
+        clearable
         class="widthinput"
         v-model="Project"
         filterable
@@ -18,6 +19,7 @@
       </el-select>
       <span class="SelectTitle">站点：</span>
       <el-select
+        clearable
         v-model="Site"
         filterable
         placeholder="请选择"
@@ -89,6 +91,8 @@
   data: function() {
     return {
       condition: "",
+      platCode: "",
+      userNo: "",
       HistoryTableData: [], //历史数据表格数据
       Page: 1, //分页默认显示页
       DataLength: 0, //分页上显示的数据总条数
@@ -136,7 +140,7 @@
         {
           platformName: "全部",
           platformCode: "",
-          dropSiteList: []
+          dropSiteList: ""
         }
       ], //平台的数据源
       Site: "", //平台
@@ -168,7 +172,8 @@
           st: this.TimeValue[0],
           et: this.TimeValue[1],
           pageNo: this.Page,
-          pageSize: this.Size
+          pageSize: this.Size,
+          userNo: this.userNo
         })
         .then(response => {
           this.loading = false;
@@ -232,6 +237,8 @@
     }
   },
   mounted: function() {
+    this.userNo = window.localStorage.getItem("USERNO");
+
     this.loadAllProject();
   }
 };
diff --git a/src/components/Engineering/Nowfault.vue b/src/components/Engineering/Nowfault.vue
index e2b4b89..bf4aba9 100644
--- a/src/components/Engineering/Nowfault.vue
+++ b/src/components/Engineering/Nowfault.vue
@@ -1,15 +1,46 @@
 <template>
   <div id="Nowfault">
     <div id="NFTopSearchBox">
-      <span class="SelectTitle">站点查询：</span>
-      <el-input
+      <span class="SelectTitle">请选择项目：</span>
+      <el-select
+        class="widthinput"
+        v-model="Project"
+        filterable
+        clearable
+        placeholder="请选择"
+        @change="loadProjectUser(Project)"
+      >
+        <el-option
+          v-for="item in ProjectOptions"
+          :key="item.index"
+          :label="item.platformName"
+          :value="item.platformCode"
+        ></el-option>
+      </el-select>
+      <span class="SelectTitle">请选择站点：</span>
+      <el-select
+        clearable
+        v-model="Site"
+        filterable
+        placeholder="请选择"
+        class="widthinput"
+      >
+        <el-option
+          v-for="item in SiteOptions"
+          :key="item.index"
+          :label="item.siteName"
+          :value="item.siteNo"
+        ></el-option>
+      </el-select>
+      <!-- <span class="SelectTitle">站点查询：</span> -->
+      <!-- <el-input
         v-model="condition"
         placeholder="请输入站点名称/编号"
-      ></el-input>
+      ></el-input> -->
       <el-button
         type="primary"
         icon="el-icon-search"
-        @click="loadDataGridData"
+        @click="searcher"
         v-has="'Search'"
         >搜索</el-button
       >
@@ -56,7 +87,26 @@
       Page: 1, //分页默认显示页
       DataLength: 0, //分页上显示的数据总条数
       Size: 10, //分页上显示的每页的条数
-      loading: false
+      loading: false,
+      Project: "", //平台
+      userNo: "",
+      platCode: "",
+      // searchnum: 1,
+      ProjectOptions: [
+        {
+          platformName: "全部",
+          platformCode: "",
+          dropSiteList: ""
+        }
+      ],
+      Site: "", //平台
+
+      SiteOptions: [
+        // {
+        //   siteName: "全部",
+        //   siteNo: ""
+        // }
+      ] //平台的数据源
     };
   },
   methods: {
@@ -70,13 +120,68 @@
       this.Page = val;
       this.loadDataGridData();
     },
+    // 获取平台的站点
+    loadProjectUser(CODE) {
+      this.platCode = CODE;
+      this.SiteOptions = [
+        {
+          siteName: "请先选择项目",
+          siteNo: ""
+        }
+      ];
+      this.Site = "";
+      for (var i = 0; i < this.ProjectOptions.length; i++) {
+        if (this.ProjectOptions[i].platformCode == CODE) {
+          this.SiteOptions = this.SiteOptions.concat(
+            this.ProjectOptions[i].dropSiteList
+          );
+          return;
+        }
+      }
+    },
+    // 获取所有平台
+    loadAllProject() {
+      this.$http
+        .get(this.nozzle.StationBaseControllerGetPlatFormSiteTree)
+        .then(response => {
+          if (response.data.data.length > 0) {
+            this.ProjectOptions = this.ProjectOptions.concat(
+              response.data.data
+            );
+            this.Project = this.ProjectOptions[0].platformCode;
+            this.loadProjectUser(this.ProjectOptions[0].dropSiteList);
+          } else {
+            this.$message({
+              showClose: true,
+              message: "无项目",
+              type: "warning"
+            });
+          }
+          // this.loadDataGridData();
+        })
+        .catch(response => {
+          this.$message({
+            showClose: true,
+            message: "请求平台失败",
+            type: "warning"
+          });
+        });
+    },
+    // 搜索的请求方法
+    searcher() {
+      this.Page = 1;
+      this.loadDataGridData();
+    },
+
     loadDataGridData() {
       this.loading = true;
       this.$http
         .post(this.nozzle.faultInfoGetTempInfo, {
-          condition: this.condition,
+          siteNo: this.Site,
           pageNo: this.Page,
-          pageSize: this.Size
+          pageSize: this.Size,
+          platCode: this.platCode,
+          userNo: this.userNo
         })
         .then(response => {
           this.loading = false;
@@ -94,6 +199,8 @@
     }
   },
   mounted: function() {
+    this.userNo = window.localStorage.getItem("USERNO");
+    this.loadAllProject();
     this.loadDataGridData();
   }
 };
diff --git a/src/components/common/PageTable/index.vue b/src/components/common/PageTable/index.vue
index 01ba393..c22b21d 100644
--- a/src/components/common/PageTable/index.vue
+++ b/src/components/common/PageTable/index.vue
@@ -342,7 +342,7 @@
             if (this.tableType === "tree") {
               arr = this.$fn.handleTree(arr);
             }
-            if (arr) {
+            if (arr.length) {
               arr.forEach(item => {
                 item.createTime = this.$fn.switchTime(
                   item.createTime,
diff --git a/src/components/site/previewOfSiteStatus.vue b/src/components/site/previewOfSiteStatus.vue
index 971875d..0d6deec 100644
--- a/src/components/site/previewOfSiteStatus.vue
+++ b/src/components/site/previewOfSiteStatus.vue
@@ -1004,7 +1004,7 @@
           ]) => {
             // create map with the given options at a DOM node w/ id 'mapNode'
             _this.map = new Map("previewOfSiteStatusMaps", {
-              center: [100, 35],
+              center: [114, 30],
               zoom: 5,
               logo: false,
               slider: false
diff --git a/src/components/sys/user.vue b/src/components/sys/user.vue
index b3ceab2..291c8e4 100644
--- a/src/components/sys/user.vue
+++ b/src/components/sys/user.vue
@@ -42,29 +42,29 @@
         </el-table-column>
         <el-table-column label="操作" width="240px">
           <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="small"
-              @click="handleClick('update', scope.row)"
-              v-has="'m9-1-2'"
-              >修改用户</el-button
-            >
             <template v-if="scope.row.userType !== 1">
               <el-button
                 type="text"
                 size="small"
+                @click="handleClick('update', scope.row)"
+                v-has="'m9-1-2'"
+                >修改用户</el-button
+              >
+              <el-button
+                type="text"
+                size="small"
                 @click="handleClick('delete', scope.row)"
                 v-has="'m9-1-3'"
                 >删除用户</el-button
               >
+              <el-button
+                type="text"
+                size="small"
+                @click="handleClick('reset', scope.row)"
+                v-has="'m9-1-4'"
+                >重置密码</el-button
+              >
             </template>
-            <el-button
-              type="text"
-              size="small"
-              @click="handleClick('reset', scope.row)"
-              v-has="'m9-1-4'"
-              >重置密码</el-button
-            >
           </template>
         </el-table-column>
       </el-table>

diff --git a/config/index.js b/config/index.js
index 1bb3a4b..68765b2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -87,7 +87,7 @@
     },
 
     // Various Dev Server settings
-    host: "localhost"    , // can be overwritten by process.env.HOST
+    host: "192.168.30.113", // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,
diff --git a/package.json b/package.json
index c41fff4..a58d9d6 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "axios": "^0.19.2",
     "echarts": "^4.7.0",
     "element-ui": "^2.13.1",
+    "ol": "^6.4.3",
     "esri-loader": "^2.14.0",
     "html2canvas": "^1.0.0-rc.7",
     "js-file-download": "^0.4.12",
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 801c3b3..eb85612 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -135,6 +135,11 @@
                 ><el-input size="small" v-model="ruleForm.lat"></el-input
               ></el-form-item>
             </el-col>
+               <!-- 坐标拾取  -->
+                <el-col :span="5">
+           <el-button type="primary" @click="pickLngLat()">坐标拾取</el-button>
+            </el-col>
+              <!-- 坐标拾取  -->
           </el-form-item>
           <el-form-item label="站点安装位置" prop="address">
             <el-input
@@ -217,15 +222,11 @@
             size="medium"
           >
             <el-form-item label="">
-<<<<<<< HEAD
-              <el-input v-model="deviceRelatedQuery.searchStr" placeholder="请输入设备名称/厂家" clearable></el-input>
-=======
               <el-input
                 v-model="deviceRelatedQuery.searchStr"
                 placeholder="请输入设备编号/厂家"
                 clearable
               ></el-input>
->>>>>>> ad620ef3af4de08b199e1d1c6c52489a965e9a0a
             </el-form-item>
             <el-form-item>
               <el-button
@@ -298,14 +299,29 @@
         </div>
       </template>
     </page-dialog>
+    <el-dialog
+      title="坐标拾取"
+      :visible.sync="dialogFormVisible"
+      :append-to-body="true"
+      :before-close="handleDialogClose"
+      customClass="addDialog"
+     
+    >
+     <markMap ref="markMap" v-on:SendLngLat="SendLngLat" style="height: 600px;width:1050px;" />
+    </el-dialog>
   </div>
 </template>
 <script>
 import axios from "axios";
 import { mapGetters } from "vuex";
+import markMap from "./markMap.vue";
 export default {
+   components: {
+        markMap
+    },
   data() {
     return {
+      dialogFormVisible:false,
       //站点搜索相关
       siteFilterInfo: {
         query: {
@@ -520,8 +536,18 @@
         refresh: 1,
         initCurpage: 1,
         fieldList: [
-          { label: "设备名称", value: "equipDesc", minWidth: 100, tooltip: true },
-          { label: "设备厂家", value: "equipFactory", minWidth: 150, tooltip: true },
+          {
+            label: "设备名称",
+            value: "equipDesc",
+            minWidth: 100,
+            tooltip: true
+          },
+          {
+            label: "设备厂家",
+            value: "equipFactory",
+            minWidth: 150,
+            tooltip: true
+          }
         ]
       },
       //已关联设备表格相关
@@ -596,19 +622,40 @@
       }
     },
     "deviceRelatedQuery.searchStr"(val) {
-      Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
-      Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+      Object.assign(
+        this.isRelatedDeviceTableInfo.query,
+        this.deviceRelatedQuery
+      );
+      Object.assign(
+        this.unRelatedDeviceTableInfo.query,
+        this.deviceRelatedQuery
+      );
     },
     platformCode(val) {
-      console.log(777,val);
+      console.log(777, val);
       this.ruleForm.platformCode = val;
     }
   },
   methods: {
+      //响应地图组件的确定，拾取坐标
+    SendLngLat(lonlat) {
+      this.dialogFormVisible=false;
+      this.ruleForm.lon=lonlat[0]
+      this.ruleForm.lat=lonlat[1]
+
+    },
+    //坐标拾取地图控件打开
+    pickLngLat(){
+      this.dialogFormVisible=true
+    },
+    //监听面板直接叉叉掉事件
+    handleDialogClose() {
+       this.dialogFormVisible = false;
+    },
     //上传头像
     fileChange(file) {
       this.loading = true;
-      const isLt1M = file.size / 1024 / 1024 < 1;
+      const isLt1M = file.size / 1024 / 1024 < 5;
       if (file.raw.type != "image/jpeg" && file.raw.type != "image/png") {
         this.loading = false;
         this.$message.error("上传图片只能是JPG或PNG格式!");
@@ -616,7 +663,7 @@
       }
       if (!isLt1M) {
         this.loading = false;
-        this.$message.error("上传图片大小不能超过 1MB!");
+        this.$message.error("上传图片大小不能超过 5MB!");
         return;
       }
       var formdata = new FormData();
@@ -960,6 +1007,10 @@
 };
 </script>
 <style lang="scss" scoped>
+.addDialog {
+  width:1050px;
+  height: 650px;
+}
 .imgtype {
   width: 150px;
   height: 100px;
diff --git a/src/components/ConfigManager/markMap.vue b/src/components/ConfigManager/markMap.vue
new file mode 100644
index 0000000..ba8030e
--- /dev/null
+++ b/src/components/ConfigManager/markMap.vue
@@ -0,0 +1,162 @@
+<template>
+  <div id="rootMap">
+    <div id="map" ref="map">
+      <el-button type="primary" style=" position: absolute;
+    left: 869px;
+    bottom: 9px;
+    z-index: 99" @click="SendLngLat()">确定</el-button>
+    </div>
+  </div>
+</template>
+<script>
+
+import "ol/ol.css";
+
+import { Map, View, Feature, color } from "ol";
+import { DEVICE_PIXEL_RATIO } from "ol/has";
+import Circle from "ol/style/Circle";
+import * as layer from "ol/layer.js";
+import * as source from "ol/source.js";
+import * as geom from "ol/geom.js";
+import * as style from "ol/style.js";
+import Overlay from "ol/Overlay.js";
+import TileLayer from "ol/layer/Tile";
+
+import SourceVector from "ol/source/Vector";
+import LayerVector from "ol/layer/Vector";
+
+import Style from "ol/style/Style";
+import Fill from "ol/style/Fill";
+import Text from "ol/style/Text";
+
+import Stroke from "ol/style/Stroke";
+import Draw from "ol/interaction/Draw";
+import Icon from "ol/style/Icon";
+import Select from "ol/interaction/Select";
+import Modify from "ol/interaction/Modify";
+import FormatWKT from "ol/format/WKT";
+
+import ImageWMS from "ol/source/ImageWMS";
+import Image from "ol/layer/Image";
+import GeoJSON from "ol/format/GeoJSON";
+import LineString from "ol/geom/LineString";
+
+import { OSM, TileArcGISRest, XYZ } from "ol/source";
+import { defaults } from "ol/control";
+import ImageArcGISRest from "ol/source/ImageArcGISRest";
+import ImageLayer from "ol/layer/Image";
+import tagPng from "./../../../static/img/yjznewpng.png";
+import Point from "ol/geom/Point";
+export default {
+  data() {
+    return {
+      map: "",
+      currentLonLat:[]
+    };
+  },
+  mounted() {
+    this.initMap();
+  },
+
+  methods: {
+    //点击确定后关闭此地图面板，然后把经纬度传给父vue
+    SendLngLat(){
+    
+      //删除entity模型
+      this.$emit("SendLngLat", this.currentLonLat);
+    },
+    //初始化地图
+    initMap() {
+      this.map = new Map({
+        controls: defaults({
+          attribution: false,
+          zoom: false,
+          rotate: false
+        }),
+
+        target: this.$refs.map,
+        layers: [
+        new TileLayer({
+          source: new XYZ({
+            url:
+              "http://map.geoq.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}"
+            //"http://cache1.arcgisonline.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}"
+          })
+        })
+        ],
+        view: new View({
+          projection: "EPSG:4326", //使用这个坐标系
+          center: [114.217, 30.828], //武汉
+          zoom: 9
+        })
+      });
+
+            this.vectorSource = new SourceVector({
+     
+            });
+            this.vector = new LayerVector({
+
+                source: this.vectorSource
+
+            });
+            this.map.addLayer(this.vector);
+
+            //初始化一个点
+            this.initPoint(114.30,30.28)
+
+
+      //鼠标移动事件
+      this.map.on("pointermove", function(evt) {
+        if (evt.map.hasFeatureAtPixel(evt.pixel)) {
+          evt.map.getTargetElement().style.cursor = "pointer";
+        } else {
+          evt.map.getTargetElement().style.cursor = "";
+        }
+      });
+      //鼠标点击事件
+      this.map.on("click", (evt)=> {
+        this.currentLonLat=evt.coordinate
+       this.initPoint(evt.coordinate[0],evt.coordinate[1])
+      });
+    },
+    initPoint(lng, lat) {
+      if (lng && lat) {
+          //清除所有feature
+           if (this.vectorSource) {
+                  this.vectorSource.clear();
+                }
+        //添加feature图标
+       this.Marker = new Feature({
+        geometry: new Point([parseFloat(lng), parseFloat(lat)])
+      });
+
+      //设置style
+      this.Marker.setStyle(
+        new Style({
+              image: new Icon({
+                src: tagPng,
+              
+              })
+            })
+            )
+
+       this.vectorSource.addFeature(this.Marker)
+        //重置中心点
+      /*   this.map.getView().setCenter([parseFloat(lng), parseFloat(lat)]);
+        this.map.getView().setZoom(12); */
+      }
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+#rootMap {
+  width: 100%;
+  height: 100%;
+}
+#map {
+     width: 88%;
+    height: 99%;
+}
+
+</style>
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index d230b2e..0eb5a75 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -364,7 +364,7 @@
           width: "240",
           btList: [
             { label: "添加用户", size: "small", type: "text", event: "addUser", show: true },
-            { label: "查看用户", size: "small", type: "text", event: "detail", show: true },
+            { label: "关联用户", size: "small", type: "text", event: "detail", show: true },
             { label: "删除用户组", size: "small", type: "text", event: "delGroup", show: true }
           ]
         }
diff --git a/src/components/Engineering/HistoricalFault.vue b/src/components/Engineering/HistoricalFault.vue
index 91c52d6..3312a76 100644
--- a/src/components/Engineering/HistoricalFault.vue
+++ b/src/components/Engineering/HistoricalFault.vue
@@ -3,6 +3,7 @@
     <div id="HFTopSearchBox">
       <span class="SelectTitle">平台：</span>
       <el-select
+        clearable
         class="widthinput"
         v-model="Project"
         filterable
@@ -18,6 +19,7 @@
       </el-select>
       <span class="SelectTitle">站点：</span>
       <el-select
+        clearable
         v-model="Site"
         filterable
         placeholder="请选择"
@@ -89,6 +91,8 @@
   data: function() {
     return {
       condition: "",
+      platCode: "",
+      userNo: "",
       HistoryTableData: [], //历史数据表格数据
       Page: 1, //分页默认显示页
       DataLength: 0, //分页上显示的数据总条数
@@ -136,7 +140,7 @@
         {
           platformName: "全部",
           platformCode: "",
-          dropSiteList: []
+          dropSiteList: ""
         }
       ], //平台的数据源
       Site: "", //平台
@@ -168,7 +172,8 @@
           st: this.TimeValue[0],
           et: this.TimeValue[1],
           pageNo: this.Page,
-          pageSize: this.Size
+          pageSize: this.Size,
+          userNo: this.userNo
         })
         .then(response => {
           this.loading = false;
@@ -232,6 +237,8 @@
     }
   },
   mounted: function() {
+    this.userNo = window.localStorage.getItem("USERNO");
+
     this.loadAllProject();
   }
 };
diff --git a/src/components/Engineering/Nowfault.vue b/src/components/Engineering/Nowfault.vue
index e2b4b89..bf4aba9 100644
--- a/src/components/Engineering/Nowfault.vue
+++ b/src/components/Engineering/Nowfault.vue
@@ -1,15 +1,46 @@
 <template>
   <div id="Nowfault">
     <div id="NFTopSearchBox">
-      <span class="SelectTitle">站点查询：</span>
-      <el-input
+      <span class="SelectTitle">请选择项目：</span>
+      <el-select
+        class="widthinput"
+        v-model="Project"
+        filterable
+        clearable
+        placeholder="请选择"
+        @change="loadProjectUser(Project)"
+      >
+        <el-option
+          v-for="item in ProjectOptions"
+          :key="item.index"
+          :label="item.platformName"
+          :value="item.platformCode"
+        ></el-option>
+      </el-select>
+      <span class="SelectTitle">请选择站点：</span>
+      <el-select
+        clearable
+        v-model="Site"
+        filterable
+        placeholder="请选择"
+        class="widthinput"
+      >
+        <el-option
+          v-for="item in SiteOptions"
+          :key="item.index"
+          :label="item.siteName"
+          :value="item.siteNo"
+        ></el-option>
+      </el-select>
+      <!-- <span class="SelectTitle">站点查询：</span> -->
+      <!-- <el-input
         v-model="condition"
         placeholder="请输入站点名称/编号"
-      ></el-input>
+      ></el-input> -->
       <el-button
         type="primary"
         icon="el-icon-search"
-        @click="loadDataGridData"
+        @click="searcher"
         v-has="'Search'"
         >搜索</el-button
       >
@@ -56,7 +87,26 @@
       Page: 1, //分页默认显示页
       DataLength: 0, //分页上显示的数据总条数
       Size: 10, //分页上显示的每页的条数
-      loading: false
+      loading: false,
+      Project: "", //平台
+      userNo: "",
+      platCode: "",
+      // searchnum: 1,
+      ProjectOptions: [
+        {
+          platformName: "全部",
+          platformCode: "",
+          dropSiteList: ""
+        }
+      ],
+      Site: "", //平台
+
+      SiteOptions: [
+        // {
+        //   siteName: "全部",
+        //   siteNo: ""
+        // }
+      ] //平台的数据源
     };
   },
   methods: {
@@ -70,13 +120,68 @@
       this.Page = val;
       this.loadDataGridData();
     },
+    // 获取平台的站点
+    loadProjectUser(CODE) {
+      this.platCode = CODE;
+      this.SiteOptions = [
+        {
+          siteName: "请先选择项目",
+          siteNo: ""
+        }
+      ];
+      this.Site = "";
+      for (var i = 0; i < this.ProjectOptions.length; i++) {
+        if (this.ProjectOptions[i].platformCode == CODE) {
+          this.SiteOptions = this.SiteOptions.concat(
+            this.ProjectOptions[i].dropSiteList
+          );
+          return;
+        }
+      }
+    },
+    // 获取所有平台
+    loadAllProject() {
+      this.$http
+        .get(this.nozzle.StationBaseControllerGetPlatFormSiteTree)
+        .then(response => {
+          if (response.data.data.length > 0) {
+            this.ProjectOptions = this.ProjectOptions.concat(
+              response.data.data
+            );
+            this.Project = this.ProjectOptions[0].platformCode;
+            this.loadProjectUser(this.ProjectOptions[0].dropSiteList);
+          } else {
+            this.$message({
+              showClose: true,
+              message: "无项目",
+              type: "warning"
+            });
+          }
+          // this.loadDataGridData();
+        })
+        .catch(response => {
+          this.$message({
+            showClose: true,
+            message: "请求平台失败",
+            type: "warning"
+          });
+        });
+    },
+    // 搜索的请求方法
+    searcher() {
+      this.Page = 1;
+      this.loadDataGridData();
+    },
+
     loadDataGridData() {
       this.loading = true;
       this.$http
         .post(this.nozzle.faultInfoGetTempInfo, {
-          condition: this.condition,
+          siteNo: this.Site,
           pageNo: this.Page,
-          pageSize: this.Size
+          pageSize: this.Size,
+          platCode: this.platCode,
+          userNo: this.userNo
         })
         .then(response => {
           this.loading = false;
@@ -94,6 +199,8 @@
     }
   },
   mounted: function() {
+    this.userNo = window.localStorage.getItem("USERNO");
+    this.loadAllProject();
     this.loadDataGridData();
   }
 };
diff --git a/src/components/common/PageTable/index.vue b/src/components/common/PageTable/index.vue
index 01ba393..c22b21d 100644
--- a/src/components/common/PageTable/index.vue
+++ b/src/components/common/PageTable/index.vue
@@ -342,7 +342,7 @@
             if (this.tableType === "tree") {
               arr = this.$fn.handleTree(arr);
             }
-            if (arr) {
+            if (arr.length) {
               arr.forEach(item => {
                 item.createTime = this.$fn.switchTime(
                   item.createTime,
diff --git a/src/components/site/previewOfSiteStatus.vue b/src/components/site/previewOfSiteStatus.vue
index 971875d..0d6deec 100644
--- a/src/components/site/previewOfSiteStatus.vue
+++ b/src/components/site/previewOfSiteStatus.vue
@@ -1004,7 +1004,7 @@
           ]) => {
             // create map with the given options at a DOM node w/ id 'mapNode'
             _this.map = new Map("previewOfSiteStatusMaps", {
-              center: [100, 35],
+              center: [114, 30],
               zoom: 5,
               logo: false,
               slider: false
diff --git a/src/components/sys/user.vue b/src/components/sys/user.vue
index b3ceab2..291c8e4 100644
--- a/src/components/sys/user.vue
+++ b/src/components/sys/user.vue
@@ -42,29 +42,29 @@
         </el-table-column>
         <el-table-column label="操作" width="240px">
           <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="small"
-              @click="handleClick('update', scope.row)"
-              v-has="'m9-1-2'"
-              >修改用户</el-button
-            >
             <template v-if="scope.row.userType !== 1">
               <el-button
                 type="text"
                 size="small"
+                @click="handleClick('update', scope.row)"
+                v-has="'m9-1-2'"
+                >修改用户</el-button
+              >
+              <el-button
+                type="text"
+                size="small"
                 @click="handleClick('delete', scope.row)"
                 v-has="'m9-1-3'"
                 >删除用户</el-button
               >
+              <el-button
+                type="text"
+                size="small"
+                @click="handleClick('reset', scope.row)"
+                v-has="'m9-1-4'"
+                >重置密码</el-button
+              >
             </template>
-            <el-button
-              type="text"
-              size="small"
-              @click="handleClick('reset', scope.row)"
-              v-has="'m9-1-4'"
-              >重置密码</el-button
-            >
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/util/CHGTwo.js b/src/util/CHGTwo.js
index 8d43b46..328ca74 100644
--- a/src/util/CHGTwo.js
+++ b/src/util/CHGTwo.js
@@ -9,22 +9,22 @@
   StationBaseControllerQueryPlatform: "/StationBaseController/queryPlatform", //获取所有平台
   StationBaseControllerGetUsers: "/StationBaseController/getUsers", //查询平台关联的权限用户
   alarmLogGetAlarmLogInfo: "/alarmLog/getAlarmLogInfo", //告警推送日志查询
-  alarmLogStatistical: "/alarmLog/statistical", //告警统计
+  alarmLogStatistical: "/alarmLog/statistical" //告警统计
 
-  syslogGetLogList: "/syslog/getLogList", //工业物联网云平台-查询日志
-  engineeringWorkOpenPump: "/engineeringWork/openPump", //工业物联网云平台-开水泵
-  engineeringWorkClosePump: "/engineeringWork/closePump", //工业物联网云平台-关水泵
-  engineeringWorkopenMachine: "/engineeringWork/openMachine  ", //工业物联网云平台-开设备
-  engineeringWorkcloseMachine: "/engineeringWork/closeMachine ", //工业物联网云平台- 关设备
-  engineeringWorkopenValve: "/engineeringWork/openValve", //工业物联网云平台-开阀门
-  engineeringWorkcloseValve: "/engineeringWork/closeValve", //工业物联网云平台-关阀门
+  // syslogGetLogList: "/syslog/getLogList", //工业物联网云平台-查询日志
+  // engineeringWorkOpenPump: "/engineeringWork/openPump", //工业物联网云平台-开水泵
+  // engineeringWorkClosePump: "/engineeringWork/closePump", //工业物联网云平台-关水泵
+  // engineeringWorkopenMachine: "/engineeringWork/openMachine  ", //工业物联网云平台-开设备
+  // engineeringWorkcloseMachine: "/engineeringWork/closeMachine ", //工业物联网云平台- 关设备
+  // engineeringWorkopenValve: "/engineeringWork/openValve", //工业物联网云平台-开阀门
+  // engineeringWorkcloseValve: "/engineeringWork/closeValve", //工业物联网云平台-关阀门
 
-  faultInfoGetTempInfo: "/faultInfo/getTempInfo", //工程作业-查询实时故障数据
-  faultInfoGetHisInfo: "/faultInfo/getHisInfo", //工程作业-查询历史故障数据
-  StationBaseControllerGetPlatFormSiteTree:
-    "/StationBaseController/getPlatFormSiteTree", //工程作业-平台站点二级树
-  taskInfoGetTempInfo: "/taskInfo/getTempInfo", //工程作业-实时作业
-  taskInfoGetHisInfo: "/taskInfo/getHisInfo", //工程作业-历史作业
+  // faultInfoGetTempInfo: "/faultInfo/getTempInfo", //工程作业-查询实时故障数据
+  // faultInfoGetHisInfo: "/faultInfo/getHisInfo", //工程作业-查询历史故障数据
+  // StationBaseControllerGetPlatFormSiteTree:
+  //   "/StationBaseController/getPlatFormSiteTree", //工程作业-平台站点二级树
+  // taskInfoGetTempInfo: "/taskInfo/getTempInfo", //工程作业-实时作业
+  // taskInfoGetHisInfo: "/taskInfo/getHisInfo", //工程作业-历史作业
 
   // 'sysLogin':'/sysLogin',//登录
   // 'menuGetCurrentUserMenu':'/menu/getCurrentUserMenu',//获取菜单以及按钮权限
@@ -34,9 +34,9 @@
   // 'updateSysuser':'/updateSysuser', //修改用户信息
   // 'addSysuser':'/addSysuser', //新增用户信息
 
-  userGroupList: "/usergroup/list", //获取用户组列表信息
+  // userGroupList: "/usergroup/list", //获取用户组列表信息
 
-  userGroupList: "/usergroup/list" //获取用户组列表信息
+  // userGroupList: "/usergroup/list" //获取用户组列表信息
 };
 
 for (let item in nozzle) {

diff --git a/config/index.js b/config/index.js
index 1bb3a4b..68765b2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -87,7 +87,7 @@
     },
 
     // Various Dev Server settings
-    host: "localhost"    , // can be overwritten by process.env.HOST
+    host: "192.168.30.113", // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,
diff --git a/package.json b/package.json
index c41fff4..a58d9d6 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "axios": "^0.19.2",
     "echarts": "^4.7.0",
     "element-ui": "^2.13.1",
+    "ol": "^6.4.3",
     "esri-loader": "^2.14.0",
     "html2canvas": "^1.0.0-rc.7",
     "js-file-download": "^0.4.12",
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 801c3b3..eb85612 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -135,6 +135,11 @@
                 ><el-input size="small" v-model="ruleForm.lat"></el-input
               ></el-form-item>
             </el-col>
+               <!-- 坐标拾取  -->
+                <el-col :span="5">
+           <el-button type="primary" @click="pickLngLat()">坐标拾取</el-button>
+            </el-col>
+              <!-- 坐标拾取  -->
           </el-form-item>
           <el-form-item label="站点安装位置" prop="address">
             <el-input
@@ -217,15 +222,11 @@
             size="medium"
           >
             <el-form-item label="">
-<<<<<<< HEAD
-              <el-input v-model="deviceRelatedQuery.searchStr" placeholder="请输入设备名称/厂家" clearable></el-input>
-=======
               <el-input
                 v-model="deviceRelatedQuery.searchStr"
                 placeholder="请输入设备编号/厂家"
                 clearable
               ></el-input>
->>>>>>> ad620ef3af4de08b199e1d1c6c52489a965e9a0a
             </el-form-item>
             <el-form-item>
               <el-button
@@ -298,14 +299,29 @@
         </div>
       </template>
     </page-dialog>
+    <el-dialog
+      title="坐标拾取"
+      :visible.sync="dialogFormVisible"
+      :append-to-body="true"
+      :before-close="handleDialogClose"
+      customClass="addDialog"
+     
+    >
+     <markMap ref="markMap" v-on:SendLngLat="SendLngLat" style="height: 600px;width:1050px;" />
+    </el-dialog>
   </div>
 </template>
 <script>
 import axios from "axios";
 import { mapGetters } from "vuex";
+import markMap from "./markMap.vue";
 export default {
+   components: {
+        markMap
+    },
   data() {
     return {
+      dialogFormVisible:false,
       //站点搜索相关
       siteFilterInfo: {
         query: {
@@ -520,8 +536,18 @@
         refresh: 1,
         initCurpage: 1,
         fieldList: [
-          { label: "设备名称", value: "equipDesc", minWidth: 100, tooltip: true },
-          { label: "设备厂家", value: "equipFactory", minWidth: 150, tooltip: true },
+          {
+            label: "设备名称",
+            value: "equipDesc",
+            minWidth: 100,
+            tooltip: true
+          },
+          {
+            label: "设备厂家",
+            value: "equipFactory",
+            minWidth: 150,
+            tooltip: true
+          }
         ]
       },
       //已关联设备表格相关
@@ -596,19 +622,40 @@
       }
     },
     "deviceRelatedQuery.searchStr"(val) {
-      Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
-      Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+      Object.assign(
+        this.isRelatedDeviceTableInfo.query,
+        this.deviceRelatedQuery
+      );
+      Object.assign(
+        this.unRelatedDeviceTableInfo.query,
+        this.deviceRelatedQuery
+      );
     },
     platformCode(val) {
-      console.log(777,val);
+      console.log(777, val);
       this.ruleForm.platformCode = val;
     }
   },
   methods: {
+      //响应地图组件的确定，拾取坐标
+    SendLngLat(lonlat) {
+      this.dialogFormVisible=false;
+      this.ruleForm.lon=lonlat[0]
+      this.ruleForm.lat=lonlat[1]
+
+    },
+    //坐标拾取地图控件打开
+    pickLngLat(){
+      this.dialogFormVisible=true
+    },
+    //监听面板直接叉叉掉事件
+    handleDialogClose() {
+       this.dialogFormVisible = false;
+    },
     //上传头像
     fileChange(file) {
       this.loading = true;
-      const isLt1M = file.size / 1024 / 1024 < 1;
+      const isLt1M = file.size / 1024 / 1024 < 5;
       if (file.raw.type != "image/jpeg" && file.raw.type != "image/png") {
         this.loading = false;
         this.$message.error("上传图片只能是JPG或PNG格式!");
@@ -616,7 +663,7 @@
       }
       if (!isLt1M) {
         this.loading = false;
-        this.$message.error("上传图片大小不能超过 1MB!");
+        this.$message.error("上传图片大小不能超过 5MB!");
         return;
       }
       var formdata = new FormData();
@@ -960,6 +1007,10 @@
 };
 </script>
 <style lang="scss" scoped>
+.addDialog {
+  width:1050px;
+  height: 650px;
+}
 .imgtype {
   width: 150px;
   height: 100px;
diff --git a/src/components/ConfigManager/markMap.vue b/src/components/ConfigManager/markMap.vue
new file mode 100644
index 0000000..ba8030e
--- /dev/null
+++ b/src/components/ConfigManager/markMap.vue
@@ -0,0 +1,162 @@
+<template>
+  <div id="rootMap">
+    <div id="map" ref="map">
+      <el-button type="primary" style=" position: absolute;
+    left: 869px;
+    bottom: 9px;
+    z-index: 99" @click="SendLngLat()">确定</el-button>
+    </div>
+  </div>
+</template>
+<script>
+
+import "ol/ol.css";
+
+import { Map, View, Feature, color } from "ol";
+import { DEVICE_PIXEL_RATIO } from "ol/has";
+import Circle from "ol/style/Circle";
+import * as layer from "ol/layer.js";
+import * as source from "ol/source.js";
+import * as geom from "ol/geom.js";
+import * as style from "ol/style.js";
+import Overlay from "ol/Overlay.js";
+import TileLayer from "ol/layer/Tile";
+
+import SourceVector from "ol/source/Vector";
+import LayerVector from "ol/layer/Vector";
+
+import Style from "ol/style/Style";
+import Fill from "ol/style/Fill";
+import Text from "ol/style/Text";
+
+import Stroke from "ol/style/Stroke";
+import Draw from "ol/interaction/Draw";
+import Icon from "ol/style/Icon";
+import Select from "ol/interaction/Select";
+import Modify from "ol/interaction/Modify";
+import FormatWKT from "ol/format/WKT";
+
+import ImageWMS from "ol/source/ImageWMS";
+import Image from "ol/layer/Image";
+import GeoJSON from "ol/format/GeoJSON";
+import LineString from "ol/geom/LineString";
+
+import { OSM, TileArcGISRest, XYZ } from "ol/source";
+import { defaults } from "ol/control";
+import ImageArcGISRest from "ol/source/ImageArcGISRest";
+import ImageLayer from "ol/layer/Image";
+import tagPng from "./../../../static/img/yjznewpng.png";
+import Point from "ol/geom/Point";
+export default {
+  data() {
+    return {
+      map: "",
+      currentLonLat:[]
+    };
+  },
+  mounted() {
+    this.initMap();
+  },
+
+  methods: {
+    //点击确定后关闭此地图面板，然后把经纬度传给父vue
+    SendLngLat(){
+    
+      //删除entity模型
+      this.$emit("SendLngLat", this.currentLonLat);
+    },
+    //初始化地图
+    initMap() {
+      this.map = new Map({
+        controls: defaults({
+          attribution: false,
+          zoom: false,
+          rotate: false
+        }),
+
+        target: this.$refs.map,
+        layers: [
+        new TileLayer({
+          source: new XYZ({
+            url:
+              "http://map.geoq.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}"
+            //"http://cache1.arcgisonline.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}"
+          })
+        })
+        ],
+        view: new View({
+          projection: "EPSG:4326", //使用这个坐标系
+          center: [114.217, 30.828], //武汉
+          zoom: 9
+        })
+      });
+
+            this.vectorSource = new SourceVector({
+     
+            });
+            this.vector = new LayerVector({
+
+                source: this.vectorSource
+
+            });
+            this.map.addLayer(this.vector);
+
+            //初始化一个点
+            this.initPoint(114.30,30.28)
+
+
+      //鼠标移动事件
+      this.map.on("pointermove", function(evt) {
+        if (evt.map.hasFeatureAtPixel(evt.pixel)) {
+          evt.map.getTargetElement().style.cursor = "pointer";
+        } else {
+          evt.map.getTargetElement().style.cursor = "";
+        }
+      });
+      //鼠标点击事件
+      this.map.on("click", (evt)=> {
+        this.currentLonLat=evt.coordinate
+       this.initPoint(evt.coordinate[0],evt.coordinate[1])
+      });
+    },
+    initPoint(lng, lat) {
+      if (lng && lat) {
+          //清除所有feature
+           if (this.vectorSource) {
+                  this.vectorSource.clear();
+                }
+        //添加feature图标
+       this.Marker = new Feature({
+        geometry: new Point([parseFloat(lng), parseFloat(lat)])
+      });
+
+      //设置style
+      this.Marker.setStyle(
+        new Style({
+              image: new Icon({
+                src: tagPng,
+              
+              })
+            })
+            )
+
+       this.vectorSource.addFeature(this.Marker)
+        //重置中心点
+      /*   this.map.getView().setCenter([parseFloat(lng), parseFloat(lat)]);
+        this.map.getView().setZoom(12); */
+      }
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+#rootMap {
+  width: 100%;
+  height: 100%;
+}
+#map {
+     width: 88%;
+    height: 99%;
+}
+
+</style>
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index d230b2e..0eb5a75 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -364,7 +364,7 @@
           width: "240",
           btList: [
             { label: "添加用户", size: "small", type: "text", event: "addUser", show: true },
-            { label: "查看用户", size: "small", type: "text", event: "detail", show: true },
+            { label: "关联用户", size: "small", type: "text", event: "detail", show: true },
             { label: "删除用户组", size: "small", type: "text", event: "delGroup", show: true }
           ]
         }
diff --git a/src/components/Engineering/HistoricalFault.vue b/src/components/Engineering/HistoricalFault.vue
index 91c52d6..3312a76 100644
--- a/src/components/Engineering/HistoricalFault.vue
+++ b/src/components/Engineering/HistoricalFault.vue
@@ -3,6 +3,7 @@
     <div id="HFTopSearchBox">
       <span class="SelectTitle">平台：</span>
       <el-select
+        clearable
         class="widthinput"
         v-model="Project"
         filterable
@@ -18,6 +19,7 @@
       </el-select>
       <span class="SelectTitle">站点：</span>
       <el-select
+        clearable
         v-model="Site"
         filterable
         placeholder="请选择"
@@ -89,6 +91,8 @@
   data: function() {
     return {
       condition: "",
+      platCode: "",
+      userNo: "",
       HistoryTableData: [], //历史数据表格数据
       Page: 1, //分页默认显示页
       DataLength: 0, //分页上显示的数据总条数
@@ -136,7 +140,7 @@
         {
           platformName: "全部",
           platformCode: "",
-          dropSiteList: []
+          dropSiteList: ""
         }
       ], //平台的数据源
       Site: "", //平台
@@ -168,7 +172,8 @@
           st: this.TimeValue[0],
           et: this.TimeValue[1],
           pageNo: this.Page,
-          pageSize: this.Size
+          pageSize: this.Size,
+          userNo: this.userNo
         })
         .then(response => {
           this.loading = false;
@@ -232,6 +237,8 @@
     }
   },
   mounted: function() {
+    this.userNo = window.localStorage.getItem("USERNO");
+
     this.loadAllProject();
   }
 };
diff --git a/src/components/Engineering/Nowfault.vue b/src/components/Engineering/Nowfault.vue
index e2b4b89..bf4aba9 100644
--- a/src/components/Engineering/Nowfault.vue
+++ b/src/components/Engineering/Nowfault.vue
@@ -1,15 +1,46 @@
 <template>
   <div id="Nowfault">
     <div id="NFTopSearchBox">
-      <span class="SelectTitle">站点查询：</span>
-      <el-input
+      <span class="SelectTitle">请选择项目：</span>
+      <el-select
+        class="widthinput"
+        v-model="Project"
+        filterable
+        clearable
+        placeholder="请选择"
+        @change="loadProjectUser(Project)"
+      >
+        <el-option
+          v-for="item in ProjectOptions"
+          :key="item.index"
+          :label="item.platformName"
+          :value="item.platformCode"
+        ></el-option>
+      </el-select>
+      <span class="SelectTitle">请选择站点：</span>
+      <el-select
+        clearable
+        v-model="Site"
+        filterable
+        placeholder="请选择"
+        class="widthinput"
+      >
+        <el-option
+          v-for="item in SiteOptions"
+          :key="item.index"
+          :label="item.siteName"
+          :value="item.siteNo"
+        ></el-option>
+      </el-select>
+      <!-- <span class="SelectTitle">站点查询：</span> -->
+      <!-- <el-input
         v-model="condition"
         placeholder="请输入站点名称/编号"
-      ></el-input>
+      ></el-input> -->
       <el-button
         type="primary"
         icon="el-icon-search"
-        @click="loadDataGridData"
+        @click="searcher"
         v-has="'Search'"
         >搜索</el-button
       >
@@ -56,7 +87,26 @@
       Page: 1, //分页默认显示页
       DataLength: 0, //分页上显示的数据总条数
       Size: 10, //分页上显示的每页的条数
-      loading: false
+      loading: false,
+      Project: "", //平台
+      userNo: "",
+      platCode: "",
+      // searchnum: 1,
+      ProjectOptions: [
+        {
+          platformName: "全部",
+          platformCode: "",
+          dropSiteList: ""
+        }
+      ],
+      Site: "", //平台
+
+      SiteOptions: [
+        // {
+        //   siteName: "全部",
+        //   siteNo: ""
+        // }
+      ] //平台的数据源
     };
   },
   methods: {
@@ -70,13 +120,68 @@
       this.Page = val;
       this.loadDataGridData();
     },
+    // 获取平台的站点
+    loadProjectUser(CODE) {
+      this.platCode = CODE;
+      this.SiteOptions = [
+        {
+          siteName: "请先选择项目",
+          siteNo: ""
+        }
+      ];
+      this.Site = "";
+      for (var i = 0; i < this.ProjectOptions.length; i++) {
+        if (this.ProjectOptions[i].platformCode == CODE) {
+          this.SiteOptions = this.SiteOptions.concat(
+            this.ProjectOptions[i].dropSiteList
+          );
+          return;
+        }
+      }
+    },
+    // 获取所有平台
+    loadAllProject() {
+      this.$http
+        .get(this.nozzle.StationBaseControllerGetPlatFormSiteTree)
+        .then(response => {
+          if (response.data.data.length > 0) {
+            this.ProjectOptions = this.ProjectOptions.concat(
+              response.data.data
+            );
+            this.Project = this.ProjectOptions[0].platformCode;
+            this.loadProjectUser(this.ProjectOptions[0].dropSiteList);
+          } else {
+            this.$message({
+              showClose: true,
+              message: "无项目",
+              type: "warning"
+            });
+          }
+          // this.loadDataGridData();
+        })
+        .catch(response => {
+          this.$message({
+            showClose: true,
+            message: "请求平台失败",
+            type: "warning"
+          });
+        });
+    },
+    // 搜索的请求方法
+    searcher() {
+      this.Page = 1;
+      this.loadDataGridData();
+    },
+
     loadDataGridData() {
       this.loading = true;
       this.$http
         .post(this.nozzle.faultInfoGetTempInfo, {
-          condition: this.condition,
+          siteNo: this.Site,
           pageNo: this.Page,
-          pageSize: this.Size
+          pageSize: this.Size,
+          platCode: this.platCode,
+          userNo: this.userNo
         })
         .then(response => {
           this.loading = false;
@@ -94,6 +199,8 @@
     }
   },
   mounted: function() {
+    this.userNo = window.localStorage.getItem("USERNO");
+    this.loadAllProject();
     this.loadDataGridData();
   }
 };
diff --git a/src/components/common/PageTable/index.vue b/src/components/common/PageTable/index.vue
index 01ba393..c22b21d 100644
--- a/src/components/common/PageTable/index.vue
+++ b/src/components/common/PageTable/index.vue
@@ -342,7 +342,7 @@
             if (this.tableType === "tree") {
               arr = this.$fn.handleTree(arr);
             }
-            if (arr) {
+            if (arr.length) {
               arr.forEach(item => {
                 item.createTime = this.$fn.switchTime(
                   item.createTime,
diff --git a/src/components/site/previewOfSiteStatus.vue b/src/components/site/previewOfSiteStatus.vue
index 971875d..0d6deec 100644
--- a/src/components/site/previewOfSiteStatus.vue
+++ b/src/components/site/previewOfSiteStatus.vue
@@ -1004,7 +1004,7 @@
           ]) => {
             // create map with the given options at a DOM node w/ id 'mapNode'
             _this.map = new Map("previewOfSiteStatusMaps", {
-              center: [100, 35],
+              center: [114, 30],
               zoom: 5,
               logo: false,
               slider: false
diff --git a/src/components/sys/user.vue b/src/components/sys/user.vue
index b3ceab2..291c8e4 100644
--- a/src/components/sys/user.vue
+++ b/src/components/sys/user.vue
@@ -42,29 +42,29 @@
         </el-table-column>
         <el-table-column label="操作" width="240px">
           <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="small"
-              @click="handleClick('update', scope.row)"
-              v-has="'m9-1-2'"
-              >修改用户</el-button
-            >
             <template v-if="scope.row.userType !== 1">
               <el-button
                 type="text"
                 size="small"
+                @click="handleClick('update', scope.row)"
+                v-has="'m9-1-2'"
+                >修改用户</el-button
+              >
+              <el-button
+                type="text"
+                size="small"
                 @click="handleClick('delete', scope.row)"
                 v-has="'m9-1-3'"
                 >删除用户</el-button
               >
+              <el-button
+                type="text"
+                size="small"
+                @click="handleClick('reset', scope.row)"
+                v-has="'m9-1-4'"
+                >重置密码</el-button
+              >
             </template>
-            <el-button
-              type="text"
-              size="small"
-              @click="handleClick('reset', scope.row)"
-              v-has="'m9-1-4'"
-              >重置密码</el-button
-            >
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/util/CHGTwo.js b/src/util/CHGTwo.js
index 8d43b46..328ca74 100644
--- a/src/util/CHGTwo.js
+++ b/src/util/CHGTwo.js
@@ -9,22 +9,22 @@
   StationBaseControllerQueryPlatform: "/StationBaseController/queryPlatform", //获取所有平台
   StationBaseControllerGetUsers: "/StationBaseController/getUsers", //查询平台关联的权限用户
   alarmLogGetAlarmLogInfo: "/alarmLog/getAlarmLogInfo", //告警推送日志查询
-  alarmLogStatistical: "/alarmLog/statistical", //告警统计
+  alarmLogStatistical: "/alarmLog/statistical" //告警统计
 
-  syslogGetLogList: "/syslog/getLogList", //工业物联网云平台-查询日志
-  engineeringWorkOpenPump: "/engineeringWork/openPump", //工业物联网云平台-开水泵
-  engineeringWorkClosePump: "/engineeringWork/closePump", //工业物联网云平台-关水泵
-  engineeringWorkopenMachine: "/engineeringWork/openMachine  ", //工业物联网云平台-开设备
-  engineeringWorkcloseMachine: "/engineeringWork/closeMachine ", //工业物联网云平台- 关设备
-  engineeringWorkopenValve: "/engineeringWork/openValve", //工业物联网云平台-开阀门
-  engineeringWorkcloseValve: "/engineeringWork/closeValve", //工业物联网云平台-关阀门
+  // syslogGetLogList: "/syslog/getLogList", //工业物联网云平台-查询日志
+  // engineeringWorkOpenPump: "/engineeringWork/openPump", //工业物联网云平台-开水泵
+  // engineeringWorkClosePump: "/engineeringWork/closePump", //工业物联网云平台-关水泵
+  // engineeringWorkopenMachine: "/engineeringWork/openMachine  ", //工业物联网云平台-开设备
+  // engineeringWorkcloseMachine: "/engineeringWork/closeMachine ", //工业物联网云平台- 关设备
+  // engineeringWorkopenValve: "/engineeringWork/openValve", //工业物联网云平台-开阀门
+  // engineeringWorkcloseValve: "/engineeringWork/closeValve", //工业物联网云平台-关阀门
 
-  faultInfoGetTempInfo: "/faultInfo/getTempInfo", //工程作业-查询实时故障数据
-  faultInfoGetHisInfo: "/faultInfo/getHisInfo", //工程作业-查询历史故障数据
-  StationBaseControllerGetPlatFormSiteTree:
-    "/StationBaseController/getPlatFormSiteTree", //工程作业-平台站点二级树
-  taskInfoGetTempInfo: "/taskInfo/getTempInfo", //工程作业-实时作业
-  taskInfoGetHisInfo: "/taskInfo/getHisInfo", //工程作业-历史作业
+  // faultInfoGetTempInfo: "/faultInfo/getTempInfo", //工程作业-查询实时故障数据
+  // faultInfoGetHisInfo: "/faultInfo/getHisInfo", //工程作业-查询历史故障数据
+  // StationBaseControllerGetPlatFormSiteTree:
+  //   "/StationBaseController/getPlatFormSiteTree", //工程作业-平台站点二级树
+  // taskInfoGetTempInfo: "/taskInfo/getTempInfo", //工程作业-实时作业
+  // taskInfoGetHisInfo: "/taskInfo/getHisInfo", //工程作业-历史作业
 
   // 'sysLogin':'/sysLogin',//登录
   // 'menuGetCurrentUserMenu':'/menu/getCurrentUserMenu',//获取菜单以及按钮权限
@@ -34,9 +34,9 @@
   // 'updateSysuser':'/updateSysuser', //修改用户信息
   // 'addSysuser':'/addSysuser', //新增用户信息
 
-  userGroupList: "/usergroup/list", //获取用户组列表信息
+  // userGroupList: "/usergroup/list", //获取用户组列表信息
 
-  userGroupList: "/usergroup/list" //获取用户组列表信息
+  // userGroupList: "/usergroup/list" //获取用户组列表信息
 };
 
 for (let item in nozzle) {
diff --git a/src/util/group.js b/src/util/group.js
index 851c0c7..da328ce 100644
--- a/src/util/group.js
+++ b/src/util/group.js
@@ -6,26 +6,26 @@
 let host = "/groupApi";
 
 let nozzle = {
-  userGroupList:"/usergroup/list",  //获取用户组列表信息
-  userGroupAdd:"/usergroup/add",  //添加用户组
-  userGroupDelete:"/usergroup/removegroup",  //删除用户组
-  addUserToGroup:"/addSysuser", //添加用户到用户组
-  userGroupRemoveUser:"/usergroup/removeuser", //从用户组删除用户
+  userGroupList: "/usergroup/list", //获取用户组列表信息
+  userGroupAdd: "/usergroup/add", //添加用户组
+  userGroupDelete: "/usergroup/removegroup", //删除用户组
+  addUserToGroup: "/addSysuser", //添加用户到用户组
+  userGroupRemoveUser: "/usergroup/removeuser", //从用户组删除用户
   // 'addGroupToProject':'/usergroup/save',  //添加用户组到项目
-  userGroupUserList:"/usergroup/groupuserlist",  //用户组下的用户列表
-  bindUserToGroup:"/usergroup/addbatch", //绑定用户到用户组
-  removeUserFromGroup:"/usergroup/removebatch", //解绑用户和用户组
+  userGroupUserList: "/usergroup/groupuserlist", //用户组下的用户列表
+  bindUserToGroup: "/usergroup/addbatch", //绑定用户到用户组
+  removeUserFromGroup: "/usergroup/removebatch", //解绑用户和用户组
 
   sysLogin: "/sysLogin", //登录
   menuGetCurrentUserMenu: "/menu/getCurrentUserMenu", //获取菜单以及按钮权限
   orgGetCurrentOrgTree: "/org/getCurrentOrgTree", //获取当前用户可管理的组织
 
-  selectSysuser:"/selectSysuser", //获取用户信息
-  deleteSysuser:"/deleteSysuser", //删除用户信息
-  updateSysuser:"/updateSysuser", //修改用户信息
-  addSysuser:"/addSysuser", //新增用户信息
-  resetUserPwd:"/resetPwd", //重置用户密码
-  updateUserPwd:"/updatePwd",  //修改用户密码
+  selectSysuser: "/selectSysuser", //获取用户信息
+  deleteSysuser: "/deleteSysuser", //删除用户信息
+  updateSysuser: "/updateSysuser", //修改用户信息
+  addSysuser: "/addSysuser", //新增用户信息
+  resetUserPwd: "/resetPwd", //重置用户密码
+  updateUserPwd: "/updatePwd", //修改用户密码
 
   orgGetOrgTree: "/org/getOrgTree", //获取组织信息
   orgDeleteOrg: "/org/deleteOrg", //删除组织信息
@@ -42,7 +42,14 @@
   menuAddMenu: "/menu/addMenu", //新增菜单树信息
   menuUpdateMenu: "/menu/updateMenu", //修改菜单树信息
   menuDeleteMenu: "/menu/deleteMenu", //删除菜单树信息
-  menuGetCurrentUserMenu: "/menu/getCurrentUserMenu" //获取当前用户的菜单
+  menuGetCurrentUserMenu: "/menu/getCurrentUserMenu", //获取当前用户的菜单
+
+  faultInfoGetTempInfo: "/faultInfo/getTempInfo", //工程作业-查询实时故障数据
+  faultInfoGetHisInfo: "/faultInfo/getHisInfo", //工程作业-查询历史故障数据
+  StationBaseControllerGetPlatFormSiteTree:
+    "/StationBaseController/getPlatFormSiteTree", //工程作业-平台站点二级树
+  taskInfoGetTempInfo: "/taskInfo/getTempInfo", //工程作业-实时作业
+  taskInfoGetHisInfo: "/taskInfo/getHisInfo" //工程作业-历史作业
 };
 
 for (let item in nozzle) {

diff --git a/config/index.js b/config/index.js
index 1bb3a4b..68765b2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -87,7 +87,7 @@
     },
 
     // Various Dev Server settings
-    host: "localhost"    , // can be overwritten by process.env.HOST
+    host: "192.168.30.113", // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,
diff --git a/package.json b/package.json
index c41fff4..a58d9d6 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "axios": "^0.19.2",
     "echarts": "^4.7.0",
     "element-ui": "^2.13.1",
+    "ol": "^6.4.3",
     "esri-loader": "^2.14.0",
     "html2canvas": "^1.0.0-rc.7",
     "js-file-download": "^0.4.12",
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 801c3b3..eb85612 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -135,6 +135,11 @@
                 ><el-input size="small" v-model="ruleForm.lat"></el-input
               ></el-form-item>
             </el-col>
+               <!-- 坐标拾取  -->
+                <el-col :span="5">
+           <el-button type="primary" @click="pickLngLat()">坐标拾取</el-button>
+            </el-col>
+              <!-- 坐标拾取  -->
           </el-form-item>
           <el-form-item label="站点安装位置" prop="address">
             <el-input
@@ -217,15 +222,11 @@
             size="medium"
           >
             <el-form-item label="">
-<<<<<<< HEAD
-              <el-input v-model="deviceRelatedQuery.searchStr" placeholder="请输入设备名称/厂家" clearable></el-input>
-=======
               <el-input
                 v-model="deviceRelatedQuery.searchStr"
                 placeholder="请输入设备编号/厂家"
                 clearable
               ></el-input>
->>>>>>> ad620ef3af4de08b199e1d1c6c52489a965e9a0a
             </el-form-item>
             <el-form-item>
               <el-button
@@ -298,14 +299,29 @@
         </div>
       </template>
     </page-dialog>
+    <el-dialog
+      title="坐标拾取"
+      :visible.sync="dialogFormVisible"
+      :append-to-body="true"
+      :before-close="handleDialogClose"
+      customClass="addDialog"
+     
+    >
+     <markMap ref="markMap" v-on:SendLngLat="SendLngLat" style="height: 600px;width:1050px;" />
+    </el-dialog>
   </div>
 </template>
 <script>
 import axios from "axios";
 import { mapGetters } from "vuex";
+import markMap from "./markMap.vue";
 export default {
+   components: {
+        markMap
+    },
   data() {
     return {
+      dialogFormVisible:false,
       //站点搜索相关
       siteFilterInfo: {
         query: {
@@ -520,8 +536,18 @@
         refresh: 1,
         initCurpage: 1,
         fieldList: [
-          { label: "设备名称", value: "equipDesc", minWidth: 100, tooltip: true },
-          { label: "设备厂家", value: "equipFactory", minWidth: 150, tooltip: true },
+          {
+            label: "设备名称",
+            value: "equipDesc",
+            minWidth: 100,
+            tooltip: true
+          },
+          {
+            label: "设备厂家",
+            value: "equipFactory",
+            minWidth: 150,
+            tooltip: true
+          }
         ]
       },
       //已关联设备表格相关
@@ -596,19 +622,40 @@
       }
     },
     "deviceRelatedQuery.searchStr"(val) {
-      Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
-      Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+      Object.assign(
+        this.isRelatedDeviceTableInfo.query,
+        this.deviceRelatedQuery
+      );
+      Object.assign(
+        this.unRelatedDeviceTableInfo.query,
+        this.deviceRelatedQuery
+      );
     },
     platformCode(val) {
-      console.log(777,val);
+      console.log(777, val);
       this.ruleForm.platformCode = val;
     }
   },
   methods: {
+      //响应地图组件的确定，拾取坐标
+    SendLngLat(lonlat) {
+      this.dialogFormVisible=false;
+      this.ruleForm.lon=lonlat[0]
+      this.ruleForm.lat=lonlat[1]
+
+    },
+    //坐标拾取地图控件打开
+    pickLngLat(){
+      this.dialogFormVisible=true
+    },
+    //监听面板直接叉叉掉事件
+    handleDialogClose() {
+       this.dialogFormVisible = false;
+    },
     //上传头像
     fileChange(file) {
       this.loading = true;
-      const isLt1M = file.size / 1024 / 1024 < 1;
+      const isLt1M = file.size / 1024 / 1024 < 5;
       if (file.raw.type != "image/jpeg" && file.raw.type != "image/png") {
         this.loading = false;
         this.$message.error("上传图片只能是JPG或PNG格式!");
@@ -616,7 +663,7 @@
       }
       if (!isLt1M) {
         this.loading = false;
-        this.$message.error("上传图片大小不能超过 1MB!");
+        this.$message.error("上传图片大小不能超过 5MB!");
         return;
       }
       var formdata = new FormData();
@@ -960,6 +1007,10 @@
 };
 </script>
 <style lang="scss" scoped>
+.addDialog {
+  width:1050px;
+  height: 650px;
+}
 .imgtype {
   width: 150px;
   height: 100px;
diff --git a/src/components/ConfigManager/markMap.vue b/src/components/ConfigManager/markMap.vue
new file mode 100644
index 0000000..ba8030e
--- /dev/null
+++ b/src/components/ConfigManager/markMap.vue
@@ -0,0 +1,162 @@
+<template>
+  <div id="rootMap">
+    <div id="map" ref="map">
+      <el-button type="primary" style=" position: absolute;
+    left: 869px;
+    bottom: 9px;
+    z-index: 99" @click="SendLngLat()">确定</el-button>
+    </div>
+  </div>
+</template>
+<script>
+
+import "ol/ol.css";
+
+import { Map, View, Feature, color } from "ol";
+import { DEVICE_PIXEL_RATIO } from "ol/has";
+import Circle from "ol/style/Circle";
+import * as layer from "ol/layer.js";
+import * as source from "ol/source.js";
+import * as geom from "ol/geom.js";
+import * as style from "ol/style.js";
+import Overlay from "ol/Overlay.js";
+import TileLayer from "ol/layer/Tile";
+
+import SourceVector from "ol/source/Vector";
+import LayerVector from "ol/layer/Vector";
+
+import Style from "ol/style/Style";
+import Fill from "ol/style/Fill";
+import Text from "ol/style/Text";
+
+import Stroke from "ol/style/Stroke";
+import Draw from "ol/interaction/Draw";
+import Icon from "ol/style/Icon";
+import Select from "ol/interaction/Select";
+import Modify from "ol/interaction/Modify";
+import FormatWKT from "ol/format/WKT";
+
+import ImageWMS from "ol/source/ImageWMS";
+import Image from "ol/layer/Image";
+import GeoJSON from "ol/format/GeoJSON";
+import LineString from "ol/geom/LineString";
+
+import { OSM, TileArcGISRest, XYZ } from "ol/source";
+import { defaults } from "ol/control";
+import ImageArcGISRest from "ol/source/ImageArcGISRest";
+import ImageLayer from "ol/layer/Image";
+import tagPng from "./../../../static/img/yjznewpng.png";
+import Point from "ol/geom/Point";
+export default {
+  data() {
+    return {
+      map: "",
+      currentLonLat:[]
+    };
+  },
+  mounted() {
+    this.initMap();
+  },
+
+  methods: {
+    //点击确定后关闭此地图面板，然后把经纬度传给父vue
+    SendLngLat(){
+    
+      //删除entity模型
+      this.$emit("SendLngLat", this.currentLonLat);
+    },
+    //初始化地图
+    initMap() {
+      this.map = new Map({
+        controls: defaults({
+          attribution: false,
+          zoom: false,
+          rotate: false
+        }),
+
+        target: this.$refs.map,
+        layers: [
+        new TileLayer({
+          source: new XYZ({
+            url:
+              "http://map.geoq.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}"
+            //"http://cache1.arcgisonline.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}"
+          })
+        })
+        ],
+        view: new View({
+          projection: "EPSG:4326", //使用这个坐标系
+          center: [114.217, 30.828], //武汉
+          zoom: 9
+        })
+      });
+
+            this.vectorSource = new SourceVector({
+     
+            });
+            this.vector = new LayerVector({
+
+                source: this.vectorSource
+
+            });
+            this.map.addLayer(this.vector);
+
+            //初始化一个点
+            this.initPoint(114.30,30.28)
+
+
+      //鼠标移动事件
+      this.map.on("pointermove", function(evt) {
+        if (evt.map.hasFeatureAtPixel(evt.pixel)) {
+          evt.map.getTargetElement().style.cursor = "pointer";
+        } else {
+          evt.map.getTargetElement().style.cursor = "";
+        }
+      });
+      //鼠标点击事件
+      this.map.on("click", (evt)=> {
+        this.currentLonLat=evt.coordinate
+       this.initPoint(evt.coordinate[0],evt.coordinate[1])
+      });
+    },
+    initPoint(lng, lat) {
+      if (lng && lat) {
+          //清除所有feature
+           if (this.vectorSource) {
+                  this.vectorSource.clear();
+                }
+        //添加feature图标
+       this.Marker = new Feature({
+        geometry: new Point([parseFloat(lng), parseFloat(lat)])
+      });
+
+      //设置style
+      this.Marker.setStyle(
+        new Style({
+              image: new Icon({
+                src: tagPng,
+              
+              })
+            })
+            )
+
+       this.vectorSource.addFeature(this.Marker)
+        //重置中心点
+      /*   this.map.getView().setCenter([parseFloat(lng), parseFloat(lat)]);
+        this.map.getView().setZoom(12); */
+      }
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+#rootMap {
+  width: 100%;
+  height: 100%;
+}
+#map {
+     width: 88%;
+    height: 99%;
+}
+
+</style>
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index d230b2e..0eb5a75 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -364,7 +364,7 @@
           width: "240",
           btList: [
             { label: "添加用户", size: "small", type: "text", event: "addUser", show: true },
-            { label: "查看用户", size: "small", type: "text", event: "detail", show: true },
+            { label: "关联用户", size: "small", type: "text", event: "detail", show: true },
             { label: "删除用户组", size: "small", type: "text", event: "delGroup", show: true }
           ]
         }
diff --git a/src/components/Engineering/HistoricalFault.vue b/src/components/Engineering/HistoricalFault.vue
index 91c52d6..3312a76 100644
--- a/src/components/Engineering/HistoricalFault.vue
+++ b/src/components/Engineering/HistoricalFault.vue
@@ -3,6 +3,7 @@
     <div id="HFTopSearchBox">
       <span class="SelectTitle">平台：</span>
       <el-select
+        clearable
         class="widthinput"
         v-model="Project"
         filterable
@@ -18,6 +19,7 @@
       </el-select>
       <span class="SelectTitle">站点：</span>
       <el-select
+        clearable
         v-model="Site"
         filterable
         placeholder="请选择"
@@ -89,6 +91,8 @@
   data: function() {
     return {
       condition: "",
+      platCode: "",
+      userNo: "",
       HistoryTableData: [], //历史数据表格数据
       Page: 1, //分页默认显示页
       DataLength: 0, //分页上显示的数据总条数
@@ -136,7 +140,7 @@
         {
           platformName: "全部",
           platformCode: "",
-          dropSiteList: []
+          dropSiteList: ""
         }
       ], //平台的数据源
       Site: "", //平台
@@ -168,7 +172,8 @@
           st: this.TimeValue[0],
           et: this.TimeValue[1],
           pageNo: this.Page,
-          pageSize: this.Size
+          pageSize: this.Size,
+          userNo: this.userNo
         })
         .then(response => {
           this.loading = false;
@@ -232,6 +237,8 @@
     }
   },
   mounted: function() {
+    this.userNo = window.localStorage.getItem("USERNO");
+
     this.loadAllProject();
   }
 };
diff --git a/src/components/Engineering/Nowfault.vue b/src/components/Engineering/Nowfault.vue
index e2b4b89..bf4aba9 100644
--- a/src/components/Engineering/Nowfault.vue
+++ b/src/components/Engineering/Nowfault.vue
@@ -1,15 +1,46 @@
 <template>
   <div id="Nowfault">
     <div id="NFTopSearchBox">
-      <span class="SelectTitle">站点查询：</span>
-      <el-input
+      <span class="SelectTitle">请选择项目：</span>
+      <el-select
+        class="widthinput"
+        v-model="Project"
+        filterable
+        clearable
+        placeholder="请选择"
+        @change="loadProjectUser(Project)"
+      >
+        <el-option
+          v-for="item in ProjectOptions"
+          :key="item.index"
+          :label="item.platformName"
+          :value="item.platformCode"
+        ></el-option>
+      </el-select>
+      <span class="SelectTitle">请选择站点：</span>
+      <el-select
+        clearable
+        v-model="Site"
+        filterable
+        placeholder="请选择"
+        class="widthinput"
+      >
+        <el-option
+          v-for="item in SiteOptions"
+          :key="item.index"
+          :label="item.siteName"
+          :value="item.siteNo"
+        ></el-option>
+      </el-select>
+      <!-- <span class="SelectTitle">站点查询：</span> -->
+      <!-- <el-input
         v-model="condition"
         placeholder="请输入站点名称/编号"
-      ></el-input>
+      ></el-input> -->
       <el-button
         type="primary"
         icon="el-icon-search"
-        @click="loadDataGridData"
+        @click="searcher"
         v-has="'Search'"
         >搜索</el-button
       >
@@ -56,7 +87,26 @@
       Page: 1, //分页默认显示页
       DataLength: 0, //分页上显示的数据总条数
       Size: 10, //分页上显示的每页的条数
-      loading: false
+      loading: false,
+      Project: "", //平台
+      userNo: "",
+      platCode: "",
+      // searchnum: 1,
+      ProjectOptions: [
+        {
+          platformName: "全部",
+          platformCode: "",
+          dropSiteList: ""
+        }
+      ],
+      Site: "", //平台
+
+      SiteOptions: [
+        // {
+        //   siteName: "全部",
+        //   siteNo: ""
+        // }
+      ] //平台的数据源
     };
   },
   methods: {
@@ -70,13 +120,68 @@
       this.Page = val;
       this.loadDataGridData();
     },
+    // 获取平台的站点
+    loadProjectUser(CODE) {
+      this.platCode = CODE;
+      this.SiteOptions = [
+        {
+          siteName: "请先选择项目",
+          siteNo: ""
+        }
+      ];
+      this.Site = "";
+      for (var i = 0; i < this.ProjectOptions.length; i++) {
+        if (this.ProjectOptions[i].platformCode == CODE) {
+          this.SiteOptions = this.SiteOptions.concat(
+            this.ProjectOptions[i].dropSiteList
+          );
+          return;
+        }
+      }
+    },
+    // 获取所有平台
+    loadAllProject() {
+      this.$http
+        .get(this.nozzle.StationBaseControllerGetPlatFormSiteTree)
+        .then(response => {
+          if (response.data.data.length > 0) {
+            this.ProjectOptions = this.ProjectOptions.concat(
+              response.data.data
+            );
+            this.Project = this.ProjectOptions[0].platformCode;
+            this.loadProjectUser(this.ProjectOptions[0].dropSiteList);
+          } else {
+            this.$message({
+              showClose: true,
+              message: "无项目",
+              type: "warning"
+            });
+          }
+          // this.loadDataGridData();
+        })
+        .catch(response => {
+          this.$message({
+            showClose: true,
+            message: "请求平台失败",
+            type: "warning"
+          });
+        });
+    },
+    // 搜索的请求方法
+    searcher() {
+      this.Page = 1;
+      this.loadDataGridData();
+    },
+
     loadDataGridData() {
       this.loading = true;
       this.$http
         .post(this.nozzle.faultInfoGetTempInfo, {
-          condition: this.condition,
+          siteNo: this.Site,
           pageNo: this.Page,
-          pageSize: this.Size
+          pageSize: this.Size,
+          platCode: this.platCode,
+          userNo: this.userNo
         })
         .then(response => {
           this.loading = false;
@@ -94,6 +199,8 @@
     }
   },
   mounted: function() {
+    this.userNo = window.localStorage.getItem("USERNO");
+    this.loadAllProject();
     this.loadDataGridData();
   }
 };
diff --git a/src/components/common/PageTable/index.vue b/src/components/common/PageTable/index.vue
index 01ba393..c22b21d 100644
--- a/src/components/common/PageTable/index.vue
+++ b/src/components/common/PageTable/index.vue
@@ -342,7 +342,7 @@
             if (this.tableType === "tree") {
               arr = this.$fn.handleTree(arr);
             }
-            if (arr) {
+            if (arr.length) {
               arr.forEach(item => {
                 item.createTime = this.$fn.switchTime(
                   item.createTime,
diff --git a/src/components/site/previewOfSiteStatus.vue b/src/components/site/previewOfSiteStatus.vue
index 971875d..0d6deec 100644
--- a/src/components/site/previewOfSiteStatus.vue
+++ b/src/components/site/previewOfSiteStatus.vue
@@ -1004,7 +1004,7 @@
           ]) => {
             // create map with the given options at a DOM node w/ id 'mapNode'
             _this.map = new Map("previewOfSiteStatusMaps", {
-              center: [100, 35],
+              center: [114, 30],
               zoom: 5,
               logo: false,
               slider: false
diff --git a/src/components/sys/user.vue b/src/components/sys/user.vue
index b3ceab2..291c8e4 100644
--- a/src/components/sys/user.vue
+++ b/src/components/sys/user.vue
@@ -42,29 +42,29 @@
         </el-table-column>
         <el-table-column label="操作" width="240px">
           <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="small"
-              @click="handleClick('update', scope.row)"
-              v-has="'m9-1-2'"
-              >修改用户</el-button
-            >
             <template v-if="scope.row.userType !== 1">
               <el-button
                 type="text"
                 size="small"
+                @click="handleClick('update', scope.row)"
+                v-has="'m9-1-2'"
+                >修改用户</el-button
+              >
+              <el-button
+                type="text"
+                size="small"
                 @click="handleClick('delete', scope.row)"
                 v-has="'m9-1-3'"
                 >删除用户</el-button
               >
+              <el-button
+                type="text"
+                size="small"
+                @click="handleClick('reset', scope.row)"
+                v-has="'m9-1-4'"
+                >重置密码</el-button
+              >
             </template>
-            <el-button
-              type="text"
-              size="small"
-              @click="handleClick('reset', scope.row)"
-              v-has="'m9-1-4'"
-              >重置密码</el-button
-            >
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/util/CHGTwo.js b/src/util/CHGTwo.js
index 8d43b46..328ca74 100644
--- a/src/util/CHGTwo.js
+++ b/src/util/CHGTwo.js
@@ -9,22 +9,22 @@
   StationBaseControllerQueryPlatform: "/StationBaseController/queryPlatform", //获取所有平台
   StationBaseControllerGetUsers: "/StationBaseController/getUsers", //查询平台关联的权限用户
   alarmLogGetAlarmLogInfo: "/alarmLog/getAlarmLogInfo", //告警推送日志查询
-  alarmLogStatistical: "/alarmLog/statistical", //告警统计
+  alarmLogStatistical: "/alarmLog/statistical" //告警统计
 
-  syslogGetLogList: "/syslog/getLogList", //工业物联网云平台-查询日志
-  engineeringWorkOpenPump: "/engineeringWork/openPump", //工业物联网云平台-开水泵
-  engineeringWorkClosePump: "/engineeringWork/closePump", //工业物联网云平台-关水泵
-  engineeringWorkopenMachine: "/engineeringWork/openMachine  ", //工业物联网云平台-开设备
-  engineeringWorkcloseMachine: "/engineeringWork/closeMachine ", //工业物联网云平台- 关设备
-  engineeringWorkopenValve: "/engineeringWork/openValve", //工业物联网云平台-开阀门
-  engineeringWorkcloseValve: "/engineeringWork/closeValve", //工业物联网云平台-关阀门
+  // syslogGetLogList: "/syslog/getLogList", //工业物联网云平台-查询日志
+  // engineeringWorkOpenPump: "/engineeringWork/openPump", //工业物联网云平台-开水泵
+  // engineeringWorkClosePump: "/engineeringWork/closePump", //工业物联网云平台-关水泵
+  // engineeringWorkopenMachine: "/engineeringWork/openMachine  ", //工业物联网云平台-开设备
+  // engineeringWorkcloseMachine: "/engineeringWork/closeMachine ", //工业物联网云平台- 关设备
+  // engineeringWorkopenValve: "/engineeringWork/openValve", //工业物联网云平台-开阀门
+  // engineeringWorkcloseValve: "/engineeringWork/closeValve", //工业物联网云平台-关阀门
 
-  faultInfoGetTempInfo: "/faultInfo/getTempInfo", //工程作业-查询实时故障数据
-  faultInfoGetHisInfo: "/faultInfo/getHisInfo", //工程作业-查询历史故障数据
-  StationBaseControllerGetPlatFormSiteTree:
-    "/StationBaseController/getPlatFormSiteTree", //工程作业-平台站点二级树
-  taskInfoGetTempInfo: "/taskInfo/getTempInfo", //工程作业-实时作业
-  taskInfoGetHisInfo: "/taskInfo/getHisInfo", //工程作业-历史作业
+  // faultInfoGetTempInfo: "/faultInfo/getTempInfo", //工程作业-查询实时故障数据
+  // faultInfoGetHisInfo: "/faultInfo/getHisInfo", //工程作业-查询历史故障数据
+  // StationBaseControllerGetPlatFormSiteTree:
+  //   "/StationBaseController/getPlatFormSiteTree", //工程作业-平台站点二级树
+  // taskInfoGetTempInfo: "/taskInfo/getTempInfo", //工程作业-实时作业
+  // taskInfoGetHisInfo: "/taskInfo/getHisInfo", //工程作业-历史作业
 
   // 'sysLogin':'/sysLogin',//登录
   // 'menuGetCurrentUserMenu':'/menu/getCurrentUserMenu',//获取菜单以及按钮权限
@@ -34,9 +34,9 @@
   // 'updateSysuser':'/updateSysuser', //修改用户信息
   // 'addSysuser':'/addSysuser', //新增用户信息
 
-  userGroupList: "/usergroup/list", //获取用户组列表信息
+  // userGroupList: "/usergroup/list", //获取用户组列表信息
 
-  userGroupList: "/usergroup/list" //获取用户组列表信息
+  // userGroupList: "/usergroup/list" //获取用户组列表信息
 };
 
 for (let item in nozzle) {
diff --git a/src/util/group.js b/src/util/group.js
index 851c0c7..da328ce 100644
--- a/src/util/group.js
+++ b/src/util/group.js
@@ -6,26 +6,26 @@
 let host = "/groupApi";
 
 let nozzle = {
-  userGroupList:"/usergroup/list",  //获取用户组列表信息
-  userGroupAdd:"/usergroup/add",  //添加用户组
-  userGroupDelete:"/usergroup/removegroup",  //删除用户组
-  addUserToGroup:"/addSysuser", //添加用户到用户组
-  userGroupRemoveUser:"/usergroup/removeuser", //从用户组删除用户
+  userGroupList: "/usergroup/list", //获取用户组列表信息
+  userGroupAdd: "/usergroup/add", //添加用户组
+  userGroupDelete: "/usergroup/removegroup", //删除用户组
+  addUserToGroup: "/addSysuser", //添加用户到用户组
+  userGroupRemoveUser: "/usergroup/removeuser", //从用户组删除用户
   // 'addGroupToProject':'/usergroup/save',  //添加用户组到项目
-  userGroupUserList:"/usergroup/groupuserlist",  //用户组下的用户列表
-  bindUserToGroup:"/usergroup/addbatch", //绑定用户到用户组
-  removeUserFromGroup:"/usergroup/removebatch", //解绑用户和用户组
+  userGroupUserList: "/usergroup/groupuserlist", //用户组下的用户列表
+  bindUserToGroup: "/usergroup/addbatch", //绑定用户到用户组
+  removeUserFromGroup: "/usergroup/removebatch", //解绑用户和用户组
 
   sysLogin: "/sysLogin", //登录
   menuGetCurrentUserMenu: "/menu/getCurrentUserMenu", //获取菜单以及按钮权限
   orgGetCurrentOrgTree: "/org/getCurrentOrgTree", //获取当前用户可管理的组织
 
-  selectSysuser:"/selectSysuser", //获取用户信息
-  deleteSysuser:"/deleteSysuser", //删除用户信息
-  updateSysuser:"/updateSysuser", //修改用户信息
-  addSysuser:"/addSysuser", //新增用户信息
-  resetUserPwd:"/resetPwd", //重置用户密码
-  updateUserPwd:"/updatePwd",  //修改用户密码
+  selectSysuser: "/selectSysuser", //获取用户信息
+  deleteSysuser: "/deleteSysuser", //删除用户信息
+  updateSysuser: "/updateSysuser", //修改用户信息
+  addSysuser: "/addSysuser", //新增用户信息
+  resetUserPwd: "/resetPwd", //重置用户密码
+  updateUserPwd: "/updatePwd", //修改用户密码
 
   orgGetOrgTree: "/org/getOrgTree", //获取组织信息
   orgDeleteOrg: "/org/deleteOrg", //删除组织信息
@@ -42,7 +42,14 @@
   menuAddMenu: "/menu/addMenu", //新增菜单树信息
   menuUpdateMenu: "/menu/updateMenu", //修改菜单树信息
   menuDeleteMenu: "/menu/deleteMenu", //删除菜单树信息
-  menuGetCurrentUserMenu: "/menu/getCurrentUserMenu" //获取当前用户的菜单
+  menuGetCurrentUserMenu: "/menu/getCurrentUserMenu", //获取当前用户的菜单
+
+  faultInfoGetTempInfo: "/faultInfo/getTempInfo", //工程作业-查询实时故障数据
+  faultInfoGetHisInfo: "/faultInfo/getHisInfo", //工程作业-查询历史故障数据
+  StationBaseControllerGetPlatFormSiteTree:
+    "/StationBaseController/getPlatFormSiteTree", //工程作业-平台站点二级树
+  taskInfoGetTempInfo: "/taskInfo/getTempInfo", //工程作业-实时作业
+  taskInfoGetHisInfo: "/taskInfo/getHisInfo" //工程作业-历史作业
 };
 
 for (let item in nozzle) {
diff --git a/static/img/yjznewpng.png b/static/img/yjznewpng.png
new file mode 100644
index 0000000..086bd14
--- /dev/null
+++ b/static/img/yjznewpng.png
Binary files differ