From f15b467c2233ba069459c809fffbe994692e3315 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期二, 24 五月 2022 18:08:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/components/Tab/Plot.vue | 1 -
src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue | 2 --
src/views/specialWork/taskCreate/components/reviewInfo/index.vue | 1 -
src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue | 1 -
src/views/login/index.vue | 2 +-
public/wutu3d/cesium-wutu/wutu3d.js | 4 +---
src/views/doublePreventAction/hiddenDanger/inspectionRecord/components/detail.vue | 1 -
src/assets/bg.jpg | 0
src/views/doublePreventAction/riskLevelManage/safetyRiskSpace/index.vue | 3 ---
config/dev.env.js | 8 ++++----
src/views/doublePreventAction/hiddenDanger/inspectionTask/components/inpectionPoint.vue | 2 --
src/views/specialWorkManage/specialWork/taskCreate/components/reviewInfo/index.vue | 1 -
src/views/doublePreventAction/riskLevelManage/analyseUnit/components/departmentChart.vue | 1 -
src/views/specialWork/taskCreate/index.vue | 1 -
14 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/config/dev.env.js b/config/dev.env.js
index dede865..99de487 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -18,12 +18,12 @@
// IMG_API: '"http://220.171.99.118:4100/upload/"',
// BASE_API: '"http://192.168.0.35:8006"',
// // IMG_API: '"http://192.168.0.35:8006/upload/"',
- // BASE_API: '"http://192.168.0.35:8006"',
- // IMG_API: '"http://192.168.0.35:8006/upload/"',
+ BASE_API: '"http://192.168.0.35:8006"',
+ IMG_API: '"http://192.168.0.35:8006/upload/"',
// BASE_API: '"http://192.168.0.62:8006"',
// IMG_API: '"http://192.168.0.62:8006/upload/"',
- BASE_API: '"http://222.92.213.22:8006/zhongtai"',
- IMG_API: '"http://222.92.213.22:8006/zhongtai/upload/"',
+ // BASE_API: '"http://222.92.213.22:8006/zhongtai"',
+ // IMG_API: '"http://222.92.213.22:8006/zhongtai/upload/"',
NANO_API: '"http://222.92.213.22:8006/nanoweb"',
ZT_API:'"http://123.56.127.115:8011"'
// BASE_API: '"http://localhost:8006"',
diff --git a/public/wutu3d/cesium-wutu/wutu3d.js b/public/wutu3d/cesium-wutu/wutu3d.js
index d94fe70..1dd5733 100644
--- a/public/wutu3d/cesium-wutu/wutu3d.js
+++ b/public/wutu3d/cesium-wutu/wutu3d.js
@@ -1961,12 +1961,10 @@
}, o.ScreenSpaceEventType.LEFT_DOUBLE_CLICK)
},
endDraw: function () {
- debugger
if (!this._enabled) return this;
this._positions_draw.length < this._minPointNum || (this.updateAttrForDrawing(), this.disable())
},
finish: function () {
- debugger
var e = this.entity;
e.editing = this.getEditClass(e), e._positions_draw = this.getDrawPosition(), e.polyline.positions = new o.CallbackProperty(function (t) {
return e._positions_draw
@@ -18992,4 +18990,4 @@
}]), e
}()
}])
-});
\ No newline at end of file
+});
diff --git a/src/assets/bg.jpg b/src/assets/bg.jpg
new file mode 100644
index 0000000..e17eaaf
--- /dev/null
+++ b/src/assets/bg.jpg
Binary files differ
diff --git a/src/components/Tab/Plot.vue b/src/components/Tab/Plot.vue
index 0a5ae38..2a4887e 100644
--- a/src/components/Tab/Plot.vue
+++ b/src/components/Tab/Plot.vue
@@ -177,7 +177,6 @@
},
removeHandle(label) {
if (!global.map) return;
- debugger
for(let i in this.colorMapList){
if(JSON.parse(this.colorMapList[i].properties).attr.id === label.attr.id){
deleteColorMap({id:this.colorMapList[i].id}).then(res =>{
diff --git a/src/views/doublePreventAction/hiddenDanger/inspectionRecord/components/detail.vue b/src/views/doublePreventAction/hiddenDanger/inspectionRecord/components/detail.vue
index e3b1d0e..1ecbfd5 100644
--- a/src/views/doublePreventAction/hiddenDanger/inspectionRecord/components/detail.vue
+++ b/src/views/doublePreventAction/hiddenDanger/inspectionRecord/components/detail.vue
@@ -524,7 +524,6 @@
this.dialogVisible = true;
},
handleRemove(file){
- debugger
return this.$confirm(`确定移除 ${ file.name }？`,'提示',{
confirmButtonText:'确定',
cancelButtonText:'取消',
diff --git a/src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue b/src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue
index 9f03856..95b83e9 100644
--- a/src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue
+++ b/src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue
@@ -316,7 +316,6 @@
}
},
downloadFile(value){
- debugger
if(value.problem.imageInfoList === null){
this.$message({
type:'warning',
diff --git a/src/views/doublePreventAction/hiddenDanger/inspectionTask/components/inpectionPoint.vue b/src/views/doublePreventAction/hiddenDanger/inspectionTask/components/inpectionPoint.vue
index 270453c..67bd0c0 100644
--- a/src/views/doublePreventAction/hiddenDanger/inspectionTask/components/inpectionPoint.vue
+++ b/src/views/doublePreventAction/hiddenDanger/inspectionTask/components/inpectionPoint.vue
@@ -79,7 +79,6 @@
this.controlActionVisible = false
if(this.title === '新建巡检计划设定'){
if(value){
- debugger
this.inspectionPointData = JSON.parse(JSON.stringify(value.map( item => {
return {
id:item.id,
@@ -142,7 +141,6 @@
this.inspectionPointData = res.data.result.checkContents
},
keepValue(value){
- debugger
this.keepValueList = value
}
}
diff --git a/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue b/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue
index eb6c39d..5f04a4f 100644
--- a/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue
+++ b/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue
@@ -467,7 +467,6 @@
}else{
this.ifShow = true
this.title = '编辑巡检计划设定'
- debugger
// this.noticeDepartment = this.handleDepartment(JSON.parse(JSON.stringify(value)).noticeUid)
// this.changeNotice()
this.execDepartment = this.handleDepartment(JSON.parse(JSON.stringify(value)).execUid)
@@ -482,7 +481,6 @@
}
},
handleDepartment(value){
- debugger
let department = ''
for(let i in this.userList){
if(this.userList[i].id === value){
diff --git a/src/views/doublePreventAction/riskLevelManage/analyseUnit/components/departmentChart.vue b/src/views/doublePreventAction/riskLevelManage/analyseUnit/components/departmentChart.vue
index 94a4888..c0345d0 100644
--- a/src/views/doublePreventAction/riskLevelManage/analyseUnit/components/departmentChart.vue
+++ b/src/views/doublePreventAction/riskLevelManage/analyseUnit/components/departmentChart.vue
@@ -29,7 +29,6 @@
async getChart() {
let res = await getDepartmentChart()
if(res.data.code === '200') {
- debugger
this.numData = res.data.result.map(item =>{
return item["count"]
})
diff --git a/src/views/doublePreventAction/riskLevelManage/safetyRiskSpace/index.vue b/src/views/doublePreventAction/riskLevelManage/safetyRiskSpace/index.vue
index bc116f5..eba0ccd 100644
--- a/src/views/doublePreventAction/riskLevelManage/safetyRiskSpace/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/safetyRiskSpace/index.vue
@@ -241,7 +241,6 @@
submitSafetyRiskSpace(){
this.$refs["safetyRiskSpaceForm"].validate((valid) =>{
if(valid){
- debugger
addSafetyRiskSpace(this.safetyRiskSpaceForm).then((res)=>{
if(res.data.code === '200'){
this.safetyRiskSpaceVisible = false
@@ -292,7 +291,6 @@
},
onFileSuccess(response){
if(response.code === '200'){
- debugger
this.safetyRiskSpaceForm.img = response.result.path
this.fileList = []
this.fileList.push({url:process.env.IMG_API + response.result.path})
@@ -310,7 +308,6 @@
}
},
handleFile(file){
- debugger
this.dialogImageUrl = file.url;
this.dialogVisible = true;
},
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f5dff7e..3effba1 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -174,7 +174,7 @@
.login-container {
min-height: 100%;
width: 100%;
- background: url("../../assets/bg_login.png") center no-repeat;
+ background: url("../../assets/bg.jpg") center no-repeat;
//background-size: auto 100%;
// background-color: #2d3a4b;
overflow: hidden;
diff --git a/src/views/specialWork/taskCreate/components/reviewInfo/index.vue b/src/views/specialWork/taskCreate/components/reviewInfo/index.vue
index b1649a9..e08804e 100644
--- a/src/views/specialWork/taskCreate/components/reviewInfo/index.vue
+++ b/src/views/specialWork/taskCreate/components/reviewInfo/index.vue
@@ -47,7 +47,6 @@
methods:{
openReviewInfo(value){
this.reviewInfoDialog = true
- debugger
this.activities = JSON.parse(JSON.stringify(value.taskReviews))
for(let i in this.activities){
if(this.activities[i].pictures !== null && this.activities[i].pictures.length !== 0){
diff --git a/src/views/specialWork/taskCreate/index.vue b/src/views/specialWork/taskCreate/index.vue
index 6927b28..982e434 100644
--- a/src/views/specialWork/taskCreate/index.vue
+++ b/src/views/specialWork/taskCreate/index.vue
@@ -232,7 +232,6 @@
},
methods: {
async getTaskData(){
- debugger
this.loginForm = JSON.parse(Cookies.get('loginForm'))
this.listLoading = true
let params = {}
diff --git a/src/views/specialWorkManage/specialWork/taskCreate/components/reviewInfo/index.vue b/src/views/specialWorkManage/specialWork/taskCreate/components/reviewInfo/index.vue
index b1649a9..e08804e 100644
--- a/src/views/specialWorkManage/specialWork/taskCreate/components/reviewInfo/index.vue
+++ b/src/views/specialWorkManage/specialWork/taskCreate/components/reviewInfo/index.vue
@@ -47,7 +47,6 @@
methods:{
openReviewInfo(value){
this.reviewInfoDialog = true
- debugger
this.activities = JSON.parse(JSON.stringify(value.taskReviews))
for(let i in this.activities){
if(this.activities[i].pictures !== null && this.activities[i].pictures.length !== 0){
--
Gitblit v1.9.2