Browse code Merge branch 'dev3.0' of http://111.198.10.15:12003/gitbucket/git/codedev/smartwell_front into dev3.0 Conflicts: package.json public/config/project.config.json dev-bjgas dev3.0
commit 580bd7490aba9887229d23a104a4e127bbfb6ebc 2 parents be86c5a + fd7eccf wangxitong authored on 22 Jan 2024

Showing 27 changed files

• README.md
• src/api/config/combustibleGasConfig.js
• src/api/config/pressConfig.js
• src/api/data/data.js
• src/api/device/deviceImei.js
• src/views/dataManage/dataManage.vue
• src/views/dataManage/deviceData/listCombustibleGasData.vue
• src/views/dataManage/deviceData/listPressData.vue
• src/views/dataView/components/panelGroup.vue
• src/views/deviceConfig/components/ListCombustibleGasConfig.vue
• src/views/deviceConfig/components/ListPressConfig.vue
• src/views/deviceConfig/components/editCombustibleGasConfig.vue
• src/views/deviceConfig/components/editLiquidConfig.vue
• src/views/deviceConfig/components/editNoiseConfig.vue
• src/views/deviceConfig/components/editPressConfig.vue
• src/views/deviceConfig/components/listH2sConfig.vue
• src/views/deviceConfig/components/listLiquidConfig.vue
• src/views/deviceConfig/deviceConfig.vue
• src/views/deviceManage/detailDevice.vue
• src/views/deviceManage/deviceImei/components/editDeviceImei.vue
• src/views/deviceManage/deviceImei/deviceImei.vue
• src/views/deviceManage/deviceType/components/editDeviceType.vue
• src/views/deviceManage/editDevice.vue
• src/views/wellManage/addWell.vue
• src/views/wellManage/detailWell.vue
• src/views/wellManage/editWell.vue
• src/views/wellManage/postionCorrectWell.vue

Ignore Space Show notes View README.md

Ignore Space Show notes View src/api/config/combustibleGasConfig.js 0 → 100644

Ignore Space Show notes View src/api/config/pressConfig.js 0 → 100644

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

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

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

Ignore Space Show notes View src/views/dataManage/deviceData/listCombustibleGasData.vue 0 → 100644

Ignore Space Show notes View src/views/dataManage/deviceData/listPressData.vue 0 → 100644

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

Ignore Space Show notes View src/views/deviceConfig/components/ListCombustibleGasConfig.vue 0 → 100644

Ignore Space Show notes View src/views/deviceConfig/components/ListPressConfig.vue 0 → 100644

Ignore Space Show notes View src/views/deviceConfig/components/editCombustibleGasConfig.vue 0 → 100644

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

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

Ignore Space Show notes View src/views/deviceConfig/components/editPressConfig.vue 0 → 100644

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

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

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

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

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

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

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

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

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

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

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

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

Show line notes below