From 7e33d014d47abdecf11897b060d876c12af1a835 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <renpy@yuanian.com>
Date: Tue, 10 Oct 2023 15:59:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?alarm=20=E6=A8=A1=E5=9D=97=20SERVICE=20AND?=
 =?UTF-8?q?=20PROCESS=20tab=20=E9=A1=B5=E9=9D=A2=E5=9B=BE=E8=A1=A8?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E5=8F=8A=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=20alarm=20=E6=A8=A1=E5=9D=97=20CPU=20tab=20=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=9B=BE=E8=A1=A8=E6=A0=87=E9=A2=98=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serverMonitor/instances/cpu.vue           |  3 +-
 .../instances/serviceProcess.vue              | 29 +++++++++++++------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/views/abnormalAlarm/serverMonitor/instances/cpu.vue b/src/views/abnormalAlarm/serverMonitor/instances/cpu.vue
index 5b75ac1..43dbf83 100644
--- a/src/views/abnormalAlarm/serverMonitor/instances/cpu.vue
+++ b/src/views/abnormalAlarm/serverMonitor/instances/cpu.vue
@@ -813,7 +813,6 @@ export default {
   &-item {
     width: 100%;
     height: 100%;
-    // background: #ade6ee;
     &-chart {
       width: 100%;
       height: calc(100% - 40px);
@@ -831,7 +830,7 @@ export default {
         font-size: 14px;
         font-weight: normal;
         color: #ffffff;
-        margin-left: 10px;
+        // margin-left: 5px;
         span {
           color: #00e9fe;
           background: none;
diff --git a/src/views/abnormalAlarm/serverMonitor/instances/serviceProcess.vue b/src/views/abnormalAlarm/serverMonitor/instances/serviceProcess.vue
index 43a213a..00d2669 100644
--- a/src/views/abnormalAlarm/serverMonitor/instances/serviceProcess.vue
+++ b/src/views/abnormalAlarm/serverMonitor/instances/serviceProcess.vue
@@ -216,14 +216,26 @@ export default {
       processCpu: {
         content: null,
         legend: ['mysqld.exe', 'svchost.exe'],
-        color: ['#2d5cd3', '#60cae8', '#1ab060', '#ffbf44', '#e86954', 'red'],
+        color: [
+          ['rgb(45, 92, 211)', 'rgba(45, 92, 211,0)'],
+          ['rgb(96, 202, 232)', 'rgba(96, 202, 232,0)'],
+          ['rgb(26, 176, 96)', 'rgba(26, 176, 96,0)'],
+          ['rgb(255, 191, 68)', 'rgba(255, 191, 68,0)'],
+          ['rgb(232, 105, 84)', 'rgba(232, 105, 84,0)'],
+        ],
         xData: [],
         data: [],
       },
       processMenbry: {
         content: null,
         legend: ['mysqld.exe', 'svchost.exe'],
-        color: ['#2d5cd3', '#60cae8', '#1ab060', '#ffbf44', '#e86954', 'red'],
+        color: [
+          ['rgb(45, 92, 211)', 'rgba(45, 92, 211,0)'],
+          ['rgb(96, 202, 232)', 'rgba(96, 202, 232,0)'],
+          ['rgb(26, 176, 96)', 'rgba(26, 176, 96,0)'],
+          ['rgb(255, 191, 68)', 'rgba(255, 191, 68,0)'],
+          ['rgb(232, 105, 84)', 'rgba(232, 105, 84,0)'],
+        ],
         xData: [],
         data: [],
       },
@@ -242,7 +254,6 @@ export default {
         showSizeChanger: true,
         total: 0,
       },
-      xData: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
       rankData: {},
     }
   },
@@ -525,12 +536,12 @@ export default {
           type: 'line',
           name: item.name,
           symbol: 'none',
-          itemStyle: { normal: { color: this.processCpu.color[index] } },
+          itemStyle: { normal: { color: this.processCpu.color[index][0] } },
           areaStyle: {
             normal: {
               color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                { offset: 0, color: this.processCpu.color[index] },
-                { offset: 1, color: 'rgba(255,255,255,0)' },
+                { offset: 0, color: this.processCpu.color[index][0] },
+                { offset: 1, color: this.processCpu.color[index][1] },
               ]),
             },
           },
@@ -599,12 +610,12 @@ export default {
           type: 'line',
           name: item.name,
           symbol: 'none',
-          itemStyle: { normal: { color: this.processCpu.color[index] } },
+          itemStyle: { normal: { color: this.processMenbry.color[index][0] } },
           areaStyle: {
             normal: {
               color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                { offset: 0, color: this.processCpu.color[index] },
-                { offset: 1, color: 'rgba(255,255,255,0)' },
+                { offset: 0, color: this.processMenbry.color[index][0] },
+                { offset: 1, color: this.processMenbry.color[index][1] },
               ]),
             },
           },

From 1de8300df304e875c431a674ae5391c5070ba4f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <renpy@yuanian.com>
Date: Tue, 10 Oct 2023 17:28:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serverMonitor/instances/createRules.vue   | 254 ++++++++----------
 1 file changed, 114 insertions(+), 140 deletions(-)

diff --git a/src/views/abnormalAlarm/serverMonitor/instances/createRules.vue b/src/views/abnormalAlarm/serverMonitor/instances/createRules.vue
index 9feda96..af1d92a 100644
--- a/src/views/abnormalAlarm/serverMonitor/instances/createRules.vue
+++ b/src/views/abnormalAlarm/serverMonitor/instances/createRules.vue
@@ -1,48 +1,38 @@
 <template>
   <div>
-    <a-modal 
-      title='Add Rule'
-      :width="845" 
-      v-model="visible" 
-      @cancel="onCancel"
-    >
-      <a-form-model
-        ref="al_ruleForm"
-        :model="form"
-        :rules="rules"
-        layout="vertical"
-      >
-        <a-row :gutter="[15,0]">
+    <a-modal title="Add Rule" :width="845" v-model="visible" @cancel="onCancel">
+      <a-form-model ref="al_ruleForm" :model="form" :rules="rules" layout="vertical">
+        <a-row :gutter="[15, 0]">
           <a-col :span="12">
             <a-form-model-item ref="sourceType" label="Source Type" prop="sourceType">
-              <a-select 
-                v-model="form.sourceType" 
-                :options="typeOptions" 
-                show-arrow 
+              <a-select
+                v-model="form.sourceType"
+                :options="typeOptions"
+                show-arrow
                 allowClear
                 disabled
-                placeholder="select..." 
-                >
+                placeholder="select..."
+              >
                 <img slot="suffixIcon" src="@/assets/images/global/select-down.png" alt="" />
               </a-select>
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
             <a-form-model-item ref="sourceId" label="Source" prop="sourceId">
-              <a-select 
-                v-model="form.sourceId" 
-                :options="serverList" 
-                show-arrow 
+              <a-select
+                v-model="form.sourceId"
+                :options="serverList"
+                show-arrow
                 allowClear
                 disabled
-                placeholder="select..." 
-                >
+                placeholder="select..."
+              >
                 <img slot="suffixIcon" src="@/assets/images/global/select-down.png" alt="" />
               </a-select>
             </a-form-model-item>
           </a-col>
         </a-row>
-        <a-row :gutter="[15,0]">
+        <a-row :gutter="[15, 0]">
           <a-col :span="12">
             <a-form-model-item ref="alarmRule" label="Alarm Rule" prop="name">
               <a-input v-model="form.name" placeholder="Pleace enter the alarm rule name" />
@@ -50,30 +40,30 @@
           </a-col>
           <a-col :span="12">
             <a-form-model-item ref="monitorItem" label="Monitor Item" prop="itemId">
-              <a-select 
-                v-model="form.itemId" 
-                :options="itemOptions" 
-                show-arrow 
+              <a-select
+                v-model="form.itemId"
+                :options="itemOptions"
+                show-arrow
                 allowClear
                 labelInValue
-                placeholder="select..." 
+                placeholder="select..."
                 @change="onItemChange"
-                >
+              >
                 <img slot="suffixIcon" src="@/assets/images/global/select-down.png" alt="" />
               </a-select>
             </a-form-model-item>
           </a-col>
         </a-row>
-        <a-row :gutter="[15,0]">
+        <a-row :gutter="[15, 0]">
           <a-col :span="12">
             <a-form-model-item ref="monitorItem" label="Logic Symbol" prop="operator">
-              <a-select 
-                v-model="form.operator" 
-                :options="operatorOptions" 
-                show-arrow 
+              <a-select
+                v-model="form.operator"
+                :options="operatorOptions"
+                show-arrow
                 allowClear
-                placeholder="select..." 
-                >
+                placeholder="select..."
+              >
                 <img slot="suffixIcon" src="@/assets/images/global/select-down.png" alt="" />
               </a-select>
             </a-form-model-item>
@@ -84,29 +74,29 @@
             </a-form-model-item>
           </a-col>
         </a-row>
-        <a-row :gutter="[15,0]">
+        <a-row :gutter="[15, 0]">
           <a-col :span="12">
             <a-form-model-item ref="silenceCycle" label="Silence Cycle" prop="silenceCycle">
-              <a-select 
-                v-model="form.silenceCycle" 
-                :options="silenceCyclerOptions" 
-                show-arrow 
+              <a-select
+                v-model="form.silenceCycle"
+                :options="silenceCyclerOptions"
+                show-arrow
                 allowClear
-                placeholder="select..." 
-                >
+                placeholder="select..."
+              >
                 <img slot="suffixIcon" src="@/assets/images/global/select-down.png" alt="" />
               </a-select>
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
             <a-form-model-item ref="contactGroup" label="Contact Group" prop="contactId">
-              <a-select 
-                v-model="form.contactId" 
-                :options="contactGroupOptions" 
-                show-arrow 
+              <a-select
+                v-model="form.contactId"
+                :options="contactGroupOptions"
+                show-arrow
                 allowClear
-                placeholder="select..." 
-                >
+                placeholder="select..."
+              >
                 <img slot="suffixIcon" src="@/assets/images/global/select-down.png" alt="" />
               </a-select>
             </a-form-model-item>
@@ -116,7 +106,7 @@
       <template slot="footer">
         <a-space class="operators" :size="20">
           <a-button type="success" @click="onSave">Save</a-button>
-          <a-button type="warn"  @click="onCancel">Cancel</a-button>
+          <a-button type="warn" @click="onCancel">Cancel</a-button>
         </a-space>
       </template>
     </a-modal>
@@ -124,125 +114,109 @@
 </template>
 
 <script>
-import { getAction, postAction, httpAction, deleteAction } from '@/api/manage'
+import { getAction } from '@/api/manage'
 export default {
-  props: ["visible","serverList","currServer","serverLabel"],
+  props: ['visible', 'serverList', 'currServer', 'serverLabel'],
   data() {
     return {
       form: {
-        sourceType: "Server",
+        sourceType: 'Server',
         sourceId: undefined,
-        name: "",
+        name: '',
         itemId: undefined,
         operator: undefined,
-        threshold: "",
+        threshold: '',
         silenceCycle: undefined,
         contactId: undefined,
       },
-      units: "",
+      units: '',
       itemOptions: [],
       typeOptions: [
         {
-          label: "Server",
-          value: "Server"
+          label: 'Server',
+          value: 'Server',
         },
         {
-          label: "Database",
-          value: "Database"
+          label: 'Database',
+          value: 'Database',
         },
         {
-          label: "E-MAIL",
-          value: "Email"
+          label: 'E-MAIL',
+          value: 'Email',
         },
       ],
       sourceOptions: [],
       operatorOptions: [
         {
-          label: ">",
-          value: ">"
+          label: '>',
+          value: '>',
         },
         {
-          label: "<",
-          value: "<"
+          label: '<',
+          value: '<',
         },
         {
-          label: ">=",
-          value: ">="
+          label: '>=',
+          value: '>=',
         },
         {
-          label: "<=",
-          value: "<="
+          label: '<=',
+          value: '<=',
         },
         {
-          label: "==",
-          value: "=="
+          label: '==',
+          value: '==',
         },
       ],
       silenceCyclerOptions: [
         {
-          label: "5 minutes",
-          value: 300
+          label: '5 minutes',
+          value: 300,
         },
         {
-          label: "15 minutes",
-          value: 900
+          label: '15 minutes',
+          value: 900,
         },
         {
-          label: "30 minutes",
-          value: 1800
+          label: '30 minutes',
+          value: 1800,
         },
         {
-          label: "60 minutes",
-          value: 3600
+          label: '60 minutes',
+          value: 3600,
         },
         {
-          label: "3 hours",
-          value: 10800
+          label: '3 hours',
+          value: 10800,
         },
         {
-          label: "6 hours",
-          value: 21600
+          label: '6 hours',
+          value: 21600,
         },
         {
-          label: "12 hours",
-          value: 43200
+          label: '12 hours',
+          value: 43200,
         },
         {
-          label: "24 hours",
-          value: 86400
-        }
+          label: '24 hours',
+          value: 86400,
+        },
       ],
       contactGroupOptions: [],
       rules: {
-        sourceType: [
-          { required: true, message: 'Please select a sourceType', trigger: 'change'},
-        ],
-        sourceId: [
-          { required: true, message: 'Please select a source', trigger: 'change'},
-        ],
-        name: [
-          { required: true, message: 'Please input alarmRule name'},
-        ],
-        itemId: [
-          { required: true, message: 'Please select a monitorItem', trigger: 'change'},
-        ],
-        operator: [
-          { required: true, message: 'Please select a logicSymbol', trigger: 'change'},
-        ],
-        threshold: [
-          { required: true, message: 'Please input threshold'},
-        ],
-        silenceCycle: [
-          { required: true, message: 'Please select a silenceCycle', trigger: 'change'},
-        ],
-        contactId: [
-          { required: true, message: 'Please select a contactGroup', trigger: 'change'},
-        ],
-      }
+        sourceType: [{ required: true, message: 'Please select a sourceType', trigger: 'change' }],
+        sourceId: [{ required: true, message: 'Please select a source', trigger: 'change' }],
+        name: [{ required: true, message: 'Please input alarmRule name' }],
+        itemId: [{ required: true, message: 'Please select a monitorItem', trigger: 'change' }],
+        operator: [{ required: true, message: 'Please select a logicSymbol', trigger: 'change' }],
+        threshold: [{ required: true, message: 'Please input threshold' }],
+        silenceCycle: [{ required: true, message: 'Please select a silenceCycle', trigger: 'change' }],
+        contactId: [{ required: true, message: 'Please select a contactGroup', trigger: 'change' }],
+      },
     }
   },
   mounted() {
-    console.log(this.currServer);
+    console.log(this.currServer)
     this.sourceOptions = this.serverList
   },
   watch: {
@@ -255,7 +229,7 @@ export default {
   },
   methods: {
     onCancel() {
-      this.$emit("onCancel")
+      this.$emit('onCancel')
       this.resetForm()
     },
     onItemChange(val, option) {
@@ -264,22 +238,22 @@ export default {
     },
     onSave() {
       this.$refs.al_ruleForm.validate((valid) => {
-        if (valid) { 
+        if (valid) {
           let params = {
-            silenceCycle:this.form.silenceCycle,
-            contactId:this.form.contactId,
-            sourceId:this.form.sourceId,
-            sourceType:this.form.sourceType,
-            itemId:this.form.itemId.key,
+            silenceCycle: this.form.silenceCycle,
+            contactId: this.form.contactId,
+            sourceId: this.form.sourceId,
+            sourceType: this.form.sourceType,
+            itemId: this.form.itemId.key,
             rule: {
               name: this.form.itemId.label,
               operator: this.form.operator,
               threshold: this.form.threshold,
               units: this.units,
             },
-            name: this.form.name
+            name: this.form.name,
           }
-          this.$emit("onCanonSavecel", params)
+          this.$emit('onCanonSavecel', params)
           this.resetForm()
         }
       })
@@ -289,42 +263,42 @@ export default {
       this.units = option.data.props.units
     },
     getItems(val) {
-      getAction("/alarmRule/getItems", {sourceName:val}).then(res => {
+      getAction('/alarmRule/getItems', { sourceName: val }).then((res) => {
         if (res.success) {
-          this.itemOptions = res.result.map(item => {
+          this.itemOptions = res.result.map((item) => {
             return {
               label: item.name,
               value: item.itemId,
-              units:item.units
+              units: item.units,
             }
           })
         } else {
-          this.$message.warning("This operation fails. Contact your system administrator")
+          this.$message.warning('This operation fails. Contact your system administrator')
         }
       })
     },
     resetForm() {
-      this.$refs.al_ruleForm.resetFields();
-      this.form= {
+      this.$refs.al_ruleForm.resetFields()
+      this.form = {
         sourceType: undefined,
         sourceId: undefined,
-        name: "",
+        name: '',
         itemId: undefined,
         operator: undefined,
-        threshold: "",
+        threshold: '',
         silenceCycle: undefined,
         contactId: undefined,
       }
-      this.sourceOptions =[]
+      this.sourceOptions = []
       this.itemOptions = []
-      this.units = ""
-    }
+      this.units = ''
+    },
   },
 }
 </script>
 
 <style lang="less" scoped>
-/deep/.ant-modal-title{
+/deep/.ant-modal-title {
   letter-spacing: 1px;
 }
 .operators {
@@ -344,7 +318,7 @@ export default {
     }
   }
 }
-.ant-select-dropdown-content{
+.ant-select-dropdown-content {
   position: relative;
   background: #03353f;
 }