Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev

src/components/tools/ShowAnnouncement.vue

@@ -13,9 +13,7 @@ import xss from "xss"
       <a-button v-if="record.openType === 'url'" type="primary" @click="toHandle">去处理</a-button>
     </template>
     <a-card class="daily-article" :loading="loading">
-      <a-card-meta
+      <a-card-meta :title="record.titile" :description="'发布人：' + record.sender + ' 发布时间： ' + record.sendTime">
-        :title="record.titile"
-        :description="'发布人：'+record.sender + ' 发布时间： ' + record.sendTime">
       </a-card-meta>
       <a-divider />
       <span v-html="record.msgContent" class="article-content"></span>
@@ -27,12 +25,11 @@ import xss from "xss"
 import { getUserList } from '@/api/api'
 import xss from 'xss'
 export default {
-    name: "SysAnnouncementModal",
+  name: 'SysAnnouncementModal',
-    components: {
+  components: {},
-    },
   data() {
     return {
-        title:"通知消息",
+      title: '通知消息',
       record: {},
       labelCol: {
         xs: { span: 24 },
@@ -46,41 +43,39 @@ import xss from "xss"
       switchFullscreen: true,
       loading: false,
       bodyStyle: {
-          padding: "0",
+        padding: '0',
-          height:(window.innerHeight*0.8)+"px",
+        height: window.innerHeight * 0.8 + 'px',
-          "overflow-y":"auto",
+        'overflow-y': 'auto',
-
       },
       modelStyle: {
         width: '60%',
         style: { top: '20px' },
-          fullScreen: false
+        fullScreen: false,
-        }
+      },
     }
   },
-    created () {
+  created() {},
-    },
   methods: {
     detail(record) {
       //update-begin---author:wangshuai ---date:20220107  for：将其它页面传递过来的用户名改成用户真实姓名
       if (record.sender) {
-          getUserList({"username":record.sender}).then((res) =>{
+        getUserList({ username: record.sender }).then((res) => {
           if (res.success && res.result.records.length > 0) {
             record.sender = res.result.records[0].realname
           }
         })
       }
       //update-end---author:wangshuai ---date:20220107  for：将其它页面传递过来的用户名改成用户真实姓名
-        this.visible = true;
+      this.visible = true
       //update-begin-author:taoyan date:2022-7-14 for: VUEN-1702 【禁止问题】sql注入漏洞
       if (record.msgContent) {
         record.msgContent = xss(record.msgContent)
       }
       //update-end-author:taoyan date:2022-7-14 for: VUEN-1702 【禁止问题】sql注入漏洞
-        this.record = record;
+      this.record = record
     },
     handleCancel() {
-        this.visible = false;
+      this.visible = false
     },
     /** 切换全屏显示 */
     handleClickToggleFullScreen() {
@@ -96,12 +91,12 @@ import xss from "xss"
     },
     toHandle() {
       if (this.record.openType === 'url') {
-          this.visible = false;
+        this.visible = false
         //链接跳转
         this.$router.push({ path: this.record.openPage })
       }
     },
-    }
+  },
 }
 </script>
 
@@ -127,6 +122,9 @@ import xss from "xss"
     border-bottom: 0;
   }
 }
+.ant-card-meta-description {
+  color: #fff !important;
+}
 </style>
 <style scoped lang="less">
 .daily-article {
@@ -148,8 +146,8 @@ import xss from "xss"
       word-break: break-all;
       text-overflow: initial;
       white-space: normal;
-        font-size: .9rem !important;
+      font-size: 0.9rem !important;
-        margin-bottom: .8rem;
+      margin-bottom: 0.8rem;
     }
   }
 }

src/style.less

@@ -188,10 +188,9 @@ body {
   }
   &-time-picker-combobox {
     background-color: @modalBg !important;
-    border-color: @formInputBorderColor !important
+    border-color: @formInputBorderColor !important;
   }
 
