diff --git a/package.json b/package.json
index 08a3dc6..c1b3a27 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
"test:ci": "npm run lint && npm run test:unit"
},
"dependencies": {
+ "@amap/amap-jsapi-loader": "^1.0.1",
"axios": "^0.24.0",
"bpmn-js": "^9.2.2",
"core-js": "^3.8.3",
diff --git a/src/main.js b/src/main.js
index 81dc20c..73de792 100644
--- a/src/main.js
+++ b/src/main.js
@@ -16,8 +16,11 @@ import eimage from '@/components/E-image/index.vue'
import moment from 'moment'
import Print from '@/utils/print' // 引入附件的js文件
import request from '@/utils/request'
-import { setDefaultOrgPath, setDefaultOrgPathName, setStorage } from './utils/auth.js'
-import VueAMap from 'vue-amap'
+import {
+ setDefaultOrgPath,
+ setDefaultOrgPathName,
+ setStorage
+} from './utils/auth.js'
Vue.use(ElementUI)
@@ -33,14 +36,35 @@ Vue.filter('dateFormat', function(dateStr, pattern = 'YYYY-MM-DD') {
})
Vue.use(Print) // 注册
-Vue.use(VueAMap)
-VueAMap.initAMapApiLoader({
- key: 'ccda12d8bffc72e9f1a32c599323a876', // 此处的key,在高德开放平台申请
- plugin: ['AMap.Scale', 'AMap.OverView', 'AMap.ToolBar', 'AMap.MapType', 'AMap.PlaceSearch', 'AMap.Geolocation', 'AMap.Geocoder'], // 此处的插件按需添加
- v: '1.4.4',
- uiVersion: '1.0'
-})
-
+import AMapLoader from '@amap/amap-jsapi-loader';
+// AMapLoader.load({
+// key: "0054c9409ec7a97ddfe933224b36f45c", //申请好的Web端开发者 Key，调用 load 时必填
+// version: "2.0", //指定要加载的 JS API 的版本，缺省时默认为 1.4.15
+// plugins: [
+// 'AMap.ElasticMarker',
+// 'AMap.Geolocation', //定位空间，用来获取和展示用户主机所在的经纬度位置
+// ' AMap.Autocomplete ', //输入提示插件
+// ' AMap.PlaceSearch ', //POI搜索插件
+// ' AMap.Scale ', //右下角缩略图插件，比例尺
+// ' AMap.OverView ', //地图鹰眼插件
+// ' AMap.ToolBar ', //地图工具条
+// ' AMap.MapType ', //类别切换空间，实现默认图层与卫星图，实施交通层之间切换的控制
+// ' AMap.PolyEditor ', //编辑 折线多边形
+// ' AMap.CircleEditor ',
+// "AMap.Geocoder", //地图编码
+// 'AMap.AMapManager',
+// 'AMap.Marker'
+// ], // 此处的插件按需添加
+// })
+// .then((AMap) => {
+// const map = new AMap.Map("container");
+// })
+// .catch((e) => {
+// console.error(e); //加载错误提示
+// });
+window._AMapSecurityConfig = {
+ securityJsCode: "e4ce71df213230e89231cc3ef9c98313",
+};
Vue.config.productionTip = false
// let token = null
@@ -63,7 +87,7 @@ if (parseInt(one) > 18) {
}
}
- // 获取登录用户信息
+// 获取登录用户信息
function getUserInfo() {
// return request({
// url: '/wms/apiadmin/sysuser/loginDetails',
@@ -100,19 +124,22 @@ function getUserInfo() {
// window.sessionStorage.setItem('departmentSid', user.departmentSid)
// window.sessionStorage.setItem('orgNamePath', user.orgNamePath)
// window.sessionStorage.setItem('orgSidPath', user.orgSidPath)
- new Vue({
- el: '#app',
- router,
- store,
- render: h => h(App)
- })
+ new Vue({
+ el: '#app',
+ router,
+ store,
+ render: h => h(App)
+ })
// })
}
getUserInfo()
+
function GetQueryString(name) {
var one = window.location.href.indexOf('?token=') + 7
- if (one < 7) { return null }
+ if (one < 7) {
+ return null
+ }
var two = window.location.href.lastIndexOf('&') // + 1
var data = window.location.href.substr(one)
if (two > one) {
@@ -125,5 +152,6 @@ function GetQueryString(name) {
return null
var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)')
var r = window.location.search.substr(1).match(reg)
- if (r != null) return unescape(r[2]); return null
+ if (r != null) return unescape(r[2]);
+ return null
}
diff --git a/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue b/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue
index 7bdf049..64845db 100644
--- a/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue
+++ b/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue
@@ -1,95 +1,115 @@
diff --git a/src/views/baseInfo/warehouses/warehouse/warehouseAdd3.vue b/src/views/baseInfo/warehouses/warehouse/warehouseAdd3.vue
new file mode 100644
index 0000000..2255afb
--- /dev/null
+++ b/src/views/baseInfo/warehouses/warehouse/warehouseAdd3.vue
@@ -0,0 +1,292 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/organizationManage/organizationManage.vue b/src/views/system/organizationManage/organizationManage.vue
index 1beee49..fe948a6 100644
--- a/src/views/system/organizationManage/organizationManage.vue
+++ b/src/views/system/organizationManage/organizationManage.vue
@@ -450,8 +450,15 @@
console.log('zgNamesChange:', val)
const choose = this.staffdata.filter((item) => item.sid == val)
console.log('>>>>>>>>>zgNamesChange', choose)
- this.form.zgNames = choose[0].name
- this.form.zgStaffSid = choose[0].sid
+
+ if (choose != null && choose.length > 0) {
+ this.form.zgNames = choose[0].name
+ this.form.zgStaffSid = choose[0].sid
+ } else {
+ this.form.zgNames = ''
+ this.form.zgStaffSid = ''
+ }
+
},
save() {
if (this.fgStaffSid.length > 0) {
diff --git a/src/views/system/roleAdminister/roleAdminister.vue b/src/views/system/roleAdminister/roleAdminister.vue
index c1b1cbc..19a9f2d 100644
--- a/src/views/system/roleAdminister/roleAdminister.vue
+++ b/src/views/system/roleAdminister/roleAdminister.vue
@@ -489,7 +489,7 @@
this.formBackup = Object.assign({}, this.roleForm)
this.getroleOrgList()
this.getPostList()
- this.getType()
+ // this.getType()
},
methods: {
pagination(val) { // 分页函数