Merge remote-tracking branch 'origin/master-dev' into feature-Beta-dev-renpy

src/views/system/DefaultNuclide/AlarmRule.vue

@@ -1,6 +1,20 @@
 <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
@@ -29,8 +43,22 @@
       </custom-table>
     </div>
     <!-- 列表结束 -->
-    <a-modal title="Edit" :width="845" v-model="visible" :maskClosable="false" @ok="handleOk" destroy-on-close>
+    <a-modal title="Edit" :width="845" v-model="visible" :maskClosable="false" @ok="handleOk">
       <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"
@@ -86,6 +114,11 @@ const columns = [
     align: 'left',
     dataIndex: 'nuclideName',
   },
+  {
+    title: 'NUCLIDE TYPE',
+    align: 'left',
+    dataIndex: 'nuclideType',
+  },
   {
     title: 'CREATE TIME',
     align: 'left',
@@ -113,6 +146,22 @@ export default {
         total: 0,
       },
       loading: false,
+      typeOptions: [
+        {
+          label: 'P',
+          value: 'P',
+        },
+        {
+          label: 'G',
+          value: 'G',
+        },
+        {
+          label: 'B',
+          value: 'B',
+        },
+      ],
+      type: undefined,
+      currType: 'P',
       targetKeys: [],
       visible: false,
       dataList: [],
@@ -129,6 +178,7 @@ export default {
         pageNo: this.ipagination.current,
         pageSize: this.ipagination.pageSize,
         useType: 2,
+        nuclideType: this.type || '',
       }
       getAction(this.url.list, params).then((res) => {
         this.loading = false
@@ -145,6 +195,16 @@ export default {
       this.ipagination.pageSize = pagination.pageSize
       this.getRulesList()
     },
+    onTypeChange(val) {
+      this.type = val
+      this.ipagination.current = 1
+      this.ipagination.pageSize = 10
+      this.getRulesList()
+    },
+    onCurrTypeChange(val) {
+      this.currType = val
+      this.getNuclideList()
+    },
     handleAdd() {
       this.visible = true
       this.spinning = true
@@ -171,7 +231,7 @@ export default {
       })
     },
     getNuclideList() {
-      getAction('/sys/defaultNuclide/allName', { useType: 2 }).then((res) => {
+      getAction('/sys/defaultNuclide/allName', { useType: 2, nuclideType: this.currType }).then((res) => {
         if (res.success) {
           if (res.result.length > 0) {
             this.targetKeys = res.result.map((item) => item)
@@ -192,6 +252,7 @@ export default {
     handleOk() {
       let params = {
         nuclideNames: this.targetKeys,
+        nuclideType: this.currType,
         useType: 2,
       }
       getAction('/sys/defaultNuclide/add', params).then((res) => {
@@ -218,10 +279,20 @@ export default {
   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;

src/views/system/DefaultNuclide/AutoProcess.vue

@@ -43,7 +43,7 @@
       </custom-table>
     </div>
     <!-- 列表结束 -->
-    <a-modal title="Edit" :width="845" v-model="visible" :maskClosable="false" @ok="handleOk" destroy-on-close>
+    <a-modal title="Edit" :width="845" v-model="visible" :maskClosable="false" @ok="handleOk">
       <a-spin :spinning="spinning">
         <div style="padding-left: 52px; margin-bottom: 20px">
           <span class="item-label">Nuclide Type</span>
@@ -155,6 +155,10 @@ export default {
           label: 'G',
           value: 'G',
         },
+        {
+          label: 'B',
+          value: 'B',
+        },
       ],
       type: undefined,
       currType: 'P',
@@ -193,6 +197,8 @@ export default {
     },
     onTypeChange(val) {
       this.type = val
+      this.ipagination.current = 1
+      this.ipagination.pageSize = 10
       this.getAuroPeocessList()
     },
     onCurrTypeChange(val) {