Browse code Merge branch 'dev3.0' of http://111.198.10.15:12003/gitbucket/git/codedev/smartwell_front into dev3.0 Conflicts: src/views/overview/overview3d.vue dev-bjgas dev3.0 v3.3.0.1 V3.3.0
commit 829dedf660a3e07c3c679b7034fd390390b8877a 2 parents 6f95761 + 64be651 wangxitong authored on 13 Jul 2022

Showing 78 changed files

• README.md
• public/config/project.config.json
• src/api/base/tenant.js
• src/api/data/dataStatics.js
• src/api/device/deviceType.js
• src/api/system/dict.js
• src/api/system/tenant.js
• src/api/systemConfig/alarmContent.js
• src/components/Amap/AMapContainer.vue
• src/components/Amap/utils/convert-helper.js
• src/components/NormalTable/index.vue
• src/main.js
• src/router/modules/config.js
• src/router/modules/well.js
• src/store/modules/settings.js
• src/utils/dateutils.js
• src/views/alarmManage/components/HandlePrompt.vue
• src/views/alarmManage/listAlarmNow.vue
• src/views/alarmManage/listAlarmRecords.vue
• src/views/alarmRule/components/listRule.vue
• src/views/alarmRule/editRule.vue
• src/views/alarmRule/listRule.vue
• src/views/concentrator/listConcentrator.vue
• src/views/dashboard/index.vue
• src/views/dataManage/deviceData/listDigData.vue
• src/views/dataManage/deviceData/listGasData.vue
• src/views/dataManage/deviceData/listHarmfulData.vue
• src/views/dataManage/deviceData/listLiquidData.vue
• src/views/dataManage/deviceData/listWellCoverData.vue
• src/views/dataView/components/alarmStatus.vue
• src/views/dataView/components/alarmView.vue
• src/views/dataView/components/jobView.vue
• src/views/dataView/components/panelGroup.vue
• src/views/dataView/components/wellCountView.vue
• src/views/dataView/dataView.vue
• src/views/deviceConfig/components/editLiquidConfig.vue
• src/views/deviceConfig/components/listLiquidConfig.vue
• src/views/deviceManage/components/listWellData.vue
• src/views/deviceManage/detailDevice.vue
• src/views/deviceManage/deviceImei/deviceImei.vue
• src/views/deviceManage/deviceModel/deviceModel.vue
• src/views/deviceManage/deviceType/components/editDeviceType.vue
• src/views/deviceManage/deviceType/deviceType.vue
• src/views/deviceManage/editDevice.vue
• src/views/deviceManage/listDevice.vue
• src/views/jobManage/listJobs.vue
• src/views/jobManage/listJobsOverTimeGet.vue
• src/views/jobManage/listJobsOverTimeHandle.vue
• src/views/overview/overviewAmap.vue
• src/views/system/area/listArea.vue
• src/views/system/dict/listDict.vue
• src/views/system/role/editRole.vue
• src/views/system/tenant/components/editTenant.vue
• src/views/system/tenant/components/relateDept.vue
• src/views/system/tenant/tenantList.vue
• src/views/system/user/listUser.vue
• src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
• src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
• src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
• src/views/systemConfig/alarmConfig/listAlarmConfig.vue
• src/views/systemConfig/alarmContent/components/editAlarmContent.vue
• src/views/systemConfig/alarmContent/listContent.vue
• src/views/systemConfig/alarmLevel/listLevel.vue
• src/views/systemConfig/deptPermission/components/editDeptPermission.vue
• src/views/systemConfig/deptPermission/deptPermission.vue
• src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
• src/views/systemConfig/tenantConfig/tenantConfig.vue
• src/views/systemConfig/viewsConfig/components/appConfig.vue
• src/views/systemConfig/viewsConfig/components/pcConfig.vue
• src/views/systemConfig/viewsConfig/viewsConfig.vue
• src/views/wellManage/addWell.vue
• src/views/wellManage/components/listWellData.vue
• src/views/wellManage/detailMapLonLat.vue
• src/views/wellManage/editWell.vue
• src/views/wellManage/infoWell.vue
• src/views/wellManage/listWell.vue
• src/views/wellManage/mapLonLat.vue
• src/views/wellManage/postionCorrectWell.vue

Ignore Space Show notes View README.md

Ignore Space Show notes View public/config/project.config.json

Show notes View src/api/base/tenant.js 100644 → 0

Ignore Space Show notes View src/api/data/dataStatics.js

Ignore Space Show notes View src/api/device/deviceType.js

Ignore Space Show notes View src/api/system/dict.js

Ignore Space Show notes View src/api/system/tenant.js

Ignore Space Show notes View src/api/systemConfig/alarmContent.js

Ignore Space Show notes View src/components/Amap/AMapContainer.vue

Ignore Space Show notes View src/components/Amap/utils/convert-helper.js

Ignore Space Show notes View src/components/NormalTable/index.vue

Ignore Space Show notes View src/main.js

Ignore Space Show notes View src/router/modules/config.js

Ignore Space Show notes View src/router/modules/well.js

