Merge branch 'master' of http://1.94.244.160:3000/shuzhihua/pms-iot-vue

src/components/DailyTableColumn/index.vue

@@ -24,16 +24,14 @@
       v-bind="col"
       align="center"
       resizable
-      :show-overflow-tooltip="true"
-    >
+      :show-overflow-tooltip="true">
       <template v-if="company === 'rd'" #default="{ row }">
         <div v-if="row.reportDetails && row.reportDetails.length > 0" class="py-2">
           <el-popover placement="right" trigger="hover" width="320" popper-class="!p-0">
             <template #reference>
               <el-badge :value="row.reportDetails.length" type="primary" class="max-w-full">
                 <div
-                  class="w-58 flex flex-col bg-gray-200/80 hover:bg-blue-100 transition-colors relative group cursor-pointer px-2 py-0.5 rounded gap-y-2"
-                >
+                  class="w-58 flex flex-col bg-gray-200/80 hover:bg-blue-100 transition-colors relative group cursor-pointer px-2 py-0.5 rounded gap-y-2">
                   <div class="flex items-center gap-x-2">
                     <div class="flex items-center">
                       <div class="i-carbon-calendar mr-1 -translate-y-[0.5px]"></div>
@@ -69,8 +67,7 @@
               <div
                 v-for="(item, index) in row.reportDetails"
                 :key="index"
-                class="flex flex-col bg-gray-200/80 hover:bg-blue-100 transition-colors relative group cursor-pointer p-2 rounded gap-y-2 max-w-80"
-              >
+                class="flex flex-col bg-gray-200/80 hover:bg-blue-100 transition-colors relative group cursor-pointer p-2 rounded gap-y-2 max-w-80">
                 <div class="flex items-center gap-x-2">
                   <div class="flex items-center">
                     <div class="i-carbon-calendar mr-1 -translate-y-[0.5px]"></div>
@@ -92,8 +89,7 @@
                 <div class="flex items-center">
                   <div class="font-medium flex-shrink-0">施工详情：</div>
                   <span
-                    class="font-medium group-hover:text-blue-600 transition-colors break-all whitespace-pre-wrap"
-                  >
+                    class="font-medium group-hover:text-blue-600 transition-colors break-all whitespace-pre-wrap">
                     {{ item.constructionDetail || '-' }}
                   </span>
                 </div>
@@ -110,8 +106,7 @@
             <template #reference>
               <el-badge :value="row.reportDetails.length" type="primary" class="max-w-full">
                 <div
-                  class="w-72 flex flex-col bg-gray-200/80 hover:bg-blue-100 transition-colors relative group cursor-pointer px-2 py-0.5 rounded gap-y-2"
-                >
+                  class="w-72 flex flex-col bg-gray-200/80 hover:bg-blue-100 transition-colors relative group cursor-pointer px-2 py-0.5 rounded gap-y-2">
                   <div class="flex items-center gap-x-2">
                     <div class="flex items-center">
                       <div class="i-carbon-calendar mr-1 -translate-y-[0.5px]"></div>
@@ -171,8 +166,7 @@
               <div
                 v-for="(item, index) in row.reportDetails"
                 :key="index"
-                class="flex flex-col bg-gray-200/80 hover:bg-blue-100 transition-colors relative group cursor-pointer p-2 rounded gap-y-2"
-              >
+                class="flex flex-col bg-gray-200/80 hover:bg-blue-100 transition-colors relative group cursor-pointer p-2 rounded gap-y-2">
                 <div class="flex items-center gap-x-2">
                   <div class="flex items-center">
                     <div class="i-carbon-calendar mr-1 -translate-y-[0.5px]"></div>
@@ -208,8 +202,7 @@
                 <div class="flex items-center">
                   <div class="font-medium flex-shrink-0">详细描述：</div>
                   <span
-                    class="font-medium break-all whitespace-pre-wrap group-hover:text-blue-600 transition-colors"
-                  >
+                    class="font-medium break-all whitespace-pre-wrap group-hover:text-blue-600 transition-colors">
                     {{ item.constructionDetail || '-' }}
                   </span>
                 </div>
