Merge branch 'main' of http://42.192.7.176:3000/lizhichao/hitap-chat

pages/investigation/components/problem-tree-item.vue

@@ -8,15 +8,16 @@
       <!--      </uni-breadcrumb>-->
 
       <view class="breadcrumb" :style="problemTreeSelectConfirmList.length > 0 ? 'padding:40rpx;': ''">
-        <view
+       
+       <view
           v-for="(route, index) in problemTreeSelectConfirmList"
           :key="index"
           @click="handleClick(route)"
-          style="display: inline-block;"
+          style="position: absolute;"
+          :style="styles(route, index)"
         >
-          {{ route.itemname }}
-          {{ index === problemTreeSelectConfirmList.length - 1 ? "" : ">" }}
         </view>
+        {{ name }}
       </view>
     </view>
     <view v-if="problemTreeSelectConfirmList.length > 0" style="margin:0 0 0 40rpx; width:calc(100% - 80rpx); height: 1px; background: #cdd0d3;box-sizing: border-box;"></view>
@@ -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;
+    display: block;
-        width: 20rpx !important;
+    width: 20rpx !important;
-        height: 20rpx !important;
+    height: 20rpx !important;
-        -webkit-appearance: auto !important;
+    -webkit-appearance: auto !important;
-        background: transparent;
+    background: transparent;
-        overflow: auto !important;
+    overflow: auto !important;
-    }
+}
-     
+  
-    ::v-deep ::-webkit-scrollbar-thumb {
+::v-deep ::-webkit-scrollbar-thumb {
-        // 滚动条里面小方块
+    // 滚动条里面小方块
-        border-radius: 20rpx !important;
+    border-radius: 20rpx !important;
-        box-shadow: inset 0 0 5rpx rgba(0, 0, 0, 0.2) !important;
+    box-shadow: inset 0 0 5rpx rgba(0, 0, 0, 0.2) !important;
-        background-color: #f7f7f7 !important;
+    background-color: #f7f7f7 !important;
-    }
+}
-     
+  
-    ::v-deep ::-webkit-scrollbar-track {
+::v-deep ::-webkit-scrollbar-track {
-        // 滚动条
+    // 滚动条
-        border-radius: 20rpx !important;
+    border-radius: 20rpx !important;
-        box-shadow: inset 0 0 5rpx rgba(0, 0, 0, 0.2) !important;
+    box-shadow: inset 0 0 5rpx rgba(0, 0, 0, 0.2) !important;
-        background-color: #dad8d8 !important;
+    background-color: #dad8d8 !important;
-    }
+}
+    
 </style>

pages/investigation/task.vue

@@ -228,9 +228,12 @@
 				<view class="point">
 					<view class="title">重点排查</view>
 					<view class='row' style="display: flex; flex-wrap: wrap; justify-content: space-between;">
-						<view style="width: 300rpx;" v-for="item in investigationSelectList" :key="item">
+						<view style="width: 300rpx;" v-for="item in investigationSelectList" :key="item" @longpress="onLongPressZD(item)">
 
-							<view class="item">{{ item.name }}</view>
+							<view class="item">{{ item.name }}
+								<image style="width: 30px;height: 30px;margin-left: 10px;" src="../../static/task/3879.png" 
+								v-show="nidZD == item.nid" @click.stop="delZD"></image>	
+							</view>
 						</view>
 						<view style="width: 300rpx;" v-show="type!='view'">
 							<view class="item add" @click="showInvestigation = true">
@@ -241,9 +244,15 @@
 					</view>
 				</view>
 				<u-checkbox-group v-model="checked" iconPlacement="right" placement="column">
-					<u-checkbox v-for="(item,index) in troubleshootingData" :key="index" :label="item.itemname"
+					
+					<view v-for="(itemData,indexData) in reversedTroubleshootingData" :key="indexData">
+						{{ indexData + 1 }}.
+						{{ itemData.length > 0 ? itemData[0].nname : '' }}
+						<u-checkbox v-for="(item,index) in itemData" :key="index" :label="item.itemname"
 						activeColor="#2663BF" :name="item.id" @click="showInvestigationTag2(item)"
 						style="padding: 8px 12px;"></u-checkbox>
+					</view>
+					
 				</u-checkbox-group>
 				<u-popup :show="showInvestigation" @close="showInvestigation = false">
 					<InvestigationItem :type="type" @select="select2"></InvestigationItem>
@@ -314,13 +323,15 @@
 					<u-row :gutter="0" justify="flex-start" style="flex-wrap: wrap">
 						<scroll-view style="max-height: 400px;" :scroll-top="0" scroll-y="true" show-scrollbar="true">
 							<view v-for="(item,index) in hiddenDangerList" :key="item" v-show="item.pcType!=1"
-								style="width: 100%">
+								style="width: 100%" @longpress="onLongPressYH(item)">
 								<view class="problem-item">
 									<view style="display: flex; justify-content: space-between">
 										<view style="width: 80%;line-height: 30px;">
 											{{ item.hdTermName||item.dangerProblem }}
 										</view>
-										<view>
+										<image style="width: 30px;height: 30px;" src="../../static/task/3879.png" 
+								v-show="nidYH == item.nid" @click.stop="delYH"></image>
+										<view v-show="!(nidYH == item.nid)">
 											<view class="check" @click="onHiddenDangerList(item,index)">
 												<image style="width: 10px; height: 16px"
 													src="../../static/scimg/right6.png"></image>
@@ -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 = ''
 			}
 		},
 	};

pages/map/index.vue

@@ -50,8 +50,8 @@
       <scroll-view :scroll-top="0" scroll-y="true" class="list-box">
         <view class="list-item" v-for="(item, index) in data" :key="index" @click="onList(item, index)"
           :style="idx == index ? 'background: #E5EFFF' : ''">
-          <image src="/static/map/d2.png" alt="" v-if="idx == index" />
+          <image src="/static/task/3811.png" alt="" v-if="item.type == 1" />
-          <image src="/static/map/d1.png" alt="" v-else />
+          <image src="/static/task/3806.png" alt="" v-else />
           <view class="tit">
             {{ item.name }}
           </view>