diff --git a/pages/investigation/components/problem-tree-item.vue b/pages/investigation/components/problem-tree-item.vue
index 0ad61d2..d0f63fb 100644
--- a/pages/investigation/components/problem-tree-item.vue
+++ b/pages/investigation/components/problem-tree-item.vue
@@ -8,15 +8,16 @@
-
- {{ route.itemname }}
- {{ index === problemTreeSelectConfirmList.length - 1 ? "" : ">" }}
+ {{ name }}
@@ -56,6 +57,8 @@ export default {
problemTreeSelectList: [],
problemTreeSelectAllList: [],
problemTreeSelectConfirmList: [],
+ name: '',
+ w1:''
};
},
// 页面加载
@@ -80,7 +83,7 @@ export default {
if (res.code == 200) {
this.originList =JSON.parse(JSON.stringify( res.result));
this.problemTreeSelectList =JSON.parse(JSON.stringify( res.result));
- this.problemTreeSelectAllList=JSON.parse(JSON.stringify( res.result))
+ this.problemTreeSelectAllList=JSON.parse(JSON.stringify( res.result))
// if(this.hiddenDangerList2.length>0) {
// // this.problemTreeSelectConfirmList = this.hiddenDangerList2
// console.log(this.hiddenDangerList2)
@@ -95,17 +98,32 @@ export default {
this.$.open(even);
},
handleSelectProblem(item, index) {
- console.log(11111)
this.problemTreeSelectConfirmList[Number(item.nlevel) - 1] = item;
if (item.children && item.children.length > 0) {
this.problemTreeSelectList = item.children;
} else {
this.problemTreeSelect = item.id;
}
+ this.name = ''
+ this.problemTreeSelectConfirmList.map((m,i) => {
+ if(i<2){
+ this.name = this.name + m.itemname + '>'
+ }else{
+ this.name = this.name + m.itemname
+ }
+ })
this.$emit("select", this.problemTreeSelectConfirmList);
},
+ styles(item, index){
+ if(index == 0) {
+ this.w1 = item.itemname.length * 18
+ return `left: 18px;width: ${item.itemname.length * 18}px;height: 20px;top: 22px;`
+ }
+ if(index == 1) {
+ return `left: ${this.w1 + 18}px;width: ${item.itemname.length * 18}px;height: 20px;top: 22px;`
+ }
+ },
handleClick(item) {
- console.log(item);
const selectIndex = this.problemTreeSelectConfirmList.indexOf(item);
const index =
selectIndex - 1 < 0
@@ -131,7 +149,14 @@ export default {
])
);
}
- console.log(this.problemTreeSelectConfirmList);
+ this.name = ''
+ this.problemTreeSelectConfirmList.map((m,i) => {
+ if(i<2){
+ this.name = this.name + m.itemname + '>'
+ }else{
+ this.name = this.name + m.itemname
+ }
+ })
},
},
onReady() {},
@@ -175,31 +200,33 @@ page {
display: flex;
align-items: center;
justify-content: left;
- overflow-x: auto;
+ overflow-x: hidden;
flex-wrap: nowrap;
+ position: relative;
}
::v-deep ::-webkit-scrollbar {
- // 滚动条整体样式
- display: block;
- width: 20rpx !important;
- height: 20rpx !important;
- -webkit-appearance: auto !important;
- background: transparent;
- overflow: auto !important;
- }
-
- ::v-deep ::-webkit-scrollbar-thumb {
- // 滚动条里面小方块
- border-radius: 20rpx !important;
- box-shadow: inset 0 0 5rpx rgba(0, 0, 0, 0.2) !important;
- background-color: #f7f7f7 !important;
- }
-
- ::v-deep ::-webkit-scrollbar-track {
- // 滚动条
- border-radius: 20rpx !important;
- box-shadow: inset 0 0 5rpx rgba(0, 0, 0, 0.2) !important;
- background-color: #dad8d8 !important;
- }
+ // 滚动条整体样式
+ display: block;
+ width: 20rpx !important;
+ height: 20rpx !important;
+ -webkit-appearance: auto !important;
+ background: transparent;
+ overflow: auto !important;
+}
+
+::v-deep ::-webkit-scrollbar-thumb {
+ // 滚动条里面小方块
+ border-radius: 20rpx !important;
+ box-shadow: inset 0 0 5rpx rgba(0, 0, 0, 0.2) !important;
+ background-color: #f7f7f7 !important;
+}
+
+::v-deep ::-webkit-scrollbar-track {
+ // 滚动条
+ border-radius: 20rpx !important;
+ box-shadow: inset 0 0 5rpx rgba(0, 0, 0, 0.2) !important;
+ background-color: #dad8d8 !important;
+}
+
diff --git a/pages/investigation/task.vue b/pages/investigation/task.vue
index 99d98ef..0a35fee 100644
--- a/pages/investigation/task.vue
+++ b/pages/investigation/task.vue
@@ -228,9 +228,12 @@
重点排查
-
+
- {{ item.name }}
+ {{ item.name }}
+
+
@@ -241,9 +244,15 @@
-
+ {{ indexData + 1 }}.
+ {{ itemData.length > 0 ? itemData[0].nname : '' }}
+
+
+
@@ -314,13 +323,15 @@
+ style="width: 100%" @longpress="onLongPressYH(item)">
{{ item.hdTermName||item.dangerProblem }}
-
+
+
@@ -728,6 +739,8 @@
columnsPicker: [
],
+ nidZD: '',
+ nidYH: '',
};
},
watch: {
@@ -742,6 +755,28 @@
}
},
},
+ computed: {
+ reversedTroubleshootingData() {
+ const array = Array.from({ length: this.investigationSelectList.length }, (_, i) => []);
+ let nidname = this.investigationSelectList.length > 0 ? this.investigationSelectList[0].name : ''
+ let nx = 0
+ this.troubleshootingData.map(r => {
+ this.investigationSelectList.map(m => {
+ if(r.nid == m.nid) {
+ r.nname = m.name
+ if(r.nname == nidname){
+ array[nx].push(r)
+ } else {
+ nidname = r.nname
+ nx++
+ array[nx].push(r)
+ }
+ }
+ })
+ })
+ return array
+ }
+ },
methods: {
showInvestigationTag(v) {
console.log(v)
@@ -1619,6 +1654,33 @@
console.log('盒子的高度:', height);
}
}).exec(); // 执行查询
+ },
+ onLongPressZD(item) {
+ this.nidZD = item.nid
+ },
+ delZD(){
+ this.troubleshootingData = this.troubleshootingData.filter(r => {
+ if(r.nid != this.nidZD){
+ return r
+ }
+ })
+ this.investigationSelectList = this.investigationSelectList.filter(r => {
+ if(r.nid != this.nidZD){
+ return r
+ }
+ })
+ this.nidZD = ''
+ },
+ onLongPressYH(item) {
+ this.nidYH = item.nid
+ },
+ delYH(){
+ this.hiddenDangerList = this.hiddenDangerList.filter(r => {
+ if(r.nid != this.nidYH){
+ return r
+ }
+ })
+ this.nidYH = ''
}
},
};
diff --git a/pages/map/index.vue b/pages/map/index.vue
index 5156505..f00b91a 100644
--- a/pages/map/index.vue
+++ b/pages/map/index.vue
@@ -50,8 +50,8 @@
-
-
+
+
{{ item.name }}
diff --git a/static/task/3806.png b/static/task/3806.png
new file mode 100644
index 0000000..0c16a42
Binary files /dev/null and b/static/task/3806.png differ
diff --git a/static/task/3811.png b/static/task/3811.png
new file mode 100644
index 0000000..0a94592
Binary files /dev/null and b/static/task/3811.png differ
diff --git a/static/task/3879.png b/static/task/3879.png
new file mode 100644
index 0000000..c5be918
Binary files /dev/null and b/static/task/3879.png differ
diff --git a/static/task/减去 199.png b/static/task/减去 199.png
new file mode 100644
index 0000000..6ba3aee
Binary files /dev/null and b/static/task/减去 199.png differ
diff --git a/static/task/组 3804.png b/static/task/组 3804.png
new file mode 100644
index 0000000..308f2b5
Binary files /dev/null and b/static/task/组 3804.png differ
diff --git a/static/task/组 3849.png b/static/task/组 3849.png
new file mode 100644
index 0000000..deec780
Binary files /dev/null and b/static/task/组 3849.png differ
diff --git a/static/task/组 3875.png b/static/task/组 3875.png
new file mode 100644
index 0000000..22d8a18
Binary files /dev/null and b/static/task/组 3875.png differ
diff --git a/static/task/组 3899.png b/static/task/组 3899.png
new file mode 100644
index 0000000..98ad4aa
Binary files /dev/null and b/static/task/组 3899.png differ
diff --git a/static/task/组 3900.png b/static/task/组 3900.png
new file mode 100644
index 0000000..64230e1
Binary files /dev/null and b/static/task/组 3900.png differ
diff --git a/static/task/路径 17710.png b/static/task/路径 17710.png
new file mode 100644
index 0000000..403605d
Binary files /dev/null and b/static/task/路径 17710.png differ