@@ -220,13 +213,12 @@
         <span v-else class="text-gray-300">-</span>
       </template>
       <template v-else #default="{ row }">
-        <div v-if="row.reportDetails && row.reportDetails.length > 0" class="py-2">
+        <!-- <div v-if="row.reportDetails && row.reportDetails.length > 0" class="py-2">
           <el-popover placement="right" trigger="hover" width="320" popper-class="p-0!">
             <template #reference>
               <el-badge :value="row.reportDetails.length" type="primary" class="max-w-full">
                 <div
-                  class="w-72 flex flex-col bg-gray-200/80 hover:bg-blue-100 transition-colors relative group cursor-pointer px-2 py-0.5 rounded gap-y-2"
-                >
+                  class="w-72 flex flex-col bg-gray-200/80 hover:bg-blue-100 transition-colors relative group cursor-pointer px-2 py-0.5 rounded gap-y-2">
                   <div class="flex items-center gap-x-2">
                     <div class="flex items-center">
                       <div class="i-carbon-calendar mr-1 -translate-y-[0.5px]"></div>
@@ -240,45 +232,7 @@
                     </div>
                   </div>
 
-                  <!-- <div class="flex items-center">
-                            <div class="font-medium flex-shrink-0">结束井深(m)：</div>
-                            <span
-                              class="font-medium truncate group-hover:text-blue-600 transition-colors"
-                              >{{ row.reportDetails[0].currentDepth || '-' }} m
-                            </span>
-                          </div> -->
-
-                  <!-- <div class="flex items-center">
-                            <div class="font-medium flex-shrink-0">工况：</div>
-                            <el-tooltip
-                              effect="dark"
-                              :content="row.reportDetails[0].currentOperation"
-                              placement="top"
-                              popper-class="max-w-100"
-                            >
-                              <span
-                                class="font-medium truncate group-hover:text-blue-600 transition-colors"
-                              >
-                                {{ row.reportDetails[0].currentOperation || '-' }}
-                              </span>
-                            </el-tooltip>
-                          </div>
-
-                          <div class="flex items-center">
-                            <div class="font-medium flex-shrink-0">详细描述：</div>
-                            <el-tooltip
-                              effect="dark"
-                              :content="row.reportDetails[0].constructionDetail"
-                              placement="top"
-                              popper-class="max-w-100"
-                            >
-                              <span
-                                class="font-medium truncate group-hover:text-blue-600 transition-colors"
-                              >
-                                {{ row.reportDetails[0].constructionDetail || '-' }}
-                              </span>
-                            </el-tooltip>
-                          </div> -->
+      
                 </div>
               </el-badge>
             </template>
@@ -286,8 +240,7 @@
               <div
                 v-for="(item, index) in row.reportDetails"
                 :key="index"
-                class="flex flex-col bg-gray-200/80 hover:bg-blue-100 transition-colors relative group cursor-pointer p-2 rounded gap-y-2"
-              >
+                class="flex flex-col bg-gray-200/80 hover:bg-blue-100 transition-colors relative group cursor-pointer p-2 rounded gap-y-2">
                 <div class="flex items-center gap-x-2">
                   <div class="flex items-center">
                     <div class="i-carbon-calendar mr-1 -translate-y-[0.5px]"></div>
@@ -309,8 +262,7 @@
                 <div class="flex items-center">
                   <div class="font-medium flex-shrink-0">工况：</div>
                   <span
-                    class="font-medium break-all whitespace-pre-wrap group-hover:text-blue-600 transition-colors"
-                  >
+                    class="font-medium break-all whitespace-pre-wrap group-hover:text-blue-600 transition-colors">
                     {{ item.currentOperation || '-' }}
                   </span>
                 </div>
@@ -318,16 +270,15 @@
                 <div class="flex items-center">
                   <div class="font-medium flex-shrink-0">详细描述：</div>
                   <span
-                    class="font-medium break-all whitespace-pre-wrap group-hover:text-blue-600 transition-colors"
-                  >
+                    class="font-medium break-all whitespace-pre-wrap group-hover:text-blue-600 transition-colors">
                     {{ item.constructionDetail || '-' }}
                   </span>
                 </div>
               </div>
             </el-scrollbar>
           </el-popover>
