代码更新

2022-07-26 16:15:36 +08:00
parent 744bb575fc
commit 0fd959d728
4 changed files with 127 additions and 72 deletions
--- a/mes/qd/src/assets/images/bigScreen.png
+++ b/mes/qd/src/assets/images/bigScreen.png
--- a/mes/qd/src/assets/images/bigScreenTwo.png
+++ b/mes/qd/src/assets/images/bigScreenTwo.png
--- a/mes/qd/src/views/wms/sb/stat/task/bigScreen.vue
+++ b/mes/qd/src/views/wms/sb/stat/task/bigScreen.vue
@@ -1,8 +1,8 @@
 <template>
-  <div>
-    <div style="font-size: 22px; color: #f4f4f5; padding: 6px 50px 6px 700px;background-color: #2c3e50">当日任务列表</div>
-    <div class="my_table">
-      <el-table border style="width: 100%;" :data="tableData" max-height="800" :cell-style="cellStyle" :highlight-current-row="true" >
+  <div class="login" :style="'background-image:url('+ Background +');'">
+    <div style="font-size: 22px; color: #f4f4f5; padding: 6px 50px 6px 700px;background-color: transparent">当日任务列表</div>
+    <div class="t_btn2">
+      <el-table border style="width: 100%;" :data="tableData" max-height="800" :header-cell-style="cellStyle" :row-style="cellStyle" :cell-style="cellStyle" :highlight-current-row="true" >
        <el-table-column type="index" label="序号" width="55" align="center" />
        <el-table-column prop="input_time" label="生成时间" />
        <el-table-column prop="repair_code" label="任务号" />
@@ -21,6 +21,8 @@

 <script>
 import crud from '@/mixins/crud'
+import Background from '@/assets/images/bigScreen.png'
+import BackgroundTwo from '@/assets/images/bigScreenTwo.png'

 export default {
  name: 'BigscreenTask',
@@ -30,6 +32,8 @@ export default {
      // path: 'ws://192.168.81.252:8086//webSocket/20',
      // path: window.g.dev.VUE_APP_BASE_API.replace('http', 'ws') + '/webSocket/20',
      path: window.g.prod.VUE_APP_BASE_API.replace('http', 'ws') + '/webSocket/20',
+      Background: Background,
+      BackgroundTwo: BackgroundTwo,
      currentDate: new Date(),
      getTime: '',
      getDate: '',
@@ -80,54 +84,56 @@ export default {
      console.log('socket已经关闭')
    },
    cellStyle(row, column, rowIndex, columnIndex) {
-      return 'font-size: 14px;'
+      return 'color: #fff,backgroundColor: transparent,fontSize: fontSize(23),textAlign: center'
    }
-  },
-  beforeCreate() {
-    this.$nextTick(() => {
-      document.body.setAttribute('style', 'background-color: #2D2F3F')
-    })
-  },
-  // 实例销毁之前钩子--移除body 标签的属性style
-  beforeDestroy() {
-    document.body.removeAttribute('style')
  }
 }
 </script>

 <style scoped>

-/*.my_table >>> .el-table::before {
-  !* 去除下边框 *!
-  height: 0;
-}*/
+.login {
+  height: 100%;
+  background-size: cover;
+}

