Quellcode durchsuchen

公共样式及浏览器标题的修改

钞小赢 vor 3 Jahren
Ursprung
Commit
d8174e96ce

+ 1 - 1
src/App.vue

@@ -23,7 +23,7 @@ export default {
23 23
 };
24 24
 </script>
25 25
 
26
-<style lang="scss" >
26
+<style lang="scss">
27 27
 @import "~@/assets/style/public-class.scss";
28 28
 
29 29
 

+ 2 - 2
src/assets/style/public-class.scss

@@ -115,8 +115,8 @@ $sizes: (0, 5, 10, 15, 20);
115 115
   color: #fff !important;
116 116
 }
117 117
 //label样式
118
-.el-form-item__label {
119
-  color: #fff !important;
118
+#formLabel .el-form-item__label {
119
+  color: #fff;
120 120
 }
121 121
 //树形节点选中后的颜色
122 122
 .el-tree-node:focus > .el-tree-node__content {

+ 3 - 1
src/libs/util.js

@@ -14,7 +14,9 @@ const util = {
14 14
  */
15 15
 util.title = function (titleText) {
16 16
   const processTitle = process.env.VUE_APP_TITLE || 'D2Admin'
17
-  window.document.title = `${processTitle}${titleText ? ` | ${titleText}` : ''}`
17
+  // window.document.title = `${processTitle}${titleText ? ` | ${titleText}` : ''}`
18
+  //浏览器标题
19
+  window.document.title = `${processTitle}`
18 20
 }
19 21
 
20 22
 /**

+ 2 - 2
src/store/modules/d2admin/modules/account.js

@@ -51,14 +51,14 @@ export default {
51 51
       // 判断是否需要确认
52 52
       if (confirm) {
53 53
         commit('d2admin/gray/set', true, { root: true })
54
-        MessageBox.confirm('确定要注销当前用户吗', '注销用户', { type: 'warning' })
54
+        MessageBox.confirm('确定要退出当前用户吗', '退出用户', { type: 'warning' })
55 55
           .then(() => {
56 56
             commit('d2admin/gray/set', false, { root: true })
57 57
             logout()
58 58
           })
59 59
           .catch(() => {
60 60
             commit('d2admin/gray/set', false, { root: true })
61
-            Message({ message: '取消注销操作' })
61
+            Message({ message: '取消退出操作' })
62 62
           })
63 63
       } else {
64 64
         logout()

+ 2 - 2
src/views/demo/alarmRecord/index.vue

@@ -3,7 +3,7 @@
3 3
     <d2-container>
4 4
       <template slot="header">首页/报警记录</template>
5 5
       <div>
6
-        <el-form :inline="true" :model="formInline" class="demo-form-inline">
6
+        <el-form :inline="true" :model="formInline" class="demo-form-inline" id="formLabel">
7 7
           <el-form-item label="报警时间">
8 8
             <el-date-picker
9 9
               v-model="formInline.scanTime"
@@ -56,7 +56,7 @@
56 56
           </el-form-item>
57 57
         </el-form>
58 58
 
59
-        <el-table :data="cfInfoList" border style="width: 100%">
59
+        <el-table :data="cfInfoList" border style="width: 100%" :header-cell-style="{background:'#0064b9',color:'#c9f5fa'}">
60 60
           <el-table-column
61 61
             prop="branchOffice"
62 62
             label="所属分公司"

+ 1 - 1
src/views/demo/dataQuery/index.vue

@@ -30,7 +30,7 @@
30 30
           <div class="right_main">
31 31
             <div class="right_title"><i class="fa fa-bar-chart" aria-hidden="true" style="padding-right:5px"></i>数据查询</div>
32 32
             <div class="right_table">
33
-          <el-form :inline="true" :model="formInline" class="demo-form-inline">
33
+          <el-form :inline="true" :model="formInline" class="demo-form-inline" id="formLabel">
34 34
             <el-form-item label="扫描时间">
35 35
               <el-date-picker
36 36
                 v-model="formInline.scanTime"

+ 1 - 1
src/views/demo/parameManagement/alarmParame/index.vue

@@ -34,7 +34,7 @@
34 34
               >修改新增报警规则</el-button
35 35
             >
36 36
           </div>
37
-          <el-form :model="formData" ref="formData">
37
+          <el-form :model="formData" ref="formData" id="formLabel">
38 38
             <el-row style="margin-top: 10px">
39 39
               <el-col :span="24" :offset="2">
40 40
                 <el-form-item label="报警启用状态:">

+ 1 - 1
src/views/demo/parameManagement/hardwareParame/index.vue

@@ -29,7 +29,7 @@
29 29
           <div class="right_main">
30 30
             <div class="right_title"><i class="fa fa-cog" aria-hidden="true" style="padding-right:5px"></i>硬件参数</div>
31 31
             <div class="right_table">
32
-          <el-form :inline="true" :model="formInline" class="demo-form-inline">
32
+          <el-form :inline="true" :model="formInline" class="demo-form-inline" id="formLabel">
33 33
             <el-form-item label="设备名称:">
34 34
               <el-input
35 35
                 v-model="formInline.sbName"

+ 1 - 1
src/views/demo/parameManagement/scanParame/index.vue

@@ -29,7 +29,7 @@
29 29
           <div class="right_main">
30 30
             <div class="right_title"><i class="fa fa-search-minus" aria-hidden="true" style="padding-right:5px"></i>扫描参数</div>
31 31
             <div class="right_table">
32
-          <el-form :inline="true" :model="formInline" class="demo-form-inline">
32
+          <el-form :inline="true" :model="formInline" class="demo-form-inline" id="formLabel">
33 33
             <el-form-item label="设备名称:">
34 34
               <el-input
35 35
                 v-model="formInline.sbName"

+ 1 - 0
src/views/demo/warehouseShow/warehouseInfo/index.vue

@@ -19,6 +19,7 @@
19 19
               :inline="true"
20 20
               :model="formInline"
21 21
               class="demo-form-inline"
22
+              id="formLabel"
22 23
             >
23 24
               <el-form-item label="仓房名称:">
24 25
                 <el-cascader :options="options"></el-cascader>

+ 1 - 1
src/views/demo/warehouseShow/warehouseInfo/warehouseInfo-check.vue

@@ -20,7 +20,7 @@
20 20
           <div>保管员信息</div>
21 21
         </div>
22 22
 
23
-        <el-form :inline="true" :model="form" class="demo-form-inline">
23
+        <el-form :inline="true" :model="form" class="demo-form-inline" label-width="130px">
24 24
           <div class="middle">
25 25
             <el-form-item label="姓名:">
26 26
               <el-select v-model="form.name" placeholder="请选择">