From 36258e74d27127692306b04fde7a8405225e15a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <peiyu_ren@163.com>
Date: Wed, 20 Mar 2024 10:06:21 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=A4=84=E7=90=86=20=E6=8A=A5=E8=AD=A6?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=B8=AD=20History=20=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=BB=9A=E5=8A=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue     | 1 +
 src/views/abnormalAlarm/analysisMonitor/alarmHistory/index.vue | 1 +
 src/views/abnormalAlarm/analysisMonitor/avgNuclide/index.vue   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue b/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue
index 67b9c98..fae8149 100644
--- a/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue
+++ b/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue
@@ -13,6 +13,7 @@
               :list="dataSource"
               :loading="loading"
               :canSelect="false"
+              :scroll="{ y: 390 }"
             >
               <template slot="info" slot-scope="{ record }">
                 <a-popover>
diff --git a/src/views/abnormalAlarm/analysisMonitor/alarmHistory/index.vue b/src/views/abnormalAlarm/analysisMonitor/alarmHistory/index.vue
index b73137e..fdde122 100644
--- a/src/views/abnormalAlarm/analysisMonitor/alarmHistory/index.vue
+++ b/src/views/abnormalAlarm/analysisMonitor/alarmHistory/index.vue
@@ -10,6 +10,7 @@
           :list="dataSource"
           :loading="loading"
           :pagination="false"
+          :scroll="{ y: 655 }"
           @rowDbclick="rowClick"
         >
           <!-- <template slot="stationList" slot-scope="{ text }">
diff --git a/src/views/abnormalAlarm/analysisMonitor/avgNuclide/index.vue b/src/views/abnormalAlarm/analysisMonitor/avgNuclide/index.vue
index bb155e9..393398a 100644
--- a/src/views/abnormalAlarm/analysisMonitor/avgNuclide/index.vue
+++ b/src/views/abnormalAlarm/analysisMonitor/avgNuclide/index.vue
@@ -53,6 +53,7 @@
         :loading="loading"
         :pagination="false"
         :canSelect="false"
+        :scroll="{ y: 655 }"
       >
       </TableList>
       <a-pagination

From e62d36e4cb1c3be14e64c7e0e02623d24d2c9e8b Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Wed, 20 Mar 2024 17:55:57 +0800
Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=E8=A1=A8=E6=A0=BC=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=BC=A0=E6=A0=87=E6=8C=89=E4=BD=8F=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CustomTable/index.vue | 63 ++++++++++++++++++++++++++--
 1 file changed, 59 insertions(+), 4 deletions(-)

diff --git a/src/components/CustomTable/index.vue b/src/components/CustomTable/index.vue
index 2f07a5a..c2eb0b5 100644
--- a/src/components/CustomTable/index.vue
+++ b/src/components/CustomTable/index.vue
@@ -2,6 +2,7 @@
   <a-table
     ref="tableRef"
     class="custom-table"
+    :class="['custom-table', canSelect && multiple && mouseMoveSelect ? 'mouse-move-select' : '']"
     v-bind="$attrs"
     :data-source="list"
     :columns="columns"
@@ -9,7 +10,7 @@
     :row-key="rowKey"
     :loading="loading"
     :pagination="pagination"
-    :customRow="customRow"
+    :customRow="multiple && mouseMoveSelect ? customMouseMoveSelectRow : customRow"
     :rowClassName="() => (canSelect ? 'custom-table-row' : '')"
     @change="handleTableChange"
   >
@@ -58,10 +59,16 @@ export default {
       type: Boolean,
       default: true,
     },
+    // 多选
     multiple: {
       type: Boolean,
       default: false,
     },
