Browse Source

状态栏样式更新

xushili 3 years ago
parent
commit
f0214df235
4 changed files with 401 additions and 243 deletions
  1. 84 86
      package-lock.json
  2. 16 0
      src/assets/style/main.css
  3. 300 156
      src/components/StatusBar.vue
  4. 1 1
      src/components/TitleBar.vue

+ 84 - 86
package-lock.json

@@ -3272,6 +3272,63 @@
           "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
           "dev": true
         },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995625950&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
+          "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.1",
+          "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.1.tgz?cache=0&sync_timestamp=1618995297666&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.1.tgz",
+          "integrity": "sha1-yAs/qyi/Y3HmhjMl7uZ+YYt35q0=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
+          "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
+          "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz",
+          "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
+          "dev": true,
+          "optional": true
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
+          "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
         "ssri": {
           "version": "8.0.1",
           "resolved": "https://registry.nlark.com/ssri/download/ssri-8.0.1.tgz?cache=0&sync_timestamp=1621364735533&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fssri%2Fdownload%2Fssri-8.0.1.tgz",
@@ -3280,6 +3337,28 @@
           "requires": {
             "minipass": "^3.1.1"
           }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
+          "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "vue-loader-v16": {
+          "version": "npm:vue-loader@16.2.0",
+          "resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.2.0.tgz",
+          "integrity": "sha1-BGpTMI3Ufljv4g3ewe3sAnzjtG4=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          }
         }
       }
     },
@@ -7178,7 +7257,7 @@
     },
     "electron": {
       "version": "12.0.11",
-      "resolved": "https://registry.nlark.com/electron/download/electron-12.0.11.tgz?cache=0&sync_timestamp=1623341150449&other_urls=https%3A%2F%2Fregistry.nlark.com%2Felectron%2Fdownload%2Felectron-12.0.11.tgz",
+      "resolved": "https://registry.nlark.com/electron/download/electron-12.0.11.tgz",
       "integrity": "sha1-VV3Bz2Y+Mg8vLL34kxk1Kwj8WfI=",
       "dev": true,
       "requires": {
@@ -13404,7 +13483,7 @@
     },
     "postcss": {
       "version": "7.0.36",
-      "resolved": "https://registry.nlark.com/postcss/download/postcss-7.0.36.tgz?cache=0&sync_timestamp=1623380305104&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss%2Fdownload%2Fpostcss-7.0.36.tgz",
+      "resolved": "https://registry.nlark.com/postcss/download/postcss-7.0.36.tgz?cache=0&sync_timestamp=1623677287157&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss%2Fdownload%2Fpostcss-7.0.36.tgz",
       "integrity": "sha1-BW+M/6k5ZiqPWQWVDAfVKFZE38s=",
       "dev": true,
       "requires": {
@@ -13518,7 +13597,7 @@
     },
     "postcss-load-config": {
       "version": "2.1.2",
-      "resolved": "https://registry.npm.taobao.org/postcss-load-config/download/postcss-load-config-2.1.2.tgz?cache=0&sync_timestamp=1612743037145&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-load-config%2Fdownload%2Fpostcss-load-config-2.1.2.tgz",
+      "resolved": "https://registry.nlark.com/postcss-load-config/download/postcss-load-config-2.1.2.tgz",
       "integrity": "sha1-xepQTyxK7zPHNZo03jVzdyrXUCo=",
       "dev": true,
       "requires": {
@@ -14637,7 +14716,7 @@
     },
     "regexpp": {
       "version": "2.0.1",
-      "resolved": "https://registry.npm.taobao.org/regexpp/download/regexpp-2.0.1.tgz",
+      "resolved": "https://registry.nlark.com/regexpp/download/regexpp-2.0.1.tgz",
       "integrity": "sha1-jRnTHPYySCtYkEn4KB+T28uk0H8=",
       "dev": true
     },
@@ -17641,87 +17720,6 @@
         }
       }
     },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.2.0",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.2.0.tgz",
