'del_public.rar'

'align-left'
Merge branch 'master' of git.picaiba.com:mt-fe-group/11-mes-new
2022-11-11 16:13:56 +08:00 · 2022-11-11 16:10:45 +08:00 · 2022-11-10 16:47:18 +08:00 · 2022-11-10 16:47:04 +08:00 · 2022-11-10 15:52:33 +08:00 · 2022-11-10 15:50:02 +08:00
11 changed files with 62 additions and 72 deletions
--- a/src/views/3DOverview/index.vue
+++ b/src/views/3DOverview/index.vue
@@ -1,6 +1,6 @@
 <template>
  <div id="v3d-outter" ref="v3d-outter">
-    <!-- <V3DApp @3d-loaded="handle3DLoaded" /> -->
+    <V3DApp @3d-loaded="handle3DLoaded" />
    <!-- 正式内容: -->
    <!-- <div v-if="showPage" id="v3d-main-content"> -->
    <div v-if="true" id="v3d-main-content">
--- a/src/views/FactoryManage/AbnormalAlarm.vue
+++ b/src/views/FactoryManage/AbnormalAlarm.vue
@@ -99,23 +99,19 @@ const tableProps = [
  {
    prop: 'createTime',
    label: i18n.t('module.factory.abnormalAlarm.alarmTime'),
-    filter: timeFormatter,
-    align: 'center'
+    filter: timeFormatter
  },
  {
    prop: 'alarmType',
-    label: i18n.t('module.factory.abnormalAlarm.alarmType'),
-    align: 'center'
+    label: i18n.t('module.factory.abnormalAlarm.alarmType')
  },
  {
    prop: 'alarmGrade',
-    label: i18n.t('module.factory.abnormalAlarm.alarmLevel'),
-    align: 'center'
+    label: i18n.t('module.factory.abnormalAlarm.alarmLevel')
  },
  {
    prop: 'alarmContent',
-    label: i18n.t('module.factory.abnormalAlarm.alarmReason'),
-    align: 'center'
+    label: i18n.t('module.factory.abnormalAlarm.alarmReason')
  },
  // {
  //   prop: 'alarmNotify',
@@ -131,7 +127,6 @@ const tableProps = [
  {
    prop: 'status',
    label: i18n.t('module.factory.abnormalAlarm.status'),
-    align: 'center',
    filter: factory('alarmStatus')
  }
  // {
--- a/src/views/FactoryManage/EquipmentAlarm.vue
+++ b/src/views/FactoryManage/EquipmentAlarm.vue
@@ -88,50 +88,41 @@ const tableProps = [
  {
    prop: 'createTime',
    label: i18n.t('module.factory.abnormalAlarm.alarmStartTime'),
-    filter: timeFormatter,
-    align: 'center'
+    filter: timeFormatter
  },
  {
    prop: 'handleTime',
    label: i18n.t('module.factory.abnormalAlarm.alarmEndTime'),
-    filter: timeFormatter,
-    align: 'center'
+    filter: timeFormatter
  },
  {
    prop: 'equipmentName',
-    label: i18n.t('module.factory.abnormalAlarm.equipmentName'),
-    align: 'center'
+    label: i18n.t('module.factory.abnormalAlarm.equipmentName')
  },
  {
    prop: 'alarmGrade',
-    label: i18n.t('module.basicData.alarmManagement.AlarmLevel'),
-    align: 'center'
+    label: i18n.t('module.basicData.alarmManagement.AlarmLevel')
  },
  {
    prop: 'equipmentArea',
-    label: i18n.t('module.factory.abnormalAlarm.equipmentArea'),
-    align: 'center'
+    label: i18n.t('module.factory.abnormalAlarm.equipmentArea')
  },
  {
    prop: 'alarmContent',
-    label: i18n.t('module.factory.abnormalAlarm.alarmInfo'),
-    align: 'center'
+    label: i18n.t('module.factory.abnormalAlarm.alarmInfo')
  },
  {
    prop: 'alarmNotify',
-    label: i18n.t('module.factory.abnormalAlarm.alarmNotify'),
-    align: 'center'
+    label: i18n.t('module.factory.abnormalAlarm.alarmNotify')
  },
  {
    prop: 'status',
    label: i18n.t('module.factory.abnormalAlarm.alarmStatus'),
-    align: 'center',
    subcomponent: AlarmStatus
  },
  {
    prop: 'remark',
-    label: i18n.t('module.basicData.visual.Remarks'),
-    align: 'center'
+    label: i18n.t('module.basicData.visual.Remarks')
  }
 ]
 export default {
--- a/src/views/FactoryManage/ShiftManager.vue
+++ b/src/views/FactoryManage/ShiftManager.vue
@@ -107,29 +107,24 @@ const tableProps = [
  {
    prop: 'planHandoverTime',
    label: i18n.t('module.teamManager.shift.onlineTime'),
-    filter: timeFormatter,
-    align: 'center'
+    filter: timeFormatter
  },
  {
    prop: 'planOfflineTime',
    label: i18n.t('module.teamManager.shift.offlineTime'),
-    filter: timeFormatter,
-    align: 'center'
+    filter: timeFormatter
  },
  {
    prop: 'className',
-    label: i18n.t('module.teamManager.shift.teamName'),
-    align: 'center'
+    label: i18n.t('module.teamManager.shift.teamName')
  },
  {
    prop: 'classCode',
-    label: i18n.t('module.teamManager.shift.teamCode'),
-    align: 'center'
+    label: i18n.t('module.teamManager.shift.teamCode')
  },
  {
    prop: 'planSection',
    label: i18n.t('module.teamManager.shift.lineOrProcess'),
-    align: 'center',
    // subcomponent: shiftManagerLine
    subcomponent: {
      props: {
@@ -161,18 +156,15 @@ const tableProps = [
  },
  {
    prop: 'planTeamName',
-    label: i18n.t('module.teamManager.shift.handoverTeam'),
-    align: 'center'
+    label: i18n.t('module.teamManager.shift.handoverTeam')
  },
  {
    prop: 'planTeamLeader',
-    label: i18n.t('module.teamManager.shift.handoverMonitor'),
-    align: 'center'
+    label: i18n.t('module.teamManager.shift.handoverMonitor')
  },
  {
    prop: 'handoverStatus',
    label: i18n.t('module.teamManager.shift.status'),
-    align: 'center',
    subcomponent: shiftManagerStatus
  },
  // {
--- a/src/views/FactoryManage/TeamInfo.vue
+++ b/src/views/FactoryManage/TeamInfo.vue
@@ -98,35 +98,29 @@ const tableProps = [
  // },
  {
    prop: 'className',
-    label: i18n.t('module.teamManager.teamInfo.className'),
-    align: 'center'
+    label: i18n.t('module.teamManager.teamInfo.className')
  },
  {
    prop: 'classCode',
-    label: i18n.t('module.teamManager.teamInfo.classCode'),
-    align: 'center'
+    label: i18n.t('module.teamManager.teamInfo.classCode')
  },
  {
    prop: 'planTeamName',
-    label: i18n.t('module.teamManager.teamInfo.planTeamName'),
-    align: 'center'
+    label: i18n.t('module.teamManager.teamInfo.planTeamName')
  },
  {
    prop: 'planPreTeamName',
-    label: i18n.t('module.teamManager.teamInfo.planPreTeamName'),
-    align: 'center'
+    label: i18n.t('module.teamManager.teamInfo.planPreTeamName')
  },
  {
    prop: 'planHandoverTime',
    label: i18n.t('module.teamManager.teamInfo.onlineTime'),
-    filter: timeFormatter,
-    align: 'center'
+    filter: timeFormatter
  },
  {
    prop: 'planOfflineTime',
    label: i18n.t('module.teamManager.teamInfo.offlineTime'),
-    filter: timeFormatter,
-    align: 'center'
+    filter: timeFormatter
  }
  // {
  //   prop: 'workStatus',
--- a/src/views/material-manage/cockpit/components/baseTable.vue
+++ b/src/views/material-manage/cockpit/components/baseTable.vue
@@ -9,7 +9,7 @@
  <div class="visual-base-table-container">
    <el-table
      v-loading="isLoading"
-      :header-cell-style="{background:'rgba(79,114,136,0.29)',color:'#fff',height: 28 * beilv + 'px',lineHeight: 28 * beilv + 'px',padding: 0,fontSize: 12 * beilv + 'px'}"
+      :header-cell-style="{background:'rgba(32, 55, 96, 0.8)',color:'#fff',height: 28 * beilv + 'px',lineHeight: 28 * beilv + 'px',padding: 0,fontSize: 12 * beilv + 'px'}"
      :row-style="setRowStyle"
      :data="renderData"
      border
@@ -111,7 +111,7 @@ export default {
    setRowStyle(v) {
      if (v.rowIndex % 2 === 0) {
        return {
-          background: 'rgba(76,97,123,0.2)',
+          background: 'rgba(14, 32, 62, 0.8)',
          color: 'rgba(255,255,255,0.5)',
          height: 26 * this.beilv + 'px',
          lineHeight: 26 * this.beilv + 'px',
@@ -120,7 +120,7 @@ export default {
        }
      } else {
        return {
-          background: 'rgba(79,114,136,0.29)',
+          background: 'rgba(32, 55, 96, 0.8)',
          color: 'rgba(255,255,255,0.5)',
          height: 26 * this.beilv + 'px',
          lineHeight: 26 * this.beilv + 'px',
--- a/src/views/material-manage/cockpit/index.vue
+++ b/src/views/material-manage/cockpit/index.vue
@@ -15,11 +15,11 @@
      <el-button
        type="text"
        class="title-button"
-        :style="{ right: 33 * beilv + 'px', top: 37 * beilv + 'px' }"
+        :style="{ right: 0, top: 37 * beilv + 'px' }"
        @click="changeFullScreen"
      >
-        <svg-icon v-if="isFullScreen" icon-class="unFullScreenView" />
-        <svg-icon v-else icon-class="fullScreenView" />
+        <svg-icon v-if="isFullScreen" icon-class="unFullScreenView" :style="{fontSize: 33 * beilv + 'px'}" />
+        <svg-icon v-else icon-class="fullScreenView" :style="{fontSize: 33 * beilv + 'px'}" />
      </el-button>
    </el-row>
    <el-row class="container-main" :style="{ padding: '0 ' + 16 * beilv + 'px' }" :gutter="16 * beilv">
--- a/src/views/orderManage/orderManagerCockpit/cockpit.vue
+++ b/src/views/orderManage/orderManagerCockpit/cockpit.vue
@@ -15,7 +15,7 @@
      <el-button
        type="text"
        class="title-button"
-        :style="{ right: 33 * beilv + 'px', top: 37 * beilv + 'px' }"
+        :style="{ right: 0, top: 37 * beilv + 'px' }"
        @click="changeFullScreen"
      >
        <svg-icon v-if="isFullScreen" icon-class="unFullScreenView" :style="{fontSize: 33 * beilv + 'px'}" />
--- a/src/views/orderManage/orderManagerCockpit/components/baseTable.vue
+++ b/src/views/orderManage/orderManagerCockpit/components/baseTable.vue
@@ -9,7 +9,7 @@
  <div class="visual-base-table-container">
    <el-table
      v-loading="isLoading"
-      :header-cell-style="{background:'rgba(79,114,136,0.29)',color:'#fff',height: 28 * beilv + 'px',lineHeight: 28 * beilv + 'px',padding: 0,fontSize: 12 * beilv + 'px'}"
+      :header-cell-style="{background:'rgba(32, 55, 96, 0.8)',color:'#fff',height: 28 * beilv + 'px',lineHeight: 28 * beilv + 'px',padding: 0,fontSize: 12 * beilv + 'px'}"
      :row-style="setRowStyle"
      :data="renderData"
      border
@@ -111,7 +111,7 @@ export default {
    setRowStyle(v) {
      if (v.rowIndex % 2 === 0) {
        return {
-          background: 'rgba(76,97,123,0.2)',
+          background: 'rgba(14, 32, 62, 0.8)',
          color: 'rgba(255,255,255,0.5)',
          height: 26 * this.beilv + 'px',
          lineHeight: 26 * this.beilv + 'px',
@@ -120,7 +120,7 @@ export default {
        }
      } else {
        return {
-          background: 'rgba(79,114,136,0.29)',
+          background: 'rgba(32, 55, 96, 0.8)',
          color: 'rgba(255,255,255,0.5)',
          height: 26 * this.beilv + 'px',
          lineHeight: 26 * this.beilv + 'px',
--- a/src/views/orderManage/orderManagerCockpit/components/workOrder.vue
+++ b/src/views/orderManage/orderManagerCockpit/components/workOrder.vue
@@ -1,7 +1,13 @@
 <template>
  <div class="order-box" :style="{ padding: '0 ' + 16 * beilv + 'px', fontSize: 14 * beilv + 'px'}">
    <!-- 小块 -->
-    <div v-for="(item,index) in orderMsg" :key="index" :style="{ padding: 10 * beilv + 'px' + ' 20px ' + 16 * beilv + 'px' + ' 16px'}" class="box">
+    <div
+      v-for="(item,index) in orderMsg"
+      :key="index"
+      :style="{ padding: 10 * beilv + 'px ' + 20 * beilv + 'px ' + 16 * beilv + 'px ' + 16 * beilv
+        + 'px', height: 168 * beilv + 'px'}"
+      class="box"
+    >
      <p class="line1">
        <span>工单编号：<span class="light-color">{{ item.code }}</span></span>
        <span class="fr">
@@ -13,7 +19,7 @@
        <span>产品名称：<span class="light-color">{{ item.name }}</span></span>
        <span class="fr">
          产线：
-          <span class="light-color" style="margin-right: 25px">{{ item.line }}</span>
+          <span class="light-color" :style="{marginRight: 25 * beilv + 'px'}">{{ item.line }}</span>
        </span>
      </p>
      <p :style="{ paddingLeft: 15 * beilv + 'px'}">
@@ -55,11 +61,11 @@ export default {
  justify-content: space-between;
  .box {
    width: 49.5%;
-    height: 49.5%;
    margin-bottom: 8px;
    background-image: url('../../../../assets/img/cockpit/module-back.png');
    background-repeat: no-repeat;
    background-size: 100% 100%;
+    overflow: auto;
    .light-color {
      opacity: 0.5;
    }
--- a/src/views/report-manage/ReportSort/index.vue
+++ b/src/views/report-manage/ReportSort/index.vue
@@ -7,7 +7,6 @@
 -->
 <template>
  <div class="app-container">
-    <top-title />
    <head-form
      :form-config="headFormConfig"
      @headBtnClick="btnClick"
@@ -45,11 +44,16 @@ const tableBtn = [{
  btnName: 'btn.delete'
 }]
 const tableProps = [{
+  prop: '',
+  label: '',
+  width: 700
+}, {
  prop: 'name',
-  label: i18n.t('module.formManage.formSort.name'),
-  align: 'center'
+  label: i18n.t('module.formManage.formSort.name')
 }]
-import TopTitle from '@/components/TopTitle'
+
+let resizeEventListener = null
+
 import HeadForm from '@/components/basicData/HeadForm'
 import AddForm from './AddForm'
 import EditForm from './EditForm'
@@ -61,7 +65,7 @@ import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
 import i18n from '@/lang'
 export default {
  name: 'OrgManager',
-  components: { TopTitle, HeadForm, Pagination, BaseTable, MethodBtn, AddForm, EditForm },
+  components: { HeadForm, Pagination, BaseTable, MethodBtn, AddForm, EditForm },
  props: {},
  data() {
    return {
@@ -100,7 +104,15 @@ export default {
    this.getList()
    // this.listLoading = false
  },
-  mounted() {},
+  mounted() {
+    this.$set(this.tableProps[0], 'width', 700 * (document.body.offsetWidth / 1920))
+    addEventListener('resize', resizeEventListener = () => {
+      this.$set(this.tableProps[0], 'width', 700 * (document.body.offsetWidth / 1920))
+    })
+  },
+  destroyed() {
+    removeEventListener('resize', resizeEventListener)
+  },
  methods: {
    handleClick(raw) {
      console.log(raw)
Author	SHA1	Message	Date
gtz	a363453ead	'del_public.rar'	2022-11-11 16:13:56 +08:00
gtz	3f8e059f53	'align-left'	2022-11-11 16:10:45 +08:00
gtz	bd640ee0dc	Merge branch 'master' of git.picaiba.com:mt-fe-group/11-mes-new	2022-11-10 16:47:18 +08:00
gtz	1da845e9b4	'1'	2022-11-10 16:47:04 +08:00
高天泽	dd24092830	Merge pull request 'lb' (#6 ) from lb into master Reviewed-on: #6	2022-11-10 15:52:33 +08:00
lb	df3427f4d6	merge from master	2022-11-10 15:50:02 +08:00
高天泽	0778f473d6	Merge pull request '改表格颜色' (#5 ) from zjl into master Reviewed-on: #5	2022-11-08 17:06:17 +08:00
juzi	356f58f4a4	改表格颜色	2022-11-08 16:57:00 +08:00
高天泽	95a2f6c1a6	Merge pull request 'zjl' (#4 ) from zjl into master Reviewed-on: #4	2022-11-08 16:48:09 +08:00
juzi	cdb93d2b8c	merge master	2022-11-08 16:36:58 +08:00
juzi	3b17b75f85	1	2022-11-08 16:33:46 +08:00
高天泽	2035643ed9	Merge pull request 'lb' (#3 ) from lb into master Reviewed-on: #3	2022-11-08 15:05:41 +08:00
juzi	76e198124e	merge master	2022-11-08 14:54:20 +08:00
juzi	5f4f9ca5fc	修改	2022-11-08 14:52:35 +08:00