Browse code Merge branch 'dev3.0' of http://111.198.10.15:12003/gitbucket/git/codedev/smartwell_front into dev3.0 dev-bjgas dev3.0 v3.3.0.1 V3.3.0
commit 72d96ef47c75a134fb412c165b2c602a3ce4c03e 2 parents e11cfc6 + 7a6a271 wangxitong authored on 12 Aug 2022

Showing 41 changed files

• package.json
• src/api/data/data.js
• src/main.js
• src/permission.js
• src/router/index.js
• src/router/modules/config.js
• src/settings.js
• src/utils/auth.js
• src/views/dataManage/deviceData/listGasdectorData.vue
• src/views/dataManage/deviceData/listH2SData.vue
• src/views/dataManage/deviceData/listTubeData.vue
• src/views/deviceManage/components/listDigData.vue
• src/views/deviceManage/components/listGasData.vue
• src/views/deviceManage/components/listGasDetectorData.vue
• src/views/deviceManage/components/listHydrantData.vue
• src/views/deviceManage/components/listLiquidData.vue
• src/views/deviceManage/components/listNoiseData.vue
• src/views/deviceManage/components/listTempData.vue
• src/views/deviceManage/components/listTempPressData.vue
• src/views/deviceManage/components/listTubeData.vue
• src/views/deviceManage/components/listWellLocaData.vue
• src/views/deviceManage/components/listWellcoverData.vue
• src/views/deviceManage/detailDevice.vue
• src/views/deviceManage/editDevice.vue
• src/views/deviceManage/listDevice.vue
• src/views/overview/overview3dzq.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/components/alarmPushConfig.vue
• src/views/systemConfig/alarmConfig/listAlarmConfig.vue
• src/views/systemConfig/alarmContent/listContent.vue
• src/views/systemConfig/responsibleUser/listResponsibleUser.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/detailWell.vue
• src/views/wellManage/infoWell.vue
• src/views/zhangqiu/components/topHeader.vue
• src/views/zhangqiu/zqindex.vue

Ignore Space Show notes View package.json

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

Ignore Space Show notes View src/main.js

Ignore Space Show notes View src/permission.js

Ignore Space Show notes View src/router/index.js

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

Ignore Space Show notes View src/settings.js

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

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

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

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

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

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

Ignore Space Show notes View src/views/deviceManage/components/listGasDetectorData.vue 0 → 100644

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

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

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

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

Ignore Space Show notes View src/views/deviceManage/components/listTempPressData.vue 0 → 100644

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

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

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

Ignore Space Show notes View src/views/deviceManage/detailDevice.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/overview/overview3dzq.vue

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

Show notes View src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue 100644 → 0

Show notes View src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue 100644 → 0

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

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

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

Ignore Space Show notes View src/views/systemConfig/responsibleUser/listResponsibleUser.vue

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

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

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

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

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

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

Ignore Space Show notes View src/views/zhangqiu/components/topHeader.vue 0 → 100644

Ignore Space Show notes View src/views/zhangqiu/zqindex.vue 0 → 100644

Show line notes below