+    // 鼠标移动选择
+    mouseMoveSelect: {
+      type: Boolean,
+      default: true,
+    },
   },
   data() {
     return {
@@ -69,6 +76,14 @@ export default {
       innerSelectedRows: [],
     }
   },
+  mounted() {
+    if (this.canSelect && this.multiple && this.mouseMoveSelect) {
+      const tbody = this.$el.querySelector('.ant-table-tbody')
+      tbody.addEventListener('mouseleave', () => {
+        this.mouseMoveStartIndex = undefined
+      })
+    }
+  },
   methods: {
     // 实现单击选中/反选功能
     customRow(record, index) {
@@ -105,6 +120,34 @@ export default {
         },
       }
     },
+
+    // 实现鼠标拖移动多选功能
+    customMouseMoveSelectRow(record, index) {
+      const key = record[this.rowKey]
+      return {
+        class: this.innerSelectedRowKeys.includes(key) ? 'ant-table-row-selected' : '',
+        on: {
+          mousedown: () => {
+            this.innerSelectedRowKeys = []
+            this.mouseMoveStartIndex = index
+          },
+          mouseenter: () => {
+            if (this.mouseMoveStartIndex !== undefined) {
+              const indexes = [this.mouseMoveStartIndex, index].sort((a, b) => a - b)
+              this.innerSelectedRowKeys = this.list.slice(indexes[0], indexes[1] + 1).map((item) => item[this.rowKey])
+            }
+          },
+          mouseup: () => {
+            // 开始和结束在同一个，相当于click
+            if (this.mouseMoveStartIndex == index) {
+              this.innerSelectedRowKeys = [key]
+            }
+            this.mouseMoveStartIndex = undefined
+          },
+        },
+      }
+    },
+
     handleTableChange(pagination, filters, sorter) {
       this.$emit('change', pagination, filters, sorter)
     },
@@ -136,8 +179,20 @@ export default {
   },
 }
 </script>