-        </div>
-        <span v-else class="text-gray-300">-</span>
+        </div> -->
+        <span>{{ row.productionStatus }}</span>
       </template>
     </el-table-column>
     <el-table-column v-else v-bind="col" align="center" resizable />

src/layout/components/useRenderLayout.tsx

@@ -33,10 +33,9 @@ export const useRenderLayout = () => {
         {!hideLeftMenu.value ? (
           <div
             class={[
-              'absolute top-0 left-0 h-full layout-border__right',
+              'absolute top-0 left-0 z-20 h-full layout-border__right',
               { '!fixed z-3000': mobile.value }
-            ]}
-          >
+            ]}>
             {logo.value ? (
               <Logo
                 class={[
@@ -47,8 +46,7 @@ export const useRenderLayout = () => {
                     'w-[var(--left-menu-max-width)]': !appStore.getCollapse
                   }
                 ]}
-                style="transition: all var(--transition-time-02);"
-              ></Logo>
+                style="transition: all var(--transition-time-02);"></Logo>
             ) : undefined}
             <Menu class={[{ '!h-[calc(100%-var(--logo-height))]': logo.value }]}></Menu>
           </div>
@@ -66,8 +64,7 @@ export const useRenderLayout = () => {
               'fixed !w-full !left-0': mobile.value
             }
           ]}
-          style="transition: all var(--transition-time-02);"
-        >
+          style="transition: all var(--transition-time-02);">
           <ElScrollbar
             v-loading={pageLoading.value}
             class={[
@@ -78,8 +75,7 @@ export const useRenderLayout = () => {
                 '!h-[calc(100%-var(--tags-view-height))] mt-0':
                   fixedHeader.value && hideTopHeader.value
               }
-            ]}
-          >
+            ]}>
             {!hideTopHeader.value ? (
               <div
                 class={[
@@ -92,16 +88,14 @@ export const useRenderLayout = () => {
                     '!w-full !left-0': hideLeftMenu.value || mobile.value
                   }
                 ]}
-                style="transition: all var(--transition-time-02);"
-              >
+                style="transition: all var(--transition-time-02);">
                 <ToolHeader
                   class={[
                     'bg-[var(--top-header-bg-color)]',
                     {
                       'layout-border__bottom': !tagsView.value
                     }
-                  ]}
-                ></ToolHeader>
+                  ]}></ToolHeader>
 
                 {!hideTopHeader.value && tagsView.value ? (
                   <TagsView class="layout-border__top layout-border__bottom"></TagsView>
@@ -131,9 +125,10 @@ export const useRenderLayout = () => {
             hideTopHeader.value
               ? 'top-0 h-full'
               : 'top-[var(--logo-height)] h-[calc(100%-var(--logo-height))]'
-          ]}
-        >
-          {!hideLeftMenu.value ? <Menu class="relative layout-border__right !h-full"></Menu> : undefined}
+          ]}>
+          {!hideLeftMenu.value ? (
+            <Menu class="relative layout-border__right !h-full"></Menu>
+          ) : undefined}
           <div
             class={[
               `${prefixCls}-content`,
@@ -146,20 +141,17 @@ export const useRenderLayout = () => {
                 'w-full left-0': hideLeftMenu.value
               }
             ]}
-            style="transition: all var(--transition-time-02);"
-          >
+            style="transition: all var(--transition-time-02);">
             <ElScrollbar
               v-loading={pageLoading.value}