-.my_table >>> .el-table__row>td {
+/*.t_btn2 >>> .el-table::before {*/
+/*  !* 去除下边框 *!*/
+/*  height: 0;*/
+/*}*/
+
+/*.t_btn2 >>> .el-table--border {*/
+/*  !* 去除上边框 *!*/
+/*  border: none;*/
+/*}*/
+
+.t_btn2 >>> .el-table th.is-leaf {
+  /* 去除表头边框 */
+  border: none;
+}
+.t_btn2 >>> .el-table__row>td {
  /* 去除表格线 */
  border: none;
 }
-
-.my_table >>> .el-table th.is-leaf {
-  /* 去除上边框 */
-  border: none;
+.t_btn2 >>> .el-table th {
+  /* 设置表头的颜色和字体颜色 */
+  background-color: #012957;
+  color: #FFFFFF;
+  font-size: 17px;
 }
-
-.my_table >>> .el-table tr {
-  /* 设置每行的颜色和字体颜色 */
-  background-color: #2D2F3F;
+.t_btn2 >>>.el-table,
+.el-table__expanded-cell {
+  background-color: transparent;
+}
+.t_btn2 >>> .el-table tr {
+  background-color: transparent !important;
  color: #FFFFFF;
  font-weight: 500;
 }
-
-.my_table >>> .el-table th {
-  /* 设置表头的颜色和字体颜色 */
-  background-color: rgb(19, 71, 98);
-  color: #FFFFFF;
-  font-size: 17px;
-}
-.my_span {
-  padding: 10px 50px 10px 0px;
-  font-size: 17px;
+.t_btn2 >>> .el-table--enable-row-transition .el-table__body td,
+.el-table .cell {
+  padding: 0;
+  background-color: transparent;
 }

 </style>
--- a/mes/qd/src/views/wms/sb/stat/taskscreen/taskScreen.vue
+++ b/mes/qd/src/views/wms/sb/stat/taskscreen/taskScreen.vue
@@ -1,8 +1,8 @@
 <template>
-  <div>
-    <div style="font-size: 22px; color: #f4f4f5; padding: 6px 50px 6px 700px; background-color: #3184d7">维修班组任务列表</div>
-    <div style="font-size: 20px; color: #f4f4f5; padding: 6px 50px 6px 10px; background-color: #2c3e50">报修任务</div>
-    <div class="my_table">
+  <div class="login" :style="'background-image:url('+ Background +');'">
+    <div style="font-size: 22px; color: #f4f4f5; padding: 6px 50px 6px 700px;background-color: transparent">维修班组任务列表</div>
+    <div style="font-size: 20px; color: #f4f4f5; padding: 6px 50px 6px 10px; background-color: transparent">报修任务</div>
+    <div class="t_btn1">
      <el-table border style="width: 100%;" :data="table" max-height="300" :cell-style="cellStyle" :highlight-current-row="true" >
        <el-table-column type="index" label="序号" width="60" align="center" />
        <el-table-column align="center" property="fault_time" label="日期"/>
@@ -14,8 +14,8 @@
      </el-table>
    </div>
    <br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br />
-    <div style="font-size: 20px; color: #f4f4f5; background-color: #2c3e50; padding: 6px 50px 6px 10px">在修任务</div>
-    <div class="my_table">
+    <div style="font-size: 20px; color: #f4f4f5; background-color: transparent; padding: 6px 50px 6px 10px">在修任务</div>
+    <div class="t_btn2">
      <el-table border style="width: 100%;" :data="table2" max-height="300" :cell-style="cellStyle2" :highlight-current-row="true" >
        <el-table-column type="index" label="序号" width="60" align="center" />
        <el-table-column align="center" property="fault_time" label="日期"/>
@@ -32,6 +32,8 @@
 </template>

 <script>
+import Background from '@/assets/images/bigScreen.png'
+
 export default {
  name: 'Test',
  data() {
@@ -39,6 +41,7 @@ export default {
      // path: 'ws://192.168.81.252:8086//webSocket/21',
      // path: window.g.dev.VUE_APP_BASE_API.replace('http', 'ws') + '/webSocket/21',
      path: window.g.prod.VUE_APP_BASE_API.replace('http', 'ws') + '/webSocket/21',
+      Background: Background,
      table: [
        { 'fault_time': '暂无数据', 'create_time': '暂无数据', 'name': '暂无数据', 'device_name': '暂无数据', 'class_name': '暂无数据' }
      ],
@@ -94,57 +97,103 @@ export default {
      this.$emit('update:visible', false)
    },
    cellStyle(row, column, rowIndex, columnIndex) {
-      return 'color:red; font-size: 14px;'
+      return 'color: #fff,backgroundColor: transparent,fontSize: fontSize(23),textAlign: center'
    },
    cellStyle2(row, column, rowIndex, columnIndex) {
-      return 'font-size: 14px;'
+      return 'color: #fff,backgroundColor: transparent,fontSize: fontSize(23),textAlign: center'
    }
-  },
-  beforeCreate() {
-    this.$nextTick(() => {
-      document.body.setAttribute('style', 'background-color: #2D2F3F')
-    })
-  },
-  // 实例销毁之前钩子--移除body 标签的属性style
-  beforeDestroy() {
-    document.body.removeAttribute('style')
  }
 }
 </script>

 <style scoped>

-/*.my_table >>> .el-table::before {
-  !* 去除下边框 *!
-  height: 0;
-}*/
+.login {
+  height: 100%;
+  background-size: cover;
+}

-.my_table >>> .el-table__row>td {
+/*.t_btn2 >>> .el-table::before {*/
+/*  !* 去除下边框 *!*/
+/*  height: 0;*/
+/*}*/
+
+/*.t_btn2 >>> .el-table--border {*/
+/*  !* 去除上边框 *!*/
+/*  border: none;*/
+/*}*/
+
+.t_btn2 >>> .el-table th.is-leaf {
+  /* 去除表头边框 */
+  border: none;
+}
+.t_btn2 >>> .el-table__row>td {
  /* 去除表格线 */
  border: none;
 }
-
-.my_table >>> .el-table th.is-leaf {
-  /* 去除上边框 */
-  border: none;
+.t_btn2 >>> .el-table th {
+  /* 设置表头的颜色和字体颜色 */
+  background-color: #012957;
+  color: #FFFFFF;
+  font-size: 17px;
 }
-
-.my_table >>> .el-table tr {
-  /* 设置每行的颜色和字体颜色 */
-  background-color: #2D2F3F;
+.t_btn2 >>>.el-table,
+.el-table__expanded-cell {
+  background-color: transparent;
+}
+.t_btn2 >>> .el-table tr {
+  background-color: transparent !important;
  color: #FFFFFF;
  font-weight: 500;
 }
+.t_btn2 >>> .el-table--enable-row-transition .el-table__body td,
+.el-table .cell {
+  padding: 0;
+  background-color: transparent;
+}

-.my_table >>> .el-table th {
+/*.t_btn1 >>> .el-table::before {*/
+/*  !* 去除下边框 *!*/
+/*  height: 0;*/
+/*}*/
+
+/*.t_btn1 >>> .el-table--border {*/
+/*  !* 去除上边框 *!*/
+/*  border: none;*/
+/*}*/
+
+.t_btn1 >>> .el-table th.is-leaf {
+  /* 去除表头边框 */
+  border: none;
+}
+
+.t_btn1 >>> .el-table th.is-leaf {
+  /* 去除上边框 */
+  border: none;
+}
+.t_btn1 >>> .el-table__row>td {
+  /* 去除表格线 */
+  border: none;
+}
+.t_btn1 >>> .el-table th {
  /* 设置表头的颜色和字体颜色 */
-  background-color: rgb(19, 71, 98);
+  background-color: #012957;
  color: #FFFFFF;
  font-size: 17px;
 }
-.my_span {
-  padding: 10px 50px 10px 0px;
-  font-size: 17px;
+.t_btn1 >>>.el-table,
+.el-table__expanded-cell {
+  background-color: transparent;
+}
+.t_btn1 >>> .el-table tr {
+  background-color: transparent !important;
+  color: #FF0000;
+  font-weight: 500;
+}
+.t_btn1 >>> .el-table--enable-row-transition .el-table__body td,
+.el-table .cell {
+  padding: 0;
+  background-color: transparent;
 }

 </style>