完善功能

public/config.js

@@ -6,7 +6,7 @@ var systemConfig = {
     // oauth服务地址
     oauthUrl: 'http://122.228.28.40:10096',
     // dtb ID配置 与数据库对应 若数据库无修改以下内容不动
-    serviceId: '9', // 对接oauth服务id
+    serviceId: '0', // 对接oauth服务id
     authType: '90', // 菜单权限在oauth中类型id
     menuIds: {
         'twoD': '1', //二维数据菜单ID

src/components/dataManage/ImportData.vue

@@ -114,7 +114,7 @@ export default {
         3: {label: '业务数据', value: 3, importTypes: [1, 2, 3], importId: 3},
         4: {label: '模型数据', value: 4, importTypes: [1], importId: 5},
         // 5: {label: '元数据', value: 5, importTypes: [1], importId: 6},
-        6: {label: '物联感知数据', value: 6, importTypes: [1, 2, 3], importId: 2},
+        6: {label: '物联感知数据', value: 6, importTypes: [1], importId: 2},
       },
       currDataType: {},
       currImportType: {},
@@ -205,8 +205,8 @@ export default {
       menuApi.getMenuData(params).then(res => {
         if (res.code === 200) {
           app.category = res.content;
-          if (app.importForm.dataType==1 && app.importForm.importType=='Excel') {
-            app.category = app.category.filter(i=>i.geometryType=='Point')
+          if (app.importForm.importType=='Excel') {
+            app.category = app.category.filter(i=>i.geometryType!=='LineString'&&i.geometryType!=='Polygon')
           }
         }
       })

src/components/systemManage/SystemLogs.vue

@@ -110,7 +110,7 @@ export default {
         username: app.filterForm.username,
         startDate: start,
         endDate: end,
-        serviceId: '8'
+        serviceId: '8,9'
       };
       app.handleLoading(true)
       api.getLogData(params).then(res=>{