-            class={[
-              `${prefixCls}-content-scrollbar`,
-              {
-                '!h-[calc(100%-var(--tags-view-height))] mt-[calc(var(--tags-view-height))]':
-                  fixedHeader.value && tagsView.value && !hideTopHeader.value,
-                '!h-[calc(100%)] mt-0':
-                  fixedHeader.value && hideTopHeader.value
-              }
-            ]}
-            >
+              class={[
+                `${prefixCls}-content-scrollbar`,
+                {
+                  '!h-[calc(100%-var(--tags-view-height))] mt-[calc(var(--tags-view-height))]':
+                    fixedHeader.value && tagsView.value && !hideTopHeader.value,
+                  '!h-[calc(100%)] mt-0': fixedHeader.value && hideTopHeader.value
+                }
+              ]}>
               {!hideTopHeader.value && tagsView.value ? (
                 <TagsView
                   class={[
@@ -167,14 +159,19 @@ export const useRenderLayout = () => {
                     {
                       '!fixed top-0 left-0 z-10': fixedHeader.value && !hideTopHeader.value,
                       'w-[calc(100%-var(--left-menu-min-width))] !left-[var(--left-menu-min-width)] mt-[var(--logo-height)]':
-                        !hideLeftMenu.value && collapse.value && fixedHeader.value && !hideTopHeader.value,
+                        !hideLeftMenu.value &&
+                        collapse.value &&
+                        fixedHeader.value &&
+                        !hideTopHeader.value,
                       'w-[calc(100%-var(--left-menu-max-width))] !left-[var(--left-menu-max-width)] mt-[var(--logo-height)]':
-                        !hideLeftMenu.value && !collapse.value && fixedHeader.value && !hideTopHeader.value,
+                        !hideLeftMenu.value &&
+                        !collapse.value &&
+                        fixedHeader.value &&
+                        !hideTopHeader.value,
                       '!w-full !left-0': hideLeftMenu.value || hideTopHeader.value
                     }
                   ]}
-                  style="transition: width var(--transition-time-02), left var(--transition-time-02);"
-                ></TagsView>
+                  style="transition: width var(--transition-time-02), left var(--transition-time-02);"></TagsView>
               ) : undefined}
 
               <AppView></AppView>
@@ -195,8 +192,7 @@ export const useRenderLayout = () => {
               {
                 'layout-border__bottom': !tagsView.value
               }
-            ]}
-          >
+            ]}>
             {logo.value ? <Logo class="custom-hover"></Logo> : undefined}
             <Menu class="h-[var(--top-tool-height)] flex-1 px-10px"></Menu>
             <ToolHeader></ToolHeader>
@@ -206,8 +202,7 @@ export const useRenderLayout = () => {
           class={[
             `${prefixCls}-content`,
             hideTopHeader.value ? 'w-full h-full' : 'w-full h-[calc(100%-var(--top-tool-height))]'
-          ]}
-        >
+          ]}>
           <ElScrollbar
             v-loading={pageLoading.value}
             class={[
@@ -217,19 +212,18 @@ export const useRenderLayout = () => {
                   fixedHeader.value && tagsView.value && !hideTopHeader.value,
                 '!h-full mt-0': hideTopHeader.value
               }
-            ]}
-          >
+            ]}>
             {!hideTopHeader.value && tagsView.value ? (
               <TagsView
                 class={[
                   'layout-border__bottom layout-border__top relative',
                   {
-                    '!fixed w-full top-[var(--top-tool-height)] left-0': fixedHeader.value && !hideTopHeader.value,
+                    '!fixed w-full top-[var(--top-tool-height)] left-0':
+                      fixedHeader.value && !hideTopHeader.value,
                     '!fixed w-full top-0 left-0': hideTopHeader.value
                   }
                 ]}
-                style="transition: width var(--transition-time-02), left var(--transition-time-02);"
-              ></TagsView>
+                style="transition: width var(--transition-time-02), left var(--transition-time-02);"></TagsView>
             ) : undefined}
 
             <AppView></AppView>
@@ -254,8 +248,7 @@ export const useRenderLayout = () => {
             hideTopHeader.value
               ? 'top-0 h-full'
               : 'top-[var(--logo-height)] h-[calc(100%-var(--logo-height))]'
-          ]}
-        >
+          ]}>
           {!hideLeftMenu.value ? <TabMenu></TabMenu> : undefined}
           <div
             class={[
@@ -273,19 +266,17 @@ export const useRenderLayout = () => {
                 'w-full left-0': hideLeftMenu.value
               }
             ]}
-            style="transition: all var(--transition-time-02);"
-          >
+            style="transition: all var(--transition-time-02);">
             <ElScrollbar
               v-loading={pageLoading.value}