-<style lang="less">
-.custom-table-row {
-  cursor: pointer;
+<style lang="less" scoped>
+::v-deep {
+  .custom-table-row {
+    cursor: pointer;
+  }
+}
+
+.mouse-move-select {
+  user-select: none;
+
+  ::v-deep {
+    td {
+      transition: none !important;
+    }
+  }
 }
 </style>

From 46c32d3627bb25c2b3095e78f28b81554a00f188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <peiyu_ren@163.com>
Date: Fri, 22 Mar 2024 15:26:42 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=94=B9=E9=80=A0=EF=BC=8C=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4=EF=BC=8C=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/logManage/index.vue | 128 +++++++++++++++++++++++++++++++++-
 1 file changed, 125 insertions(+), 3 deletions(-)

diff --git a/src/views/logManage/index.vue b/src/views/logManage/index.vue
index 0b4ee06..d28d4bf 100644
--- a/src/views/logManage/index.vue
+++ b/src/views/logManage/index.vue
@@ -30,6 +30,21 @@
     </a-card>
     <!-- 日志列表 -->
     <div class="log-list">
+      <div class="search-bar">
+        <a-row type="flex">
+          <a-col flex="290px">
+            <a-form-model-item label="Name">
+              <a-input v-model="nameStr" placeholder="Please Input..." />
+            </a-form-model-item>
+          </a-col>
+          <a-col flex="108px">
+            <a-button class="search-btn" type="primary" @click="onSearch">
+              <img src="@/assets/images/global/search.png" alt="" />
+              Search
+            </a-button>
+          </a-col>
+        </a-row>
+      </div>
       <custom-table
         size="middle"
         rowKey="id"
@@ -39,7 +54,7 @@
         :loading="isGettingTreeData || loading"
         :can-select="false"
         @change="handleTableChange"
-        :scroll="{ y: 'calc(100vh - 175px)' }"
+        :scroll="{ y: 'calc(100vh - 275px)' }"
       >
         <template slot="operate" slot-scope="{ record }">
           <a-space :size="20">
@@ -53,6 +68,22 @@
           </a-space>
         </template>
       </custom-table>
+      <a-pagination
+        size="small"
+        v-model="ipagination.current"
+        :pageSize="ipagination.pageSize"
+        :page-size-options="ipagination.pageSizeOptions"
+        show-size-changer
+        show-quick-jumper
+        :total="ipagination.total"
+        :show-total="
+          (total, range) =>
+            `Total ${total} items　Page ${ipagination.current} / ${Math.ceil(total / ipagination.pageSize)}`
+        "
+        show-less-items
+        @change="handlePageChange"
+        @showSizeChange="handleSizeChange"
+      />
     </div>
     <!-- 日志列表结束 -->
     <custom-modal title="Log" :width="950" v-model="visible" :footer="null">
@@ -108,6 +139,7 @@ export default {
   data() {
     this.columns = columns
     return {
+      nameStr: '',
       disableMixinCreated: true,
       url: {
         list: '/logManage/findFiles',
@@ -121,12 +153,37 @@ export default {
       visible: false,
       isGettingDetail: false,
       logInfo: [],
+      ipagination: {
+        current: 1,
+        pageSize: 10,
+        pageSizeOptions: ['10', '20', '30'],
+        showTotal: (total, range) => {
+          const { current, pageSize } = this.ipagination
+          return `Total ${total} items　Page ${current} / ${Math.ceil(total / pageSize)}`
+        },
+        showQuickJumper: true,
+        showSizeChanger: true,
+        total: 0,
+      },
     }
   },
   created() {
     this.getTreeData()
   },
   methods: {
+    onSearch() {
+      this.loadData()
+    },
+    handlePageChange(page, pageSize) {
+      this.ipagination.current = page
+      this.ipagination.pageSize = pageSize
+      this.loadData()
+    },
+    handleSizeChange(current, size) {
+      this.ipagination.current = current
+      this.ipagination.pageSize = size
+      this.loadData()
+    },
     async getTreeData() {
       try {
         this.isGettingTreeData = true
@@ -164,6 +221,8 @@ export default {
     },
     onSelect() {
       this.queryParam.path = this.selectedKeys[0]
+      this.ipagination.current = 1
+      this.ipagination.pageSize = 10
       this.loadData()
     },
 
@@ -179,10 +238,14 @@ export default {
       this.onClearSelected()
 
       var params = this.getQueryParams() //查询条件
+      params.name = this.nameStr
+      params.pageNo = this.ipagination.current
+      params.pageSize = this.ipagination.pageSize
       this.loading = true
       getAction(this.url.list, params)
-        .then((res) => {
-          this.dataSource = res
+        .then(({ result: { records, total } }) => {
+          this.dataSource = records
+          this.ipagination.total = total
         })
         .finally(() => {
           this.loading = false
@@ -302,6 +365,10 @@ export default {
       }
     }
   }
+  &-list {
+    position: relative;
+    overflow: hidden;
+  }
 }
 
 .log-detail {
@@ -314,4 +381,59 @@ export default {
     }
   }
 }
+.search-bar {
+  height: 50px;
+  border-top: 1px solid rgba(13, 235, 201, 0.3);
+  border-bottom: 1px solid rgba(13, 235, 201, 0.3);
+  margin-bottom: 15px;
+  padding: 8px 10px;
+  background: rgba(12, 235, 201, 0.05);
+}
+.ant-input {
+  width: 266px;
+}
+::v-deep {
+  .ant-form-item {
+    display: flex;
+    margin-bottom: 0;
+    .ant-form-item-label,
+    .ant-form-item-control {
+      line-height: 32px;
+      height: 32px;
+    }
+    .ant-form-item-label {
+      flex-shrink: 0;
+      margin-right: 10px;
+      label {
+        font-size: 16px;
+        font-family: ArialMT;
+        color: #ade6ee;
+        &::after {
+          display: none;
+        }
+      }
+    }
+    .ant-calendar-range-picker-separator {
+      color: white;
+    }
+    .ant-form-item-control-wrapper {
+      width: 100%;
+      // overflow: hidden;
+    }
+  }
+}
+.search-btn {
+  margin-bottom: 10px;
+  img {
+    width: 16px;
+    height: 17px;
+    margin-right: 9px;
+  }
+}
+.ant-pagination {
+  position: absolute;
+  left: 50%;
+  bottom: 0;
+  transform: translateX(-50%);
+}
 </style>

From 656a02c1ec1bb24b9bf4dc86a9d0901227d107af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <peiyu_ren@163.com>
Date: Mon, 1 Apr 2024 11:35:36 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E6=8E=92=E7=8F=AD=E4=BB=BB=E5=8A=A1=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E7=BB=84=E4=BB=B6=E8=B0=83=E6=95=B4=EF=BC=8C=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E7=BB=93=E6=9E=9C=E5=BC=B9=E7=AA=97=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/Scheduling.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/system/Scheduling.vue b/src/views/system/Scheduling.vue
index 7070e2c..a8f84ed 100644
--- a/src/views/system/Scheduling.vue
+++ b/src/views/system/Scheduling.vue
@@ -196,11 +196,11 @@
     </custom-modal>
     <!-- 增加/编辑排班弹窗结束 -->
     <custom-modal title="Failure record" v-model="visibleRes" :footer="null">
-      <custom-table size="middle" :columns="columns" :list="dataSource">
+      <a-table size="middle" :columns="columns" :dataSource="dataSource" :pagination="false" :scroll="{ y: 600 }">
         <template slot="index" slot-scope="{ index }">
           {{ index + 1 }}
         </template>
-      </custom-table>
+      </a-table>
     </custom-modal>
   </div>
 </template>

From bcaaf9d2806e5d6e19ed020e21371ef9a61e30ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <peiyu_ren@163.com>
Date: Tue, 16 Apr 2024 17:44:12 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=A4=84=E7=90=86=20View=20Spectrum=20?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E4=B8=AD=E4=B8=8B=E8=BD=BD=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?tab=E9=A1=B5=E4=B8=AD=E7=9A=84=E6=96=87=E6=A1=A3=E5=87=BA?=
 =?UTF-8?q?=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BetaGammaSpectrumModal.vue                | 27 +++++--------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSpectrumModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSpectrumModal.vue
index 990600c..c9576b5 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSpectrumModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSpectrumModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <custom-modal v-model="visible" :width="1000" title="View Spectrum" destroyOnClose>
+  <custom-modal v-model="visible" :width="1000" title="View Spectrum" destroyOnClose @cancel="handleCancel">
     <a-spin :spinning="isLoading">
       <a-tabs :animated="false" @change="handleTabChange">
         <a-tab-pane tab="Sample Spectrum" :key="1">
@@ -19,7 +19,7 @@
     <div slot="custom-footer">
       <a-space :size="20">
         <a-button type="primary" @click="handleOk">Save Text</a-button>
-        <a-button @click="visible = false">Cancel</a-button>
+        <a-button @click="handleCancel">Cancel</a-button>
       </a-space>
     </div>
   </custom-modal>
@@ -89,7 +89,6 @@ export default {
       this.currTab = key
     },
     handleOk() {
-      console.log(this.sampleData)
       this.fileName = ''
       let text = ''
       if (this.currTab == 1) {
@@ -104,7 +103,6 @@ export default {
       if (text) {
         let name = this.newSampleData.inputFileName.split('.')[0]
         let strData = new Blob([text], { type: 'text/plain;charset=utf-8' })
-        // saveAs(strData, `GammaViewer Log.txt`)
         if (this.currTab == 1) {
           saveAs(strData, `${name}_Sample Spectrum.txt`)
         } else if (this.currTab == 2) {
@@ -114,27 +112,14 @@ export default {
         } else if (this.currTab == 4) {
           saveAs(strData, `${name}_QC Spectrum.txt`)
         }
-        // let _this = this
-        // this.$confirm({
-        //   title: 'Please enter file name',
-        //   content: (h) => <a-input v-model={_this.fileName} />,
-        //   okText: 'Cancle',
-        //   cancelText: 'Save',
-        //   okButtonProps: { style: { backgroundColor: '#b98326', color: '#fff', borderColor: 'transparent' } },
-        //   cancelButtonProps: { style: { color: '#fff', backgroundColor: '#31aab0', borderColor: 'transparent' } },
-        //   onOk() {
-        //     console.log('Cancel')
-        //   },
-        //   onCancel() {
-        //     if (_this.fileName) {
-        //       saveAs(strData, `${_this.fileName}.txt`)
-        //     }
-        //   },
-        // })
       } else {
         this.$message.warning('No data can be saved!')
       }
     },
+    handleCancel() {
+      this.currTab = 1
+      this.visible = false
+    },
   },
 }
 </script>