From 71db047c4f9c9be87e7accb8d33f9324fb5efbc3 Mon Sep 17 00:00:00 2001
From: wangchengming <15110151257@163.com>
Date: Tue, 26 Aug 2025 14:27:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=AA=92=E4=BD=93=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/iconList.png          | Bin 0 -> 577 bytes
 src/assets/images/iconListChose.png     | Bin 0 -> 623 bytes
 src/assets/images/iconTimeLine.png      | Bin 0 -> 502 bytes
 src/assets/images/iconTimeLineChose.png | Bin 0 -> 539 bytes
 src/assets/images/time-line-icon.png    | Bin 0 -> 1134 bytes
 src/assets/styles/ruoyi.scss            | 122 ++++++++++++++++++-
 src/views/mediaLibrary/exportDialog.vue | 133 ++++++++++++++++++++
 src/views/mediaLibrary/index.vue        | 109 +++++++++++++++--
 src/views/mediaLibrary/mediaLogs.vue    | 154 +++++++++++++++++++-----
 src/views/supplier/supplierLogs.vue     | 154 +++++++++++++++++++-----
 10 files changed, 610 insertions(+), 62 deletions(-)
 create mode 100644 src/assets/images/iconList.png
 create mode 100644 src/assets/images/iconListChose.png
 create mode 100644 src/assets/images/iconTimeLine.png
 create mode 100644 src/assets/images/iconTimeLineChose.png
 create mode 100644 src/assets/images/time-line-icon.png
 create mode 100644 src/views/mediaLibrary/exportDialog.vue