-            class={[
-              `${prefixCls}-content-scrollbar`,
-              {
-                '!h-[calc(100%-var(--tags-view-height))] mt-[calc(var(--tags-view-height))]':
-                  fixedHeader.value && tagsView.value && !hideTopHeader.value,
-                '!h-full mt-0': hideTopHeader.value
-              }
-            ]}
-            >
+              class={[
+                `${prefixCls}-content-scrollbar`,
+                {
+                  '!h-[calc(100%-var(--tags-view-height))] mt-[calc(var(--tags-view-height))]':
+                    fixedHeader.value && tagsView.value && !hideTopHeader.value,
+                  '!h-full mt-0': hideTopHeader.value
+                }
+              ]}>
               {!hideTopHeader.value && tagsView.value ? (
                 <TagsView
                   class={[
@@ -294,17 +285,32 @@ export const useRenderLayout = () => {
                       '!fixed top-0 left-0 z-10': fixedHeader.value && !hideTopHeader.value,
                       '!fixed top-0 left-0 z-10 w-full': hideTopHeader.value,
                       'w-[calc(100%-var(--tab-menu-min-width))] !left-[var(--tab-menu-min-width)] mt-[var(--logo-height)]':
-                        !hideLeftMenu.value && collapse.value && fixedHeader.value && !fixedMenu.value && !hideTopHeader.value,
+                        !hideLeftMenu.value &&
+                        collapse.value &&
+                        fixedHeader.value &&
+                        !fixedMenu.value &&
+                        !hideTopHeader.value,
                       'w-[calc(100%-var(--tab-menu-max-width))] !left-[var(--tab-menu-max-width)] mt-[var(--logo-height)]':
-                        !hideLeftMenu.value && !collapse.value && fixedHeader.value && !fixedMenu.value && !hideTopHeader.value,
+                        !hideLeftMenu.value &&
+                        !collapse.value &&
+                        fixedHeader.value &&
+                        !fixedMenu.value &&
+                        !hideTopHeader.value,
                       'w-[calc(100%-var(--tab-menu-min-width)-var(--left-menu-max-width))] !left-[calc(var(--tab-menu-min-width)+var(--left-menu-max-width))] mt-[var(--logo-height)]':
-                        !hideLeftMenu.value && collapse.value && fixedHeader.value && fixedMenu.value && !hideTopHeader.value,
+                        !hideLeftMenu.value &&
+                        collapse.value &&
+                        fixedHeader.value &&
+                        fixedMenu.value &&
+                        !hideTopHeader.value,
                       'w-[calc(100%-var(--tab-menu-max-width)-var(--left-menu-max-width))] !left-[calc(var(--tab-menu-max-width)+var(--left-menu-max-width))] mt-[var(--logo-height)]':
-                        !hideLeftMenu.value && !collapse.value && fixedHeader.value && fixedMenu.value && !hideTopHeader.value
+                        !hideLeftMenu.value &&
+                        !collapse.value &&
+                        fixedHeader.value &&
+                        fixedMenu.value &&
+                        !hideTopHeader.value
                     }
                   ]}
-                  style="transition: width var(--transition-time-02), left var(--transition-time-02);"
-                ></TagsView>
+                  style="transition: width var(--transition-time-02), left var(--transition-time-02);"></TagsView>
               ) : undefined}
 
               <AppView></AppView>

src/views/pms/stat/rdkb/rdProductionBriefs.vue

