Merge branch 'dev_zyh' of United_Software/k_online_ui into dev

src/styles/theme-g.scss

@@ -4,31 +4,31 @@
   // 横幅
   --dashboard-scoring-bg-color: linear-gradient(
     270deg,
-    rgba(255, 182, 121,0.1) 0.9%,
-    rgba(118, 145, 255,0.1) 49.92%,
-    rgba(96, 242, 255,0.1) 98.78%
+    rgba(255, 182, 121, 0.1) 0.9%,
+    rgba(118, 145, 255, 0.1) 49.92%,
+    rgba(96, 242, 255, 0.1) 98.78%
   );
-  --scoring-colurful-color: linear-gradient(251deg, rgba(113, 103, 99) 0%,rgba(92, 106, 125) 100%);
+  --scoring-colurful-color: linear-gradient(251deg, rgba(113, 103, 99) 0%, rgba(92, 106, 125) 100%);
 
-  // button 
+  // button
   --color-btn-default-bg-color: transparent;
-  --color-btn-default-bg-hover:rgba(255, 117, 0, 0.2);
-  --color-btn-default-dark-bg: #ED6D00;
+  --color-btn-default-bg-hover: rgba(255, 117, 0, 0.2);
+  --color-btn-default-dark-bg: #ed6d00;
   --color-btn-default-dark-hover: #fff;
-  --color-grey: #3C414A;
+  --color-grey: #3c414a;
 
   --management-bg-color: #3e454f;
-  --more-type-bg-color: #343A43;
+  --more-type-bg-color: #343a43;
 
   // filterstag
   --color-tag-checked-all: rgba(255, 117, 0, 0.2);
   --color-tag-all-bg: rgba(255, 117, 0, 0.2);
-  --color-tag-all-bg-color:rgba(226,99,148,0.2);
+  --color-tag-all-bg-color: rgba(226, 99, 148, 0.2);
   --color-tag-created-bg: rgba(1, 103, 251, 0.2);
   --color-tag-confirmed-bg: rgba(179, 232, 93, 0.15);
   --color-tag-cancelled-bg: rgba(240, 241, 243, 0.2);
-  --color-tag-cancelled: rgba(240,241,243,0.7)
-  --color-tag-departure: #40A6E5;
+  --color-tag-cancelled: rgba(240, 241, 243, 0.7);
+  --color-tag-departure: #40a6e5;
   --color-tag-departure-bg: rgba(64, 166, 229, 0.2);
   --color-tag-cargo-received-bg: rgba(111, 124, 241, 0.2);
   --color-tag-cargo-received: #6f7cf1;
@@ -36,24 +36,23 @@
   --color-tag-completed-bg: rgba(91, 180, 98, 0.2);
 
   --color-select-border: #656f7d;
-  --border-color-2: #4C515A;
+  --border-color-2: #4c515a;
   --border-hover-color: rgba(255, 117, 0, 0.2);
 
-
   --el-color-info: #fff;
   --el-border-color-light: #3e454f;
   --el-checkbox-bg-color: #656f7d;
 
   // 日历
   --color-orange-6: #614d3f;
-  --color-range-text: #ED6D00;
+  --color-range-text: #ed6d00;
 
   // more filters
-  --color-table-header-bg: #343A43;
+  --color-table-header-bg: #343a43;
   --icon-color-black: #fff;
-  --more-filters-background-color: #2A2E34;
-  --addparties-background-color: #343A43;
-  --color-border-top: #3F434A;
+  --more-filters-background-color: #2a2e34;
+  --addparties-background-color: #343a43;
+  --color-border-top: #3f434a;
 
   // tag
   --tag-bg-color: rgba(239, 239, 240, 0.1);
@@ -66,8 +65,8 @@
   --scoring-smile-radio-color: #626871;
 
   // 输入框禁用的颜色
-  --input-disabled-bg-color: rgba(244,244,244,0.2);
+  --input-disabled-bg-color: rgba(244, 244, 244, 0.2);
   --input-disabled-text-color: #66696f;
-  --color-recent-name: rgba(240,241,243,0.1);
+  --color-recent-name: rgba(240, 241, 243, 0.1);
   --color-disabled-bg: #2b2b2c;
 }

src/styles/vxeTable.scss

@@ -20,6 +20,9 @@
 .vxe-table--render-default tr.vxe-body--row.row--stripe {
   background-color: var(--color-table-header-bg);
 }
+.vxe-table--render-default .vxe-body--row.row--current {
+  background-color: rgba(255, 117, 0, 0.2) !important;
+}
 
 .vxe-table--render-default .vxe-body--column.col--ellipsis,
 .vxe-table--render-default .vxe-footer--column.col--ellipsis,

src/views/Layout/src/components/Header/HeaderView.vue

@@ -360,10 +360,10 @@ div.el-popover.el-popper.toggle-theme-popover {
   width: 400px;
   height: 278px;
   padding: 16px;
-  // right: 20px !important;
-  // top: 52px !important;
-  // left: auto !important;
   inset: 56px 52.8px auto auto !important;
+  .el-popper__arrow {
+    display: none;
+  }
   .header {
     display: flex;
     justify-content: space-between;

src/views/Tracking/src/components/TrackingTable/src/TrackingTable.vue

@@ -268,6 +268,16 @@ const trackingTable = ref<any>({
   headerRowStyle: {
     backgroundColor: 'var(--color-table-header-bg)'
   },
+  // menuConfig: {
+  //   body: {
+  //     options: [
+  //       [
+  //         { code: 'custom3', name: '自定义前缀图标', prefixConfig: { icon: 'vxe-icon-download' } },
+  //         { code: 'custom4', name: '自定义前缀内容', prefixConfig: { content: 'Ctrl+S' } }
+  //       ]
+  //     ]
+  //   }
+  // },
   sortConfig: {
     sortMethod: (params) => {
       const { data, sortList } = params
@@ -511,6 +521,14 @@ defineExpose({
   getLoadingData,
   pageInfo
 })
+
+// const test1 = (params) => {
+//   console.log(params, '12223')
+//   window.open(
+//     `http://localhost/k_new_online/tracking/detail?a=${params.row.__serial_no}&_schemas=${params.row._schemas}`,
+//     '_blank'
+//   )
+// }
 </script>
 
 <template>