|
@@ -22,11 +22,7 @@
|
|
|
<el-collapse-transition>
|
|
|
<div v-if='showView===2'>
|
|
|
<lengend-edit
|
|
|
-<<<<<<< HEAD
|
|
|
@changeSwitch='handleSwich'
|
|
|
-=======
|
|
|
- @handleSwich2='handleSwich2'
|
|
|
->>>>>>> develop-cd
|
|
|
v-if='editTable.length>0'
|
|
|
:loading='loading1'
|
|
|
ref='editLen'
|
|
@@ -55,16 +51,10 @@
|
|
|
</el-tooltip>
|
|
|
<!-- 编辑图例 -->
|
|
|
<el-tooltip effect='dark' content='编辑图例' placement='left'>
|
|
|
-<<<<<<< HEAD
|
|
|
<span class='bjtk' v-if='systemName != "土建系统" && isMessage' @click='editTl'>图例</span>
|
|
|
<!-- <p v-if='systemName != "土建系统" && isMessage' @click='editTl' class='tltk-1'> -->
|
|
|
<!-- <img src='@/assets/imgs/bjtl.png' alt /> -->
|
|
|
<!-- </p> -->
|
|
|
-=======
|
|
|
- <p v-if='systemName != "土建系统" && isMessage' @click='editTl' class='tltk-1'>
|
|
|
- <img src='@/assets/imgs/bjtl.png' alt />
|
|
|
- </p>
|
|
|
->>>>>>> develop-cd
|
|
|
</el-tooltip>
|
|
|
<!-- 新增分布图 -->
|
|
|
<el-tooltip effect='dark' content='新增分布图' placement='left' v-if='floorSelect.length!=floors.length && type==0'>
|
|
@@ -223,24 +213,16 @@ export default {
|
|
|
async getDraftNum() {
|
|
|
let res = null,
|
|
|
// floorId = this.$cookie.get('floorMapId'),
|
|
|
-<<<<<<< HEAD
|
|
|
floorId = this.$store.state.currentFloor.gname || this.$cookie.get('floorMapId'),
|
|
|
categoryId = this.categoryId || this.$cookie.get('categoryId')
|
|
|
// console.log('getDraftNum', this.innerLeng, categoryId)
|
|
|
-=======
|
|
|
- floorId = this.$store.state.currentFloor.gname || this.$cookie.get('floorMapId')
|
|
|
->>>>>>> develop-cd
|
|
|
// 增加校验 floorId,防止上传 undefined
|
|
|
if (!floorId) {
|
|
|
return true
|
|
|
}
|
|
|
let data = {
|
|
|
Distinct: true,
|
|
|
-<<<<<<< HEAD
|
|
|
Filters: `projectId='${this.plazaId}';isPub=false;BuildingId='1';categoryId='${categoryId}';floorId='${floorId}'`,
|
|
|
-=======
|
|
|
- Filters: `projectId='${this.plazaId}';isPub=false;floorId='${floorId}'`,
|
|
|
->>>>>>> develop-cd
|
|
|
PageNumber: 1,
|
|
|
PageSize: 500,
|
|
|
Projection: ['floorId']
|
|
@@ -371,11 +353,7 @@ export default {
|
|
|
let categoryId = this.categoryId || this.$cookie.get('categoryId')
|
|
|
// console.log('queryView', this.innerLeng, categoryId)
|
|
|
let data = {
|
|
|
-<<<<<<< HEAD
|
|
|
- categoryId,
|
|
|
-=======
|
|
|
categoryId: this.$cookie.get('categoryId'),
|
|
|
->>>>>>> develop-cd
|
|
|
graphId: this.$cookie.get('graphId'),
|
|
|
projectId: this.$store.state.plazaId,
|
|
|
flag: flag,
|
|
@@ -410,11 +388,7 @@ export default {
|
|
|
let categoryId = this.categoryId || this.$cookie.get('categoryId')
|
|
|
// console.log('queryEditNum', categoryId)
|
|
|
let data = {
|
|
|
-<<<<<<< HEAD
|
|
|
- categoryId,
|
|
|
-=======
|
|
|
categoryId: this.$cookie.get('categoryId'),
|
|
|
->>>>>>> develop-cd
|
|
|
graphId: this.$cookie.get('graphId'),
|
|
|
projectId: this.$store.state.plazaId,
|
|
|
flag: flag,
|
|
@@ -431,7 +405,6 @@ export default {
|
|
|
queryEdit(val) {
|
|
|
let arr = []
|
|
|
if (val.length > 0) {
|
|
|
-<<<<<<< HEAD
|
|
|
val.forEach(e => {
|
|
|
let obj = {
|
|
|
BuildingId: '1',
|
|
@@ -440,17 +413,6 @@ export default {
|
|
|
FloorId: this.$cookie.get('floorMapId'),
|
|
|
ProjectId: e.ProjectId,
|
|
|
CategoryId: e.GraphCategoryId
|
|
|
-=======
|
|
|
- val.forEach(el => {
|
|
|
- let obj = {
|
|
|
- BuildingId: '1',
|
|
|
- FloorId: this.$store.state.currentFloor.gname,
|
|
|
- ProjectId: this.plazaId,
|
|
|
- CategoryId: el.GraphCategoryId,
|
|
|
- GraphId: this.$cookie.get('graphId'),
|
|
|
- GraphElementId: el.GraphElementId,
|
|
|
- Num: el.Num
|
|
|
->>>>>>> develop-cd
|
|
|
}
|
|
|
arr.push(obj)
|
|
|
})
|
|
@@ -460,7 +422,6 @@ export default {
|
|
|
Content: arr
|
|
|
}
|
|
|
}
|
|
|
-<<<<<<< HEAD
|
|
|
updateStatis(params)
|
|
|
.then(res => {
|
|
|
if (res.Result == 'success') {
|
|
@@ -477,18 +438,6 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
.catch(err => {
|
|
|
-=======
|
|
|
- updateStatis(params).then(res => {
|
|
|
- if (res.Result == 'success') {
|
|
|
- //console.log('更新图例', res)
|
|
|
- this.$message({
|
|
|
- message: '操作成功',
|
|
|
- type: 'success'
|
|
|
- })
|
|
|
- this.$store.commit('SETSHOWVIEW', 1)
|
|
|
- // this.queryEditNum(this.editSwitch)
|
|
|
- } else {
|
|
|
->>>>>>> develop-cd
|
|
|
this.$message({
|
|
|
message: err,
|
|
|
type: 'error'
|
|
@@ -501,11 +450,8 @@ export default {
|
|
|
element.Modify = element.IsModify
|
|
|
})
|
|
|
this.queryEdit(val)
|
|
|
-<<<<<<< HEAD
|
|
|
this.$store.commit('SETSHOWVIEW', 1)
|
|
|
this.handleSwich(true)
|
|
|
-=======
|
|
|
->>>>>>> develop-cd
|
|
|
// this.isShow2()
|
|
|
} else {
|
|
|
// this.show2 = false
|
|
@@ -557,13 +503,9 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
mounted() {
|
|
|
-<<<<<<< HEAD
|
|
|
// console.log('lengend mounted')
|
|
|
// console.log(this.categoryId)
|
|
|
// console.log('editTips', this.editTips)
|
|
|
-=======
|
|
|
- console.log('editTips', this.editTips)
|
|
|
->>>>>>> develop-cd
|
|
|
this.init()
|
|
|
// 定时查询草稿箱数量
|
|
|
// TODO: 1
|