Compare commits

..

No commits in common. "34f0b3eba9a8cb3dfc3d8db8de1d85ec5b34b0c3" and "0f81f19da22785842fe0965a70b1aff7af64ed9f" have entirely different histories.

View File

@ -339,11 +339,14 @@
</div> </div>
<div <div
class="flex items-center justify-center w-96 h-48 border-2 border-dashed rounded border-gray-500 overflow-hidden z-[999] fixed bottom-10 right-7" class="flex items-center justify-center w-96 h-48 border-2 border-dashed rounded border-gray-500 overflow-hidden z-[999] fixed bottom-10 right-7"
ref="main9" :class="{ ref="main9"
:class="{
'animate-popup': isAnimating && relationShow, 'animate-popup': isAnimating && relationShow,
'animate-shrink': isAnimating && !relationShow, 'animate-shrink': isAnimating && !relationShow,
'opacity-0 scale-0': !relationShow && !isAnimating 'opacity-0 scale-0': !relationShow && !isAnimating
}" v-show="relationShow || isAnimating" style="transform-origin: bottom right;"> }"
v-show="relationShow || isAnimating"
style="transform-origin: bottom right;">
</div> </div>
@ -502,10 +505,10 @@ const choujianShow = ref(false);
const tousuShow = ref(false); const tousuShow = ref(false);
const zhifaShow = ref(false); const zhifaShow = ref(false);
// //
const littlemonth = ref(0); const littlemonth = ref(-1);
// "" // ""
const yearValue = ref("2024"); const yearValue = ref("2023");
// ""option // ""option
const yearOptions = [ const yearOptions = [
{ {
@ -520,10 +523,6 @@ const yearOptions = [
value: "2023", value: "2023",
label: "2023", label: "2023",
}, },
{
value: "2024",
label: "2024",
},
// //
]; ];
@ -3988,7 +3987,7 @@ const choujianEchartsPinfa = () => {
showSymbol: true, showSymbol: true,
emphasis: { focus: "series" }, emphasis: { focus: "series" },
z: 1, z: 1,
// tooltip: { show: false }, // 线tooltip tooltip: { show: false }, // 线tooltip
}, },
]) ])
.flat(); .flat();
@ -4001,51 +4000,10 @@ const choujianEchartsPinfa = () => {
textStyle: { color: "#00ffff", fontSize: 20, fontWeight: "bold" }, textStyle: { color: "#00ffff", fontSize: 20, fontWeight: "bold" },
top: 5, top: 5,
}, },
// tooltip: {
// trigger: "axis",
// // valueFormatter: (v) => (v == null ? "" : v + "%"),
// valueFormatter: (v) => (v == null ? choujianPinfaData.value[0].prediction + "%" : v + "%"),
// },
tooltip: { tooltip: {
trigger: 'axis', trigger: "axis",
formatter: function (params) { // valueFormatter: (v) => (v == null ? "" : v + "%"),
let ymonth = ""; valueFormatter: (v) => (v == null ? choujianPinfaData.value[0].prediction + "%" : v + "%"),
let result = '';
const dataMap = {};
// 线线
params.forEach(item => {
// console.log(item);
const isPrediction = item.seriesName.includes('预测');
const baseName = isPrediction ? item.seriesName.replace('预测', '') : item.seriesName;
if (!dataMap[baseName]) {
dataMap[baseName] = { value: null, prediction: null };
}
if (isPrediction) {
dataMap[baseName].prediction = item.value;
} else {
dataMap[baseName].value = item.value;
}
ymonth = item.name;
// console.log(ymonth);
});
// tooltip
Object.keys(dataMap).forEach(name => {
const item = dataMap[name];
if (item.prediction && ymonth == "5月") {
result += `${name}: (预测: ${item.prediction}%)`;
} else {
result += `${name}: ${item.value || '0'}%`;
}
result += '<br/>';
});
return result;
},
}, },
legend: { legend: {
data: legendData, data: legendData,
@ -4121,7 +4079,7 @@ const zhifaEchartsPinfa = () => {
showSymbol: true, showSymbol: true,
emphasis: { focus: "series" }, emphasis: { focus: "series" },
z: 1, z: 1,
// tooltip: { show: false }, // 线tooltip tooltip: { show: false }, // 线tooltip
}, },
]) ])
.flat(); .flat();
@ -4134,52 +4092,11 @@ const zhifaEchartsPinfa = () => {
textStyle: { color: "#00ffff", fontSize: 20, fontWeight: "bold" }, textStyle: { color: "#00ffff", fontSize: 20, fontWeight: "bold" },
top: 5, top: 5,
}, },
// tooltip: {
// trigger: "axis",
// valueFormatter: (v) => (v == null ? zhifaPinfaData.value[0].prediction + "%" : v + "%"),
// // formatter: '{b0}: {c0}<br />{b1}: {c1}'
// },
tooltip: { tooltip: {
trigger: 'axis', trigger: "axis",
formatter: function (params) { valueFormatter: (v) => (v == null ? zhifaPinfaData.value[0].prediction + "%" : v + "%"),
let ymonth = ""; // formatter: '{b0}: {c0}<br />{b1}: {c1}'
let result = '';
const dataMap = {};
// 线线
params.forEach(item => {
// console.log(item);
const isPrediction = item.seriesName.includes('预测');
const baseName = isPrediction ? item.seriesName.replace('预测', '') : item.seriesName;
if (!dataMap[baseName]) {
dataMap[baseName] = { value: null, prediction: null };
}
if (isPrediction) {
dataMap[baseName].prediction = item.value;
} else {
dataMap[baseName].value = item.value;
}
ymonth = item.name;
// console.log(ymonth);
});
// tooltip
Object.keys(dataMap).forEach(name => {
const item = dataMap[name];
if (ymonth == "5月") {
result += `${name}: (预测: ${item.prediction}%)`;
} else {
result += `${name}: ${item.value || '0'}%`;
}
result += '<br/>';
});
return result;
},
}, },
legend: { legend: {
data: legendData, data: legendData,
@ -4232,7 +4149,7 @@ const jubaoGaofaData = ref([
tousulv: "2.04%", tousulv: "2.04%",
dengji: "yellow", dengji: "yellow",
}, { }, {
huanjie: "餐饮环节", huanjie: "销售环节",
zhonglei: "虚假宣传", zhonglei: "虚假宣传",
tousulv: "1.97%", tousulv: "1.97%",
dengji: "yellow", dengji: "yellow",
@ -4485,12 +4402,10 @@ const handleFancyClick = (e: MouseEvent) => {
opacity: 0; opacity: 0;
transform: scale(0) translate(0, 0); transform: scale(0) translate(0, 0);
} }
50% { 50% {
opacity: 0.8; opacity: 0.8;
transform: scale(0.8) translate(0, -20px); transform: scale(0.8) translate(0, -20px);
} }
100% { 100% {
opacity: 1; opacity: 1;
transform: scale(1) translate(0, 0); transform: scale(1) translate(0, 0);
@ -4503,12 +4418,10 @@ const handleFancyClick = (e: MouseEvent) => {
opacity: 1; opacity: 1;
transform: scale(1) translate(0, 0); transform: scale(1) translate(0, 0);
} }
50% { 50% {
opacity: 0.8; opacity: 0.8;
transform: scale(0.8) translate(0, -20px); transform: scale(0.8) translate(0, -20px);
} }
100% { 100% {
opacity: 0; opacity: 0;
transform: scale(0) translate(0, 0); transform: scale(0) translate(0, 0);