From c5794c24f4f9d2b22e57786c254f74f9651efded Mon Sep 17 00:00:00 2001
From: renpy <peiyu_ren@163.com>
Date: Mon, 4 Sep 2023 18:04:17 +0800
Subject: [PATCH 1/6] =?UTF-8?q?system=E6=A8=A1=E5=9D=97=20default=20Nuclid?=
 =?UTF-8?q?e=20=E6=8A=A5=E8=AD=A6=E8=A7=84=E5=88=99=EF=BC=8C=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=A4=84=E7=90=86=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E5=8F=8A=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   1 +
 src/views/system/DefaultNuclide/AlarmRule.vue | 339 +++++++++++++++
 .../system/DefaultNuclide/AutoProcess.vue     | 404 ++++++++++++++++++
 vue.config.js                                 |  13 +
 4 files changed, 757 insertions(+)
 create mode 100644 src/views/system/DefaultNuclide/AlarmRule.vue
 create mode 100644 src/views/system/DefaultNuclide/AutoProcess.vue

diff --git a/package.json b/package.json
index bbea7cf..44eb672 100644
--- a/package.json
+++ b/package.json
@@ -55,6 +55,7 @@
     "xss": "^1.0.13"
   },
   "devDependencies": {
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
     "@babel/polyfill": "^7.2.5",
     "@types/crypto-js": "^4.1.1",
     "@vue/cli-plugin-babel": "^3.3.0",
diff --git a/src/views/system/DefaultNuclide/AlarmRule.vue b/src/views/system/DefaultNuclide/AlarmRule.vue
new file mode 100644
index 0000000..8b213cf
--- /dev/null
+++ b/src/views/system/DefaultNuclide/AlarmRule.vue
@@ -0,0 +1,339 @@
+<template>
+  <div style="height: 100%;">
+    <div class="header">
+      <a-button type="primary" @click="handleAdd">
+          <img src="@/assets/images/global/add.png" alt="" />
+          Edit
+        </a-button>
+    </div>
+    <!-- 列表 -->
+    <div>
+      <custom-table
+        size="middle"
+        rowKey="id"
+        :columns="columns"
+        :list="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        @change="handleTableChange"
+        :scroll="{ y: 'calc(100vh - 365px)' }"
+      >
+        <template slot="index" slot-scope="{ index }">
+          {{ index + 1 }}
+        </template>
+        <template slot="roles" slot-scope="{ text }">
+          <span v-for="role of text" :key="role.id">
+            {{ role.roleName }}
+          </span>
+        </template>
+      </custom-table>
+    </div>
+    <!-- 列表结束 -->
+    <a-modal 
+      title='Edit'
+      :width="845" 
+      v-model="visible" 
+      @ok="handleOk" 
+      destroy-on-close
+    >
+      <a-spin :spinning="spinning">
+        <div class="group-assign">
+          <a-transfer
+            :dataSource="dataList"
+            :target-keys="targetKeys"
+            show-search
+            :render="item => item.title"
+            :operations="['Assign', 'Remove']"
+            :titles="['Total Nuclides', 'User Nuclides']"
+            @change="handleChange"
+            @search="handleSearch"
+          >
+          </a-transfer>
+        </div>
+      </a-spin>
+      <template slot="footer">
+        <slot name="custom-footer"></slot>
+        <a-space class="operators" :size="20">
+          <a-button type="success" @click="handleOk" >Save</a-button>
+          <a-button type="warn" @click="onCancel">Cancel</a-button>
+        </a-space>
+      </template>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+import { getAction, putAction } from '@/api/manage'
+const columns = [
+  {
+    title: 'NO',
+    align: 'left',
+    width: 170,
+    scopedSlots: {
+      customRender: 'index'
+    },
+    customHeaderCell: () => {
+      return {
+        style: {
+          'padding-left': '60px !important'
+        }
+      }
+    },
+    customCell: () => {
+      return {
+        style: {
+          'padding-left': '60px !important'
+        }
+      }
+    }
+  },
+  {
+    title: 'NUCLIDE NAME',
+    align: 'left',
+    dataIndex: 'nuclideName'
+  },
+  {
+    title: 'CREATE TIME',
+    align: 'left',
+    dataIndex: 'createTime'
+  },
+]
+export default {
+  data() {
+    return {
+      columns,
+      dataSource: [],
+      url: {
+        list: '/sys/defaultNuclide/findPage',
+      },
+      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
+      },
+      loading: false,
+      targetKeys: [],
+      visible: false,
+      dataList: [],
+      spinning: false
+    }
+  },
+  mounted () {
+    this.getRulesList();
+  },
+  methods: {
+    getRulesList() {
+      this.loading = true
+      let params = {
+        pageNo: this.ipagination.current,
+        pageSize: this.ipagination.pageSize,
+        useType: 2
+      }
+      getAction(this.url.list, params).then(res => {
+        this.loading = false
+        if (res.success) {
+          this.dataSource = res.result.records
+          this.ipagination.total = res.result.total
+        } else {
+          this.$message.warning("This operation fails. Contact your system administrator")
+        }
+        
+      })
+    },
+    handleTableChange(pagination, filters, sorter) {
+      this.ipagination.current = pagination.current
+      this.ipagination.pageSize = pagination.pageSize
+      this.getRulesList();
+    },
+    handleAdd() {
+      this.visible = true
+      this.spinning = true
+      this.getNuclideListAll()
+      this.getNuclideList()
+    },
+    getNuclideListAll() {
+      getAction("/gardsNuclLib/allName").then(res => {
+        this.spinning = false
+        if (res.success) {
+          if (res.result.length > 0) {
+            this.dataList = res.result.map((item,index) => {
+              return {
+                key: item,
+                title: item
+              }
+            })
+          } else {
+            this.dataList = []
+          }
+        } else {
+          this.$message.warning("This operation fails. Contact your system administrator")
+        }
+      })
+    },
+    getNuclideList() {
+      getAction("/sys/defaultNuclide/allName",{useType:2}).then(res => {
+        if (res.success) {
+          if (res.result.length > 0) {
+            this.targetKeys = res.result.map(item => item)
+          } else {
+            this.targetKeys = []
+          }
+        } else {
+          this.$message.warning("This operation fails. Contact your system administrator")
+        }
+      })
+    },
+    handleChange(targetKeys, direction, moveKeys) {
+      this.targetKeys= targetKeys;
+    },
+    handleSearch(dir, value) {
+      console.log('search:', dir, value)
+    },
+    handleOk() {
+      let params = {
+        nuclideNames: this.targetKeys,
+        useType: 2
+      }
+      putAction("/sys/defaultNuclide/add",params).then(res => {
+        this.visible = false
+        if (res.success) {
+          this.$message(res.message)
+        } else {
+          this.$message.warning("This operation fails. Contact your system administrator")
+        }
+      })
+    },
+    onCancel() {
+      this.visible = false
+    },
+  },
+}
+</script>
+
+<style lang="less" scoped>
+.header{
+  height: 54px;
+  border-top: 1px solid rgba(12, 235, 201, 0.3);
+  border-bottom: 1px solid rgba(12, 235, 201, 0.3);
+  display: flex;
+  align-items: center;
+  background-color: rgba(12, 235, 201, 0.05);
+  padding: 0 10px;
+  margin-bottom: 18px;
+}
+.operators {
+  width: 100%;
+  justify-content: center;
+  .ant-btn {
+    width: 92px;
+  }
+}
+.group-assign{
+  position: relative;
+  width: 690px;
+  margin: 0 auto;
+  .ant-transfer {
+    margin-bottom: 10px;
+    ::v-deep {
+      .ant-transfer-list {
+        width: 291px;
+        height: 411px;
+        padding-top: 0;
+        &-header {
+          height: 37px;
+          &-selected {
+            span:first-child {
+              display: none;
+            }
+          }
+          &-title {
+            left: 16px;
+          }
+        }
+        &-body{
+          height: calc(100% - 37px);
+        }
+        &-content {
+          &-item {
+            &:hover {
+              background-color: transparent;
+            }
+          }
+        }
+  
+        &:last-child {
+          height: 411px;
+          position: relative;
+          // top: 35px;
+        }
+      }
+  
+      .ant-transfer-operation {
+        .ant-btn {
+          width: 92px;
+          height: 26px;
+          padding: 0;
+          .anticon {
+            display: none;
+          }
+          span {
+            margin-left: 0;
+          }
+          &:first-child {
+            margin-bottom: 52px;
+            &::after {
+              display: inline-block;
+              margin-left: 13px;
+              content: '';
+              width: 18px;
+              height: 10px;
+              background: url(~@/assets/images/system/transfer-right.png) no-repeat;
+              background-size: contain;
+            }
+          }
+          &:nth-child(2) {
+            &::before {
+              display: inline-block;
+              margin-right: 6px;
+              content: '';
+              width: 18px;
+              height: 10px;
+              background: url(~@/assets/images/system/transfer-left.png) no-repeat;
+              background-size: contain;
+              position: static;
+              opacity: initial;
+            }
+          }
+        }
+      }
+      .ant-transfer-list-header{
+        position: relative;
+        .ant-checkbox-wrapper{
+          position: absolute;
+          right: 10px;
+        }
+      }
+      .ant-transfer-list-content-item{
+        position: relative;
+        .ant-checkbox-wrapper{
+          position: absolute;
+          right: 10px;
+        }
+      }
+      .ant-transfer-list-content-item-text{
+        padding-left: 22px;
+      }
+    }
+  }
+}
+/deep/.ant-modal-title{
+  letter-spacing: 1px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/system/DefaultNuclide/AutoProcess.vue b/src/views/system/DefaultNuclide/AutoProcess.vue
new file mode 100644
index 0000000..32ffb68
--- /dev/null
+++ b/src/views/system/DefaultNuclide/AutoProcess.vue
@@ -0,0 +1,404 @@
+<template>
+  <div style="height: 100%;">
+    <div class="header">
+      <div>
+        <span class="item-label">Nuclide Type</span>
+        <a-select 
+          style="width: 180px;display: inline-block;" 
+          v-model="type" 
+          :options="typeOptions" 
+          show-arrow 
+          allowClear
+          placeholder="select..." 
+          @change="onTypeChange"
+        >
+          <img slot="suffixIcon" src="@/assets/images/global/select-down.png" alt="" />
+        </a-select>
+      </div>
+      <a-button type="primary" @click="handleAdd">
+        <img src="@/assets/images/global/add.png" alt="" />
+        Edit
+      </a-button>
+    </div>
+    <!-- 列表 -->
+    <div>
+      <custom-table
+        size="middle"
+        rowKey="id"
+        :columns="columns"
+        :list="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        @change="handleTableChange"
+        :scroll="{ y: 'calc(100vh - 365px)' }"
+      >
+        <template slot="index" slot-scope="{ index }">
+          {{ index + 1 }}
+        </template>
+        <template slot="roles" slot-scope="{ text }">
+          <span v-for="role of text" :key="role.id">
+            {{ role.roleName }}
+          </span>
+        </template>
+      </custom-table>
+    </div>
+    <!-- 列表结束 -->
+    <a-modal 
+      title='Edit'
+      :width="845" 
+      v-model="visible" 
+      @ok="handleOk" 
+      destroy-on-close
+    >
+      <a-spin :spinning="spinning">
+        <div style="padding-left: 52px;margin-bottom: 20px;">
+          <span class="item-label">Nuclide Type</span>
+          <a-select 
+            style="width: 180px;display: inline-block;" 
+            v-model="currType" 
+            :options="typeOptions" 
+            show-arrow 
+            allowClear
+            placeholder="select..." 
+            @change="onCurrTypeChange"
+          >
+            <img slot="suffixIcon" src="@/assets/images/global/select-down.png" alt="" />
+          </a-select>
+        </div>
+        <div class="group-assign">
+          <a-transfer
+            :dataSource="dataList"
+            :target-keys="targetKeys"
+            show-search
+            :render="item => item.title"
+            :operations="['Assign', 'Remove']"
+            :titles="['Total Nuclides', 'User Nuclides']"
+            @change="handleChange"
+            @search="handleSearch"
+          >
+          </a-transfer>
+        </div>
+      </a-spin>
+      <template slot="footer">
+        <slot name="custom-footer"></slot>
+        <a-space class="operators" :size="20">
+          <a-button type="success" @click="handleOk" >Save</a-button>
+          <a-button type="warn" @click="onCancel">Cancel</a-button>
+        </a-space>
+      </template>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+import {getAction } from '@/api/manage'
+const columns = [
+  {
+    title: 'NO',
+    align: 'left',
+    width: 170,
+    scopedSlots: {
+      customRender: 'index'
+    },
+    customHeaderCell: () => {
+      return {
+        style: {
+          'padding-left': '60px !important'
+        }
+      }
+    },
+    customCell: () => {
+      return {
+        style: {
+          'padding-left': '60px !important'
+        }
+      }
+    }
+  },
+  {
+    title: 'NUCLIDE NAME',
+    align: 'left',
+    dataIndex: 'nuclideName'
+  },
+  {
+    title: 'NUCLIDE TYPE',
+    align: 'left',
+    dataIndex: 'nuclideType'
+  },
+  {
+    title: 'CREATE TIME',
+    align: 'left',
+    dataIndex: 'createTime'
+  },
+]
+export default {
+  data() {
+    return {
+      columns,
+      dataSource: [],
+      url: {
+        list: '/sys/defaultNuclide/findPage',
+      },
+      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
+      },
+      loading: false,
+      typeOptions: [
+        {
+          label: "P",
+          value: "P"
+        },
+        {
+          label: "G",
+          value: "G"
+        }
+      ],
+      type: undefined,
+      currType: "P",
+      targetKeys: [],
+      visible: false,
+      dataList: [],
+      spinning: false
+    }
+  },
+  mounted () {
+    this.getAuroPeocessList();
+  },
+  methods: {
+    getAuroPeocessList() {
+      this.loading = true
+      let params = {
+        pageNo: this.ipagination.current,
+        pageSize: this.ipagination.pageSize,
+        useType: 1,
+        nuclideType: this.type || ""
+      }
+      getAction(this.url.list, params).then(res => {
+        this.loading = false
+        if (res.success) {
+          this.dataSource = res.result.records
+          this.ipagination.total = res.result.total
+        } else {
+          this.$message.warning("This operation fails. Contact your system administrator")
+        }
+        
+      })
+    },
+    handleTableChange(pagination, filters, sorter) {
+      this.ipagination.current = pagination.current
+      this.ipagination.pageSize = pagination.pageSize
+      this.getAuroPeocessList();
+    },
+    onTypeChange(val) {
+      this.type = val
+      this.getAuroPeocessList();
+    },
+    onCurrTypeChange(val) {
+      this.currType = val
+    },
+    handleAdd() {
+      this.visible = true
+      this.spinning = true
+      this.getNuclideListAll()
+      this.getNuclideList()
+    },
+    getNuclideListAll() {
+      getAction("/gardsNuclLib/allName").then(res => {
+        this.spinning = false
+        if (res.success) {
+          if (res.result.length > 0) {
+            this.dataList = res.result.map((item,index) => {
+              return {
+                key: item,
+                title: item
+              }
+            })
+          } else {
+            this.dataList = []
+          }
+        } else {
+          this.$message.warning("This operation fails. Contact your system administrator")
+        }
+      })
+    },
+    getNuclideList() {
+      getAction("/sys/defaultNuclide/allName",{useType:1}).then(res => {
+        if (res.success) {
+          if (res.result.length > 0) {
+            this.targetKeys = res.result.map(item => item)
+          } else {
+            this.targetKeys = []
+          }
+        } else {
+          this.$message.warning("This operation fails. Contact your system administrator")
+        }
+      })
+    },
+    handleChange(targetKeys, direction, moveKeys) {
+      console.log(targetKeys, direction, moveKeys);
+      this.targetKeys= targetKeys;
+    },
+    handleSearch(dir, value) {
+      console.log('search:', dir, value)
+    },
+    handleOk() {
+      let params = {
+        nuclideNames: this.targetKeys,
+        nuclideType: this.currType,
+        useType: 1
+      }
+      putAction("/sys/defaultNuclide/add",params).then(res => {
+        this.visible = false
+        if (res.success) {
+          this.$message(res.message)
+        } else {
+          this.$message.warning("This operation fails. Contact your system administrator")
+        }
+      })
+    },
+    onCancel() {
+      this.visible = false
+    },
+  },
+}
+</script>
+
+<style lang="less" scoped>
+.header{
+  height: 54px;
+  border-top: 1px solid rgba(12, 235, 201, 0.3);
+  border-bottom: 1px solid rgba(12, 235, 201, 0.3);
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  background-color: rgba(12, 235, 201, 0.05);
+  padding: 0 10px;
+  margin-bottom: 18px;
+}
+.item-label{
+  display: inline-block;
+  font-size: 16px;
+  font-family: ArialMT;
+  color: #ade6ee;
+  line-height: 32px;
+  height: 32px;
+  margin-right: 10px;
+}
+.operators {
+  width: 100%;
+  justify-content: center;
+  .ant-btn {
+    width: 92px;
+  }
+}
+.group-assign{
+  position: relative;
+  width: 690px;
+  margin: 0 auto;
+  .ant-transfer {
+    margin-bottom: 10px;
+    ::v-deep {
+      .ant-transfer-list {
+        width: 291px;
+        height: 411px;
+        padding-top: 0;
+        &-header {
+          height: 37px;
+          &-selected {
+            span:first-child {
+              display: none;
+            }
+          }
+          &-title {
+            left: 16px;
+          }
+        }
+        &-body{
+          height: calc(100% - 37px);
+        }
+        &-content {
+          &-item {
+            &:hover {
+              background-color: transparent;
+            }
+          }
+        }
+  
+        &:last-child {
+          height: 411px;
+          position: relative;
+          // top: 35px;
+        }
+      }
+  
+      .ant-transfer-operation {
+        .ant-btn {
+          width: 92px;
+          height: 26px;
+          padding: 0;
+          .anticon {
+            display: none;
+          }
+          span {
+            margin-left: 0;
+          }
+          &:first-child {
+            margin-bottom: 52px;
+            &::after {
+              display: inline-block;
+              margin-left: 13px;
+              content: '';
+              width: 18px;
+              height: 10px;
+              background: url(~@/assets/images/system/transfer-right.png) no-repeat;
+              background-size: contain;
+            }
+          }
+          &:nth-child(2) {
+            &::before {
+              display: inline-block;
+              margin-right: 6px;
+              content: '';
+              width: 18px;
+              height: 10px;
+              background: url(~@/assets/images/system/transfer-left.png) no-repeat;
+              background-size: contain;
+              position: static;
+              opacity: initial;
+            }
+          }
+        }
+      }
+      .ant-transfer-list-header{
+        position: relative;
+        .ant-checkbox-wrapper{
+          position: absolute;
+          right: 10px;
+        }
+      }
+      .ant-transfer-list-content-item{
+        position: relative;
+        .ant-checkbox-wrapper{
+          position: absolute;
+          right: 10px;
+        }
+      }
+      .ant-transfer-list-content-item-text{
+        padding-left: 22px;
+      }
+    }
+  }
+}
+/deep/.ant-modal-title{
+  letter-spacing: 1px;
+}
+</style>
\ No newline at end of file
diff --git a/vue.config.js b/vue.config.js
index 1c90d4c..6ac77a3 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -69,6 +69,19 @@ module.exports = {
       .use()
       .loader('babel-loader')
       .end()
+    config.module
+      .rule('ol')
+      .test(/\.js$/)
+      .include
+        .add(resolve('node_modules/ol'))
+        .end()
+      .use()
+      .loader('babel-loader')
+      .options({
+        presets: ['@babel/preset-env'],
+        plugins: ['@babel/plugin-proposal-nullish-coalescing-operator']
+      })
+      .end()
   },
 
   css: {

From 53e5cf6bd36bb95798215c85a35b1f76d2c23c84 Mon Sep 17 00:00:00 2001
From: renpy <peiyu_ren@163.com>
Date: Mon, 4 Sep 2023 18:26:53 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/manage.js                               | 6 ++++--
 src/views/system/DefaultNuclide/AlarmRule.vue   | 6 +++---
 src/views/system/DefaultNuclide/AutoProcess.vue | 6 +++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/api/manage.js b/src/api/manage.js
index 5ce1de7..91d24d6 100644
--- a/src/api/manage.js
+++ b/src/api/manage.js
@@ -1,6 +1,7 @@
 import Vue from 'vue'
 import { axios } from '@/utils/request'
 import signMd5Utils from '@/utils/encryption/signMd5Utils'
+import qs from "qs";
 
 const api = {
   user: '/mock/api/user',
@@ -60,15 +61,16 @@ export function getAction(url,parameter) {
   // update-begin--author:taoyan---date:20220421--for: VUEN-410【签名改造】 X-TIMESTAMP牵扯
   let signHeader = {"X-Sign": sign,"X-TIMESTAMP": signMd5Utils.getTimestamp()};
   // update-end--author:taoyan---date:20220421--for: VUEN-410【签名改造】 X-TIMESTAMP牵扯
-
   return axios({
     url: url,
     method: 'get',
     params: parameter,
+    paramsSerializer: function (params) {  
+      return qs.stringify(params, { arrayFormat: "repeat" });  
+    },
     headers: signHeader
   })
 }
-
 //deleteAction
 export function deleteAction(url,parameter) {
   return axios({
diff --git a/src/views/system/DefaultNuclide/AlarmRule.vue b/src/views/system/DefaultNuclide/AlarmRule.vue
index 8b213cf..4dbe2c9 100644
--- a/src/views/system/DefaultNuclide/AlarmRule.vue
+++ b/src/views/system/DefaultNuclide/AlarmRule.vue
@@ -63,7 +63,7 @@
 </template>
 
 <script>
-import { getAction, putAction } from '@/api/manage'
+import { getAction } from '@/api/manage'
 const columns = [
   {
     title: 'NO',
@@ -201,10 +201,10 @@ export default {
         nuclideNames: this.targetKeys,
         useType: 2
       }
-      putAction("/sys/defaultNuclide/add",params).then(res => {
+      getAction("/sys/defaultNuclide/add",params).then(res => {
         this.visible = false
         if (res.success) {
-          this.$message(res.message)
+          this.$message.success(res.message)
         } else {
           this.$message.warning("This operation fails. Contact your system administrator")
         }
diff --git a/src/views/system/DefaultNuclide/AutoProcess.vue b/src/views/system/DefaultNuclide/AutoProcess.vue
index 32ffb68..6f12978 100644
--- a/src/views/system/DefaultNuclide/AutoProcess.vue
+++ b/src/views/system/DefaultNuclide/AutoProcess.vue
@@ -91,7 +91,7 @@
 </template>
 
 <script>
-import {getAction } from '@/api/manage'
+import { getAction } from '@/api/manage'
 const columns = [
   {
     title: 'NO',
@@ -256,10 +256,10 @@ export default {
         nuclideType: this.currType,
         useType: 1
       }
-      putAction("/sys/defaultNuclide/add",params).then(res => {
+      getAction("/sys/defaultNuclide/add",params).then(res => {
         this.visible = false
         if (res.success) {
-          this.$message(res.message)
+          this.$message.success(res.message)
         } else {
           this.$message.warning("This operation fails. Contact your system administrator")
         }

From d867093ad44a31e18a86f9e01c1a0ea7127d9c49 Mon Sep 17 00:00:00 2001
From: renpy <peiyu_ren@163.com>
Date: Tue, 5 Sep 2023 11:45:49 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=A0=B8=E7=B4=A0=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E6=8E=A5=E5=8F=A3=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E8=B0=83=E6=95=B4=20=E7=B3=BB=E7=BB=9F=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=A8=A1=E5=9D=97=E4=BF=AE=E6=94=B9menu=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E9=BB=98=E8=AE=A4=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page/GlobalLayout.vue          | 64 +++++++++++++++++++
 .../system/DefaultNuclide/AutoProcess.vue     |  2 +-
 2 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/src/components/page/GlobalLayout.vue b/src/components/page/GlobalLayout.vue
index 7505b0c..c3d8da1 100644
--- a/src/components/page/GlobalLayout.vue
+++ b/src/components/page/GlobalLayout.vue
@@ -718,6 +718,50 @@
           border-left: 0;
         }
       }
+      .ant-menu-submenu{
+        background: rgba(58, 236, 240, .22) !important;
+        border-bottom: none !important;
+        margin-right: 10px;
+        height: 30px;
+        line-height: 30px;
+        padding: 0 16px;
+        letter-spacing: 2px;
+        position: relative;
+        &-title {
+          color: #c9f6f6;
+          font-weight: bold;
+          font-family: BookmanOldStyle;
+          padding: 0;
+        }
+        &-active,
+        &-selected {
+          > a {
+            color: #2affdf !important;
+          }
+
+          &::before,
+          &::after {
+            border-color: #0cecca !important;
+          }
+        }
+        &::before,
+        &::after {
+          content: '';
+          position: absolute;
+          border: 2px solid #569e9e;
+          width: 7px;
+          height: 30px;
+          top: 0;
+        }
+        &::before {
+          left: 0;
+          border-right: 0;
+        }
+        &::after {
+          right: 0;
+          border-left: 0;
+        }
+      }
     }
   }
   .global-content {
@@ -783,4 +827,24 @@
       }
     }
   }
+  .ant-menu-submenu-popup .ant-menu-item{
+    display: block !important;
+    width: 100%;
+    padding: 0 16px !important;
+    height: 32px !important;
+    line-height: 32px !important;
+    color: #fff;
+    font-family: Arial;
+    margin-bottom: 0 !important;
+  }
+  .ant-menu-submenu-popup .ant-menu{
+    height: auto;
+    width: 220px;
+    position: absolute;
+    left: -16px;
+  }
+  .ant-menu-submenu-popup{
+    position: relative;
+  }
+  
 </style>
\ No newline at end of file
diff --git a/src/views/system/DefaultNuclide/AutoProcess.vue b/src/views/system/DefaultNuclide/AutoProcess.vue
index 6f12978..9525571 100644
--- a/src/views/system/DefaultNuclide/AutoProcess.vue
+++ b/src/views/system/DefaultNuclide/AutoProcess.vue
@@ -231,7 +231,7 @@ export default {
       })
     },
     getNuclideList() {
-      getAction("/sys/defaultNuclide/allName",{useType:1}).then(res => {
+      getAction("/sys/defaultNuclide/allName",{useType:1,nuclideType: this.currType}).then(res => {
         if (res.success) {
           if (res.result.length > 0) {
             this.targetKeys = res.result.map(item => item)

From e6c3b405f8b07a09f6a5754c54ef3c0b28c955ea Mon Sep 17 00:00:00 2001
From: renpy <peiyu_ren@163.com>
Date: Tue, 5 Sep 2023 13:45:51 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8C=E7=BA=A7?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=9A=84=E9=BB=98=E8=AE=A4=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page/GlobalLayout.vue            | 6 ++++++
 src/views/system/DefaultNuclide/AutoProcess.vue | 1 +
 2 files changed, 7 insertions(+)

diff --git a/src/components/page/GlobalLayout.vue b/src/components/page/GlobalLayout.vue
index c3d8da1..e2d2dd8 100644
--- a/src/components/page/GlobalLayout.vue
+++ b/src/components/page/GlobalLayout.vue
@@ -842,6 +842,12 @@
     width: 220px;
     position: absolute;
     left: -16px;
+    a{
+      color: white;
+      &:hover{
+        color: white;
+      }
+    }
   }
   .ant-menu-submenu-popup{
     position: relative;
diff --git a/src/views/system/DefaultNuclide/AutoProcess.vue b/src/views/system/DefaultNuclide/AutoProcess.vue
index 9525571..98d5906 100644
--- a/src/views/system/DefaultNuclide/AutoProcess.vue
+++ b/src/views/system/DefaultNuclide/AutoProcess.vue
@@ -204,6 +204,7 @@ export default {
     },
     onCurrTypeChange(val) {
       this.currType = val
+      this.getNuclideList()
     },
     handleAdd() {
       this.visible = true

From 15ecb0a9490df49e04049e5dbde3904202d68d74 Mon Sep 17 00:00:00 2001
From: renpy <peiyu_ren@163.com>
Date: Tue, 5 Sep 2023 14:00:29 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=90=8E=E7=9A=84=E5=88=97=E8=A1=A8=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/DefaultNuclide/AlarmRule.vue   | 1 +
 src/views/system/DefaultNuclide/AutoProcess.vue | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/views/system/DefaultNuclide/AlarmRule.vue b/src/views/system/DefaultNuclide/AlarmRule.vue
index 4dbe2c9..25ff6f4 100644
--- a/src/views/system/DefaultNuclide/AlarmRule.vue
+++ b/src/views/system/DefaultNuclide/AlarmRule.vue
@@ -205,6 +205,7 @@ export default {
         this.visible = false
         if (res.success) {
           this.$message.success(res.message)
+          this.getRulesList()
         } else {
           this.$message.warning("This operation fails. Contact your system administrator")
         }
diff --git a/src/views/system/DefaultNuclide/AutoProcess.vue b/src/views/system/DefaultNuclide/AutoProcess.vue
index 98d5906..d8767b1 100644
--- a/src/views/system/DefaultNuclide/AutoProcess.vue
+++ b/src/views/system/DefaultNuclide/AutoProcess.vue
@@ -261,6 +261,7 @@ export default {
         this.visible = false
         if (res.success) {
           this.$message.success(res.message)
+          this.getAuroPeocessList()
         } else {
           this.$message.warning("This operation fails. Contact your system administrator")
         }

From f8a20f1ab0ba18f35fc0d605d5333e0298e97972 Mon Sep 17 00:00:00 2001
From: renpy <peiyu_ren@163.com>
Date: Tue, 5 Sep 2023 14:10:48 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E7=9A=84=E9=AB=98=E5=BA=A6=EF=BC=8C=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E5=87=BA=E7=8E=B0=E5=8F=8C=E6=BB=9A=E5=8A=A8=E8=BD=B4?=
 =?UTF-8?q?=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/system/DataBase.vue                   | 2 +-
 src/views/system/DefaultNuclide/AlarmRule.vue   | 2 +-
 src/views/system/DefaultNuclide/AutoProcess.vue | 2 +-
 src/views/system/RoleUserList.vue               | 2 +-
 src/views/system/UserList.vue                   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/system/DataBase.vue b/src/views/system/DataBase.vue
index a36a1bb..62b038b 100644
--- a/src/views/system/DataBase.vue
+++ b/src/views/system/DataBase.vue
@@ -17,7 +17,7 @@
       :loading="loading"
       @change="handleTableChange"
       :selectedRowKeys.sync="selectedRowKeys"
-      :scroll="{ x: true, y: 'calc(100vh - 410px)' }"
+      :scroll="{ x: true, y: 'calc(100vh - 415px)' }"
     >
       <template slot="index" slot-scope="{ index }">
         {{ index + 1 }}
diff --git a/src/views/system/DefaultNuclide/AlarmRule.vue b/src/views/system/DefaultNuclide/AlarmRule.vue
index 25ff6f4..f793756 100644
--- a/src/views/system/DefaultNuclide/AlarmRule.vue
+++ b/src/views/system/DefaultNuclide/AlarmRule.vue
@@ -16,7 +16,7 @@
         :pagination="ipagination"
         :loading="loading"
         @change="handleTableChange"
-        :scroll="{ y: 'calc(100vh - 365px)' }"
+        :scroll="{ y: 'calc(100vh - 370px)' }"
       >
         <template slot="index" slot-scope="{ index }">
           {{ index + 1 }}
diff --git a/src/views/system/DefaultNuclide/AutoProcess.vue b/src/views/system/DefaultNuclide/AutoProcess.vue
index d8767b1..cacf284 100644
--- a/src/views/system/DefaultNuclide/AutoProcess.vue
+++ b/src/views/system/DefaultNuclide/AutoProcess.vue
@@ -30,7 +30,7 @@
         :pagination="ipagination"
         :loading="loading"
         @change="handleTableChange"
-        :scroll="{ y: 'calc(100vh - 365px)' }"
+        :scroll="{ y: 'calc(100vh - 370px)' }"
       >
         <template slot="index" slot-scope="{ index }">
           {{ index + 1 }}
diff --git a/src/views/system/RoleUserList.vue b/src/views/system/RoleUserList.vue
index 5fde23f..9c0175b 100644
--- a/src/views/system/RoleUserList.vue
+++ b/src/views/system/RoleUserList.vue
@@ -39,7 +39,7 @@
             :pagination="ipagination"
             :loading="loading"
             :rowSelection="{ selectedRowKeys: selectedRowKeys1, onChange: onSelectChange1, type: 'radio' }"
-            :scroll="{ y: 'calc(100vh - 365px)' }"
+            :scroll="{ y: 'calc(100vh - 370px)' }"
             @change="handleTableChange"
           >
             <span slot="action" slot-scope="text, record">
diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue
index 926a368..f91a695 100644
--- a/src/views/system/UserList.vue
+++ b/src/views/system/UserList.vue
@@ -33,7 +33,7 @@
         :loading="loading"
         @change="handleTableChange"
         :selectedRowKeys.sync="selectedRowKeys"
-        :scroll="{ y: 'calc(100vh - 365px)' }"
+        :scroll="{ y: 'calc(100vh - 370px)' }"
       >
         <template slot="index" slot-scope="{ index }">
           {{ index + 1 }}