告警库排序，行为感知按钮位置

src/components/common/query.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="ioc-query-form">
-    <a-form layout="inline" :form="formData">
+    <a-form layout="inline" :form="formData" style="width: 100%;position: relative">
       <a-form-item label="单位名称：" class="formItem" v-if="visible.company">
         <a-select
           default-value="0"
@@ -72,8 +72,8 @@
         ></timeRange>
       </a-form-item>
       <slot name="extraItem"></slot>
-      <a-form-item class="formItem" style="float: right; margin-right: 3%">
-        <a-space size="middle">
+      <a-form-item class="formItem" style="position: absolute;right: 0">
+        <a-space size="middle" >
           <a-button
             type="primary"
             size="small"
@@ -258,6 +258,9 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.ioc-query-form {
+  width: 100%;
+}
 .formItem {
   margin: 0px 15px;
 }

src/components/dashboard/more/carbonOverviewChart.vue

@@ -58,6 +58,9 @@ export default {
             type: 'bar',
             stack: 'A',
             barWidth: '25',
+            itemStyle: {
+              color: '#0065B3'
+            },
             backgroundStyle: {
               color: 'rgba(180, 180, 180, 0.2)'
             }
@@ -67,6 +70,9 @@ export default {
             data: [],
             type: 'bar',
             stack: 'A',
+            itemStyle: {
+              color: '#0091FF'
+            },
             backgroundStyle: {
               color: 'rgba(180, 180, 180, 0.2)'
             }

src/components/security/alarm/securityAlarmInfo.vue

@@ -243,6 +243,12 @@ export default {
         }
         this.tableData.push(obj);
       }
+      this.tableData.sort((a,b)=>{
+        if (a.time>b.time) {
+          return -1;
+        }
+        return 1;
+      })
     }
   }
 }

src/style/custom.less

@@ -2,7 +2,7 @@
   font-family: SourceHanSansCN-Regular;
   src: url("@/assets/fonts/SourceHanSansCN-Regular.otf");
 }
-@primary-color: #2ba8e4; // 全局主色
+@primary-color: #0080FF; // 全局主色
 
 // 菜单颜色
 @menu-dark-color: #000;

src/utils/constant.js

@@ -27,16 +27,16 @@ const ECHARTS_OPTION_DATAZOOM = [
 ]
 
 let echartsColors = [
-    '#0091ff',
-    '#2cc185',
-    '#f06f48',
+    '#0080FF',
+    '#2BC084',
+    '#F06F48',
     '#9790F8',
     '#F8797E',
     '#c2ddf2',
 ]
 let echartsGradientColors = [
-    getEchartsGradientColor('#8BCFFF'),
-    getEchartsGradientColor('#7EE6D4'),
+    getEchartsGradientColor('#0091ff'),
+    getEchartsGradientColor('#2BC084'),
     getEchartsGradientColor('#f06f48'),
     getEchartsGradientColor('#9790F8'),
     getEchartsGradientColor('#F8797E'),