代码提交

src/components/SelectItem/index.vue

@@ -42,6 +42,12 @@ watch(() => props.selectData, (newVal) => {
   } else {
     searchPlaceholder.value = '请搜索';
   }
+
+  if (checkboxList.value.length === props.selectData.length) {
+    checked1.value = true; // 全选
+  } else {
+    checked1.value = false// 取消全选
+  }
 });
 
 const filteredList = computed(() => {

src/views/alarm/allData/index.vue

@@ -205,9 +205,6 @@ const dialog = reactive<any>({
   title: ''
 });
 
-const scrollContainer = ref<HTMLElement | null>(null);
-const scrollPosition = ref(0);
-
 const cancel = () => {
   dialog.visible = false;
 }
@@ -440,7 +437,7 @@ const sensorList =ref<any>([])
 // 被选中当条数据下标
 const selectedItemIndex = ref(0)
 
-
+const scrollContainer = ref<HTMLElement | null>(null);
 const changeMoveUp = () =>{
 //上移
   if (selectedItemIndex.value > 0) {

src/views/alarm/singleDevice/index.vue

@@ -87,7 +87,7 @@
         </el-tabs>
         <div class="selected-list-box">
           <div class="disposition-title" style="margin-top: 0px">已选设备</div>
-          <div class="selected-list-c">
+          <div class="selected-list-c" ref="scrollContainer">
             <template v-for="(item,index) in copiedCustomizeColumns" :key="item.se_type">
               <div  :class="selectedItemIndex===index?'selected-item-tag-active':'selected-item-tag'" @click="changeSelected(index)"
                     draggable="true"
@@ -251,6 +251,7 @@ const drop = (event, index) => {
   // 移动数组中的元素来更新顺序
   const draggedItem = copiedCustomizeColumns.value.splice(draggedIndex, 1)[0];
   copiedCustomizeColumns.value.splice(index, 0, draggedItem);
+  selectedItemIndex.value = index
 };
 
 const handlePlatform = (item) => {
@@ -563,7 +564,7 @@ let customizeColumns= ref<any>([
 
 
 ])
-
+const scrollContainer = ref<HTMLElement | null>(null);
 const changeMoveUp = () =>{
 //上移
   if (selectedItemIndex.value > 0) {
@@ -571,6 +572,10 @@ const changeMoveUp = () =>{
     copiedCustomizeColumns.value[selectedItemIndex.value - 1] = copiedCustomizeColumns.value[selectedItemIndex.value]
     copiedCustomizeColumns.value[selectedItemIndex.value] = temp
     selectedItemIndex.value--
+
+    if (scrollContainer.value) {
+      scrollContainer.value.scrollTop -= 50;
+    }
   }
 }
 
@@ -581,6 +586,10 @@ const changeMoveDown = ()=>{
     copiedCustomizeColumns.value[selectedItemIndex.value + 1] = copiedCustomizeColumns.value[selectedItemIndex.value]
     copiedCustomizeColumns.value[selectedItemIndex.value] = temp
     selectedItemIndex.value++
+
+    if (scrollContainer.value) {
+      scrollContainer.value.scrollTop += 50;
+    }
   }
 }
 

src/views/alarm/singleStationData/index.vue

@@ -385,7 +385,7 @@
 				</el-tabs>
 				<div class="selected-list-box">
 					<div class="disposition-title" style="margin-top: 0px">已选要素</div>
-					<div class="selected-list-c">
+					<div class="selected-list-c" ref="scrollContainer">
 						<template v-for="(item, index) in copiedCustomizeColumns" :key="item.id">
 							<div :class="selectedItemIndex === index ? 'selected-item-tag-active' : 'selected-item-tag'"
 								@click="changeSelected(index)" draggable="true" @dragstart="dragStart($event, index)"
@@ -477,6 +477,7 @@ const drop = (event, index) => {
 	// 移动数组中的元素来更新顺序
 	const draggedItem = copiedCustomizeColumns.value.splice(draggedIndex, 1)[0];
 	copiedCustomizeColumns.value.splice(index, 0, draggedItem);
+  selectedItemIndex.value = index
 };
 
 const globalStore = useGlobalStore();
@@ -861,7 +862,7 @@ const sensorList = ref<any>([])
 // 被选中当条数据下标
 const selectedItemIndex = ref(0)
 
-
+const scrollContainer = ref<HTMLElement | null>(null);
 const changeMoveUp = () => {
 	//上移
 	if (selectedItemIndex.value > 0) {
@@ -869,6 +870,10 @@ const changeMoveUp = () => {
 		copiedCustomizeColumns.value[selectedItemIndex.value - 1] = copiedCustomizeColumns.value[selectedItemIndex.value]
 		copiedCustomizeColumns.value[selectedItemIndex.value] = temp
 		selectedItemIndex.value--
+
+    if (scrollContainer.value) {
+      scrollContainer.value.scrollTop -= 50;
+    }
 	}
 }
 
@@ -879,6 +884,10 @@ const changeMoveDown = () => {
 		copiedCustomizeColumns.value[selectedItemIndex.value + 1] = copiedCustomizeColumns.value[selectedItemIndex.value]
 		copiedCustomizeColumns.value[selectedItemIndex.value] = temp
 		selectedItemIndex.value++
+
+    if (scrollContainer.value) {
+      scrollContainer.value.scrollTop += 50;
+    }
 	}
 }
 

src/views/analysis/featureCurves/index.vue

@@ -47,11 +47,11 @@
             <div class="chart_item zhuti">
               <div style="font-weight: bold;" class="item_title">
                 <span>2分钟平均风向 ( ° )/2分钟平均风速 ( m/s )</span>
-         
+
                   <el-icon style="vertical-align: middle;cursor: pointer;"  @click="showBig(1, 0, 0)">
                     <Search />
                   </el-icon>
-      
+
               </div>
               <div class="mt5">
                 <div ref="wind" class="ve-ring" style="height: 330px"></div>
@@ -207,7 +207,7 @@
         </el-tabs>
         <div class="selected-list-box">
           <div class="disposition-title" style="margin-top: 0px">已选要素</div>
-          <div class="selected-list-c">
+          <div class="selected-list-c" ref="scrollContainer">
             <template v-for="(item, index) in copiedCustomizeColumns" :key="item.id">
               <div :class="selectedItemIndex === index ? 'selected-item-tag-active' : 'selected-item-tag'"
                 @click="changeSelected(index)" draggable="true" @dragstart="dragStart($event, index)" @dragover.prevent
@@ -297,6 +297,7 @@ const drop = (event, index) => {
   // 移动数组中的元素来更新顺序
   const draggedItem = copiedCustomizeColumns.value.splice(draggedIndex, 1)[0];
   copiedCustomizeColumns.value.splice(index, 0, draggedItem);
+  selectedItemIndex.value = index
 };
 
 const handleDateRangeChange = (newVal) => {
@@ -372,7 +373,7 @@ const copiedCustomizeColumns = ref<any>([...customizeColumns.value]);
 const sensorList = ref<any>([])
 // 被选中当条数据下标
 const selectedItemIndex = ref(0)
-
+const scrollContainer = ref<HTMLElement | null>(null);
 
 const changeMoveUp = () => {
   //上移
@@ -381,6 +382,10 @@ const changeMoveUp = () => {
     copiedCustomizeColumns.value[selectedItemIndex.value - 1] = copiedCustomizeColumns.value[selectedItemIndex.value]
     copiedCustomizeColumns.value[selectedItemIndex.value] = temp
     selectedItemIndex.value--
+
+    if (scrollContainer.value) {
+      scrollContainer.value.scrollTop -= 50;
+    }
   }
 }
 
@@ -391,6 +396,10 @@ const changeMoveDown = () => {
     copiedCustomizeColumns.value[selectedItemIndex.value + 1] = copiedCustomizeColumns.value[selectedItemIndex.value]
     copiedCustomizeColumns.value[selectedItemIndex.value] = temp
     selectedItemIndex.value++
+
+    if (scrollContainer.value) {
+      scrollContainer.value.scrollTop += 50;
+    }
   }
 }
 

src/views/query/deviceHealth/index.vue

@@ -112,7 +112,7 @@
         </el-tabs>
         <div class="selected-list-box">
           <div class="disposition-title" style="margin-top: 0px">已选设备</div>
-          <div class="selected-list-c">
+          <div class="selected-list-c" ref="scrollContainer">
             <template v-for="(item,index) in copiedCustomizeColumns" :key="item.se_type">
               <div  :class="selectedItemIndex===index?'selected-item-tag-active':'selected-item-tag'" @click="changeSelected(index)"
                     draggable="true"
@@ -170,6 +170,7 @@ const drop = (event, index) => {
   // 移动数组中的元素来更新顺序
   const draggedItem = copiedCustomizeColumns.value.splice(draggedIndex, 1)[0];
   copiedCustomizeColumns.value.splice(index, 0, draggedItem);
+  selectedItemIndex.value = index
 };
 
 const pageable = ref<any>({
@@ -529,7 +530,7 @@ let customizeColumns= ref<any>([
     }
 
 ])
-
+const scrollContainer = ref<HTMLElement | null>(null);
 const changeMoveUp = () =>{
 //上移
   if (selectedItemIndex.value > 0) {
@@ -537,6 +538,10 @@ const changeMoveUp = () =>{
     copiedCustomizeColumns.value[selectedItemIndex.value - 1] = copiedCustomizeColumns.value[selectedItemIndex.value]
     copiedCustomizeColumns.value[selectedItemIndex.value] = temp
     selectedItemIndex.value--
+
+    if (scrollContainer.value) {
+      scrollContainer.value.scrollTop -= 50;
+    }
   }
 }
 
@@ -547,6 +552,10 @@ const changeMoveDown = ()=>{
     copiedCustomizeColumns.value[selectedItemIndex.value + 1] = copiedCustomizeColumns.value[selectedItemIndex.value]
     copiedCustomizeColumns.value[selectedItemIndex.value] = temp
     selectedItemIndex.value++
+
+    if (scrollContainer.value) {
+      scrollContainer.value.scrollTop += 50;
+    }
   }
 }
 

src/views/query/queryObservationData/index.vue

@@ -277,6 +277,7 @@ const drop = (event, index) => {
   // 移动数组中的元素来更新顺序
   const draggedItem = copiedCustomizeColumns.value.splice(draggedIndex, 1)[0];
   copiedCustomizeColumns.value.splice(index, 0, draggedItem);
+  selectedItemIndex.value = index
 };
 
 const cancel = () => {

src/views/system/stations/index.vue

@@ -562,6 +562,7 @@ const drop = (event, index) => {
   // 移动数组中的元素来更新顺序
   const draggedItem = copiedCustomizeColumns.value.splice(draggedIndex, 1)[0];
   copiedCustomizeColumns.value.splice(index, 0, draggedItem);
+  selectedItemIndex.value = index
 };