@@ -306,30 +306,31 @@ onMounted(() => {
   :deep(.el-table__header-wrapper th.el-table__cell) {
     font-size: calc(16px * var(--kb-scale, 1));
     line-height: 1.2;
-    color: #10233c;
-    background: #b5cde7;
-    border-color: #fff;
+    color: #0e3f8a;
+    background: #7fb5ff;
+    border-color: #a6c4ec;
+    font-weight: 600;
   }
 
-  :deep(.el-table__body td.el-table__cell) {
-    padding: calc(7px * var(--kb-scale, 1)) 0;
-    font-size: calc(14px * var(--kb-scale, 1));
-    color: #07192c;
-    background: #89b3de;
-    border-color: #fff;
-  }
+  // :deep(.el-table__body td.el-table__cell) {
+  //   padding: calc(7px * var(--kb-scale, 1)) 0;
+  //   font-size: calc(14px * var(--kb-scale, 1));
+  //   color: #07192c;
+  //   background: #89b3de;
+  //   border-color: #fff;
+  // }
 
-  :deep(.el-table__body tr:nth-child(2n) td.el-table__cell) {
-    background: #b8cee5;
-  }
+  // :deep(.el-table__body tr:nth-child(2n) td.el-table__cell) {
+  //   background: #b8cee5;
+  // }
 
-  :deep(.el-table__body tr) {
-    cursor: pointer;
-  }
+  // :deep(.el-table__body tr) {
+  //   cursor: pointer;
+  // }
 
-  :deep(.el-table__row:hover > td.el-table__cell) {
-    background: #75a5d6 !important;
-  }
+  // :deep(.el-table__row:hover > td.el-table__cell) {
+  //   background: #75a5d6 !important;
+  // }
 }
 
 .production-brief-table__device-names {

src/views/pms/stat/rhkb/deviceList.vue

@@ -272,24 +272,27 @@ onMounted(() => {
 
 .device-list-table {
   :deep(.el-table__header-wrapper th.el-table__cell) {
-    color: #10233c;
-    background: #b5cde7;
-    border-color: #fff;
+    font-size: calc(16px * var(--kb-scale, 1));
+    line-height: 1.2;
+    color: #0e3f8a;
+    background: #7fb5ff;
+    border-color: #a6c4ec;
+    font-weight: 600;
   }
 
-  :deep(.el-table__body td.el-table__cell) {
-    color: #07192c;
-    background: #89b3de;
-    border-color: #fff;
-  }
+  // :deep(.el-table__body td.el-table__cell) {
+  //   color: #07192c;
+  //   background: rgba(137, 179, 222);
+  //   border-color: #fff;
+  // }
 
-  :deep(.el-table__body tr:nth-child(2n) td.el-table__cell) {
-    background: #b8cee5;
-  }
+  // :deep(.el-table__body tr:nth-child(2n) td.el-table__cell) {
+  //   background: #b8cee5;
+  // }
 
-  :deep(.el-table__row:hover > td.el-table__cell) {
-    background: #75a5d6 !important;
-  }
+  // :deep(.el-table__row:hover > td.el-table__cell) {
+  //   background: #75a5d6 !important;
+  // }
 }
 
 .device-list-table__multi-value {

src/views/pms/stat/rykb/ryProductionBriefs.vue

@@ -296,27 +296,28 @@ onMounted(() => {
   :deep(.el-table__header-wrapper th.el-table__cell) {
     font-size: calc(16px * var(--kb-scale, 1));
     line-height: 1.2;
-    color: #10233c !important;
-    background: #b5cde7 !important;
-    border-color: #fff !important;
+    color: #0e3f8a;
+    background: #7fb5ff;
+    border-color: #a6c4ec;
+    font-weight: 600;
   }
 
-  :deep(.el-table__body td.el-table__cell) {
-    height: calc(58px * var(--kb-scale, 1));
-    padding: calc(7px * var(--kb-scale, 1)) 0;
-    font-size: calc(14px * var(--kb-scale, 1));
-    color: #07192c !important;
-    background: #89b3de !important;
-    border-color: #fff !important;
-  }
-
-  :deep(.el-table__body tr:nth-child(2n) td.el-table__cell) {
-    background: #b8cee5 !important;
-  }
-
-  :deep(.el-table__row:hover > td.el-table__cell) {
-    background: #75a5d6 !important;
-  }
+  // :deep(.el-table__body td.el-table__cell) {
+  //   height: calc(58px * var(--kb-scale, 1));
+  //   padding: calc(7px * var(--kb-scale, 1)) 0;
+  //   font-size: calc(14px * var(--kb-scale, 1));
+  //   color: #07192c !important;
+  //   background: #89b3de !important;
+  //   border-color: #fff !important;
+  // }
+
+  // :deep(.el-table__body tr:nth-child(2n) td.el-table__cell) {
+  //   background: #b8cee5 !important;
+  // }
+
+  // :deep(.el-table__row:hover > td.el-table__cell) {
+  //   background: #75a5d6 !important;
+  // }
 }
 
 .production-brief-table__summary {