-      "integrity": "sha512-TitGhqSQ61RJljMmhIGvfWzJ2zk9m1Qug049Ugml6QP3t0e95o0XJjk29roNEiPKJQBEi8Ord5hFuSuELzSp8Q==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true,
-          "optional": true
-        },
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "vue-style-loader": {
       "version": "4.1.3",
       "resolved": "https://registry.npm.taobao.org/vue-style-loader/download/vue-style-loader-4.1.3.tgz",
@@ -17897,7 +17895,7 @@
     },
     "webpack": {
       "version": "4.46.0",
-      "resolved": "https://registry.nlark.com/webpack/download/webpack-4.46.0.tgz?cache=0&sync_timestamp=1622151377755&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fwebpack%2Fdownload%2Fwebpack-4.46.0.tgz",
+      "resolved": "https://registry.nlark.com/webpack/download/webpack-4.46.0.tgz",
       "integrity": "sha1-v5tEBOogoHNgXgoBHRiNd8tq1UI=",
       "dev": true,
       "requires": {

+ 16 - 0
src/assets/style/main.css

@@ -12,3 +12,19 @@ body,
     background-color: #000000;
     overflow: hidden;
 }
+.el-popover{
+    background-color: rgb(36,36,36) !important;
+    border-color: rgb(36,36,36) !important;
+  }
+  .el-table{
+    border-color: rgb(36,36,36) !important;
+  }
+  .el-table__row>td{
+	border-color: rgb(36,36,36) !important;
+}
+.el-table::before {
+	height: 0px !important;
+}
+.el-table::after {
+	height: 0px !important;
+}

+ 300 - 156
src/components/StatusBar.vue

@@ -1,176 +1,320 @@
 /* 状态栏 */
 <template>
-    <div class='status-bar'>
-        <el-row>
-            <el-col :span="16">
-                <span style="color: white">系统时间:</span>
-                <span style="color: white">{{currentTime}}</span>
-            </el-col>
-            <el-col :span="8">
-                <el-popover placement="top-start" :width="400" trigger="hover">
-                    <template #reference>
-                        <div class="status-list">
-                            <img class="status-img" src="../assets/img/statusbar/hidden_danger.png">
-                            <span class="status-label hidden-danger">隐患</span>
-                            <span>{{hiddenDangerNum}}</span>
-                        </div>
-                    </template>
-                    <el-table :data="gridData">
-                        <el-table-column width="150" property="date" label="日期1"></el-table-column>
-                        <el-table-column width="100" property="name" label="姓名"></el-table-column>
-                        <el-table-column width="300" property="address" label="地址"></el-table-column>
-                    </el-table>
-                </el-popover>
-                <el-popover placement="top-start" :width="400" trigger="hover">
-                    <template #reference>
-                        <div class="status-list">
-                            <img class="status-img" src="../assets/img/statusbar/defect.png">
-                            <span class="status-label defect">缺陷</span>
-                            <span>{{defectNum}}</span>
-                        </div>
-                    </template>
-                    <el-table :data="gridData">
-                        <el-table-column width="150" property="date" label="日期2"></el-table-column>
-                        <el-table-column width="100" property="name" label="姓名"></el-table-column>
-                        <el-table-column width="300" property="address" label="地址"></el-table-column>
-                    </el-table>
-                </el-popover>
-                <el-popover placement="top" :width="400" trigger="hover">
-                    <template #reference>
-                        <div class="status-list">
-                            <img class="status-img" src="../assets/img/statusbar/malfunction.png">
-                            <span class="status-label malfunction">故障</span>
-                            <span>{{malfunctionNum}}</span>
-                        </div>
-                    </template>
-                    <el-table :data="gridData">
-                        <el-table-column width="150" property="date" label="日期3"></el-table-column>
-                        <el-table-column width="100" property="name" label="姓名"></el-table-column>
-                        <el-table-column width="300" property="address" label="地址"></el-table-column>
-                    </el-table>
-                </el-popover>
-                <el-popover placement="top" :width="400" trigger="hover">
-                    <template #reference>
-                        <div class="status-list">
-                            <img class="status-img" src="../assets/img/statusbar/accident.png">
-                            <span class="status-label accident">事故</span>
-                            <span>{{accidentNum}}</span>
-                        </div>
-                    </template>
-                    <el-table :data="gridData">
-                        <el-table-column width="150" property="date" label="日期4"></el-table-column>
-                        <el-table-column width="100" property="name" label="姓名"></el-table-column>
-                        <el-table-column width="300" property="address" label="地址"></el-table-column>
-                    </el-table>
-                </el-popover>
-            </el-col>
-        </el-row>
-    </div>
+  <div class="status-bar">
+    <el-row>
+      <el-col :span="19" style="margin-top: 5px">
+        <span style="color: white; margin-left: 20px">系统时间:</span>
+        <span style="color: white">{{ currentTime }}</span>
+      </el-col>
+      <el-col :span="5" style="margin-top: 5px">
+        <el-popover
+          placement="top-start"
+          :width="521"
+          trigger="hover"
+          class="popoverBack"
+          show-arrow="false"
+          visible-arrow="false"
+        >
+          <template #reference>
+            <div class="status-list">
+              <img
+                class="status-img"
+                src="../assets/img/statusbar/hidden_danger.png"
+              />
+              <span class="status-label hidden-danger">隐患</span>
+              <span>{{ hiddenDangerNum }}</span>
+            </div>
+          </template>
+          <el-table
+            :data="gridData"
+            border
+            border-color="rgb(36,36,36)"
+            max-height="750px"
+            :header-cell-style="{
+              background: 'Black',
+              color: 'rgb(220,220,220)',
+              border:'0px'
+            }"
+            :cell-style="{ background: 'Black', color: 'rgb(220,220,220)',}"
+          >
+            <el-table-column
+              width="100"
+              property="date"
+              label="时间"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              width="120"
+              property="name"
+              label="设备"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              width="300"
+              property="address"
+              label="故障信息"
+              align="center"
+            ></el-table-column>
+          </el-table>
+        </el-popover>
+        <el-popover placement="top-start"
+          :width="521"
+          trigger="hover"
+          class="popoverBack"
+          show-arrow="false">
+          <template #reference>
+            <div class="status-list">
+              <img
+                class="status-img"
+                src="../assets/img/statusbar/defect.png"
+              />
+              <span class="status-label defect">缺陷</span>
+              <span>{{ defectNum }}</span>
+            </div>
+          </template>
+          <el-table
+            :data="gridData"
+            border
+            border-color="rgb(36,36,36)"
+            max-height="750px"
+            :header-cell-style="{
+              background: 'Black',
+              color: 'rgb(220,220,220)',
+              border:'0px'
+            }"
+            :cell-style="{ background: 'Black', color: 'rgb(220,220,220)',}">
+            <el-table-column
+              width="100"
+              property="date"
+              label="时间"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              width="120"
+              property="name"
+              label="设备"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              width="300"
+              property="address"
+              label="故障信息"
+              align="center"
+            ></el-table-column>
+          </el-table>
+        </el-popover>
+        <el-popover
+          placement="top-start"
+          :width="521"
+          trigger="hover"
+          class="popoverBack"
+          show-arrow="false">
+          <template #reference>
+            <div class="status-list">
+              <img
+                class="status-img"
+                src="../assets/img/statusbar/malfunction.png"
+              />
+              <span class="status-label malfunction">故障</span>
+              <span>{{ malfunctionNum }}</span>
+            </div>
+          </template>
+          <el-table
+            :data="gridData"
+            border
+            border-color="rgb(36,36,36)"
+            max-height="750px"
+            :header-cell-style="{
+              background: 'Black',
+              color: 'rgb(220,220,220)',
+              border:'0px'
+            }"
+            :cell-style="{ background: 'Black', color: 'rgb(220,220,220)',}">
+            <el-table-column
+              width="100"
+              property="date"
+              label="时间"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              width="120"
+              property="name"
+              label="设备"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              width="300"
+              property="address"
+              label="故障信息"
+              align="center"
+            ></el-table-column>
+          </el-table>
+        </el-popover>
+        <el-popover
+          placement="top-start"
+          :width="521"
+          trigger="hover"
+          class="popoverBack"
+          show-arrow="false">
+          <template #reference>
+            <div class="status-list">
+              <img
+                class="status-img"
+                src="../assets/img/statusbar/accident.png"
+              />
+              <span class="status-label accident">事故</span>
+              <span>{{ accidentNum }}</span>
+            </div>
+          </template>
+          <el-table
+            :data="gridData"
+            border
+            border-color="rgb(36,36,36)"
+            max-height="750px"
+            :header-cell-style="{
+              background: 'Black',
+              color: 'rgb(220,220,220)',
+              border:'0px'
+            }"
+            :cell-style="{ background: 'Black', color: 'rgb(220,220,220)',}">
+            <el-table-column
+              width="100"
+              property="date"
+              label="时间"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              width="120"
+              property="name"
+              label="设备"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              width="300"
+              property="address"
+              label="故障信息"
+              align="center"
+            ></el-table-column>
+          </el-table>
+        </el-popover>
+      </el-col>
+    </el-row>
+  </div>
 </template>
 
 <script>