diff --git a/src/assets/images/iconList.png b/src/assets/images/iconList.png
new file mode 100644
index 0000000000000000000000000000000000000000..5399ee287dc752cdac6eb3e7ae9b2699a2297960
GIT binary patch
literal 577
zcmV-H0>1r;P)<h;3K|Lk000e1NJLTq000&M000sQ1^@s6UnMRr0005@Nkl<Zcmb4@
zO-lk%6o#9z9QsnCqQIgb6D@01u1X{|A;M*~6sm2wNWuKfc2bL0ZTvIVNERYdCZ^6z
z?|W%vY|~ZFGxwf*?s>g)?ol<H&7Oe{us}VN$!v`Mek{vUuyzZ2fN>e9b*@6=6lj39
zq$tWEC!|;`u3_8-<3QG^bwXj{Od9z8eqV70MwqKAPMCEhbl{h4-|O{0p&S+4A7RX?
zp-?Dl7{($5R^4v*0{nYh!0-1Pkw|0%v1PC-1GU28@PT;kXf)b@fF1}0zHCwFh}bL8
zWuO*wg>b1<nogxsbLn(?f{TC2<#Mx(%RnvWv)vNiZub*qXu4dkCfaI~0TPeL8Gk?t
zJ{XsQTF^-F#77XZZ+`~!5D@0``Pgn-!jXSa>xjbgDI@Gu@tT*|Zvfgm+AYlqsnu##
z_;;9FK-LUus<`Q6kH<5G`pxLNK96>Lv=vZe6aG%S-JWDz25M1Llmh+Q4WQL1WQ#h-
zSS<F<xD3={t`N@W^NaZNSxF|7ygaTCQ79Ca8JB@tOlCV>o2L1OT0U!<)<E($1EgFo
zyU;on{F+`Emw{Ty$?(L3_JWv(<UNeSTCEn_ZCyB{J@zSVI&*NNc884NONL_3egDi&
zw%Y|ZbpWl7#}yD33<j&1+<+dCwGIw<@dE$=|Nr$xlCS^(00v1!K~w_(8D4OUs034=
P00000NkvXXu0mjfNuUQj

literal 0
HcmV?d00001

diff --git a/src/assets/images/iconListChose.png b/src/assets/images/iconListChose.png
new file mode 100644
index 0000000000000000000000000000000000000000..3020e7db70c8ebe0a2308458303fdbbec73ea2d7
GIT binary patch
literal 623
zcmV-#0+9WQP)<h;3K|Lk000e1NJLTq000&M000sQ1^@s6UnMRr0006cNkl<Zcmb4>
zJ#Q015Qb;h92T)bAY$ElFOULJQSuW|N~lN&4M;&kDRYPEEb$=}JAecYUj<MC1r<$x
z2NjJW-uoa52(Wa-=bOx|<&)!TZOyYcyYJ5HyWNq^K;Kh=&Ilx874}!4{Gspz{hro`
z1nV|r%~0Q$0-!}cRf59>6t_8HyjHx70M{r#LfA%CAl#9(o1w=fL^;P?(Em=>=Xy$h
z<JVIq83MkW%#)t`o$_sBz7X(6_B-kp6wnZ&I5R@I7<JUA(&d8~>5f{-or=f04eX^i
z)tdQiy`^^hn@c-M*Bg|kQ%U;JO<1>qy|~mEyBl%sY^!(b;u<=<ILl)A^Em4^uou@$
zYNw|aQT)wE&R%pP+EW|-%Pbh$C{+-BK8nLXtlPj|>?x_8*2!di`vU49#7&x;aQ`LC
z0C>er><8*LST{#uUt_;h0^(!ZJ|Z}N7lnAi36s>_9wL0CoIZ?3yC5%oB6ZgfPu6}d
zP^;B-t$8}$YJMr}+oFiNYIPwS9An)E_R<|cFh}vVePQ3U8X1+QQ^~hy=l`>A1AB3)
zG4}384L{sjYP8cjFV4~kQjc{T*o*6>3iV5wV~Qw$ID>rG52LFr7*?@D?Y8Ye9<go%
zd#OObqRWG_y~wOemvx<<Cfsu=x7#H%nQyqkM^PNELAurPihyE98?Rf8g#>{QXk$ij
z!~*4WPMG+S*8_yNln)8p$k_7$0096063wAD00006Nkl<Z0|4EWjEVvsr+)wd002ov
JPDHLkV1mwz8vp<R

literal 0
HcmV?d00001

diff --git a/src/assets/images/iconTimeLine.png b/src/assets/images/iconTimeLine.png
new file mode 100644
index 0000000000000000000000000000000000000000..02b89eb046f2f2f08dae014b1f588397400afe9a
GIT binary patch
literal 502
zcmV<S0SW$zP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00052Nkl<ZcmbT0
zJx{_=6ozR@WwJj&-89inHw6acV9+?o#9)j=Dd9Kq)o7ybx?nUqDJr9biP6M`A7Fwp
zDuw!-1}c<FsN{XQ_nwdUo^$U7HRAg?j-!;z<&9FQbinuwzu+f)5nHiXOi7F{Eixcf
zC=?bdmC6l4RYg(u80X*wjKNv4sj7NrS=Kdi^VmFiLO9l<(P$k{9F7DPC14%F)n1@0
zB$ePe!8i%Wh2H6OPAR~xOhrJUl6|rRMQCT6m___H^h3vB;a5}?Q!JKYAZ**N<#M?P
zoNsUlh$LunT`Jlg@`f}Zwxd#dGGty*cv22~I>_U<wcG6}UDsnmHebTue`Yfxq+t9L
znx;uoB%jZ>GMUV`khk<ff&)E>P{UgVOt|6;UbVb#k5u<Ws0Mpzh)}J!8ZpZ2?&m-k
z9Cl4^?P!F+ST2N)Rns)9MBl^z;+A)IF4ymHcm^u(Ff5wnn%trzXB06E;}L~43?tU0
zrF1v<_iuz2FHx7D$~bM_5xYW5S8VRWt;n76CF<F1HqK64P%hyWbE`|4A2Q!0CLyuR
sJ^TOw0RR7$f2xrH000I_L_t&o00Qf{MC5Tjod5s;07*qoM6N<$g4WI4E&u=k

literal 0
HcmV?d00001

diff --git a/src/assets/images/iconTimeLineChose.png b/src/assets/images/iconTimeLineChose.png
new file mode 100644
index 0000000000000000000000000000000000000000..14b5c8987263df71145e86d4f7699553b21024eb
GIT binary patch
literal 539
zcmV+$0_6RPP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B0005dNkl<Zcmb4C
zzfTlV5dLP2QW%Nl?E@=KG_lYQfx=iAG!{}DV`2Ocbg{M7!+*fSXrlJoU^H6ksU$WQ
zBt{dOyIndU5W>$ld~*j2+%4qpWxm}vGv9pg&Azvaj$x9d*$v`#c$EJOX|_hJ68}Ax
zJkG`dllHO$Lg8U{A*6HP$(kbWLF^n0P7r;>S&vD?M=tO!Of=3jR#+i4Fp*z_Vw$TB
z7umxmf)Q?Nx{~HscPULF--(&MXYdr!t@SJHL)h6Fg-lHC6|2id#BQr?U1ENdXt#bu
zdC4wBlQbU_$WS|@@VBH^pFH!2{sPfyY%`?!brs-lXST<P;SO8FXpdzjbQyJ_fs#x|
zC|OLx>67z)4$*j-guQPjHmD4+J3bFHF)zaJ7qT()<l?$RqOFi_L}4yeFTApe$mh_y
z-G0NHh&c9_)Z;|UOzJLFYk5aL{dVuifi8G~YO0X8M@n>)RJ_xAwK8R}U)}J_Ir1Za
zntW35&$OubVOU1*V<|>F05vEC%so$Lc%<V!iY<xhxYvTCDa1D#&j!CllcDa~w4X7`
zmBwV{tJgXTA$MFouZCfT+@kM?Fw6JG4rX~&Zw$DZRl|sL882)b00960A^?U000006
dNkl<Z0{}V<rCH%AD>DE9002ovPDHLkV1hw<^2-1K

literal 0
HcmV?d00001

diff --git a/src/assets/images/time-line-icon.png b/src/assets/images/time-line-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..31e37fa81e458f828ac5ef10b713a83d71935552
GIT binary patch
literal 1134
zcmV-!1d;oRP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000CdNkl<ZcmcFk
zJ&znk6s+#~xSjLvfi2F)Bsc&G4u~#51V|@=1LPR~1R~;p5W$~-*d!2G1jqpwVGbk+
z?8JaAVYpr2?Co^-qw4Jk=4^)^P3`o&S5>cjUhhoAQw}pk`}%_|yZQExegDn{`|jOc
zyZPQF#}5ZDcuYBQ$bE_p9xFiOU_b4(IDCJC@oWcm*CJPjU<q}YqtB<9B6&<XambZM
z+OviJSAc|w!~G7k%M&0qG#QZkg`2Cuyf0{m?9jb(xf+}+4Yls^NR>?iPuw`z1}58B
zoEA5hS*i^~^JFOJ98N+SY3bo!t0G>2fq=vP5hfU+PuXWI@!EJ&SE#w7t<x5Q#)_@;
z;%Y_G%7b3+$s%3=M|;g?<{~oTXV*uxi*4ljB~<YWLiMUc<FvTwIdPoKA8FSsaZhlk
zeEDI8{-us--j(E6{fxQ@>n;Gz%P3(N7DmVx92%Ql^qe^2N+ZOT2R)76kvpZv374*&
zp{0scr+^`yM;=~;@v-H|Vs;)eTy_}89#f7Saix(~9`cgscveU39Jko!Hte`VM9_21
z)d<CQfx1B~5h1^Y%033dXAX@OQ%)RlrI8jq<RwpfM;bKVSXCB5&8zC?*yx4`KzI`Y
zpKv8t0bGG#xau*_S)fOYIzA6+<smOMJeDRRafc{?)zQx*3dXQti1{3&*MRT}fQDF~
z9DD4Vb4o18@f@UGGvrC{h_;QaZ0k6x91uziON>=)zP-j=O`JU$v)2J~#Fa+cHEU9v
zyrbVwQ}F9E_=#973jaj^70`RfB3}<RW4Q;yF8~s8_GB#l43HDZl}6e%OOvK|q<O}p
zM>i^nm?5xvrFzKJb-;e(bs*L!#~!;5akQJN@(|Ll8QQjW%4}#H(A5<S1-`@rrhHZ8
z^bean5JvM`K>VD$<{N5nI|4Xn40g*og)2_wZ`U?Ma4&h5I7A%pEO5fc_T91{B2;;f
z814gUfOd%CN96DYLip67v0}=JBd#>kat4r>Jn0=V8z*dUEiggtl||4NYw8E6nm-UQ
zN3@I(9w6tt4vjs=oH*i2Bds2dyyQvm7(V(cqr1yyGCMRCf0w7;{h|L081AsZefDII
zDwqR9&w}?nCyuyF6+<fzddhqGSoV(CwCRcW!UFgAirsewi}nQ7=uhNw8<u}{lz0bq
zd(U&?tmy1V?H-_)d$N1r5dsYRhjUE1WHm=cv{XG)L5)xKfKxt7L1V>~6U3E9T6xgR
zJ?Xt%0S62e9Naj8s<&Ga`rhi1Ni35mK{@B}yDg2h^l&dMk4*vHdSd^u$N2Xtz!_J$
z@j{xNp!dF@v7kwaBd#>mx`)hGh^y=7LV|@ijuzPecFG-g?B8a+V`P|Y1VLlP^wFP<
zkHwWn+Ktg_@Gk%W0RR7{fW4^z000I_L_t&o0HaoG`NQRRQvd(}07*qoM6N<$f_ncM
A7ytkO

literal 0
HcmV?d00001

diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss
index be6d44f..cb5c2e2 100644
--- a/src/assets/styles/ruoyi.scss
+++ b/src/assets/styles/ruoyi.scss
@@ -413,7 +413,7 @@ h6 {
   background: #ffc63d;
   color: #000000;
 }
- 
+
 .my-downAllFile-btn {
   width: 140px;
   height: 34px;
@@ -513,6 +513,21 @@ h6 {
   }
 }
 
+.myUpdate_popover {
+  min-width: 430px !important;
+  border-radius: 6px !important;
+  padding: 8px !important;
+  background: #FFFFFF !important;
+  box-shadow: 0 0 8px 0 #00328214 !important;
+
+  .el-popper__arrow,
+  .el-popper__arrow:before {
+    display: none;
+  }
+
+
+}
+
 .popBtns {
   width: 100%;
   line-height: 30px;
@@ -980,6 +995,13 @@ h6 {
   height: calc(100vh - 240px);
 }
 
+.myLogCard .el-card__body {
+  padding: 20px 20px 0 20px !important;
+  overflow-y: auto;
+  width: 100%;
+  height: calc(100vh - 165px);
+}
+
 .myDetailCard .el-card__body {
   padding: 30px 30px 0 30px !important;
   overflow-y: auto;
@@ -1059,6 +1081,41 @@ h6 {
   border-top: 1px solid #58585830 !important;
 }
 
+// 弹窗tab页
+.my_dialog .el-tabs__nav-wrap:after {
+  height: 0px;
+}
+
+.my_dialog .el-tabs__item {
+  align-items: center;
+  box-sizing: border-box;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  font-size: 22px;
+  color: #1E1E1E;
+  display: flex;
+  padding: 0 20px;
+}
+
+.my_dialog .el-tabs__item.is-active,
+.el-tabs__item:hover {
+  font-family: Microsoft YaHei;
+  font-weight: 600;
+  font-size: 22px;
+  color: #1E1E1E;
+}
+
+.my_dialog .el-tabs__active-bar {
+  height: 3px;
+  background: #1a75e6;
+  bottom: 0;
+  left: 0;
+  list-style: none;
+  position: absolute;
+  transition: width var(--el-transition-duration) var(--el-transition-function-ease-in-out-bezier), transform var(--el-transition-duration) var(--el-transition-function-ease-in-out-bezier);
+  z-index: 1;
+}
+
 // 表单录入样式 
 .myInsertForm .el-form-item--default {
   margin-bottom: 20px;
@@ -1294,4 +1351,67 @@ h6 {
   font-size: 18px;
   color: #000000;
   padding: 6px 20px;
+}
+
+// 时间轴
+.my-time-line .el-timeline-item__timestamp.is-top {
+  display: inline-flex;
+  justify-content: center;
+  vertical-align: middle;
+  width: 110px;
+  height: 24px;
+  border-radius: 12px 12px 12px 12px;
+  background: #1a75e6;
+  font-family: Arial;
+  font-weight: 700;
+  font-size: 16px;
+  line-height: 26px;
+  color: #FEFEFF;
+  margin-bottom: 0px;
+  padding-top: 0px;
+}
+
+.my-time-line .el-timeline-item {
+  padding-bottom: 34px;
+  position: relative;
+}
+
+.my-time-line .el-timeline-item__content {
+  display: inline-table;
+  padding-left: 16px;
+  width: calc(100% - 110px);
+}
+
+.my-time-line .el-timeline-item__wrapper {
+  padding-left: 34px;
+  position: relative;
+  top: 0px;
+}
+
+.my-time-line .el-timeline-item__tail {
+  border-left: 1px solid #FFC63D;
+  height: 100%;
+  left: 11px;
+  top: 8px;
+  position: absolute;
+}
+
+.my-time-line .el-timeline-item__node--normal {
+  height: 24px;
+  left: 0px;
+  width: 24px;
+}
+
+.my-time-line .el-timeline-item__node {
+  align-items: center;
+  background-color: transparent;
+  border-color: transparent;
+  border-radius: 50%;
+  box-sizing: border-box;
+  display: flex;
+  justify-content: center;
+  position: absolute;
+
+  background-image: url('../images/time-line-icon.png');
+  background-size: cover;
 }
\ No newline at end of file
diff --git a/src/views/mediaLibrary/exportDialog.vue b/src/views/mediaLibrary/exportDialog.vue
new file mode 100644
index 0000000..e3185dc
--- /dev/null
+++ b/src/views/mediaLibrary/exportDialog.vue
@@ -0,0 +1,133 @@
+<template>
+    <!-- 导出对话框 -->
+    <el-dialog :title="exportTitle" v-model="exportOpen" width="800px" class="my_dialog" align-center
+        :destroy-on-close="true" :close-on-click-modal="false">
+        <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+            <el-tab-pane label="媒体基础信息" name="first">
+                <div class="my_dialog_itemHeader">
+                    <el-row :gutter="10">
+                        <el-col :span="12">选择导出字段</el-col>
+                        <el-col :span="12" style="text-align: right;">
+                            <el-checkbox class="checkAllChose" v-model="checkAll" :indeterminate="isIndeterminate"
+                                @change="handleCheckAllChange">
+                                全选
+                            </el-checkbox>
+                        </el-col>
+                    </el-row>
+                </div>
+
+                <el-checkbox-group class="checkAllChose" style="margin: 30px 0;" v-model="checkedCities"
+                    @change="handleCheckedCitiesChange">
+                    <el-checkbox v-for="city in cities" :key="city.value" :label="city.label" :value="city.value">
+                        {{ city.label }}
+                    </el-checkbox>
+                </el-checkbox-group>
+
+                <div class="my_dialog_itemHeader">附件选项</div>
+                <el-checkbox-group class="checkAllChose" style="margin: 30px 0;" v-model="checkedCities2"
+                    @change="handleCheckedCitiesChange2">
+                    <el-checkbox v-for="city in cities2" :key="city.value" :label="city.label" :value="city.value">
+                        {{ city.label }}
+                    </el-checkbox>
+                </el-checkbox-group>
+            </el-tab-pane>
+            <el-tab-pane label="媒体报价信息" name="second">
+                <div class="my_dialog_itemHeader">
+                    <el-row :gutter="10">
+                        <el-col :span="12">选择导出字段</el-col>
+                        <el-col :span="12" style="text-align: right;">
+                            <el-checkbox class="checkAllChose" v-model="checkAll" :indeterminate="isIndeterminate"
+                                @change="handleCheckAllChange">
+                                全选
+                            </el-checkbox>
+                        </el-col>
+                    </el-row>
+                </div>
+
+                <el-checkbox-group class="checkAllChose" style="margin: 30px 0;" v-model="checkedCities"
+                    @change="handleCheckedCitiesChange">
+                    <el-checkbox v-for="city in cities" :key="city.value" :label="city.label" :value="city.value">
+                        {{ city.label }}
+                    </el-checkbox>
+                </el-checkbox-group>
+            </el-tab-pane>
+        </el-tabs>
+
+        <template #footer>
+            <div class="dialog-footer">
+                <el-button class="my-cancel-btn" @click="exportOpen = false">取 消</el-button>
+                <el-button class="my-confirm-btn" type="primary" @click="handleSubmitExport">确 定</el-button>
+            </div>
+        </template>
+    </el-dialog>
+</template>
+<script setup name="Post">
+import { onMounted, ref } from 'vue';
+
+const exportTitle = ref('导出')
+const exportOpen = ref(false)
+const activeName = ref('first')
+
+const checkAll = ref(false)
+const isIndeterminate = ref(true)
+const checkedCities = ref(['Shanghai'])
+const cities = [
+    { label: '字段名', value: 'Shanghai' },
+    { label: '字段名', value: 'begnjing' },
+    { label: '字段名', value: 'chongq' },
+    { label: '字段名', value: 'sdag' },
+    { label: '字段名', value: 'Shanghai1' },
+    { label: '字段名', value: 'begnjing2' },
+    { label: '字段名', value: 'chongq3' },
+    { label: '字段名', value: 'sdag4' },
+    { label: '字段名', value: 'Shanghai5' },
+    { label: '字段名', value: 'begnjing6' },
+    { label: '字段名', value: 'chongq7' },
+    { label: '字段名', value: 'sdag8' },
+    { label: '字段名', value: 'Shanghai9' },
+    { label: '字段名', value: 'begnjing10' },
+    { label: '字段名', value: 'chongq11' },
+    { label: '字段名', value: 'sdag12' },
+]
+
+
+const checkedCities2 = ref([])
+const cities2 = [
+    { label: '包含附件', value: 'fujian' },
+]
+
+// 全选操作
+const handleCheckAllChange = (val) => {
+    checkedCities.value = []
+    if (val) {
+        cities.forEach(element => {
+            checkedCities.value.push(element.value)
+        });
+    }
+    isIndeterminate.value = false
+}
+// 单个选择字段
+const handleCheckedCitiesChange = (value) => {
+    console.log('单选操作', value)
+    const checkedCount = value.length
+    checkAll.value = checkedCount === cities.length
+    isIndeterminate.value = checkedCount > 0 && checkedCount < cities.length
+}
+// 选择附件
+const handleCheckedCitiesChange2 = (value) => {
+
+}
+// 切换选项卡
+const handleClick = (tab, event) => {
+    console.log(tab, event)
+    activeName.value = tab
+}
+const handleSubmitExport = () => {
+
+}
+
+// 暴露方法\属性给父组件
+defineExpose({
+    exportOpen,
+});
+</script>
\ No newline at end of file
diff --git a/src/views/mediaLibrary/index.vue b/src/views/mediaLibrary/index.vue
index 4852a44..9e55da5 100644
--- a/src/views/mediaLibrary/index.vue
+++ b/src/views/mediaLibrary/index.vue
@@ -198,7 +198,7 @@
                                 <img :src="otherbg" />
                                 <template #reference>
                                     <span class="mediaNameLabel" @click="handleOpenDetail">{{ scope.row.mediaName
-                                    }}</span>
+                                        }}</span>
                                 </template>
                             </el-popover>
 
@@ -277,6 +277,7 @@
         <history-data ref="historyDataRef" />
         <down-files ref="downFileRef" />
         <view-file-dialog ref="viewFileRef" />
+        <export-dialog ref="exportDialogRef" />
 
         <!-- 废除对话框 -->
         <el-dialog title="废除" v-model="abolishOpen" width="650px" class="my_dialog" align-center
@@ -330,7 +331,24 @@
                     {{ tag.mediaName }}
                 </el-tag>
             </div>
-            <div class="my_dialog_itemHeader">选择需要写入方案的媒体字段</div>
+            <div class="my_dialog_itemHeader">
+                <el-row :gutter="10">
+                    <el-col :span="12">选择需要写入方案的媒体字段</el-col>
+                    <el-col :span="12" style="text-align: right;">
+                        <el-checkbox class="checkAllChose" v-model="checkAll" :indeterminate="isIndeterminate"
+                            @change="handleCheckAllChange">
+                            全选
+                        </el-checkbox>
+                    </el-col>
+                </el-row>
+            </div>
+
+            <el-checkbox-group class="checkAllChose" style="margin-top: 30px;" v-model="checkedCities"
+                @change="handleCheckedCitiesChange">
+                <el-checkbox v-for="city in cities" :key="city.value" :label="city.label" :value="city.value">
+                    {{ city.label }}
+                </el-checkbox>
+            </el-checkbox-group>
             <template #footer>
                 <div class="dialog-footer">
                     <el-button class="my-cancel-btn" @click="exportPPT.open = false">取 消</el-button>
@@ -358,6 +376,7 @@ import mediaLogs from "./mediaLogs.vue";
 import historyData from "./historyData.vue"
 import downFiles from './downFiles.vue';
 import viewFileDialog from '@/components/ViewFile/index.vue'
+import exportDialog from './exportDialog.vue';
 
 const bgStore = useBackgroundStore()
 const { proxy } = getCurrentInstance()
@@ -383,6 +402,30 @@ const abolishOpen = ref(false)
 const historyDataRef = ref(null)
 const downFileRef = ref(null)
 const viewFileRef = ref(null)
+const exportDialogRef = ref(null)
+// 导出PPT勾选字段
+const checkAll = ref(false)
+const isIndeterminate = ref(true)
+const checkedCities = ref(['Shanghai'])
+const cities = [
+    { label: '字段名', value: 'Shanghai' },
+    { label: '字段名', value: 'begnjing' },
+    { label: '字段名', value: 'chongq' },
+    { label: '字段名', value: 'sdag' },
+    { label: '字段名', value: 'Shanghai1' },
+    { label: '字段名', value: 'begnjing2' },
+    { label: '字段名', value: 'chongq3' },
+    { label: '字段名', value: 'sdag4' },
+    { label: '字段名', value: 'Shanghai5' },
+    { label: '字段名', value: 'begnjing6' },
+    { label: '字段名', value: 'chongq7' },
+    { label: '字段名', value: 'sdag8' },
+    { label: '字段名', value: 'Shanghai9' },
+    { label: '字段名', value: 'begnjing10' },
+    { label: '字段名', value: 'chongq11' },
+    { label: '字段名', value: 'sdag12' },
+]
+
 
 // 归属选项
 const supplierList = ref([])
@@ -607,13 +650,33 @@ const handleViewPhoto = () => {
 
 /** 导出Excel按钮操作 */
 const handleExportExcel = () => {
-
+    exportDialogRef.value.exportOpen = true
+    nextTick(() => {
+        // historyDataRef.value.initHistoryCharLine()
+    })
 }
 /** 导出PPT按钮操作 */
 const handleExportPPT = (key) => {
     exportPPT.title = '导出PPT'
     exportPPT.open = true
 }
+// 全选操作
+const handleCheckAllChange = (val) => {
+    checkedCities.value = []
+    if (val) {
+        cities.forEach(element => {
+            checkedCities.value.push(element.value)
+        });
+    }
+    isIndeterminate.value = false
+}
+// 单个选择字段
+const handleCheckedCitiesChange = (value) => {
+    console.log('单选操作', value)
+    const checkedCount = value.length
+    checkAll.value = checkedCount === cities.length
+    isIndeterminate.value = checkedCount > 0 && checkedCount < cities.length
+}
 // 导出ppt实现代码
 const handleSubmitExportPPT = () => {
     exportPPT.open = false
@@ -725,11 +788,43 @@ onMounted(() => {
 .chosedMediaNamsConter {
     width: 100%;
     min-height: 60px;
-    border-radius: 4px;
     background: #ffffff;
-    border: 1px solid #EEEEEE;
-    margin-top: 10px;
-    margin-bottom: 30px;
     padding: 10px 0;
 }
+
+.checkAllChose .el-checkbox__label {
+    display: inline-block;
+    font-size: var(--el-checkbox-font-size);
+    line-height: 1;
+    padding-left: 8px;
+    font-family: Microsoft YaHei;
+    font-weight: 400;
+    font-size: 16px;
+    color: #1E1E1E;
+}
+
+.checkAllChose .el-checkbox__input.is-checked .el-checkbox__inner,
+.checkAllChose .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+    background-color: #1A75E6;
+    border-color: #1A75E6;
+}
+
+.checkAllChose .el-checkbox__inner {
+    background: #ffffff;
+    border: 1px solid #ACACAC;
+    border-radius: 2px;
+    box-sizing: border-box;
+    display: inline-block;
+    height: 16px;
+    width: 16px;
+}
+
+.checkAllChose .el-checkbox__inner:after {
+    height: 8px;
+    left: 5px;
+}
+
+.checkAllChose .el-checkbox__input.is-checked+.el-checkbox__label {
+    color: #1E1E1E;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/mediaLibrary/mediaLogs.vue b/src/views/mediaLibrary/mediaLogs.vue
index 868bf6c..717aeac 100644
--- a/src/views/mediaLibrary/mediaLogs.vue
+++ b/src/views/mediaLibrary/mediaLogs.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-card class="myDetailCard">
+    <el-card class="myLogCard">
         <template #header>
             <div class="card-header">
                 <span>媒体日志</span>
@@ -8,7 +8,7 @@
                 </el-icon>
             </div>
         </template>
-        <el-row :gutter="10" class="my_row">
+        <el-row :gutter="10" class="my_row" style="margin-top: 0;">
             <el-col :span="12">
                 <el-form :inline="true" class="searchInputForm">
                     <el-form-item label="">
@@ -24,13 +24,15 @@
             <el-col :span="12" style="text-align: right;">
                 <el-button-group>
                     <el-button v-for="(item, index) in ToolOptions" :key="index"
-                        :type="activeIndex === index ? 'primary' : 'default'" :icon="item"
-                        @click="activeIndex = index" />
+                        :type="activeIndex === index ? 'primary' : 'default'" @click="activeIndex = index">
+                        <img v-if="index == 0" :src="activeIndex === index ? item.activeIcon : item.defaultIcon" />
+                        <img v-if="index == 1" :src="activeIndex === index ? item.activeIcon : item.defaultIcon" />
+                    </el-button>
                 </el-button-group>
             </el-col>
         </el-row>
 
-        <el-table v-if="activeIndex == 0" v-loading="loading" :data="activities" height="calc(100vh - 267px)">
+        <el-table v-if="activeIndex == 0" v-loading="loading" :data="activities" height="calc(100vh - 250px)">
             <el-table-column label="序号" align="center" width="80">
                 <template #default="scope">
                     {{ scope.$index + 1 }}
@@ -39,16 +41,53 @@
             <el-table-column label="供应商名称" align="left" prop="supplierName" width="230" :show-overflow-tooltip="true" />
             <el-table-column label="操作类型" align="left" prop="type" width="100" :show-overflow-tooltip="true" />
             <el-table-column label="操作人" align="center" prop="user" width="160" :show-overflow-tooltip="true" />
-            <el-table-column label="操作时间" align="center" prop="timestamp" width="150"
-                :show-overflow-tooltip="true" />
-            <el-table-column label="变更字段" align="center" prop="content" min-width="210"
-                :show-overflow-tooltip="true" /> 
+            <el-table-column label="操作时间" align="center" prop="timestamp" width="150" :show-overflow-tooltip="true" />
+            <el-table-column label="变更字段" align="left" prop="content" min-width="210" >
+                <template #default="scope">
+                    <el-popover popper-class="myUpdate_popover" placement="bottom-start">
+                        <el-table :data="detailTable" height="230px">
+                            <el-table-column label="字段名称" align="left" prop="type" min-width="100"
+                                :show-overflow-tooltip="true" />
+                            <el-table-column label="变更前" align="left" prop="type" min-width="100"
+                                :show-overflow-tooltip="true" />
+                            <el-table-column label="变更后" align="left" prop="type" min-width="100"
+                                :show-overflow-tooltip="true" />
+                        </el-table>
+                        <template #reference>
+                            <span class="updatefiter" @click="handleOpenDetail(scope.row.supplierId)">{{
+                                scope.row.content
+                                }}</span>
+                        </template>
+                    </el-popover>
+                </template>
+            </el-table-column>
         </el-table>
         <div v-if="activeIndex == 1">
-            <el-timeline style="padding-left: 0;">
-                <el-timeline-item v-for="(activity, index) in activities" :key="index"
-                    :timestamp="activity.user + '于' + activity.timestamp + activity.type">
-                    <div> 变更字段：{{ activity.content }}</div> 
+            <el-timeline class="my-time-line" style="padding-left: 0;">
+                <el-timeline-item v-for="(activity, index) in activities" :key="index" placement="top"
+                    :timestamp="activity.timestamp">
+                    <div class="logsTitle mb20"><span class="mr10">{{ activity.user }}</span><span>{{ activity.type
+                    }}</span>
+                    </div>
+                    <ul class="defaultUL">
+                        <li>
+                            <span class="logsLable">变更字段：</span>
+                            <el-popover popper-class="myUpdate_popover" placement="bottom-start">
+                                <el-table :data="detailTable" height="230px">
+                                    <el-table-column label="字段名称" align="left" prop="type" min-width="100"
+                                        :show-overflow-tooltip="true" />
+                                    <el-table-column label="变更前" align="left" prop="type" min-width="100"
+                                        :show-overflow-tooltip="true" />
+                                    <el-table-column label="变更后" align="left" prop="type" min-width="100"
+                                        :show-overflow-tooltip="true" />
+                                </el-table>
+                                <template #reference>
+                                    <span class="updatefiter">{{ activity.content }}</span>
+                                </template>
+                            </el-popover>
+
+                        </li>
+                    </ul>
                 </el-timeline-item>
             </el-timeline>
         </div>
@@ -57,19 +96,28 @@
 <script setup>
 import { onMounted, defineEmits, ref } from 'vue'
 import { Close, Grid, Calendar } from '@element-plus/icons-vue'
+
+import iconList from '@/assets/images/iconList.png'
+import iconTimeLine from '@/assets/images/iconTimeLine.png'
+import iconListChose from '@/assets/images/iconListChose.png'
+import iconTimeLineChose from '@/assets/images/iconTimeLineChose.png'
 import { getBusSupplier } from "@/api/supplier"
 
 const emit = defineEmits(['handleShowList']);
-const ToolOptions = ref([Grid, Calendar])
+const ToolOptions = ref([
+    { defaultIcon: iconList, activeIcon: iconListChose },
+    { defaultIcon: iconTimeLine, activeIcon: iconTimeLineChose }
+])
 const activeIndex = ref(0)
 const supplierLogList = ref([])
+const detailTable = ref([])
 const loading = ref(false)
 const queryParams = ref({
     keyword: undefined
 })
 
 const activities = [{
-    content: '其他: ; 年营收金额: ; 供应商所在城市: 山西/长治市/东湖区; 税点: ; 合作采购金额: 0.0; 联系人职务: ; 发票类型: ; 不良记录信息: ; 邮箱: ; ',
+    content: '其他: ; 年营收金额: ; 供应商所在城市: 山西/长治市/东湖区; 税点: ; 合作采购金额: 0.0; 联系人职务: ; 发票类型: ; 不良记录信息: ; 邮箱: ;其他: ; 年营收金额: ; 供应商所在城市: 山西/长治市/东湖区; 税点: ; 合作采购金额: 0.0; 联系人职务: ; 发票类型: ; 不良记录信息: ; 邮箱: ; ',
     content2: '其他: ; 年营收金额: 待定; 供应商所在城市: 山西/长治市; 税点: 待定; 合作采购金额: 0; 联系人职务: 待定; 发票类型: 暂定; 不良记录信息: ; 邮箱: ; ',
     timestamp: '2018-04-15',
     user: '优客传媒管理员',
@@ -117,21 +165,73 @@ const handleClose = () => {
 .el-button-group>.el-button {
     float: left;
     position: relative;
-    height: 38px;
-    border: 1px solid #DFDFDF;
-    background: #ffffff;
-    font-family: Microsoft YaHei;
-    font-weight: 400;
-    font-size: 18px;
-    text-align: center;
-    color: #000000;
+    height: 30px;
+    border: 1px solid #9C9C9C;
+    border-radius: 15px;
+    background: #9c9c9c1a;
 }
 
 .el-button-group>.el-button--primary {
-    background: #1f1f1f;
+    background: #1a75e61a;
+    border: 1px solid #1A75E6;
+    border-radius: 15px;
+}
+
+.el-button-group .el-button--primary:last-child {
+    border-left-color: #1A75E6;
+}
+
+.el-button-group .el-button--primary:first-child {
+    border-right-color: #1A75E6;
+}
+
+.updatefiter {
     font-family: Microsoft YaHei;
-    font-weight: 600;
-    color: #FFFFFF;
-    border: 1px solid #1f1f1f;
+    font-weight: 400;
+    font-size: 16px;
+    color: #1A75E6;
+    cursor: pointer;
+}
+
+.updatefiter:hover {
+    text-decoration: underline solid #1A75E6 1px;
+    text-underline-offset: 4px;
+}
+
+.logsTitle {
+    font-family: Microsoft YaHei;
+    font-weight: 400;
+    font-size: 16px;
+    color: #636262;
+}
+
+.defaultUL {
+    list-style: none;
+    padding-left: 0px;
+    font-family: Microsoft YaHei;
+    font-weight: 400;
+    font-size: 16px;
+}
+
+.defaultUL li {
+    line-height: 24px;
+}
+
+.defaultUL li::before {
+    content: "•";
+    color: #1A75E6;
+    font-weight: bold;
+    display: inline-block;
+    width: 6px;
+    height: 6px;
+    margin-right: 10px;
+}
+
+.logsLable {
+    color: #00316E;
+}
+
+.logsValue {
+    color: #1A75E6;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/supplier/supplierLogs.vue b/src/views/supplier/supplierLogs.vue
index a4e7e7e..c8ab4d3 100644
--- a/src/views/supplier/supplierLogs.vue
+++ b/src/views/supplier/supplierLogs.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-card class="myDetailCard">
+    <el-card class="myLogCard">
         <template #header>
             <div class="card-header">
                 <span>供应商日志</span>
@@ -8,7 +8,7 @@
                 </el-icon>
             </div>
         </template>
-        <el-row :gutter="10" class="my_row">
+        <el-row :gutter="10" class="my_row" style="margin-top: 0;">
             <el-col :span="12">
                 <el-form :inline="true" class="searchInputForm">
                     <el-form-item label="">
@@ -24,13 +24,15 @@
             <el-col :span="12" style="text-align: right;">
                 <el-button-group>
                     <el-button v-for="(item, index) in ToolOptions" :key="index"
-                        :type="activeIndex === index ? 'primary' : 'default'" :icon="item"
-                        @click="activeIndex = index" />
+                        :type="activeIndex === index ? 'primary' : 'default'" @click="activeIndex = index">
+                        <img v-if="index == 0" :src="activeIndex === index ? item.activeIcon : item.defaultIcon" />
+                        <img v-if="index == 1" :src="activeIndex === index ? item.activeIcon : item.defaultIcon" />
+                    </el-button>
                 </el-button-group>
             </el-col>
         </el-row>
 
-        <el-table v-if="activeIndex == 0" v-loading="loading" :data="activities" height="calc(100vh - 267px)">
+        <el-table v-if="activeIndex == 0" v-loading="loading" :data="activities" height="calc(100vh - 250px)">
             <el-table-column label="序号" align="center" width="80">
                 <template #default="scope">
                     {{ scope.$index + 1 }}
@@ -39,16 +41,53 @@
             <el-table-column label="供应商名称" align="left" prop="supplierName" width="230" :show-overflow-tooltip="true" />
             <el-table-column label="操作类型" align="left" prop="type" width="100" :show-overflow-tooltip="true" />
             <el-table-column label="操作人" align="center" prop="user" width="160" :show-overflow-tooltip="true" />
-            <el-table-column label="操作时间" align="center" prop="timestamp" width="150"
-                :show-overflow-tooltip="true" />
-            <el-table-column label="变更字段" align="center" prop="content" min-width="210"
-                :show-overflow-tooltip="true" /> 
+            <el-table-column label="操作时间" align="center" prop="timestamp" width="150" :show-overflow-tooltip="true" />
+            <el-table-column label="变更字段" align="center" prop="content" min-width="210" :show-overflow-tooltip="true">
+                <template #default="scope">
+                    <el-popover popper-class="myUpdate_popover" placement="bottom-start">
+                        <el-table :data="detailTable" height="230px">
+                            <el-table-column label="字段名称" align="left" prop="type" min-width="100"
+                                :show-overflow-tooltip="true" />
+                            <el-table-column label="变更前" align="left" prop="type" min-width="100"
+                                :show-overflow-tooltip="true" />
+                            <el-table-column label="变更后" align="left" prop="type" min-width="100"
+                                :show-overflow-tooltip="true" />
+                        </el-table>
+                        <template #reference>
+                            <span class="updatefiter" @click="handleOpenDetail(scope.row.supplierId)">{{
+                                scope.row.content
+                                }}</span>
+                        </template>
+                    </el-popover>
+                </template>
+            </el-table-column>
         </el-table>
         <div v-if="activeIndex == 1">
-            <el-timeline style="padding-left: 0;">
-                <el-timeline-item v-for="(activity, index) in activities" :key="index"
-                    :timestamp="activity.user + '于' + activity.timestamp + activity.type">
-                    <div> 变更字段：{{ activity.content }}</div> 
+            <el-timeline class="my-time-line" style="padding-left: 0;">
+                <el-timeline-item v-for="(activity, index) in activities" :key="index" placement="top"
+                    :timestamp="activity.timestamp">
+                    <div class="logsTitle mb20"><span class="mr10">{{ activity.user }}</span><span>{{ activity.type
+                    }}</span>
+                    </div>
+                    <ul class="defaultUL">
+                        <li>
+                            <span class="logsLable">变更字段：</span>
+                            <el-popover popper-class="myUpdate_popover" placement="bottom-start">
+                                <el-table :data="detailTable" height="230px">
+                                    <el-table-column label="字段名称" align="left" prop="type" min-width="100"
+                                        :show-overflow-tooltip="true" />
+                                    <el-table-column label="变更前" align="left" prop="type" min-width="100"
+                                        :show-overflow-tooltip="true" />
+                                    <el-table-column label="变更后" align="left" prop="type" min-width="100"
+                                        :show-overflow-tooltip="true" />
+                                </el-table>
+                                <template #reference>
+                                    <span class="updatefiter">{{ activity.content }}</span>
+                                </template>
+                            </el-popover>
+
+                        </li>
+                    </ul>
                 </el-timeline-item>
             </el-timeline>
         </div>
@@ -57,19 +96,28 @@
 <script setup>
 import { onMounted, defineEmits, ref } from 'vue'
 import { Close, Grid, Calendar } from '@element-plus/icons-vue'
+
+import iconList from '@/assets/images/iconList.png'
+import iconTimeLine from '@/assets/images/iconTimeLine.png'
+import iconListChose from '@/assets/images/iconListChose.png'
+import iconTimeLineChose from '@/assets/images/iconTimeLineChose.png'
 import { getBusSupplier } from "@/api/supplier"
 
 const emit = defineEmits(['handleShowList']);
-const ToolOptions = ref([Grid, Calendar])
+const ToolOptions = ref([
+    { defaultIcon: iconList, activeIcon: iconListChose },
+    { defaultIcon: iconTimeLine, activeIcon: iconTimeLineChose }
+])
 const activeIndex = ref(0)
 const supplierLogList = ref([])
+const detailTable = ref([])
 const loading = ref(false)
 const queryParams = ref({
     keyword: undefined
 })
 
 const activities = [{
-    content: '其他: ; 年营收金额: ; 供应商所在城市: 山西/长治市/东湖区; 税点: ; 合作采购金额: 0.0; 联系人职务: ; 发票类型: ; 不良记录信息: ; 邮箱: ; ',
+    content: '其他: ; 年营收金额: ; 供应商所在城市: 山西/长治市/东湖区; 税点: ; 合作采购金额: 0.0; 联系人职务: ; 发票类型: ; 不良记录信息: ; 邮箱: ;其他: ; 年营收金额: ; 供应商所在城市: 山西/长治市/东湖区; 税点: ; 合作采购金额: 0.0; 联系人职务: ; 发票类型: ; 不良记录信息: ; 邮箱: ; ',
     content2: '其他: ; 年营收金额: 待定; 供应商所在城市: 山西/长治市; 税点: 待定; 合作采购金额: 0; 联系人职务: 待定; 发票类型: 暂定; 不良记录信息: ; 邮箱: ; ',
     timestamp: '2018-04-15',
     user: '优客传媒管理员',
@@ -117,21 +165,73 @@ const handleClose = () => {
 .el-button-group>.el-button {
     float: left;
     position: relative;
-    height: 38px;
-    border: 1px solid #DFDFDF;
-    background: #ffffff;
-    font-family: Microsoft YaHei;
-    font-weight: 400;
-    font-size: 18px;
-    text-align: center;
-    color: #000000;
+    height: 30px;
+    border: 1px solid #9C9C9C;
+    border-radius: 15px;
+    background: #9c9c9c1a;
 }
 
 .el-button-group>.el-button--primary {
-    background: #1f1f1f;
+    background: #1a75e61a;
+    border: 1px solid #1A75E6;
+    border-radius: 15px;
+}
+
+.el-button-group .el-button--primary:last-child {
+    border-left-color: #1A75E6;
+}
+
+.el-button-group .el-button--primary:first-child {
+    border-right-color: #1A75E6;
+}
+
+.updatefiter {
     font-family: Microsoft YaHei;
-    font-weight: 600;
-    color: #FFFFFF;
-    border: 1px solid #1f1f1f;
+    font-weight: 400;
+    font-size: 16px;
+    color: #1A75E6;
+    cursor: pointer;
+}
+
+.updatefiter:hover {
+    text-decoration: underline solid #1A75E6 1px;
+    text-underline-offset: 4px;
+}
+
+.logsTitle {
+    font-family: Microsoft YaHei;
+    font-weight: 400;
+    font-size: 16px;
+    color: #636262;
+}
+
+.defaultUL {
+    list-style: none;
+    padding-left: 0px;
+    font-family: Microsoft YaHei;
+    font-weight: 400;
+    font-size: 16px;
+}
+
+.defaultUL li {
+    line-height: 24px;
+}
+
+.defaultUL li::before {
+    content: "•";
+    color: #1A75E6;
+    font-weight: bold;
+    display: inline-block;
+    width: 6px;
+    height: 6px;
+    margin-right: 10px;
+}
+
+.logsLable {
+    color: #00316E;
+}
+
+.logsValue {
+    color: #1A75E6;
 }
 </style>
\ No newline at end of file