Ignore Space Show notes View src/store/modules/settings.js

Ignore Space Show notes View src/utils/dateutils.js

Ignore Space Show notes View src/views/alarmManage/components/HandlePrompt.vue

Ignore Space Show notes View src/views/alarmManage/listAlarmNow.vue

Ignore Space Show notes View src/views/alarmManage/listAlarmRecords.vue

Ignore Space Show notes View src/views/alarmRule/components/listRule.vue

Show notes View src/views/alarmRule/editRule.vue 100644 → 0

Show notes View src/views/alarmRule/listRule.vue 100644 → 0

Ignore Space Show notes View src/views/concentrator/listConcentrator.vue

Ignore Space Show notes View src/views/dashboard/index.vue

Ignore Space Show notes View src/views/dataManage/deviceData/listDigData.vue

Ignore Space Show notes View src/views/dataManage/deviceData/listGasData.vue

Ignore Space Show notes View src/views/dataManage/deviceData/listHarmfulData.vue

Ignore Space Show notes View src/views/dataManage/deviceData/listLiquidData.vue

Ignore Space Show notes View src/views/dataManage/deviceData/listWellCoverData.vue

Ignore Space Show notes View src/views/dataView/components/alarmStatus.vue

Ignore Space Show notes View src/views/dataView/components/alarmView.vue

Show notes View src/views/dataView/components/jobView.vue 100644 → 0

Ignore Space Show notes View src/views/dataView/components/panelGroup.vue

Ignore Space Show notes View src/views/dataView/components/wellCountView.vue

Ignore Space Show notes View src/views/dataView/dataView.vue

Ignore Space Show notes View src/views/deviceConfig/components/editLiquidConfig.vue

Ignore Space Show notes View src/views/deviceConfig/components/listLiquidConfig.vue

Ignore Space Show notes View src/views/deviceManage/components/listWellData.vue

Ignore Space Show notes View src/views/deviceManage/detailDevice.vue

Ignore Space Show notes View src/views/deviceManage/deviceImei/deviceImei.vue

Ignore Space Show notes View src/views/deviceManage/deviceModel/deviceModel.vue

Ignore Space Show notes View src/views/deviceManage/deviceType/components/editDeviceType.vue

Ignore Space Show notes View src/views/deviceManage/deviceType/deviceType.vue

Ignore Space Show notes View src/views/deviceManage/editDevice.vue

Ignore Space Show notes View src/views/deviceManage/listDevice.vue

Ignore Space Show notes View src/views/jobManage/listJobs.vue

Ignore Space Show notes View src/views/jobManage/listJobsOverTimeGet.vue

Ignore Space Show notes View src/views/jobManage/listJobsOverTimeHandle.vue

Ignore Space Show notes View src/views/overview/overviewAmap.vue

Ignore Space Show notes View src/views/system/area/listArea.vue

Ignore Space Show notes View src/views/system/dict/listDict.vue

Ignore Space Show notes View src/views/system/role/editRole.vue

Ignore Space Show notes View src/views/system/tenant/components/editTenant.vue

Ignore Space Show notes View src/views/system/tenant/components/relateDept.vue 0 → 100644

Ignore Space Show notes View src/views/system/tenant/tenantList.vue

Ignore Space Show notes View src/views/system/user/listUser.vue

Ignore Space Show notes View src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue 0 → 100644

Ignore Space Show notes View src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue

Ignore Space Show notes View src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue

Ignore Space Show notes View src/views/systemConfig/alarmConfig/listAlarmConfig.vue

Ignore Space Show notes View src/views/systemConfig/alarmContent/components/editAlarmContent.vue

Ignore Space Show notes View src/views/systemConfig/alarmContent/listContent.vue

Ignore Space Show notes View src/views/systemConfig/alarmLevel/listLevel.vue

Ignore Space Show notes View src/views/systemConfig/deptPermission/components/editDeptPermission.vue

Ignore Space Show notes View src/views/systemConfig/deptPermission/deptPermission.vue

Show notes View src/views/systemConfig/tenantConfig/components/editTenantConfig.vue 100644 → 0

Ignore Space Show notes View src/views/systemConfig/tenantConfig/tenantConfig.vue

Ignore Space Show notes View src/views/systemConfig/viewsConfig/components/appConfig.vue 0 → 100644

Ignore Space Show notes View src/views/systemConfig/viewsConfig/components/pcConfig.vue 0 → 100644

Ignore Space Show notes View src/views/systemConfig/viewsConfig/viewsConfig.vue

Ignore Space Show notes View src/views/wellManage/addWell.vue

Ignore Space Show notes View src/views/wellManage/components/listWellData.vue

Ignore Space Show notes View src/views/wellManage/detailMapLonLat.vue

Ignore Space Show notes View src/views/wellManage/editWell.vue

Ignore Space Show notes View src/views/wellManage/infoWell.vue

Ignore Space Show notes View src/views/wellManage/listWell.vue

Ignore Space Show notes View src/views/wellManage/mapLonLat.vue

Ignore Space Show notes View src/views/wellManage/postionCorrectWell.vue

Show line notes below