Browse code Merge branch 'dev3.0' of http://111.198.10.15:12003/gitbucket/git/codedev/smartwell_front into dev3.0 Conflicts: public/config/project.config.json dev-bjgas dev3.0 v3.3.0.1 V3.3.0
commit f0c4521acf468adf263c7a9d2e07f38880aa8114 2 parents e4fc6ee + 3a9c9be wangxitong authored on 22 Aug 2022

Showing 32 changed files

• public/config/mapConfig.js
• src/assets/zhangqiu/1.png
• src/assets/zhangqiu/31.png
• src/assets/zhangqiu/border.png
• src/assets/zhangqiu/deviceInstalledIcon.png
• src/assets/zhangqiu/handlingAlarmCircle1.png
• src/assets/zhangqiu/handlingAlarmCircle2.png
• src/assets/zhangqiu/handlingAlarmCircle3.png
• src/assets/zhangqiu/headerTitle.png
• src/assets/zhangqiu/littleTitle.png
• src/assets/zhangqiu/sevenDaysOperationStatusBottom.png
• src/assets/zhangqiu/sevenDaysOperationStatusIcon.png
• src/assets/zhangqiu/sevenDaysOperationStatusTop.png
• src/utils/maputils.js
• src/utils/request.js
• src/views/jobManage/detailJob.vue
• src/views/wellManage/editWell.vue
• src/views/zhangqiu/components/chart.vue
• src/views/zhangqiu/components/deviceAlarm/deviceAlarm.vue
• src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue
• src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue
• src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue
• src/views/zhangqiu/components/headerTitle.vue
• src/views/zhangqiu/components/lineDepartment/lineDepartment.vue
• src/views/zhangqiu/components/map3d.vue
• src/views/zhangqiu/components/progressBar.vue
• src/views/zhangqiu/components/sevenDaysOperationStatus/sevenDaysOperationStatus.vue
• src/views/zhangqiu/components/showItem.vue
• src/views/zhangqiu/components/tableData.vue
• src/views/zhangqiu/components/topHeader.vue
• src/views/zhangqiu/js/data.js
• src/views/zhangqiu/zqindex.vue

Ignore Space Show notes View public/config/mapConfig.js

Ignore Space Show notes View src/assets/zhangqiu/1.png 0 → 100644

Ignore Space Show notes View src/assets/zhangqiu/31.png 0 → 100644

Ignore Space Show notes View src/assets/zhangqiu/border.png 0 → 100644

Ignore Space Show notes View src/assets/zhangqiu/deviceInstalledIcon.png 0 → 100644

Ignore Space Show notes View src/assets/zhangqiu/handlingAlarmCircle1.png 0 → 100644

Ignore Space Show notes View src/assets/zhangqiu/handlingAlarmCircle2.png 0 → 100644

Ignore Space Show notes View src/assets/zhangqiu/handlingAlarmCircle3.png 0 → 100644

Ignore Space Show notes View src/assets/zhangqiu/headerTitle.png 0 → 100644

Ignore Space Show notes View src/assets/zhangqiu/littleTitle.png 0 → 100644

Ignore Space Show notes View src/assets/zhangqiu/sevenDaysOperationStatusBottom.png 0 → 100644

Ignore Space Show notes View src/assets/zhangqiu/sevenDaysOperationStatusIcon.png 0 → 100644

Ignore Space Show notes View src/assets/zhangqiu/sevenDaysOperationStatusTop.png 0 → 100644

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View src/views/zhangqiu/js/data.js 0 → 100644

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

Show line notes below