Merge remote-tracking branch 'origin/master_tuzuo' into master_tuzuo

data-ui/src/views/centerdata_emergency1/attach/index.vue

@@ -169,7 +169,7 @@
 </template>
 
 <script>
-import { listAttach, getAttach, delAttach, addAttach, updateAttach } from "@/api/edyj/attach";
+import { listAttach, getAttach, delAttach, addAttach, updateAttach } from "@/api/centerdata_emergency1/attach";
 
 export default {
   name: "Attach",

data-ui/src/views/centerdata_emergency1/dept/index.vue

@@ -145,7 +145,7 @@
 </template>
 
 <script>
-import { listDept, getDept, delDept, addDept, updateDept } from "@/api/edyj/dept";
+import { listDept, getDept, delDept, addDept, updateDept } from "@/api/centerdata_emergency1/dept";
 
 export default {
   name: "Dept",

data-ui/src/views/centerdata_emergency1/enterprise/index.vue

@@ -301,9 +301,9 @@
 <script>
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-  import {listEnterprise, getEnterprise, delEnterprise, addEnterprise, updateEnterprise} from "@/api/edyj/enterprise";
+  import {listEnterprise, getEnterprise, delEnterprise, addEnterprise, updateEnterprise} from "@/api/centerdata_emergency1/enterprise";
   import {listUser, deptTreeSelect,} from "@/api/system/user";
-  import {getLoginUser} from "@/api/edyj/main";
+  import {getLoginUser} from "@/api/centerdata_emergency1/main";
 
   import supermap from './supermap'
 

data-ui/src/views/centerdata_emergency1/enterprise/supermap.vue

@@ -1,132 +1,132 @@
-<!-- **************************************NO.5 地图*************************************** -->
-<template>
-  <div class="map-container">
-
-    <div id="enterprisemap" style="width: 100%;height: 100%;"></div>
-  </div>
-</template>
-
-<script>
-
-  import L from 'leaflet'
-  import '@supermap/iclient-leaflet'
-  import 'leaflet/dist/leaflet.css'
-
-  export default {
-    name: 'spuermap',
-    data() {
-      return {
-        mapUrl: 'http://121.36.228.94:8090/iserver/services/map-JiLin/rest/maps/JiLin',
-        map: null,
-        lat: '',
-        lng: '',
-        iconMarker: new L.Icon({
-          iconUrl: require('@/assets/images/icon-danger.png'),
-          iconSize: [65, 60],
-          iconAnchor: [12, 41],
-          popupAnchor: [17, -34],
-          shadowSize: [41, 41]
-        }),
-        marker: {},
-        layers: [],
-        myGroup: undefined
-      }
-    },
-    mounted() {
-      this.initMap()
-    },
-    props:{
-      setLatLng : Function
-    },
-    methods: {
-      clearM: async function() {
-        if (this.myGroup != undefined) {
-          // await this.initMap()
-          this.myGroup.clearLayers()
-        }
-        this.layers = []
-      },
-
-      setMarker(lat,lng){
-        this.clearM()
-        let marker = window.L.marker([lat, lng], {
-          icon: this.iconMarker
-        })
-        this.layers.push(marker)
-        this.myGroup = window.L.layerGroup(this.layers)
-        this.map.addLayer(this.myGroup)
-
-
-        this.map.panTo([lat,lng])
-        // let center = window.L.LonLat(104.07, 30.67);
-        // this.map.setCenter(center,7)
-      },
-
-      initMap() {
-        let lat = 43.875228
-        let lon = 125.379896
-        this.map = window.L.map('enterprisemap', {
-          crs: window.L.CRS.EPSG4326,
-          center: [lat, lon],
-          maxZoom: 18,
-          zoom: 10,
-          editable: true,
-          zoomControl: false
-        })
-        window.L.supermap.tiledMapLayer(this.mapUrl).addTo(this.map)
-        let that = this
-        this.map.on('click', function(e) {
-          that.clearM()
-          let lat = e.latlng.lat
-          let lng = e.latlng.lng
-          let marker = window.L.marker([lat, lng], {
-            icon: that.iconMarker
-          })
-          that.setLatLng(lat,lng)
-
-          that.layers.push(marker)
-          that.myGroup = window.L.layerGroup(that.layers)
-          that.map.addLayer(that.myGroup)
-
-
-        })
-
-
-
-        // this.map.on('click', function(e) {
-        //   console.log(e)
-        //   let lat = e.latlng.lat
-        //   let lng = e.latlng.lng
-        //   // let marker = L.marker([lat, lng], {
-        //   //   icon: this.iconMarker
-        //   // })
-        //   // this.layers.push(marker)
-        //   // this.myGroup = L.layerGroup(this.layers)
-        //   // this.map.addLayer(this.myGroup)
-        //   // this.map.addLayer(this.marker)
-        // })
-      }
-    }
-
-  }
-</script>
-
-<style rel="stylesheet/scss" lang="scss">
-  .map-container {
-    width: 100%;
-    height: 100%;
-    color: #fff;
-    background-color: #01020c;
-    box-shadow: rgba(1, 2, 12, 1) 0px 0px 25px inset;
-
-    .leaflet-left {
-      .leaflet-control {
-        margin-top: 60px;
-      }
-    }
-
-    .leaflet-right {
-      display: none;
-    }
-  }
-</style>
+<!--&lt;!&ndash; **************************************NO.5 地图*************************************** &ndash;&gt;-->
+<!--<template>-->
+<!--  <div class="map-container">-->
+
+<!--    <div id="enterprisemap" style="width: 100%;height: 100%;"></div>-->
+<!--  </div>-->
+<!--</template>-->
+
+<!--<script>-->
+
+<!--  import L from 'leaflet'-->
+<!--  import '@supermap/iclient-leaflet'-->
+<!--  import 'leaflet/dist/leaflet.css'-->
+
+<!--  export default {-->
+<!--    name: 'spuermap',-->
+<!--    data() {-->
+<!--      return {-->
+<!--        mapUrl: 'http://121.36.228.94:8090/iserver/services/map-JiLin/rest/maps/JiLin',-->
+<!--        map: null,-->
+<!--        lat: '',-->
+<!--        lng: '',-->
+<!--        iconMarker: new L.Icon({-->
+<!--          iconUrl: require('@/assets/images/icon-danger.png'),-->
+<!--          iconSize: [65, 60],-->
+<!--          iconAnchor: [12, 41],-->
+<!--          popupAnchor: [17, -34],-->
+<!--          shadowSize: [41, 41]-->
+<!--        }),-->
+<!--        marker: {},-->
+<!--        layers: [],-->
+<!--        myGroup: undefined-->
+<!--      }-->
+<!--    },-->
+<!--    mounted() {-->
+<!--      this.initMap()-->
+<!--    },-->
+<!--    props:{-->
+<!--      setLatLng : Function-->
+<!--    },-->
+<!--    methods: {-->
+<!--      clearM: async function() {-->
+<!--        if (this.myGroup != undefined) {-->
+<!--          // await this.initMap()-->
+<!--          this.myGroup.clearLayers()-->
+<!--        }-->
+<!--        this.layers = []-->
+<!--      },-->
+
+<!--      setMarker(lat,lng){-->
+<!--        this.clearM()-->
+<!--        let marker = window.L.marker([lat, lng], {-->
+<!--          icon: this.iconMarker-->
+<!--        })-->
+<!--        this.layers.push(marker)-->
+<!--        this.myGroup = window.L.layerGroup(this.layers)-->
+<!--        this.map.addLayer(this.myGroup)-->
+
+
+<!--        this.map.panTo([lat,lng])-->
+<!--        // let center = window.L.LonLat(104.07, 30.67);-->
+<!--        // this.map.setCenter(center,7)-->
+<!--      },-->
+
+<!--      initMap() {-->
+<!--        let lat = 43.875228-->
+<!--        let lon = 125.379896-->
+<!--        this.map = window.L.map('enterprisemap', {-->
+<!--          crs: window.L.CRS.EPSG4326,-->
+<!--          center: [lat, lon],-->
+<!--          maxZoom: 18,-->
+<!--          zoom: 10,-->
+<!--          editable: true,-->
+<!--          zoomControl: false-->
+<!--        })-->
+<!--        window.L.supermap.tiledMapLayer(this.mapUrl).addTo(this.map)-->
+<!--        let that = this-->
+<!--        this.map.on('click', function(e) {-->
+<!--          that.clearM()-->
+<!--          let lat = e.latlng.lat-->
+<!--          let lng = e.latlng.lng-->
+<!--          let marker = window.L.marker([lat, lng], {-->
+<!--            icon: that.iconMarker-->
+<!--          })-->
+<!--          that.setLatLng(lat,lng)-->
+
+<!--          that.layers.push(marker)-->
+<!--          that.myGroup = window.L.layerGroup(that.layers)-->
+<!--          that.map.addLayer(that.myGroup)-->
+
+
+<!--        })-->
+
+
+
+<!--        // this.map.on('click', function(e) {-->
+<!--        //   console.log(e)-->
+<!--        //   let lat = e.latlng.lat-->
+<!--        //   let lng = e.latlng.lng-->
+<!--        //   // let marker = L.marker([lat, lng], {-->
+<!--        //   //   icon: this.iconMarker-->
+<!--        //   // })-->
+<!--        //   // this.layers.push(marker)-->
+<!--        //   // this.myGroup = L.layerGroup(this.layers)-->
+<!--        //   // this.map.addLayer(this.myGroup)-->
+<!--        //   // this.map.addLayer(this.marker)-->
+<!--        // })-->
+<!--      }-->
+<!--    }-->
+
+<!--  }-->
+<!--</script>-->
+
+<!--<style rel="stylesheet/scss" lang="scss">-->
+<!--  .map-container {-->
+<!--    width: 100%;-->
+<!--    height: 100%;-->
+<!--    color: #fff;-->
+<!--    background-color: #01020c;-->
+<!--    box-shadow: rgba(1, 2, 12, 1) 0px 0px 25px inset;-->
+
+<!--    .leaflet-left {-->
+<!--      .leaflet-control {-->
+<!--        margin-top: 60px;-->
+<!--      }-->
+<!--    }-->
+
+<!--    .leaflet-right {-->
+<!--      display: none;-->
+<!--    }-->
+<!--  }-->
+<!--</style>-->

data-ui/src/views/centerdata_emergency1/inspection/index.vue

@@ -245,7 +245,7 @@
     delInspection,
     addInspection,
     updateInspection
-  } from "@/api/edyj/inspection";
+  } from "@/api/centerdata_emergency1/inspection";
 
   export default {
     name: "Inspection",

data-ui/src/views/centerdata_emergency1/items/index.vue

@@ -201,7 +201,7 @@
 </template>
 
 <script>
-  import {listItems, getItems, delItems, addItems, updateItems} from "@/api/edyj/items";
+  import {listItems, getItems, delItems, addItems, updateItems} from "@/api/centerdata_emergency1/items";
 
   export default {
     name: "Items",

data-ui/src/views/centerdata_emergency1/log/index.vue

@@ -260,7 +260,7 @@
 </template>
 
 <script>
-  import {listLog, getLog, delLog, addLog, updateLog} from "@/api/edyj/log";
+  import {listLog, getLog, delLog, addLog, updateLog} from "@/api/centerdata_emergency1/log";
 
   export default {
     name: "Log",

data-ui/src/views/centerdata_emergency1/mapping/index.vue

@@ -120,7 +120,7 @@
 </template>
 
 <script>
-import { listMapping, getMapping, delMapping, addMapping, updateMapping } from "@/api/edyj/mapping";
+import { listMapping, getMapping, delMapping, addMapping, updateMapping } from "@/api/centerdata_emergency1/mapping";
 
 export default {
   name: "Mapping",

data-ui/src/views/centerdata_emergency1/material/index.vue

@@ -275,7 +275,7 @@
 </template>
 
 <script>
-  import {listMaterial, getMaterial, delMaterial, addMaterial, updateMaterial} from "@/api/edyj/material";
+  import {listMaterial, getMaterial, delMaterial, addMaterial, updateMaterial} from "@/api/centerdata_emergency1/material";
 
   export default {
     name: "Material",

data-ui/src/views/centerdata_emergency1/patrolstation/index.vue

@@ -206,7 +206,7 @@
     delPatrolstation,
     addPatrolstation,
     updatePatrolstation
-  } from "@/api/edyj/patrolstation";
+  } from "@/api/centerdata_emergency1/patrolstation";
   import supermap from './supermap'
 
   export default {

data-ui/src/views/centerdata_emergency1/patrolstation/supermap.vue

@@ -1,132 +1,132 @@
-<!-- **************************************NO.5 地图*************************************** -->
-<template>
-  <div class="map-container">
-
-    <div id="enterprisemap" style="width: 100%;height: 100%;"></div>
-  </div>
-</template>
-
-<script>
-
-  import L from 'leaflet'
-  import '@supermap/iclient-leaflet'
-  import 'leaflet/dist/leaflet.css'
-
-  export default {
-    name: 'spuermap',
-    data() {
-      return {
-        mapUrl: 'http://121.36.228.94:8090/iserver/services/map-JiLin/rest/maps/JiLin',
-        map: null,
-        lat: '',
-        lng: '',
-        iconMarker: new L.Icon({
-          iconUrl: require('@/assets/images/icon-danger.png'),
-          iconSize: [65, 60],
-          iconAnchor: [12, 41],
-          popupAnchor: [17, -34],
-          shadowSize: [41, 41]
-        }),
-        marker: {},
-        layers: [],
-        myGroup: undefined
-      }
-    },
-    mounted() {
-      this.initMap()
-    },
-    props:{
-      setLatLng : Function
-    },
-    methods: {
-      clearM: async function() {
-        if (this.myGroup != undefined) {
-          // await this.initMap()
-          this.myGroup.clearLayers()
-        }
-        this.layers = []
-      },
-
-      setMarker(lat,lng){
-        this.clearM()
-        let marker = window.L.marker([lat, lng], {
-          icon: this.iconMarker
-        })
-        this.layers.push(marker)
-        this.myGroup = window.L.layerGroup(this.layers)
-        this.map.addLayer(this.myGroup)
-
-
-        this.map.panTo([lat,lng])
-        // let center = window.L.LonLat(104.07, 30.67);
-        // this.map.setCenter(center,7)
-      },
-
-      initMap() {
-        let lat = 43.875228
-        let lon = 125.379896
-        this.map = window.L.map('enterprisemap', {
-          crs: window.L.CRS.EPSG4326,
-          center: [lat, lon],
-          maxZoom: 18,
-          zoom: 10,
-          editable: true,
-          zoomControl: false
-        })
-        window.L.supermap.tiledMapLayer(this.mapUrl).addTo(this.map)
-        let that = this
-        this.map.on('click', function(e) {
-          that.clearM()
-          let lat = e.latlng.lat
-          let lng = e.latlng.lng
-          let marker = window.L.marker([lat, lng], {
-            icon: that.iconMarker
-          })
-          that.setLatLng(lat,lng)
-
-          that.layers.push(marker)
-          that.myGroup = window.L.layerGroup(that.layers)
-          that.map.addLayer(that.myGroup)
-
-
-        })
-
-
-
-        // this.map.on('click', function(e) {
-        //   console.log(e)
-        //   let lat = e.latlng.lat
-        //   let lng = e.latlng.lng
-        //   // let marker = L.marker([lat, lng], {
-        //   //   icon: this.iconMarker
-        //   // })
-        //   // this.layers.push(marker)
-        //   // this.myGroup = L.layerGroup(this.layers)
-        //   // this.map.addLayer(this.myGroup)
-        //   // this.map.addLayer(this.marker)
-        // })
-      }
-    }
-
-  }
-</script>
-
-<style rel="stylesheet/scss" lang="scss">
-  .map-container {
-    width: 100%;
-    height: 100%;
-    color: #fff;
-    background-color: #01020c;
-    box-shadow: rgba(1, 2, 12, 1) 0px 0px 25px inset;
-
-    .leaflet-left {
-      .leaflet-control {
-        margin-top: 60px;
-      }
-    }
-
-    .leaflet-right {
-      display: none;
-    }
-  }
-</style>
+<!--&lt;!&ndash; **************************************NO.5 地图*************************************** &ndash;&gt;-->
+<!--<template>-->
+<!--  <div class="map-container">-->
+
+<!--    <div id="enterprisemap" style="width: 100%;height: 100%;"></div>-->
+<!--  </div>-->
+<!--</template>-->
+
+<!--<script>-->
+
+<!--  import L from 'leaflet'-->
+<!--  import '@supermap/iclient-leaflet'-->
+<!--  import 'leaflet/dist/leaflet.css'-->
+
+<!--  export default {-->
+<!--    name: 'spuermap',-->
+<!--    data() {-->
+<!--      return {-->
+<!--        mapUrl: 'http://121.36.228.94:8090/iserver/services/map-JiLin/rest/maps/JiLin',-->
+<!--        map: null,-->
+<!--        lat: '',-->
+<!--        lng: '',-->
+<!--        iconMarker: new L.Icon({-->
+<!--          iconUrl: require('@/assets/images/icon-danger.png'),-->
+<!--          iconSize: [65, 60],-->
+<!--          iconAnchor: [12, 41],-->
+<!--          popupAnchor: [17, -34],-->
+<!--          shadowSize: [41, 41]-->
+<!--        }),-->
+<!--        marker: {},-->
+<!--        layers: [],-->
+<!--        myGroup: undefined-->
+<!--      }-->
+<!--    },-->
+<!--    mounted() {-->
+<!--      this.initMap()-->
+<!--    },-->
+<!--    props:{-->
+<!--      setLatLng : Function-->
+<!--    },-->
+<!--    methods: {-->
+<!--      clearM: async function() {-->
+<!--        if (this.myGroup != undefined) {-->
+<!--          // await this.initMap()-->
+<!--          this.myGroup.clearLayers()-->
+<!--        }-->
+<!--        this.layers = []-->
+<!--      },-->
+
+<!--      setMarker(lat,lng){-->
+<!--        this.clearM()-->
+<!--        let marker = window.L.marker([lat, lng], {-->
+<!--          icon: this.iconMarker-->
+<!--        })-->
+<!--        this.layers.push(marker)-->
+<!--        this.myGroup = window.L.layerGroup(this.layers)-->
+<!--        this.map.addLayer(this.myGroup)-->
+
+
+<!--        this.map.panTo([lat,lng])-->
+<!--        // let center = window.L.LonLat(104.07, 30.67);-->
+<!--        // this.map.setCenter(center,7)-->
+<!--      },-->
+
+<!--      initMap() {-->
+<!--        let lat = 43.875228-->
+<!--        let lon = 125.379896-->
+<!--        this.map = window.L.map('enterprisemap', {-->
+<!--          crs: window.L.CRS.EPSG4326,-->
+<!--          center: [lat, lon],-->
+<!--          maxZoom: 18,-->
+<!--          zoom: 10,-->
+<!--          editable: true,-->
+<!--          zoomControl: false-->
+<!--        })-->
+<!--        window.L.supermap.tiledMapLayer(this.mapUrl).addTo(this.map)-->
+<!--        let that = this-->
+<!--        this.map.on('click', function(e) {-->
+<!--          that.clearM()-->
+<!--          let lat = e.latlng.lat-->
+<!--          let lng = e.latlng.lng-->
+<!--          let marker = window.L.marker([lat, lng], {-->
+<!--            icon: that.iconMarker-->
+<!--          })-->
+<!--          that.setLatLng(lat,lng)-->
+
+<!--          that.layers.push(marker)-->
+<!--          that.myGroup = window.L.layerGroup(that.layers)-->
+<!--          that.map.addLayer(that.myGroup)-->
+
+
+<!--        })-->
+
+
+
+<!--        // this.map.on('click', function(e) {-->
+<!--        //   console.log(e)-->
+<!--        //   let lat = e.latlng.lat-->
+<!--        //   let lng = e.latlng.lng-->
+<!--        //   // let marker = L.marker([lat, lng], {-->
+<!--        //   //   icon: this.iconMarker-->
+<!--        //   // })-->
+<!--        //   // this.layers.push(marker)-->
+<!--        //   // this.myGroup = L.layerGroup(this.layers)-->
+<!--        //   // this.map.addLayer(this.myGroup)-->
+<!--        //   // this.map.addLayer(this.marker)-->
+<!--        // })-->
+<!--      }-->
+<!--    }-->
+
+<!--  }-->
+<!--</script>-->
+
+<!--<style rel="stylesheet/scss" lang="scss">-->
+<!--  .map-container {-->
+<!--    width: 100%;-->
+<!--    height: 100%;-->
+<!--    color: #fff;-->
+<!--    background-color: #01020c;-->
+<!--    box-shadow: rgba(1, 2, 12, 1) 0px 0px 25px inset;-->
+
+<!--    .leaflet-left {-->
+<!--      .leaflet-control {-->
+<!--        margin-top: 60px;-->
+<!--      }-->
+<!--    }-->
+
+<!--    .leaflet-right {-->
+<!--      display: none;-->
+<!--    }-->
+<!--  }-->
+<!--</style>-->

data-ui/src/views/centerdata_emergency1/team/index.vue

@@ -263,7 +263,7 @@
 </template>
 
 <script>
-  import {listTeam, getTeam, delTeam, addTeam, updateTeam} from "@/api/edyj/team";
+  import {listTeam, getTeam, delTeam, addTeam, updateTeam} from "@/api/centerdata_emergency1/team";
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
   import {deptTreeSelect} from "@/api/system/user";

data-ui/src/views/centerdata_emergency1/track/index.vue

@@ -161,7 +161,7 @@
 </template>
 
 <script>
-import { listTrack, getTrack, delTrack, addTrack, updateTrack } from "@/api/edyj/track";
+import { listTrack, getTrack, delTrack, addTrack, updateTrack } from "@/api/centerdata_emergency1/track";
 
 export default {
   name: "Track",

data-ui/src/views/centerdata_emergency1/user/index.vue

@@ -83,7 +83,7 @@
 </template>
 
 <script>
-import { listUser, getUser, delUser, addUser, updateUser } from "@/api/edyj/user";
+import { listUser, getUser, delUser, addUser, updateUser } from "@/api/centerdata_emergency1/user";
 
 export default {
   name: "User",

data-ui/src/views/centerdata_emergency1/warehouse/index.vue

@@ -182,7 +182,7 @@
 </template>
 
 <script>
-  import {listWarehouse, getWarehouse, delWarehouse, addWarehouse, updateWarehouse} from "@/api/edyj/warehouse";
+  import {listWarehouse, getWarehouse, delWarehouse, addWarehouse, updateWarehouse} from "@/api/centerdata_emergency1/warehouse";
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
   import {deptTreeSelect} from "@/api/system/user";

data-ui/src/views/centerdata_emergency1/warehouse/supermap.vue

@@ -1,132 +1,132 @@
-<!-- **************************************NO.5 地图*************************************** -->
-<template>
-  <div class="map-container">
-
-    <div id="warehousemap" style="width: 100%;height: 100%;"></div>
-  </div>
-</template>
-
-<script>
-
-  import L from 'leaflet'
-  import '@supermap/iclient-leaflet'
-  import 'leaflet/dist/leaflet.css'
-
-  export default {
-    name: 'spuermap',
-    data() {
-      return {
-        mapUrl: 'http://121.36.228.94:8090/iserver/services/map-JiLin/rest/maps/JiLin',
-        map: null,
-        lat: '',
-        lng: '',
-        iconMarker: new L.Icon({
-          iconUrl: require('@/assets/images/icon-danger.png'),
-          iconSize: [65, 60],
-          iconAnchor: [12, 41],
-          popupAnchor: [17, -34],
-          shadowSize: [41, 41]
-        }),
-        marker: {},
-        layers: [],
-        myGroup: undefined
-      }
-    },
-    mounted() {
-      this.initMap()
-    },
-    props:{
-      setLatLng : Function
-    },
-    methods: {
-      clearM: async function() {
-        if (this.myGroup != undefined) {
-          // await this.initMap()
-          this.myGroup.clearLayers()
-        }
-        this.layers = []
-      },
-
-      setMarker(lat,lng){
-        this.clearM()
-        let marker = window.L.marker([lat, lng], {
-          icon: this.iconMarker
-        })
-        this.layers.push(marker)
-        this.myGroup = window.L.layerGroup(this.layers)
-        this.map.addLayer(this.myGroup)
-
-
-        this.map.panTo([lat,lng])
-        // let center = window.L.LonLat(104.07, 30.67);
-        // this.map.setCenter(center,7)
-      },
-
-      initMap() {
-        let lat = 43.875228
-        let lon = 125.379896
-        this.map = window.L.map('warehousemap', {
-          crs: window.L.CRS.EPSG4326,
-          center: [lat, lon],
-          maxZoom: 18,
-          zoom: 10,
-          editable: true,
-          zoomControl: false
-        })
-        window.L.supermap.tiledMapLayer(this.mapUrl).addTo(this.map)
-        let that = this
-        this.map.on('click', function(e) {
-          that.clearM()
-          let lat = e.latlng.lat
-          let lng = e.latlng.lng
-          let marker = window.L.marker([lat, lng], {
-            icon: that.iconMarker
-          })
-          that.setLatLng(lat,lng)
-
-          that.layers.push(marker)
-          that.myGroup = window.L.layerGroup(that.layers)
-          that.map.addLayer(that.myGroup)
-
-
-        })
-
-
-
-        // this.map.on('click', function(e) {
-        //   console.log(e)
-        //   let lat = e.latlng.lat
-        //   let lng = e.latlng.lng
-        //   // let marker = L.marker([lat, lng], {
-        //   //   icon: this.iconMarker
-        //   // })
-        //   // this.layers.push(marker)
-        //   // this.myGroup = L.layerGroup(this.layers)
-        //   // this.map.addLayer(this.myGroup)
-        //   // this.map.addLayer(this.marker)
-        // })
-      }
-    }
-
-  }
-</script>
-
-<style rel="stylesheet/scss" lang="scss">
-  .map-container {
-    width: 100%;
-    height: 100%;
-    color: #fff;
-    background-color: #01020c;
-    box-shadow: rgba(1, 2, 12, 1) 0px 0px 25px inset;
-
-    .leaflet-left {
-      .leaflet-control {
-        margin-top: 60px;
-      }
-    }
-
-    .leaflet-right {
-      display: none;
-    }
-  }
-</style>
+<!--&lt;!&ndash; **************************************NO.5 地图*************************************** &ndash;&gt;-->
+<!--<template>-->
+<!--  <div class="map-container">-->
+
+<!--    <div id="warehousemap" style="width: 100%;height: 100%;"></div>-->
+<!--  </div>-->
+<!--</template>-->
+
+<!--<script>-->
+
+<!--  import L from 'leaflet'-->
+<!--  import '@supermap/iclient-leaflet'-->
+<!--  import 'leaflet/dist/leaflet.css'-->
+
+<!--  export default {-->
+<!--    name: 'spuermap',-->
+<!--    data() {-->
+<!--      return {-->
+<!--        mapUrl: 'http://121.36.228.94:8090/iserver/services/map-JiLin/rest/maps/JiLin',-->
+<!--        map: null,-->
+<!--        lat: '',-->
+<!--        lng: '',-->
+<!--        iconMarker: new L.Icon({-->
+<!--          iconUrl: require('@/assets/images/icon-danger.png'),-->
+<!--          iconSize: [65, 60],-->
+<!--          iconAnchor: [12, 41],-->
+<!--          popupAnchor: [17, -34],-->
+<!--          shadowSize: [41, 41]-->
+<!--        }),-->
+<!--        marker: {},-->
+<!--        layers: [],-->
+<!--        myGroup: undefined-->
+<!--      }-->
+<!--    },-->
+<!--    mounted() {-->
+<!--      this.initMap()-->
+<!--    },-->
+<!--    props:{-->
+<!--      setLatLng : Function-->
+<!--    },-->
+<!--    methods: {-->
+<!--      clearM: async function() {-->
+<!--        if (this.myGroup != undefined) {-->
+<!--          // await this.initMap()-->
+<!--          this.myGroup.clearLayers()-->
+<!--        }-->
+<!--        this.layers = []-->
+<!--      },-->
+
+<!--      setMarker(lat,lng){-->
+<!--        this.clearM()-->
+<!--        let marker = window.L.marker([lat, lng], {-->
+<!--          icon: this.iconMarker-->
+<!--        })-->
+<!--        this.layers.push(marker)-->
+<!--        this.myGroup = window.L.layerGroup(this.layers)-->
+<!--        this.map.addLayer(this.myGroup)-->
+
+
+<!--        this.map.panTo([lat,lng])-->
+<!--        // let center = window.L.LonLat(104.07, 30.67);-->
+<!--        // this.map.setCenter(center,7)-->
+<!--      },-->
+
+<!--      initMap() {-->
+<!--        let lat = 43.875228-->
+<!--        let lon = 125.379896-->
+<!--        this.map = window.L.map('warehousemap', {-->
+<!--          crs: window.L.CRS.EPSG4326,-->
+<!--          center: [lat, lon],-->
+<!--          maxZoom: 18,-->
+<!--          zoom: 10,-->
+<!--          editable: true,-->
+<!--          zoomControl: false-->
+<!--        })-->
+<!--        window.L.supermap.tiledMapLayer(this.mapUrl).addTo(this.map)-->
+<!--        let that = this-->
+<!--        this.map.on('click', function(e) {-->
+<!--          that.clearM()-->
+<!--          let lat = e.latlng.lat-->
+<!--          let lng = e.latlng.lng-->
+<!--          let marker = window.L.marker([lat, lng], {-->
+<!--            icon: that.iconMarker-->
+<!--          })-->
+<!--          that.setLatLng(lat,lng)-->
+
+<!--          that.layers.push(marker)-->
+<!--          that.myGroup = window.L.layerGroup(that.layers)-->
+<!--          that.map.addLayer(that.myGroup)-->
+
+
+<!--        })-->
+
+
+
+<!--        // this.map.on('click', function(e) {-->
+<!--        //   console.log(e)-->
+<!--        //   let lat = e.latlng.lat-->
+<!--        //   let lng = e.latlng.lng-->
+<!--        //   // let marker = L.marker([lat, lng], {-->
+<!--        //   //   icon: this.iconMarker-->
+<!--        //   // })-->
+<!--        //   // this.layers.push(marker)-->
+<!--        //   // this.myGroup = L.layerGroup(this.layers)-->
+<!--        //   // this.map.addLayer(this.myGroup)-->
+<!--        //   // this.map.addLayer(this.marker)-->
+<!--        // })-->
+<!--      }-->
+<!--    }-->
+
+<!--  }-->
+<!--</script>-->
+
+<!--<style rel="stylesheet/scss" lang="scss">-->
+<!--  .map-container {-->
+<!--    width: 100%;-->
+<!--    height: 100%;-->
+<!--    color: #fff;-->
+<!--    background-color: #01020c;-->
+<!--    box-shadow: rgba(1, 2, 12, 1) 0px 0px 25px inset;-->
+
+<!--    .leaflet-left {-->
+<!--      .leaflet-control {-->
+<!--        margin-top: 60px;-->
+<!--      }-->
+<!--    }-->
+
+<!--    .leaflet-right {-->
+<!--      display: none;-->
+<!--    }-->
+<!--  }-->
+<!--</style>-->

src/main/java/com/sooka/sponest/data/emergency/appmin/base/AppBaseService.java

@@ -1,12 +1,13 @@
 package com.sooka.sponest.data.emergency.appmin.base;
 
+import com.ruoyi.common.datascope.base.service.BaseService;
 import com.ruoyi.system.api.domain.SysDept;
 import com.sooka.sponest.data.emergency.remoteapi.service.center.data.RemoteSystemBaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
-public class AppBaseService {
+public class AppBaseService extends BaseService {
     @Autowired
     private RemoteSystemBaseService remoteSystemBaseService;
 

src/main/java/com/sooka/sponest/data/emergency/appmin/index/service/impl/AppIndexServiceImpl.java

@@ -1,6 +1,7 @@
 package com.sooka.sponest.data.emergency.appmin.index.service.impl;
 
 import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.datascope.annotation.DataScope;
 import com.sooka.sponest.data.emergency.appmin.base.AppBaseService;
 import com.sooka.sponest.data.emergency.appmin.index.domain.AppIndexVO;
@@ -47,14 +48,9 @@ public class AppIndexServiceImpl extends AppBaseService implements AppIndexServi
             }
             countStr += ls.get(0).getXunjianListCount();
             countStr = countStr.substring(0, 3) + "," + countStr.substring(3);
-            map.put("xunjianImgCount", countStr);
-            map.put("noticeList", remoteSystemBaseService.noticlist(1,10));
+            TableDataInfo noticlist = remoteSystemBaseService.noticlist(1, 1);
 
-
-//            List late_inspection_list = managerMainMapper.getMainInspections(vo);
-//            ajaxResult.put("late_inspection_list",late_inspection_list);
-
-            return AjaxResult.success(map);
+            return AjaxResult.success(!noticlist.getRows().isEmpty() ? noticlist.getRows().get(0) : null);
         } catch (Exception e) {
             e.printStackTrace();
             return AjaxResult.error("错误");

src/main/java/com/sooka/sponest/data/emergency/appmin/xuncha/controller/AppXunchaController.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.sooka.sponest.data.emergency.appmin.xuncha.domain.AppXunchaVO;
 import com.sooka.sponest.data.emergency.appmin.xuncha.service.AppXunchaService;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -23,13 +24,15 @@ public class AppXunchaController extends BaseController {
     public AjaxResult getXunchaCount(AppXunchaVO vo){
         return appXunchaService.getXunchaCount(vo);
     }
-    @RequestMapping("getXunchaList")
+
+
+    @GetMapping("/getXunchaList")
     public AjaxResult getXunchaList(AppXunchaVO vo){
         startPage();
         List list = appXunchaService.getXunchaList(vo);
         list.removeAll(Collections.singleton(null));
         TableDataInfo tableDataInfo = getDataTable(list);
-        return AjaxResult.success(tableDataInfo);
+        return AjaxResult.success(tableDataInfo.getRows());
     }
 
 

src/main/java/com/sooka/sponest/data/emergency/appmin/xuncha/domain/AppXunchaVO.java

@@ -1,12 +1,13 @@
 package com.sooka.sponest.data.emergency.appmin.xuncha.domain;
 
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.ruoyi.common.datascope.base.domain.BaseBusinessEntity;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public class AppXunchaVO extends BaseEntity {
+public class AppXunchaVO extends BaseBusinessEntity {
 
     String todayStart;
     String todayEnd;

src/main/java/com/sooka/sponest/data/emergency/appmin/xuncha/service/impl/AppXunchaServiceImpl.java

@@ -2,6 +2,7 @@ package com.sooka.sponest.data.emergency.appmin.xuncha.service.impl;
 
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.datascope.annotation.DataScope;
+import com.ruoyi.common.datascope.base.service.BaseService;
 import com.sooka.sponest.data.emergency.appmin.base.AppBaseService;
 import com.sooka.sponest.data.emergency.appmin.xuncha.domain.AppXunchaCountBO;
 import com.sooka.sponest.data.emergency.appmin.xuncha.domain.AppXunchaListBO;
@@ -63,6 +64,7 @@ public class AppXunchaServiceImpl extends AppBaseService implements AppXunchaSer
     @Override
     @DataScope(deptAlias = "e")
     public List<AppXunchaListBO> getXunchaList(AppXunchaVO vo) {
+        setSookaDataBase(vo);
         return appXunchaMapper.getXunchaList(vo);
     }
 

src/main/java/com/sooka/sponest/data/emergency/appmin/zhenggaijindu/domain/AppZhenggaijinduVO.java

@@ -1,11 +1,12 @@
 package com.sooka.sponest.data.emergency.appmin.zhenggaijindu.domain;
 
+import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public class AppZhenggaijinduVO {
+public class AppZhenggaijinduVO extends BaseBusinessEntity {
 
     String busInspectionId;
 

src/main/java/com/sooka/sponest/data/emergency/appmin/zhenggaijindu/service/impl/AppZhenggaijinduServiceImpl.java

@@ -1,11 +1,11 @@
 package com.sooka.sponest.data.emergency.appmin.zhenggaijindu.service.impl;
 
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.sooka.sponest.data.emergency.appmin.base.AppBaseService;
+import com.ruoyi.system.api.RemoteConfigService;
+import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.emergency.appmin.zhenggaijindu.domain.AppZhenggaijinduVO;
 import com.sooka.sponest.data.emergency.appmin.zhenggaijindu.mapper.AppZhenggaijinduMapper;
 import com.sooka.sponest.data.emergency.appmin.zhenggaijindu.service.AppZhenggaijinduService;
-import com.sooka.sponest.data.emergency.remoteapi.service.center.data.RemoteSystemBaseService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -14,19 +14,19 @@ import java.util.List;
 import java.util.Map;
 
 @Service
-public class AppZhenggaijinduServiceImpl extends AppBaseService implements AppZhenggaijinduService {
+public class AppZhenggaijinduServiceImpl extends BaseServiceImpl implements AppZhenggaijinduService {
 
     @Resource
     AppZhenggaijinduMapper appZhenggaijinduMapper;
 
     @Resource
-    RemoteSystemBaseService remoteSystemBaseService;
+    RemoteConfigService remoteSystemBaseService;
 
     @Override
     public AjaxResult getZhenggaijinduList(AppZhenggaijinduVO vo) {
-
+        setSookaDataBase(vo);
         try {
-            String pictureBasePath = remoteSystemBaseService.configKeyapp("pictureBasePath").get("code").toString();
+            String pictureBasePath = remoteSystemBaseService.remotegetConfigKey("appUrl").getData();
             List list = appZhenggaijinduMapper.getZhenggaijinduList(vo);
             Map map = new HashMap();
             map.put("pictureBasePath", pictureBasePath);

src/main/java/com/sooka/sponest/data/emergency/remoteapi/service/center/data/RemoteSystemBaseService.java

@@ -41,7 +41,7 @@ public interface RemoteSystemBaseService {
      * @author pengyu
      * @date 2023/2/22 13:05
      **/
-    @GetMapping("/notice/noticlist")
+    @GetMapping("/notice/noticeList")
     public TableDataInfo noticlist(@RequestParam(value = "pageNum") Integer pageNum, @RequestParam(value = "pageSize") Integer pageSize);
 
     //根据通知公告编号获取详细信息（App）

src/main/resources/mapper/emergency/appmin/AppXunchaMapper.xml

@@ -59,7 +59,7 @@
         t.deptName as deptName,
 
         log.bus_log_id as busLogId,
-        (select dict_label from sys_dict_data where dict_value = log.bus_log_type ) as busLogTypeLabel ,
+        (select dict_label from ${database_system}.sys_dict_data where dict_value = log.bus_log_type ) as busLogTypeLabel ,
         log.bus_enterprise_id as busEnterpriseId,
         log.bus_enterprise_name as busEnterpriseName,
         log.is_risk as isRisk,
@@ -67,8 +67,8 @@
         log.create_by as createBy
         from t_bus_log log,t_bus_enterprise e,
         (select sd.bus_log_id bus_log_id,
-        sd.user_id, (select s.nick_name from sys_user s where s.user_id= sd.user_id) as nickName,
-        sd.dept_id,(select d.dept_name from sys_dept d where d.dept_id = sd.dept_id) as deptName,
+        sd.user_id, (select s.nick_name from ${database_system}.sys_user s where s.user_id= sd.user_id) as nickName,
+        sd.dept_id,(select d.dept_name from ${database_system}.sys_dept d where d.dept_id = sd.dept_id) as deptName,
         min(sd.create_time) as create_time from t_bus_dept sd
         group by bus_log_id) t
         where log.bus_log_id=t.bus_log_id and e.bus_enterprise_id=log.bus_enterprise_id

src/main/resources/mapper/emergency/appmin/AppZhenggaijinduMapper.xml

@@ -31,10 +31,10 @@
 select * from
 (select
 t.bus_track_id busTrackId,
-(select nick_name from sys_user where user_id=t.user_id) nickName,
-(select dept_name from sys_dept where dept_id=t.dept_id) deptName,
+(select nick_name from ${database_system}.sys_user where user_id=t.user_id) nickName,
+(select dept_name from ${database_system}.sys_dept where dept_id=t.dept_id) deptName,
 t.risk_status riskStatus,
-(select dict_label from sys_dict_data where dict_value = t.risk_status) riskStatusValue,
+(select dict_label from ${database_system}.sys_dict_data where dict_value = t.risk_status) riskStatusValue,
 g.bus_enterprise_name enterpriseName,
 ifnull(t.bus_track_content,'') busTrackContent,
 t.create_time crreateTime,