-
   &-picker {
     width: 100%;
     &-container {
@@ -202,7 +201,7 @@ body {
       color: #00e9fe !important;
     }
     &-select {
-      background-color: @formInputBgColor !important
+      background-color: @formInputBgColor !important;
     }
   }
 
@@ -341,7 +340,8 @@ body {
 
   &-selected-day &-date,
   &-date:hover {
-    background-color: #072f32 !important;
+    background-color: #0b4f54 !important;
+    // background-color: #072f32 !important;
   }
 }
 

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;

src/views/abnormalAlarm/serverMonitor/instances/createRules.vue

@@ -1,17 +1,7 @@
 <template>
   <div>
-    <a-modal 
+    <a-modal title="Add Rule" :width="845" v-model="visible" @cancel="onCancel">
-      title='Add Rule'
+      <a-form-model ref="al_ruleForm" :model="form" :rules="rules" layout="vertical">
-      :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">
@@ -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",
+          label: 'Server',
-          value: "Server"
+          value: 'Server',
         },
         {
-          label: "Database",
+          label: 'Database',
-          value: "Database"
+          value: 'Database',
         },
         {
-          label: "E-MAIL",
+          label: 'E-MAIL',
-          value: "Email"
+          value: 'Email',
         },
       ],
       sourceOptions: [],
       operatorOptions: [
         {
-          label: ">",
+          label: '>',
-          value: ">"
+          value: '>',
         },
         {
-          label: "<",
+          label: '<',
-          value: "<"
+          value: '<',
         },
         {
-          label: ">=",
+          label: '>=',
-          value: ">="
+          value: '>=',
         },
         {
-          label: "<=",
+          label: '<=',
-          value: "<="
+          value: '<=',
         },
         {
-          label: "==",
+          label: '==',
-          value: "=="
+          value: '==',
         },
       ],
       silenceCyclerOptions: [
         {
-          label: "5 minutes",
+          label: '5 minutes',
-          value: 300
+          value: 300,
         },
         {
-          label: "15 minutes",
+          label: '15 minutes',
-          value: 900
+          value: 900,
         },
         {
-          label: "30 minutes",
+          label: '30 minutes',
-          value: 1800
+          value: 1800,
         },
         {
-          label: "60 minutes",
+          label: '60 minutes',
-          value: 3600
+          value: 3600,
         },
         {
-          label: "3 hours",
+          label: '3 hours',
-          value: 10800
+          value: 10800,
         },
         {
-          label: "6 hours",
+          label: '6 hours',
-          value: 21600
+          value: 21600,
         },
         {
-          label: "12 hours",
+          label: '12 hours',
-          value: 43200
+          value: 43200,
         },
         {
-          label: "24 hours",
+          label: '24 hours',
-          value: 86400
+          value: 86400,
-        }
+        },
       ],
       contactGroupOptions: [],
       rules: {
-        sourceType: [
+        sourceType: [{ required: true, message: 'Please select a sourceType', trigger: 'change' }],
-          { 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' }],
-        sourceId: [
+        itemId: [{ required: true, message: 'Please select a monitorItem', trigger: 'change' }],
-          { required: true, message: 'Please select a source', trigger: 'change'},
+        operator: [{ required: true, message: 'Please select a logicSymbol', trigger: 'change' }],
-        ],
+        threshold: [{ required: true, message: 'Please input threshold' }],
-        name: [
+        silenceCycle: [{ required: true, message: 'Please select a silenceCycle', trigger: 'change' }],
-          { required: true, message: 'Please input alarmRule name'},
+        contactId: [{ required: true, message: 'Please select a contactGroup', trigger: 'change' }],
-        ],
+      },
-        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) {
@@ -277,9 +251,9 @@ export default {
               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,36 +263,36 @@ 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.$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.itemOptions = []
-      this.units = ""
+      this.units = ''
-    }
+    },
   },
 }
 </script>

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: 0, color: this.processCpu.color[index][0] },
-                { offset: 1, color: 'rgba(255,255,255,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: 0, color: this.processMenbry.color[index][0] },
-                { offset: 1, color: 'rgba(255,255,255,0)' },
+                { offset: 1, color: this.processMenbry.color[index][1] },
               ]),
             },
           },