-    export default {
-        data() {
-            return {
-                hiddenDangerNum: 0,
-                defectNum: 0,
-                malfunctionNum: 0,
-                accidentNum: 0,
-                statusTimer: "",
-                currentTime: "",
-                gridData: [{
-                    date: '2016-05-02',
-                    name: '王小虎',
-                    address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                    date: '2016-05-04',
-                    name: '王小虎',
-                    address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                    date: '2016-05-01',
-                    name: '王小虎',
-                    address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                    date: '2016-05-03',
-                    name: '王小虎',
-                    address: '上海市普陀区金沙江路 1518 弄'
-                }]
-            }
+export default {
+  data() {
+    return {
+      hiddenDangerNum: 0,
+      defectNum: 0,
+      malfunctionNum: 0,
+      accidentNum: 0,
+      statusTimer: "",
+      currentTime: "",
+      gridData: [
+        {
+          date: "2016-05-02",
+          name: "王小虎",
+          address: "上海市普陀区金沙江路 1518 弄",
         },
-        mounted() {
-            let that = this
-            this.statusTimer = setInterval(function () {
-                that.currentTime =
-                    new Date().getFullYear() +
-                    "-" +
-                    that.appendZero((new Date().getMonth() + 1)) +
-                    "-" +
-                    that.appendZero(new Date().getDate()) +
-                    " " +
-                    that.appendZero(new Date().getHours()) +
-                    ":" +
-                    that.appendZero(new Date().getMinutes()) +
-                    ": " +
-                    that.appendZero(new Date().getSeconds());
-            }, 1000)
+        {
+          date: "2016-05-04",
+          name: "王小虎",
+          address: "上海市普陀区金沙江路 1518 弄",
         },
-        beforeDestory() {
-            clearInterval(this.statusTimer)
-            this.statusTimer = null;
+        {
+          date: "2016-05-01",
+          name: "王小虎",
+          address: "上海市普陀区金沙江路 1518 弄",
         },
-        methods: {
-            appendZero(obj) {
-                if (obj < 10) {
-                    return "0" + obj
-                } else {
-                    return obj
-                }
-            }
-        }
-    }
+        {
+          date: "2016-05-03",
+          name: "王小虎",
+          address: "上海市普陀区金沙江路 1518 弄",
+        },
+      ],
+    };
+  },
+  mounted() {
+    let that = this;
+    this.statusTimer = setInterval(function () {
+      that.currentTime =
+        new Date().getFullYear() +
+        "-" +
+        that.appendZero(new Date().getMonth() + 1) +
+        "-" +
+        that.appendZero(new Date().getDate()) +
+        " " +
+        that.appendZero(new Date().getHours()) +
+        ":" +
+        that.appendZero(new Date().getMinutes()) +
+        ": " +
+        that.appendZero(new Date().getSeconds());
+    }, 1000);
+  },
+  beforeDestory() {
+    clearInterval(this.statusTimer);
+    this.statusTimer = null;
+  },
+  methods: {
+    appendZero(obj) {
+      if (obj < 10) {
+        return "0" + obj;
+      } else {
+        return obj;
+      }
+    },
+  },
+};
 </script>
 
 <style scoped>
-    .status-bar {
-        height: 4vh;
-        background-color: #191919;
+span {
+  font-size: 13px;
+}
+
+.status-bar {
+  height: 4vh;
+  background-color: #191919;
 
-        margin-bottom: 0;
-        margin-left: 0;
-        margin-right: 0;
-    }
+  margin-bottom: 0;
+  margin-left: 0;
+  margin-right: 0;
+}
 
-    .status-list {
-        position: relative;
-        display: inline-block;
-        box-sizing: border-box;
-        color: white;
-    }
+.status-list {
+  position: relative;
+  display: inline-block;
+  box-sizing: border-box;
+  color: white;
+}
 
-    .status-label {
-        margin-left: 10px;
-        margin-right: 10px;
-    }
+.status-label {
+  margin-left: 10px;
+  margin-right: 10px;
+}
 
-    .status-img {
-        position: relative;
-        top: 5px;
-        margin-left: 20px;
-    }
+.status-img {
+  position: relative;
+  top: 4px;
+  margin-left: 20px;
+  width: 20px;
+}
 
-    .status-label.hidden-danger {
-        color: #E6D541;
-    }
+.status-label.hidden-danger {
+  color: #e6d541;
+}
 
-    .status-label.defect {
-        color: #E69641;
-    }
+.status-label.defect {
+  color: #e69641;
+}
 
-    .status-label.malfunction {
-        color: #D541E6;
-    }
+.status-label.malfunction {
+  color: #d541e6;
+}
 
-    .status-label.accident {
-        color: #AF3E3D;
-    }
+.status-label.accident {
+  color: #af3e3d;
+}
 </style>

+ 1 - 1
src/components/TitleBar.vue

@@ -72,7 +72,7 @@
       </el-col>
       <el-col :span=1>
           <div style="margin-top:7px;position: absolute;right: 10px;">
-            <button class="closeButton" style="font-size: 40px; color: white; background: rgb(41,41,41);width:44px;height:44px;border-radius:8px;border: none;">×</button>
+            <button class="closeButton" style="font-size: 30px; color: white; background: rgb(41,41,41);width:44px;height:44px;border-radius:8px;border: none;">×</button>
           </div>
       </el-col>
     </el-row>