diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..d582484 Binary files /dev/null and b/dist.zip differ diff --git a/src/view/dialog/dialogPush.vue b/src/view/dialog/dialogPush.vue index 4187a53..8418aae 100644 --- a/src/view/dialog/dialogPush.vue +++ b/src/view/dialog/dialogPush.vue @@ -1,387 +1,392 @@ - - - - \ No newline at end of file + .lampMessage { + font-size: 16px; + font-weight: 600; + font-family: PingFangSC, PingFang SC; + letter-spacing: 1px; + color: #ff5959; + width: 100%; + display: flex; + justify-content: flex-end; + margin-top: 17px; + z-index: 10; + } + .bo { + width: 100%; + display: flex; + .title { + margin: 10px auto; + display: flex; + flex-direction: column; + + &_top { + display: flex; + align-items: end; + justify-content: center; + + img { + height: 33px; + width: 33px; + } + + .name { + font-family: PangMenZhengDao, PangMenZhengDao; + font-weight: 600; + font-size: 33px; + color: #ffffff; + line-height: 38px; + text-align: center; + font-style: normal; + letter-spacing: 2px; + background: linear-gradient(180deg, #ffffff 0%, #51ffef 100%); + -webkit-background-clip: text; + /*将设置的背景颜色限制在文字中*/ + -webkit-text-fill-color: transparent; + /*给文字设置成透明*/ + } + } + + &_botton { + margin-top: 5px; + height: 19px; + } + } + } + .progressGreen { + width: 181px; + height: 15px; + margin: 0 auto; + border-radius: 6px; + background: linear-gradient(358deg, #21eda8 0%, #8bffcd 100%); + } + .progressYellow { + width: 181px; + height: 15px; + border: 2px solid #ffe1a5; + margin: 0 auto; + border-radius: 6px; + } + + :deep(.el-table) { + --el-table-bg-color: none; + --el-table-tr-bg-color: none; + --el-table-header-bg-color: none; + background: none; + border: none; + --el-table-text-color: #fff; + --el-table-header-text-color: #fff; + --el-table-border-color: none !important; + font-size: 16px; + } + :deep( + .el-table--striped + .el-table__body + tr.el-table__row--striped + td.el-table__cell + ) { + background: #2f4b74; + } + :deep(.el-table .el-table__cell) { + padding: 18px 0; + } + + // :deep(.el-table th) { + // text-align: center; + // } +} + diff --git a/src/view/dialog/dialogSf.vue b/src/view/dialog/dialogSf.vue index 7424dfb..2341b40 100644 --- a/src/view/dialog/dialogSf.vue +++ b/src/view/dialog/dialogSf.vue @@ -49,28 +49,47 @@ " >
-
概况模型
+
+
+ 概况模型 +
+
+ + +
+
+
+
{{ data.content.bz }}
-
详情描述
+
+
+ 详情描述 +
+
+ + +
+
+
-
输入:
+
输入:
-
对比逻辑:
+
对比逻辑:
-
输出:
+
输出:
{ margin-bottom: 20px; box-sizing: border-box; .item_content_item_title { + width: 100px; + height: 30px; + line-height: 30px; + text-align: center; + background-color: #3287d2; font-weight: 600; font-size: 17px; - width: 100px; margin-right: 10px; + padding: 0 8px; } .item_content_item_content { width: calc(100% - 110px); @@ -304,4 +328,168 @@ const handle = (current) => { display: none; /* Chrome Safari */ } } +.yd_title { + box-sizing: border-box; + width: 98%; + height: 31px; + position: relative; + overflow: hidden; + display: flex; + align-items: center; + justify-content: space-between; + span { + font-size: 23px; + font-weight: 500; + font-family: titleNore; + margin-left: 20px; + color: #fff; + position: relative; + z-index: 1; + width: 500px; + overflow: hidden; /* 超出一行文字自动隐藏 */ + text-overflow: ellipsis; /*文字隐藏后添加省略号*/ + white-space: nowrap; + } + /* 利用伪元素和两个i元素产生4条线 */ + .animate-border { + position: absolute; + top: 0px; + width: 100%; + height: 100%; + &::before, + &::after { + content: ""; + position: absolute; + width: 100%; + height: 2px; + } + i { + position: absolute; + display: inline-block; + height: 100%; + width: 2px; + } + &::before { + top: 0; + left: -100%; + background-image: linear-gradient( + 90deg, + transparent, + #03e9f4, + transparent + ); + + animation: one 4s linear infinite; + } + i:nth-child(1) { + top: -100%; + right: 0; + background-image: linear-gradient( + 180deg, + transparent, + #03e9f4, + transparent + ); + /* 动画名称 动画持续时间 动画渲染函数 动画延迟时间 动画执行次数 */ + animation: two 4s linear 1s infinite; + } + &::after { + bottom: 0; + right: -100%; + background-image: linear-gradient( + -90deg, + transparent, + #03e9f4, + transparent + ); + animation: three 4s linear 2s infinite; + } + i:nth-child(2) { + bottom: -100%; + left: 0; + background-image: linear-gradient( + 360deg, + transparent, + #03e9f4, + transparent + ); + animation: four 4s linear 3s infinite; + } + } + .semi-circle-shadow { + position: absolute; + bottom: -5px; + left: -24px; + width: 22%; + height: 20px; + background: radial-gradient( + circle, + rgba(37, 127, 173, 1) 0%, + rgba(37, 127, 173, 0) 70% + ); + border-radius: 50%; + z-index: 0; + } +} +.yd_title::before { + content: ""; + width: 4px; + height: 4px; + background-color: rgba(0, 229, 255, 1); + border-radius: 50%; + position: absolute; + left: 0; + margin-left: 3px; + z-index: 2; +} +.yd_title::after { + content: ""; + width: 90%; + height: 1px; + background: linear-gradient(to right, #257fad, rgba(37, 127, 173, 0)); + position: absolute; + bottom: 0; + left: 0; + z-index: 0; +} + +@keyframes one { + 0% { + left: -100%; + } + 50%, + 100% { + left: 100%; + } +} + +@keyframes two { + 0% { + top: -100%; + } + 50%, + 100% { + top: 100%; + } +} + +@keyframes three { + 0% { + right: -100%; + } + 50%, + 100% { + right: 100%; + } +} + +@keyframes four { + 0% { + bottom: -100%; + } + 50%, + 100% { + bottom: 100%; + } +} diff --git a/src/view/echart_analyze/rxfx.vue b/src/view/echart_analyze/rxfx.vue index 8e81d46..56e5fda 100644 --- a/src/view/echart_analyze/rxfx.vue +++ b/src/view/echart_analyze/rxfx.vue @@ -32,12 +32,13 @@ const getOption = () => { data.option = { tooltip: { trigger: "axis", - formatter: "{b0}
{a1}:{c1}
{a3}:{c3}", + formatter: "{b0}
{a1}:{c1}", + // formatter: "{b0}
{a1}:{c1}
{a3}:{c3}", }, legend: { data: ["招生数", "报名数"], top: "6%", - right: "35%", + // right: "35%", textStyle: { fontSize: 16, color: "#ffffff", @@ -125,7 +126,7 @@ const getOption = () => { symbolPosition: "end", data: data.zss, symbol: "diamond", - symbolOffset: ["-65%", "-50%"], + symbolOffset: ["0%", "-50%"], symbolSize: [20, 10], itemStyle: { borderColor: "#2fffa4", @@ -160,49 +161,49 @@ const getOption = () => { }, }, }, - { - z: 2, - name: "上部1", - type: "pictorialBar", - symbolPosition: "end", - data: data.bms, - symbol: "diamond", - symbolOffset: ["62%", "-50%"], - symbolSize: [20, 10], - itemStyle: { - borderColor: "#32ffee", - color: "rgba(23, 237, 255, 1)", - }, - }, - { - z: 2, - name: "报名数", - type: "bar", - barGap: 0.3 /*多个并排柱子设置柱子之间的间距*/, - data: data.bms, - barWidth: "30%", - label: { - show: true, - color: "#ffffff", - position: "top", + // { + // z: 2, + // name: "上部1", + // type: "pictorialBar", + // symbolPosition: "end", + // data: data.bms, + // symbol: "diamond", + // symbolOffset: ["62%", "-50%"], + // symbolSize: [20, 10], + // itemStyle: { + // borderColor: "#32ffee", + // color: "rgba(23, 237, 255, 1)", + // }, + // }, + // { + // z: 2, + // name: "报名数", + // type: "bar", + // barGap: 0.3 /*多个并排柱子设置柱子之间的间距*/, + // data: data.bms, + // barWidth: "30%", + // label: { + // show: true, + // color: "#ffffff", + // position: "top", - }, - itemStyle: { - color: { - type: "linear", - x: 0, - x2: 1, - y: 0, - y2: 0, - colorStops: [ - { offset: 0, color: "rgba(23, 237, 255, .7)" }, - { offset: 0.5, color: "rgba(23, 237, 255, .7)" }, - { offset: 0.5, color: "rgba(23, 237, 255, .3)" }, - { offset: 1, color: "rgba(23, 237, 255, .5)" }, - ], - }, - }, - }, + // }, + // itemStyle: { + // color: { + // type: "linear", + // x: 0, + // x2: 1, + // y: 0, + // y2: 0, + // colorStops: [ + // { offset: 0, color: "rgba(23, 237, 255, .7)" }, + // { offset: 0.5, color: "rgba(23, 237, 255, .7)" }, + // { offset: 0.5, color: "rgba(23, 237, 255, .3)" }, + // { offset: 1, color: "rgba(23, 237, 255, .5)" }, + // ], + // }, + // }, + // }, { type: "bar", xAxisIndex: 1, diff --git a/src/view/person/rwTable.vue b/src/view/person/rwTable.vue index 42d28bc..c5f78b5 100644 --- a/src/view/person/rwTable.vue +++ b/src/view/person/rwTable.vue @@ -33,6 +33,7 @@
{ getRegisteredDB(); } else { if (search1.date == null) { - throttle(getDate, 50); + search1.date = ""; + throttle(getRegisteredDB, 50); } else { getRegisteredDB(); console.log(search); } } }; + const searchT1 = (val) => { // console.log(val); // if (val == "name") { diff --git a/src/view/sy_details.vue b/src/view/sy_details.vue index 180896c..3147437 100644 --- a/src/view/sy_details.vue +++ b/src/view/sy_details.vue @@ -448,7 +448,7 @@ const push = reactive({ columns: [ { label: "序号", - property: "xm", + property: "index", width: "90", }, {