yanghao пре 1 недеља
родитељ
комит
d837300438
2 измењених фајлова са 19 додато и 17 уклоњено
  1. 7 6
      src/views/pms/qhse/kanban/index.vue
  2. 12 11
      src/views/pms/qhse/socSummary/index.vue

+ 7 - 6
src/views/pms/qhse/kanban/index.vue

@@ -205,9 +205,9 @@ const qualificationWarnings = ref([
 ])
 ])
 
 
 const qhseMetricTabs = [
 const qhseMetricTabs = [
-  { label: 'LTIR', value: 'ltir', accent: '#3d7cff' },
-  { label: 'TRIR', value: 'trir', accent: '#17b6c5' },
-  { label: 'PMVA', value: 'pmva', accent: '#f2a93b' }
+  { label: 'LTIR', value: 'ltir', accent: '#3d7cff', label2: '百万工时损失工时事故率' },
+  { label: 'TRIR', value: 'trir', accent: '#17b6c5', label2: '百万工时总可记录事件率' },
+  { label: 'PMVA', value: 'pmva', accent: '#f2a93b', label2: '百万公里可预防性交通事故率' }
 ] as const
 ] as const
 
 
 const activeQhseMetric = ref<QhseMetricValue>('ltir')
 const activeQhseMetric = ref<QhseMetricValue>('ltir')
@@ -714,7 +714,7 @@ function getSocChartOption(): echarts.EChartsOption {
     }),
     }),
     legend: {
     legend: {
       orient: 'vertical',
       orient: 'vertical',
-      right: 4,
+      right: 100,
       top: 'center',
       top: 'center',
       itemWidth: 12,
       itemWidth: 12,
       itemHeight: 12,
       itemHeight: 12,
@@ -913,7 +913,7 @@ watch(
 )
 )
 
 
 onMounted(async () => {
 onMounted(async () => {
-  supportsZoom.value = typeof CSS !== 'undefined' && CSS.supports?.('zoom', '1') === true
+  // supportsZoom.value = typeof CSS !== 'undefined' && CSS.supports?.('zoom', '1') === true
   nextTick(updateScale)
   nextTick(updateScale)
   resizeObserver = new ResizeObserver(updateScale)
   resizeObserver = new ResizeObserver(updateScale)
   if (wrapperRef.value) {
   if (wrapperRef.value) {
@@ -1087,6 +1087,7 @@ onUnmounted(() => {
                     <button
                     <button
                       v-for="item in qhseMetricTabs"
                       v-for="item in qhseMetricTabs"
                       :key="item.value"
                       :key="item.value"
+                      :title="item.label2"
                       type="button"
                       type="button"
                       class="qhse-metric-tab"
                       class="qhse-metric-tab"
                       :class="{ 'is-active': activeQhseMetric === item.value }"
                       :class="{ 'is-active': activeQhseMetric === item.value }"
@@ -1308,7 +1309,7 @@ onUnmounted(() => {
 </template>
 </template>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
-@import url('@/styles/qhse_kb.scss');
+@import url('@/styles/kb.scss');
 
 
 :deep(.el-select__wrapper) {
 :deep(.el-select__wrapper) {
   height: 38px !important;
   height: 38px !important;

+ 12 - 11
src/views/pms/qhse/socSummary/index.vue

@@ -4,7 +4,7 @@
     <DeptTree @node-click="handleDeptNodeClick" v-model:collapsed="isLeftContentCollapsed" />
     <DeptTree @node-click="handleDeptNodeClick" v-model:collapsed="isLeftContentCollapsed" />
 
 
     <el-col :span="isLeftContentCollapsed ? 24 : 20" :xs="24">
     <el-col :span="isLeftContentCollapsed ? 24 : 20" :xs="24">
-      <ContentWrap style="border: none">
+      <div style="border: none; background-color: #fff" class="p-2">
         <div class="soc-summary-chart">
         <div class="soc-summary-chart">
           <div class="soc-summary-chart__header">
           <div class="soc-summary-chart__header">
             <div class="soc-summary-chart__title">
             <div class="soc-summary-chart__title">
@@ -14,14 +14,11 @@
               返回总览
               返回总览
             </el-button>
             </el-button>
           </div>
           </div>
-          <Echart
-            :options="socChartOption"
-            :height="340"
-            @chart-click="handleChartClick" />
+          <Echart :options="socChartOption" :height="240" @chart-click="handleChartClick" />
         </div>
         </div>
-      </ContentWrap>
+      </div>
 
 
-      <ContentWrap style="border: none">
+      <ContentWrap style="border: none; margin-top: 5px">
         <!-- 搜索工作栏 -->
         <!-- 搜索工作栏 -->
         <el-form
         <el-form
           class="-mb-15px"
           class="-mb-15px"
@@ -73,8 +70,13 @@
       </ContentWrap>
       </ContentWrap>
 
 
       <!-- 列表 -->
       <!-- 列表 -->
-      <ContentWrap style="border: none">
-        <zm-table :loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <ContentWrap style="border: none; margin-top: -10px">
+        <zm-table
+          :loading="loading"
+          :data="list"
+          height="35vh"
+          :stripe="true"
+          :show-overflow-tooltip="true">
           <zm-table-column :label="t('monitor.serial')" width="70" align="center">
           <zm-table-column :label="t('monitor.serial')" width="70" align="center">
             <template #default="scope">
             <template #default="scope">
               {{ scope.$index + 1 }}
               {{ scope.$index + 1 }}
@@ -386,7 +388,6 @@ async function getStatic() {
     child.value = res.child
     child.value = res.child
     totalData.value = res.total
     totalData.value = res.total
   }
   }
-
 }
 }
 
 
 const handleChartClick = (params: any) => {
 const handleChartClick = (params: any) => {
@@ -525,7 +526,7 @@ onMounted(() => {
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;
   justify-content: space-between;
   justify-content: space-between;
-  margin-bottom: 12px;
+  // margin-bottom: 12px;
 }
 }
 
 
 .soc-summary-chart__title {
 .soc-summary-chart__title {