From c73a2c380aca7ac4ef16e76388b1a52356df8634 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期五, 30 八月 2024 19:01:04 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/tasklist/index.vue | 45
src/views/index.vue | 454 ++++++++-------
src/api/system/user.js | 2
src/views/repositoryai/templateku/configurat/index.vue | 25
src/views/knowledge/questionnaire/compilequer/index.vue | 9
src/views/knowledge/education/index.vue | 49 +
src/api/system/dept.js | 2
src/views/index copy.vue | 929 ++++++++++++++++++++++++++++++++
src/views/patient/propaganda/QuestionnaireTask.vue | 85 --
src/views/system/user/index.vue | 6
src/views/knowledge/questionnaire/index.vue | 4
src/views/knowledge/education/compilequer/index.vue | 8
src/views/patient/propaganda/Missioncreation.vue | 3
src/views/patient/propaganda/particty.vue | 60 +
14 files changed, 1,326 insertions(+), 355 deletions(-)
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index c89329c..d2f933f 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -20,7 +20,7 @@
// 鏌ヨ閮ㄩ棬璇︾粏
export function getDept(deptId) {
return request({
- url: '/system/dept/' + deptId,
+ url: '/system/dept/getInfo' + deptId,
method: 'get'
})
}
diff --git a/src/api/system/user.js b/src/api/system/user.js
index eb6f277..1f33108 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -13,7 +13,7 @@
// 鏌ヨ鐢ㄦ埛璇︾粏
export function getUser(userId) {
return request({
- url: '/system/user/' + parseStrEmpty(userId),
+ url: '/system/user/getInfo/' + parseStrEmpty(userId),
method: 'get'
})
}
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index e569728..ab4f5d7 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -546,6 +546,7 @@
topqueryParams: {
pageNum: 1,
pageSize: 10,
+ type: 3,
userName: undefined,
tagid: undefined,
topic: undefined,
@@ -637,22 +638,24 @@
/** 鏌ヨ浠诲姟鍒楄〃 */
getList() {
this.loading = true;
+ let type = this.$route.query.type;
this.tasktopic = this.$route.query.tasktopic
? this.$route.query.tasktopic
: this.tasktopic;
this.topqueryParams.serviceType = Number(this.tasktopic);
+ this.topqueryParams.type = Number(this.type);
if (this.tasktopic == 1 || this.tasktopic == 7 || this.tasktopic == 6) {
this.topqueryParams.type = 2;
this.TaskOperation.taskType = 2;
} else if (this.tasktopic == 4 || this.tasktopic == 8) {
- this.topqueryParams.type = 1;
+ this.topqueryParams.type = 3;
this.TaskOperation.taskType = 3;
} else if (
this.tasktopic == 2 ||
this.tasktopic == 3 ||
this.tasktopic == 5
) {
- this.topqueryParams.type = 3;
+ this.topqueryParams.type = 1;
this.TaskOperation.taskType = 1;
}
// this.topqueryParams.typename = this.findLabelByValue(
@@ -746,7 +749,7 @@
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
- if (this.topqueryParams.type == 3) {
+ if (this.topqueryParams.type == 1) {
this.$router.push({
path: "/followvisit/particty",
query: {
@@ -762,7 +765,7 @@
serviceType: this.tasktopic,
},
});
- } else if (this.topqueryParams.type == 1) {
+ } else if (this.topqueryParams.type == 3) {
this.$router.push({
path: "/followvisit/Missioncreation",
query: {
@@ -774,29 +777,32 @@
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
- // this.$router.push({
- // path: "/followvisit/particty",
- // query: { type: this.tasktopic, id: row.taskid },
- // });
- if (
- this.tasktopic == 2 ||
- this.tasktopic == 3 ||
- this.tasktopic == 4 ||
- this.tasktopic == 5
- ) {
+ if (this.topqueryParams.type == 1) {
this.$router.push({
path: "/followvisit/particty",
- query: { type: 1, id: row.taskid },
+ query: {
+ id: row.taskid,
+ type: this.topqueryParams.type,
+ serviceType: this.tasktopic,
+ },
});
- } else if (this.tasktopic == 6) {
+ } else if (this.topqueryParams.type == 2) {
this.$router.push({
path: "/followvisit/QuestionnaireTask",
- query: { type: 2, id: row.taskid },
+ query: {
+ id: row.taskid,
+ type: this.topqueryParams.type,
+ serviceType: this.tasktopic,
+ },
});
- } else if (this.tasktopic == 1) {
+ } else if (this.topqueryParams.type == 3) {
this.$router.push({
path: "/followvisit/Missioncreation",
- query: { type: 3, id: row.taskid },
+ query: {
+ id: row.taskid,
+ type: this.topqueryParams.type,
+ serviceType: this.tasktopic,
+ },
});
}
},
@@ -806,7 +812,6 @@
sponsor(row) {
console.log(row, "浠诲姟淇℃伅");
this.taskform = row;
- console.log(12);
if (this.taskform.showDate && this.taskform.sendType != 2) {
this.taskform.showDate = this.taskform.showDate.split(",");
}
diff --git a/src/views/index copy.vue b/src/views/index copy.vue
new file mode 100644
index 0000000..cf19982
--- /dev/null
+++ b/src/views/index copy.vue
@@ -0,0 +1,929 @@
+<template>
+ <div id="home">
+ <div class="home" style="margin-top: 40px; margin-left: 20px">
+ <!-- 澶撮儴涓や釜 -->
+ <el-row :gutter="20">
+ <el-col :span="11">
+ <!-- 灏辫瘖缁熻鐩掑瓙 -->
+ <div class="grid-content bg-purple headerBox bgc1">
+ <div class="title">
+ 鎮h�呯粺璁�<span
+ style="
+ font-size: 25px;
+ font-weight: 600;
+ text-shadow: 2px 4px 7px rgb(85 132 255 / 50%);
+ color: black;
+ "
+ >12322 (浜�)</span
+ >
+ <span>{{ endatd }} ~ {{ statd }}</span>
+ </div>
+ <el-row :gutter="20">
+ <el-col :span="8">
+ <div class="home-user-task-stats">
+ <p>{{ 11231 }}</p>
+ <div class="text-color2">
+ <p>闂ㄨ瘖鎬绘暟锛堜汉锛�</p>
+ </div>
+ </div>
+ </el-col>
+ <el-col :span="7">
+ <div class="home-user-task-stats">
+ <p>{{ 9207 }}</p>
+ <div class="text-color2">
+ <p>浣忛櫌鎬绘暟锛堜汉锛�</p>
+ </div>
+ </div>
+ </el-col>
+ <el-col :span="7">
+ <div class="home-user-task-stats">
+ <p>{{ 1209 }}</p>
+ <div class="text-color2">
+ <p>浣撴鎬绘暟锛堜汉锛�</p>
+ </div>
+ </div>
+ </el-col>
+ </el-row>
+ </div>
+ </el-col>
+ <el-col :span="9">
+ <div class="grid-content bg-purple headerBox bgc2">
+ <div class="title">
+ 闂ㄨ瘖鏈嶅姟鎬绘暟
+ <span
+ style="
+ font-size: 25px;
+ text-shadow: 2px 4px 7px rgb(255 99 85 / 50%);
+ font-weight: 600;
+ color: red;
+ "
+ >12322 (浜�)</span
+ >
+ <span>{{ endatd }} ~ {{ statd }}</span>
+ </div>
+ <el-row :gutter="20">
+ <el-col :span="12">
+ <div class="home-user-task-stats">
+ <p style="color: red">{{ 3453 }}</p>
+ </div>
+ <div class="text-color2">
+ <p>浣忛櫌鏈嶅姟浜烘暟</p>
+ </div>
+ </el-col>
+ <el-col :span="12">
+ <div class="home-user-task-stats">
+ <p style="color: red">{{ 4213 }}</p>
+ <div class="text-color2">
+ <p>浣撴鏈嶅姟浜烘暟</p>
+ </div>
+ </div>
+ </el-col>
+ </el-row>
+ </div>
+ </el-col>
+ </el-row>
+ <!-- 涓棿鍜屽彸杈� -->
+ <el-row :gutter="20">
+ <el-col :span="20">
+ <!-- echars鏁版嵁鍙鍖� -->
+ <div class="grid-content bg-purple" style="min-height: 365px">
+ <div class="title">
+ 灏辫瘖缁熻
+ <span>{{ endatd }} ~ {{ statd }}</span>
+ <el-radio-group
+ v-model="radio1"
+ size="mini"
+ style="margin-left: 390px"
+ @change="changes"
+ >
+ <el-radio-button label="鍛�" @click="dyat = 7"></el-radio-button>
+ <el-radio-button
+ label="鏈�"
+ @click="dyat = 30"
+ ></el-radio-button>
+ <el-radio-button
+ label="骞�"
+ @click="dyat = 360"
+ ></el-radio-button>
+ </el-radio-group>
+ </div>
+ <!-- 涓棿echars -->
+ <div class="boxEchars">
+ <div class="echars1" id="echars"></div>
+ <div class="echars2" id="echars2"></div>
+ </div>
+ </div>
+ </el-col>
+ <!-- 涓棿鍜屽彸杈� -->
+ <el-col :span="4" class="aside">
+ <div class="grid-content bg-purple" style="margin-top: -180px">
+ <div class="title">
+ 鍋ュ悍瀹f暀
+ <span>{{ endatd }} ~ {{ statd }}</span>
+ </div>
+ <div style="max-height: 690px; width: 100%; overflow: auto">
+ <el-table style="width: 100%" :data="SkuTop">
+ <template v-for="(item, index) in SkuTop"></template>
+ <el-table-column
+ prop="order"
+ width="30"
+ style="background: url(~@/assets/order/4.png)"
+ type="index"
+ ></el-table-column>
+ <el-table-column
+ prop="skuName"
+ width="88"
+ class-name="name"
+ ></el-table-column>
+ <el-table-column prop="count" class-name="count">
+ <template slot-scope="scope">
+ {{ scope.row.count }}娆�
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </div>
+ </el-col>
+ </el-row>
+ <!-- 搴曢儴涓�涓� -->
+ <el-row :gutter="20" style="margin-bottom: 20px">
+ <el-col :span="13">
+ <div class="grid-content bg-purple" style="min-height: 300px">
+ <div class="title">
+ 璇婂悗缁熻
+ <span class="el-icon-s-unfold moreIcon"></span>
+ </div>
+ <div class="cooperate">
+ <!-- 鍚堜綔鍖哄煙 -->
+ <div class="pieChart" id="pieCharts"></div>
+ <div class="Points">
+ <p>{{ 122 }}</p>
+ <span>鍏朵腑闅忚骞查浜烘</span>
+ <p>{{ 122 }}</p>
+ <span>闂ㄨ瘖闅忚</span>
+ <p>{{ 122 }}</p>
+ <span>鍑洪櫌闅忚</span>
+ </div>
+ </div>
+ </div>
+ </el-col>
+ <el-col :span="10">
+ <div class="grid-content bg-purple" style="min-height: 300px">
+ <div class="title">
+ 鍚勯」鏈嶅姟缁熻
+ <span class="el-icon-s-unfold moreIcon2"></span>
+ </div>
+ <div class="empenty">
+ <el-row>
+ <el-col :span="4"
+ ><div class="grid-contents bg-purple">璇婄枟棰勭害</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-contents bg-purple-light">123娆�</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-contents bg-purple">杞瘖鏈嶅姟</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-contents bg-purple-light">231娆�</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-contents bg-purple">淇℃伅鎺ㄩ��</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-contents bg-purple-light">900娆�</div></el-col
+ > </el-row
+ ><el-row>
+ <el-col :span="4"
+ ><div class="grid-contents bg-purple">鏍囪瘑涓庡鑸�</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-contents bg-purple-light">23娆�</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-contents bg-purple">
+ 鎮h�呬究鍒╀繚闅滄湇鍔�
+ </div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-contents bg-purple-light">13娆�</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-contents bg-purple">杩滅▼鍖荤枟</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-contents bg-purple-light">31娆�</div></el-col
+ > </el-row
+ ><el-row>
+ <el-col :span="4"
+ ><div class="grid-contents bg-purple">鎮h�呭弽棣�</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-contents bg-purple-light">150浜�</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-contents bg-purple">鎮h�呯鐞�</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-contents bg-purple-light">231浜�</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-contents bg-purple">鍋ュ悍瀹f暀</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-contents bg-purple-light">400</div></el-col
+ >
+ </el-row>
+ <el-row>
+ <el-col :span="4"
+ ><div class="grid-contents bg-purple">鍙嶉鍗犳瘮</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-contents bg-purple-light">23%</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-contents bg-purple">绠$悊鍗犳瘮</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-contents bg-purple-light">32%</div></el-col
+ >
+ </el-row>
+ </div>
+ </div>
+ </el-col>
+ </el-row>
+ </div>
+ </div>
+</template>
+
+<script>
+// import {
+// getUserWork,
+// getregionCollect,
+// getregionOrderCount,
+
+// } from "@/api/home";
+import dayjs from "dayjs";
+
+export default {
+ name: "home",
+ data() {
+ return {
+ NodeCount: "",
+ PrtnerCount: "",
+ NodeCount: "",
+ radio1: "鍛�",
+ ticketStatistics: {},
+ order: "",
+ Count: "",
+ datatni: [],
+ series: [],
+ tableData: [],
+ nodeCollect: [],
+ SkuTop: [],
+ cylinderSeries: [],
+ cylinderXAxis: [],
+ dyat: 30,
+ };
+ },
+
+ computed: {
+ // 鏃堕棿鍖哄煙
+ td() {
+ return dayjs().format("YYYY-MM-DD HH:mm:ss");
+ },
+ atd() {
+ return dayjs().subtract(this.dyat, "day").format("YYYY-MM-DD HH:mm:ss");
+ },
+ statd() {
+ return dayjs().format("YYYY-MM-DD");
+ },
+ endatd() {
+ return dayjs().subtract(this.dyat, "day").format("YYYY-MM-DD");
+ },
+ },
+ created() {
+ this.$nextTick(function () {
+ this.getregionAmountCollect();
+ this.getUserWorks();
+ this.getregionCollect();
+ this.getregionOrderCount();
+ this.getNodeCount();
+ this.getPrtnerCount();
+ this.getnodeCollect();
+ this.getSkuTop();
+ this.getOrderAmount();
+ });
+ },
+ mounted() {},
+ methods: {
+ // 鏀瑰彉鏃堕棿浜嬩欢
+ changes() {
+ if (this.radio1 == "鍛�") {
+ this.dyat = 7;
+ } else if (this.radio1 == "鏈�") {
+ this.dyat = 30;
+ } else {
+ this.dyat = 360;
+ }
+ this.getregionAmountCollect();
+ this.getUserWorks();
+ this.getregionCollect();
+ this.getregionOrderCount();
+ this.getNodeCount();
+ this.getPrtnerCount();
+ this.getnodeCollect();
+ this.getSkuTop();
+ this.getOrderAmount();
+ },
+ // 鏌辩姸鍥�
+ async getOrderAmount() {
+ // const res = await getOrderAmount(this.endatd, this.statd);
+ // this.cylinderXAxis = res.data.xAxis;
+ // this.cylinderSeries = res.data.series;
+ this.cylinderXAxis = [
+ "1鏈�",
+ "2鏈�",
+ "3鏈�",
+ "4鏈�",
+ "5鏈�",
+ "6鏈�",
+ "7鏈�",
+ "8鏈�",
+ ];
+ this.cylinderSeries = [123, 123, 223, 212, 432, 123, 442, 234];
+ this.myEcharts();
+ },
+ // 鑾峰彇鐐逛綅鎬绘暟
+ async getNodeCount() {
+ // const res = await getNodeCount();
+ // this.NodeCount = res.data;
+ },
+ // 鑾峰彇鍚堜綔鍟嗘�绘暟
+ async getPrtnerCount() {
+ // const res = await getPrtnerCount();
+ // this.PrtnerCount = res.data;
+ },
+ // 鍚堜綔鍟嗙偣浣嶆眹鎬荤粺璁¢ゼ鐘跺浘
+ async getnodeCollect() {
+ // const res = await getnodeCollect();
+ // this.nodeCollect = res.data;
+ this.nodeCollect = [
+ { name: "闂ㄨ瘖闅忚", value: 1232 },
+ { name: "鍑洪櫌闅忚", value: 342 },
+ ];
+ this.myPieChart();
+ },
+ // top鎺掕
+ async getSkuTop() {
+ // const res = await getSkuTop(10, this.endatd, this.statd);
+ // this.SkuTop = res.data;
+ this.SkuTop = [
+ { amount: 0, count: 123, skuId: "0", skuName: "蹇冭偤绉�" },
+ { amount: 0, count: 122, skuId: "0", skuName: "鑲捐剰绉�" },
+ { amount: 0, count: 112, skuId: "0", skuName: "娉屽翱绉�" },
+ { amount: 0, count: 111, skuId: "0", skuName: "鐢风" },
+ { amount: 0, count: 102, skuId: "0", skuName: "濡囦骇绉�" },
+ { amount: 0, count: 98, skuId: "0", skuName: "澶栫" },
+ { amount: 0, count: 89, skuId: "0", skuName: "鎬ヨ瘖" },
+ { amount: 0, count: 88, skuId: "0", skuName: "鍣ㄦ绉�" },
+ { amount: 0, count: 87, skuId: "0", skuName: "楠ㄧ" },
+ { amount: 0, count: 67, skuId: "0", skuName: "鏀惧皠绉�" },
+ { amount: 0, count: 89, skuId: "0", skuName: "鎬ヨ瘖" },
+ { amount: 0, count: 88, skuId: "0", skuName: "鍣ㄦ绉�" },
+ { amount: 0, count: 87, skuId: "0", skuName: "楠ㄧ" },
+ { amount: 0, count: 67, skuId: "0", skuName: "鏀惧皠绉�" },
+
+ ];
+ },
+ // 鑾峰彇宸ュ崟鏁伴噺
+ async getUserWorks() {
+ // const res = await getUserWork(this.atd, this.td);
+ // this.ticketStatistics = res.data[0];
+ },
+ // 鑾峰彇灏辫瘖鏁伴噺
+ async getregionOrderCount() {
+ // const res = await getregionOrderCount({
+ // start: this.atd,
+ // end: this.td,
+ // });
+ // this.order = res.data;
+ },
+ // 鑾峰彇鎬婚噺鏁伴噺
+ async getregionCollect() {
+ // const res = await getregionCollect({
+ // start: this.atd,
+ // end: this.td,
+ // });
+ // this.Count = (res.data / 1000000).toFixed(2);
+ },
+
+ // 鏌辩姸鍥�
+ myEcharts() {
+ // 鍩轰簬鍑嗗濂界殑dom锛屽垵濮嬪寲echarts瀹炰緥
+ var echarts = require("echarts");
+ var myChart = echarts.init(document.getElementById("echars2"));
+
+ // 鎸囧畾鍥捐〃鐨勯厤缃」鍜屾暟鎹�
+ var option = {
+ title: {
+ text: "璇婁腑缁熻",
+ },
+ tooltip: {
+ trigger: "axis",
+ },
+ legend: {
+ data: ["闄㈠唴鎺ㄩ��", "瀹f暀瀹屾垚"],
+ },
+ toolbox: {
+ show: true,
+ feature: {
+ dataView: { show: true, readOnly: false },
+ magicType: { show: true, type: ["line", "bar"] },
+ restore: { show: true },
+ saveAsImage: { show: true },
+ },
+ },
+ calculable: true,
+ xAxis: [
+ {
+ type: "category",
+ // prettier-ignore
+ data: ["涓�鏈�","浜屾湀","涓夋湀","鍥涙湀","浜旀湀","鍏湀","涓冩湀","鍏湀","涔濇湀","鍗佹湀"],
+ },
+ ],
+ yAxis: [
+ {
+ type: "value",
+ },
+ ],
+ series: [
+ {
+ name: "闄㈠唴鎺ㄩ��",
+ type: "bar",
+ data: [20, 49, 70, 32, 56, 76, 56, 122, 26, 20, 64, 33],
+ markPoint: {
+ data: [
+ { type: "max", name: "Max" },
+ { type: "min", name: "Min" },
+ ],
+ },
+ markLine: {
+ data: [{ type: "average", name: "Avg" }],
+ },
+ },
+ {
+ name: "瀹f暀瀹屾垚",
+ type: "bar",
+ data: [26, 59, 90, 64, 87, 70, 75, 182, 87, 82, 60, 23],
+ markPoint: {
+ data: [
+ { name: "Max", value: 182, xAxis: 7, yAxis: 183 },
+ { name: "Min", value: 2.3, xAxis: 11, yAxis: 3 },
+ ],
+ },
+ markLine: {
+ data: [{ type: "average", name: "Avg" }],
+ },
+ },
+ ],
+ };
+
+ // 浣跨敤鍒氭寚瀹氱殑閰嶇疆椤瑰拰鏁版嵁鏄剧ず鍥捐〃銆�
+ myChart.setOption(option);
+ },
+ // 鑾峰彇绾跨姸鍥炬椂闂�
+ async getregionAmountCollect() {
+ // const res = await getregionAmountCollect(1, this.endatd, this.statd);
+ // this.xAxis = res.data.xAxis;
+ // this.series = res.data.series;
+ this.xAxis = ["1鏈�", "2鏈�", "3鏈�", "4鏈�", "5鏈�", "6鏈�", "7鏈�", "8鏈�"];
+ this.series = [123, 123, 223, 212, 432, 123, 442, 234];
+ this.myEcharts2();
+ },
+ // 绾挎�у浘
+ myEcharts2() {
+ var echarts = require("echarts");
+ var myChart2 = echarts.init(document.getElementById("echars"));
+ var option2 = {
+ title: {
+ text: "璇婂墠鏁版嵁",
+ },
+ tooltip: {
+ trigger: "axis",
+ },
+ dataset: {
+ source: [
+ ["product", "2018", "2019", "2020", "2021", "2022", "2023"],
+ ["澶嶈瘖", 256, 182, 388, 270, 253, 385],
+ ["浣忛櫌", 351, 451, 355, 353, 373, 468],
+ ["鎵嬫湳", 440, 362, 569, 436, 445, 332],
+ ["杞瘖", 525, 237, 541, 518, 433, 249],
+ ],
+ },
+ xAxis: { type: "category" },
+ yAxis: { gridIndex: 0 },
+ grid: { top: "55%" },
+ series: [
+ {
+ type: "line",
+ smooth: true,
+ seriesLayoutBy: "row",
+ emphasis: { focus: "series" },
+ },
+ {
+ type: "line",
+ smooth: true,
+ seriesLayoutBy: "row",
+ emphasis: { focus: "series" },
+ },
+ {
+ type: "line",
+ smooth: true,
+ seriesLayoutBy: "row",
+ emphasis: { focus: "series" },
+ },
+ {
+ type: "line",
+ smooth: true,
+ seriesLayoutBy: "row",
+ emphasis: { focus: "series" },
+ },
+ {
+ type: "pie",
+ id: "pie",
+ radius: "30%",
+ center: ["50%", "25%"],
+ emphasis: {
+ focus: "self",
+ },
+ label: {
+ formatter: "{b}: {@2018} ({d}%)",
+ },
+ encode: {
+ itemName: "product",
+ value: "2018",
+ tooltip: "2018",
+ },
+ },
+ ],
+ };
+ myChart2.on("updateAxisPointer", function (event) {
+ const xAxisInfo = event.axesInfo[0];
+ if (xAxisInfo) {
+ const dimension = xAxisInfo.value + 1;
+ myChart2.setOption({
+ series: {
+ id: "pie",
+ label: {
+ formatter: "{b}: {@[" + dimension + "]} ({d}%)",
+ },
+ encode: {
+ value: dimension,
+ tooltip: dimension,
+ },
+ },
+ });
+ }
+ });
+ myChart2.setOption(option2);
+ },
+ // 楗肩姸鍥�
+ myPieChart() {
+ // 鍩轰簬鍑嗗濂界殑dom锛屽垵濮嬪寲echarts瀹炰緥
+ var echarts = require("echarts");
+ var mypPieCharts = echarts.init(document.getElementById("pieCharts"));
+
+ // 鎸囧畾鍥捐〃鐨勯厤缃」鍜屾暟鎹�
+ var optionPie = {
+ // title: {
+ // left: "left",
+ // },
+
+ tooltip: {
+ trigger: "item",
+ formatter: "{b}<br/>鎬诲崰姣� : {d}% ",
+ },
+ toolbox: {
+ show: true,
+ feature: {
+ mark: { show: true },
+ },
+ },
+ legend: {
+ top: "5%",
+ left: "center",
+ },
+ series: [
+ {
+ name: "Access From",
+ type: "pie",
+ radius: ["40%", "70%"],
+ avoidLabelOverlap: false,
+ itemStyle: {
+ borderRadius: 10,
+ borderColor: "#fff",
+ borderWidth: 2,
+ },
+
+ emphasis: {
+ label: {
+ show: true,
+ fontSize: 40,
+ fontWeight: "bold",
+ },
+ },
+ labelLine: {
+ show: false,
+ },
+ data: [
+ { value: 580, name: "闂ㄨ瘖闅忚" },
+ { value: 484, name: "鍑洪櫌闅忚" },
+ ],
+ },
+ ],
+ };
+
+ // 浣跨敤鍒氭寚瀹氱殑閰嶇疆椤瑰拰鏁版嵁鏄剧ず鍥捐〃銆�
+ mypPieCharts.setOption(optionPie);
+ },
+ },
+};
+</script>
+
+<style lang="scss" scoped>
+* {
+ padding: 0;
+ margin: 0;
+}
+
+.boxEchars {
+ width: 100%;
+ height: 480px;
+ margin-top: 45px;
+ display: flex;
+ .echars1 {
+ flex: 1;
+ }
+ .echars2 {
+ flex: 1;
+ }
+}
+::v-deep .el-table {
+ td:first-child {
+ .cell {
+ display: inline-block;
+ text-align: center;
+ width: 22px;
+ height: 20px;
+ margin-left: 2px;
+ padding-left: 6px;
+ text-align: center;
+ white-space: nowrap;
+ font-size: 12px;
+ font-family: zihun143-zhengkuchaojihei, zihun143;
+ font-weight: 400;
+ line-height: 14px;
+ background: url(~@/assets/order/4.png) no-repeat;
+ color: #e9b499;
+ }
+ }
+ td:nth-child(2) {
+ .cell {
+ height: 20px;
+ font-size: 14px;
+ font-family: PingFangSC-Medium, PingFang SC;
+ font-weight: 500;
+ color: #333;
+ line-height: 20px;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+ }
+ td:last-child {
+ height: 20px;
+ font-size: 14px;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #737589;
+ line-height: 20px;
+ text-align: right;
+ }
+}
+::v-deep .el-table {
+ tr:nth-child(1) {
+ td:nth-child(1) {
+ .cell {
+ background: url(~@/assets/order/1.png);
+ color: #8e5900;
+ }
+ }
+ }
+ tr:nth-child(2) {
+ td:nth-child(1) {
+ .cell {
+ background: url(~@/assets/order/2.png);
+ color: #494949;
+ }
+ }
+ }
+ tr:nth-child(3) {
+ td:nth-child(1) {
+ .cell {
+ background: url(~@/assets/order/3.png);
+ color: #cf6d3d;
+ }
+ }
+ }
+}
+.moreIcon {
+ font-size: 22px !important;
+ margin-left: 400px !important;
+ color: #5f84ff !important;
+ cursor: pointer;
+}
+.moreIcon2 {
+ font-size: 22px !important;
+ margin-left: 250px !important;
+ color: #5f84ff !important;
+ cursor: pointer;
+}
+.empenty {
+ width: 100%;
+ padding: 20px 0;
+ min-height: 280px;
+}
+.cooperate {
+ width: 100%;
+ height: 280px;
+ margin-top: 25px;
+ display: flex;
+ .pieChart {
+ flex: 3;
+ }
+ .Points {
+ width: 154px;
+ height: 230px;
+ text-align: center;
+ padding: 20px 0;
+ background: linear-gradient(135deg, transparent, #f8f8f9 0) 0 0,
+ linear-gradient(-135deg, transparent 12px, #f8f8f9 0) 100% 0,
+ linear-gradient(-45deg, transparent, #f8f8f9 0) 100% 100%,
+ linear-gradient(45deg, transparent 12px, #f8f8f9 0) 0 100%;
+ background-size: 50% 50%;
+ background-repeat: no-repeat;
+ p {
+ height: 33px;
+ margin-bottom: 10px;
+ font-size: 24px;
+ font-family: PingFangSC-Semibold, PingFang SC;
+ font-weight: 600;
+ color: #072074;
+ line-height: 33px;
+ }
+ span {
+ height: 17px;
+ margin-top: 6px;
+ font-size: 12px;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #000412;
+ line-height: 17px;
+ }
+ }
+}
+.title {
+ -webkit-box-align: center;
+ -ms-flex-align: center;
+ align-items: center;
+ -webkit-box-flex: 1;
+ -ms-flex: 1;
+ flex: 1;
+ font-size: 16px;
+ font-family: PingFangSC-Semibold, PingFang SC;
+ font-weight: 600;
+ color: #333;
+ padding-top: 17px;
+ padding-bottom: -4px;
+
+ span {
+ margin-left: 10px;
+ font-size: 12px;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #999;
+ }
+}
+.bgc2 {
+ background: #fbefe8 url(~@/assets/dashboard/bg33.png) no-repeat
+ calc(100% - 12px) 100% !important;
+
+ .home-user-task-stats {
+ margin-top: 10px;
+ height: 50px;
+ font-size: 36px;
+ font-family: PingFangSC-Semibold, PingFang SC;
+ font-weight: 600;
+ line-height: 50px;
+ text-shadow: 2px 4px 7px rgb(255 99 85 / 50%);
+ }
+ .text-color2 {
+ height: 17px;
+ margin-top: 3px;
+ font-size: 12px;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #ff5757;
+ line-height: 17px;
+ }
+}
+.bgc1 {
+ background: #e9f3ff !important;
+ background-image: url(~@/assets/dashboard/bg11.png),
+ url(~@/assets/dashboard/bg22.png) !important;
+ background-repeat: no-repeat, no-repeat !important;
+ background-position: 0 0, calc(100% - 12px) 100% !important;
+ .title {
+ -webkit-box-align: center;
+ -ms-flex-align: center;
+ align-items: center;
+ -webkit-box-flex: 1;
+ -ms-flex: 1;
+ flex: 1;
+ font-size: 16px;
+ font-family: PingFangSC-Semibold, PingFang SC;
+ font-weight: 600;
+ color: #333;
+ span {
+ margin-left: 10px;
+ font-size: 12px;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #999;
+ }
+ }
+ .home-user-task-stats {
+ margin-top: 10px;
+ height: 50px;
+ font-size: 36px;
+ font-family: PingFangSC-Semibold, PingFang SC;
+ font-weight: 600;
+ line-height: 50px;
+ text-shadow: 2px 4px 7px rgb(85 132 255 / 50%);
+ }
+ .text-color2 {
+ height: 17px;
+ margin-top: 3px;
+ font-size: 12px;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #91a7dc;
+ line-height: 17px;
+ }
+}
+::v-deep.aside .el-table__header-wrapper {
+ overflow: hidden;
+ display: none;
+}
+.headerBox {
+ height: 150px;
+ padding: 25px;
+}
+.el-row {
+ margin-bottom: 20px;
+ &:last-child {
+ margin-bottom: 0;
+ }
+}
+.el-col {
+ border-radius: 4px;
+}
+.bg-purple-dark {
+ background: #99a9bf;
+}
+.bg-purple {
+ background: #fff;
+}
+.bg-purple-light {
+ background: #e5e9f2;
+ text-align: center;
+ align-items: center;
+ line-height: 36px;
+}
+.grid-content {
+ min-height: 36px;
+ border-radius: 20px;
+ padding: 0 10px;
+}
+.grid-contents {
+ min-height: 36px;
+ border-radius: 20px;
+ padding: 0 10px;
+ padding-right: 0;
+}
+.row-bg {
+ padding: 10px 0;
+ background-color: #f9fafc;
+}
+</style>
diff --git a/src/views/index.vue b/src/views/index.vue
index e86fe40..a98450a 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -110,7 +110,6 @@
<!-- 涓棿echars -->
<div class="boxEchars">
<div class="echars1" id="echars"></div>
- <div class="echars2" id="echars2"></div>
</div>
</div>
</el-col>
@@ -147,27 +146,19 @@
</el-row>
<!-- 搴曢儴涓�涓� -->
<el-row :gutter="20" style="margin-bottom: 20px">
- <el-col :span="13">
+ <el-col :span="15">
<div class="grid-content bg-purple" style="min-height: 300px">
<div class="title">
- 璇婂悗缁熻
+ 瀹f暀缁熻
<span class="el-icon-s-unfold moreIcon"></span>
</div>
<div class="cooperate">
<!-- 鍚堜綔鍖哄煙 -->
<div class="pieChart" id="pieCharts"></div>
- <div class="Points">
- <p>{{ 122 }}</p>
- <span>鍏朵腑闅忚骞查浜烘</span>
- <p>{{ 122 }}</p>
- <span>闂ㄨ瘖闅忚</span>
- <p>{{ 122 }}</p>
- <span>鍑洪櫌闅忚</span>
- </div>
</div>
</div>
</el-col>
- <el-col :span="10">
+ <el-col :span="9">
<div class="grid-content bg-purple" style="min-height: 300px">
<div class="title">
鍚勯」鏈嶅姟缁熻
@@ -179,19 +170,25 @@
><div class="grid-contents bg-purple">璇婄枟棰勭害</div></el-col
>
<el-col :span="4"
- ><div class="grid-contents bg-purple-light">123娆�</div></el-col
+ ><div class="grid-contents bg-purple-light">
+ 123娆�
+ </div></el-col
>
<el-col :span="4"
><div class="grid-contents bg-purple">杞瘖鏈嶅姟</div></el-col
>
<el-col :span="4"
- ><div class="grid-contents bg-purple-light">231娆�</div></el-col
+ ><div class="grid-contents bg-purple-light">
+ 231娆�
+ </div></el-col
>
<el-col :span="4"
><div class="grid-contents bg-purple">淇℃伅鎺ㄩ��</div></el-col
>
<el-col :span="4"
- ><div class="grid-contents bg-purple-light">900娆�</div></el-col
+ ><div class="grid-contents bg-purple-light">
+ 900娆�
+ </div></el-col
> </el-row
><el-row>
<el-col :span="4"
@@ -219,13 +216,17 @@
><div class="grid-contents bg-purple">鎮h�呭弽棣�</div></el-col
>
<el-col :span="4"
- ><div class="grid-contents bg-purple-light">150浜�</div></el-col
+ ><div class="grid-contents bg-purple-light">
+ 150浜�
+ </div></el-col
>
<el-col :span="4"
><div class="grid-contents bg-purple">鎮h�呯鐞�</div></el-col
>
<el-col :span="4"
- ><div class="grid-contents bg-purple-light">231浜�</div></el-col
+ ><div class="grid-contents bg-purple-light">
+ 231浜�
+ </div></el-col
>
<el-col :span="4"
><div class="grid-contents bg-purple">鍋ュ悍瀹f暀</div></el-col
@@ -261,12 +262,7 @@
// getUserWork,
// getregionCollect,
// getregionOrderCount,
-// getregionAmountCollect,
-// getNodeCount,
-// getPrtnerCount,
-// getnodeCollect,
-// getSkuTop,
-// getOrderAmount,
+
// } from "@/api/home";
import dayjs from "dayjs";
@@ -277,6 +273,10 @@
NodeCount: "",
PrtnerCount: "",
NodeCount: "",
+ myChart2: null,
+ mypPieCharts: null,
+ lastWidth: window.innerWidth,
+ lastHeight: window.innerHeight,
radio1: "鍛�",
ticketStatistics: {},
order: "",
@@ -289,6 +289,7 @@
cylinderSeries: [],
cylinderXAxis: [],
dyat: 30,
+ intervalId: null,
};
},
@@ -317,10 +318,17 @@
this.getPrtnerCount();
this.getnodeCollect();
this.getSkuTop();
- this.getOrderAmount();
});
},
- mounted() {},
+ mounted() {
+ this.setInterval();
+ // window.addEventListener("resize", this.handleResize());
+ },
+ beforeDestroy() {
+ if (this.intervalId) {
+ clearInterval(this.intervalId); // 娓呴櫎瀹氭椂鍣�
+ }
+ },
methods: {
// 鏀瑰彉鏃堕棿浜嬩欢
changes() {
@@ -339,26 +347,8 @@
this.getPrtnerCount();
this.getnodeCollect();
this.getSkuTop();
- this.getOrderAmount();
},
- // 鏌辩姸鍥�
- async getOrderAmount() {
- // const res = await getOrderAmount(this.endatd, this.statd);
- // this.cylinderXAxis = res.data.xAxis;
- // this.cylinderSeries = res.data.series;
- this.cylinderXAxis = [
- "1鏈�",
- "2鏈�",
- "3鏈�",
- "4鏈�",
- "5鏈�",
- "6鏈�",
- "7鏈�",
- "8鏈�",
- ];
- this.cylinderSeries = [123, 123, 223, 212, 432, 123, 442, 234];
- this.myEcharts();
- },
+
// 鑾峰彇鐐逛綅鎬绘暟
async getNodeCount() {
// const res = await getNodeCount();
@@ -398,7 +388,6 @@
{ amount: 0, count: 88, skuId: "0", skuName: "鍣ㄦ绉�" },
{ amount: 0, count: 87, skuId: "0", skuName: "楠ㄧ" },
{ amount: 0, count: 67, skuId: "0", skuName: "鏀惧皠绉�" },
-
];
},
// 鑾峰彇宸ュ崟鏁伴噺
@@ -423,80 +412,6 @@
// this.Count = (res.data / 1000000).toFixed(2);
},
- // 鏌辩姸鍥�
- myEcharts() {
- // 鍩轰簬鍑嗗濂界殑dom锛屽垵濮嬪寲echarts瀹炰緥
- var echarts = require("echarts");
- var myChart = echarts.init(document.getElementById("echars2"));
-
- // 鎸囧畾鍥捐〃鐨勯厤缃」鍜屾暟鎹�
- var option = {
- title: {
- text: "璇婁腑缁熻",
- },
- tooltip: {
- trigger: "axis",
- },
- legend: {
- data: ["闄㈠唴鎺ㄩ��", "瀹f暀瀹屾垚"],
- },
- toolbox: {
- show: true,
- feature: {
- dataView: { show: true, readOnly: false },
- magicType: { show: true, type: ["line", "bar"] },
- restore: { show: true },
- saveAsImage: { show: true },
- },
- },
- calculable: true,
- xAxis: [
- {
- type: "category",
- // prettier-ignore
- data: ["涓�鏈�","浜屾湀","涓夋湀","鍥涙湀","浜旀湀","鍏湀","涓冩湀","鍏湀","涔濇湀","鍗佹湀"],
- },
- ],
- yAxis: [
- {
- type: "value",
- },
- ],
- series: [
- {
- name: "闄㈠唴鎺ㄩ��",
- type: "bar",
- data: [20, 49, 70, 32, 56, 76, 56, 122, 26, 20, 64, 33],
- markPoint: {
- data: [
- { type: "max", name: "Max" },
- { type: "min", name: "Min" },
- ],
- },
- markLine: {
- data: [{ type: "average", name: "Avg" }],
- },
- },
- {
- name: "瀹f暀瀹屾垚",
- type: "bar",
- data: [26, 59, 90, 64, 87, 70, 75, 182, 87, 82, 60, 23],
- markPoint: {
- data: [
- { name: "Max", value: 182, xAxis: 7, yAxis: 183 },
- { name: "Min", value: 2.3, xAxis: 11, yAxis: 3 },
- ],
- },
- markLine: {
- data: [{ type: "average", name: "Avg" }],
- },
- },
- ],
- };
-
- // 浣跨敤鍒氭寚瀹氱殑閰嶇疆椤瑰拰鏁版嵁鏄剧ず鍥捐〃銆�
- myChart.setOption(option);
- },
// 鑾峰彇绾跨姸鍥炬椂闂�
async getregionAmountCollect() {
// const res = await getregionAmountCollect(1, this.endatd, this.statd);
@@ -510,66 +425,145 @@
myEcharts2() {
var echarts = require("echarts");
var myChart2 = echarts.init(document.getElementById("echars"));
+ this.myChart2 = myChart2;
var option2 = {
- title: {
- text: "璇婂墠鏁版嵁",
- },
tooltip: {
trigger: "axis",
+ axisPointer: {
+ type: "cross",
+ crossStyle: {
+ color: "#999",
+ },
+ },
},
- dataset: {
- source: [
- ["product", "2018", "2019", "2020", "2021", "2022", "2023"],
- ["澶嶈瘖", 256, 182, 388, 270, 253, 385],
- ["浣忛櫌", 351, 451, 355, 353, 373, 468],
- ["鎵嬫湳", 440, 362, 569, 436, 445, 332],
- ["杞瘖", 525, 237, 541, 518, 433, 249],
+ toolbox: {
+ feature: {
+ dataView: { show: true, readOnly: false },
+ magicType: { show: true, type: ["line", "bar"] },
+ restore: { show: true },
+ saveAsImage: { show: true },
+ },
+ },
+ legend: {
+ data: [
+ "鍑洪櫌闅忚閲�",
+ "闂ㄨ瘖闅忚閲�",
+ "鍦ㄩ櫌闅忚閲�",
+ "闂ㄨ瘖澶嶈瘖閫氱煡",
+ "鍑洪櫌澶嶈瘖閫氱煡",
+ "鍦ㄩ櫌璇勪及閲�",
],
},
- xAxis: { type: "category" },
- yAxis: { gridIndex: 0 },
- grid: { top: "55%" },
+ xAxis: [
+ {
+ type: "category",
+ data: [
+ "涓�鏈�",
+ "浜屾湀",
+ "涓夋湀",
+ "鍥涙湀",
+ "浜旀湀",
+ "鍏湀",
+ "涓冩湀",
+ "鍏湀",
+ "涔濇湀",
+ "鍗佹湀",
+ ],
+ axisPointer: {
+ type: "shadow",
+ },
+ },
+ ],
+ yAxis: [
+ {
+ type: "value",
+ name: "Precipitation",
+ min: 0,
+ max: 250,
+ interval: 50,
+ axisLabel: {
+ formatter: "{value} ml",
+ },
+ },
+ {
+ type: "value",
+ name: "Temperature",
+ min: 0,
+ max: 250,
+ interval: 50,
+ axisLabel: {
+ formatter: "{value} 娆�",
+ },
+ },
+ ],
+ grid: { top: "35%" },
series: [
{
- type: "line",
- smooth: true,
- seriesLayoutBy: "row",
- emphasis: { focus: "series" },
- },
- {
- type: "line",
- smooth: true,
- seriesLayoutBy: "row",
- emphasis: { focus: "series" },
- },
- {
- type: "line",
- smooth: true,
- seriesLayoutBy: "row",
- emphasis: { focus: "series" },
- },
- {
- type: "line",
- smooth: true,
- seriesLayoutBy: "row",
- emphasis: { focus: "series" },
- },
- {
- type: "pie",
- id: "pie",
- radius: "30%",
- center: ["50%", "25%"],
- emphasis: {
- focus: "self",
+ name: "鍑洪櫌闅忚閲�",
+ type: "bar",
+ tooltip: {
+ valueFormatter: function (value) {
+ return value + " ml";
+ },
},
- label: {
- formatter: "{b}: {@2018} ({d}%)",
+ data: [120, 150, 165, 90, 140, 200, 130, 85, 175, 95, 110, 160],
+ },
+ {
+ name: "闂ㄨ瘖闅忚閲�",
+ type: "bar",
+ tooltip: {
+ valueFormatter: function (value) {
+ return value + " ml";
+ },
},
- encode: {
- itemName: "product",
- value: "2018",
- tooltip: "2018",
+ data: [102, 190, 135, 88, 175, 160, 83, 145, 200, 110, 97, 180],
+ },
+ {
+ name: "鍦ㄩ櫌闅忚閲�",
+ type: "bar",
+ tooltip: {
+ valueFormatter: function (value) {
+ return value + " ml";
+ },
},
+ data: [145, 92, 178, 134, 167, 85, 199, 112, 156, 88, 120, 145],
+ },
+
+ {
+ name: "鍑洪櫌澶嶈瘖閫氱煡",
+ type: "line",
+ smooth: 0.3,
+ yAxisIndex: 1,
+ tooltip: {
+ valueFormatter: function (value) {
+ return value + " 娆�";
+ },
+ },
+ data: [45, 123, 78, 156, 89, 34, 199, 112, 67, 145, 88, 175],
+ },
+ {
+ name: "闂ㄨ瘖澶嶈瘖閫氱煡",
+ type: "line",
+ smooth: 0.3,
+ yAxisIndex: 1,
+ tooltip: {
+ valueFormatter: function (value) {
+ return value + " 娆�";
+ },
+ },
+ data: [102, 190, 135, 88, 175, 160, 83, 145, 200, 110, 97, 180],
+ },
+ {
+ name: "鍦ㄩ櫌璇勪及閲�",
+ type: "line",
+ smooth: 0.3,
+ yAxisIndex: 1,
+ tooltip: {
+ valueFormatter: function (value) {
+ return value + " 娆�";
+ },
+ },
+ data: [120, 150, 165, 90, 140, 200, 130, 85, 175, 95, 110, 160],
},
],
};
@@ -581,7 +575,7 @@
series: {
id: "pie",
label: {
- formatter: "{b}: {@[" + dimension + "]} ({d}%)",
+ formatter: "{b}: {@[" + dimension + "]} ",
},
encode: {
value: dimension,
@@ -598,59 +592,112 @@
// 鍩轰簬鍑嗗濂界殑dom锛屽垵濮嬪寲echarts瀹炰緥
var echarts = require("echarts");
var mypPieCharts = echarts.init(document.getElementById("pieCharts"));
-
+ this.mypPieCharts = mypPieCharts;
// 鎸囧畾鍥捐〃鐨勯厤缃」鍜屾暟鎹�
var optionPie = {
- // title: {
- // left: "left",
- // },
-
+ legend: {},
tooltip: {
- trigger: "item",
- formatter: "{b}<br/>鎬诲崰姣� : {d}% ",
+ trigger: "axis",
+ showContent: true,
},
- toolbox: {
- show: true,
- feature: {
- mark: { show: true },
- },
+ dataset: {
+ source: [
+ ["product", "2012", "2013", "2014", "2015", "2016", "2017"],
+ ["鍑洪櫌瀹f暀", 56.5, 82.1, 88.7, 70.1, 53.4, 85.1],
+ ["鍦ㄩ櫌瀹f暀", 51.1, 51.4, 55.1, 53.3, 73.8, 68.7],
+ ["闂ㄨ瘖瀹f暀", 40.1, 62.2, 69.5, 36.4, 45.2, 32.5],
+ ],
},
- legend: {
- top: "5%",
- left: "center",
- },
+ xAxis: { type: "category" },
+ yAxis: { gridIndex: 0 },
+ grid: { top: "25%", left: "10%", right: "40%", bottom: "10%" },
series: [
{
- name: "Access From",
+ name: "鍑洪櫌瀹f暀",
+ type: "line",
+ smooth: true,
+ seriesLayoutBy: "row",
+ emphasis: { focus: "series" },
+ },
+ {
+ name: "鍦ㄩ櫌瀹f暀",
+ type: "line",
+ smooth: true,
+ seriesLayoutBy: "row",
+ emphasis: { focus: "series" },
+ },
+ {
+ name: "闂ㄨ瘖瀹f暀",
+ type: "line",
+ smooth: true,
+ seriesLayoutBy: "row",
+ emphasis: { focus: "series" },
+ },
+ {
type: "pie",
+ id: "pie",
radius: ["40%", "70%"],
- avoidLabelOverlap: false,
+ center: ["80%", "50%"],
+ emphasis: {
+ focus: "self",
+ },
itemStyle: {
borderRadius: 10,
borderColor: "#fff",
borderWidth: 2,
},
-
- emphasis: {
- label: {
- show: true,
- fontSize: 40,
- fontWeight: "bold",
- },
+ label: {
+ formatter: "{b}: {@2012}",
},
- labelLine: {
- show: false,
+ encode: {
+ itemName: "product",
+ value: "2012",
+ tooltip: "2012",
},
- data: [
- { value: 580, name: "闂ㄨ瘖闅忚" },
- { value: 484, name: "鍑洪櫌闅忚" },
- ],
},
],
};
+ mypPieCharts.on("updateAxisPointer", function (event) {
+ const xAxisInfo = event.axesInfo[0];
+ if (xAxisInfo) {
+ const dimension = xAxisInfo.value + 1;
+ mypPieCharts.setOption({
+ series: {
+ id: "pie",
+ label: {
+ formatter: "{b}: {@[" + dimension + "]} ",
+ },
+ encode: {
+ value: dimension,
+ tooltip: dimension,
+ },
+ },
+ });
+ }
+ });
// 浣跨敤鍒氭寚瀹氱殑閰嶇疆椤瑰拰鏁版嵁鏄剧ず鍥捐〃銆�
mypPieCharts.setOption(optionPie);
+ },
+ // 椤甸潰鍙樺寲璋冩暣澶у皬
+ handleResize() {
+ console.log(111);
+ // 璋冩暣 ECharts 鍥捐〃澶у皬
+ if (this.myChart2) {
+ this.myChart2.resize();
+ }
+ if (this.mypPieCharts) {
+ this.mypPieCharts.resize();
+ }
+ },
+ setInterval() {
+ this.intervalId = setInterval(() => {
+ if (window.innerWidth != this.lastWidth) {
+ this.lastWidth = window.innerWidth;
+ console.log("绐楀彛澶у皬鍙兘琚墜鍔ㄨ皟鏁翠簡");
+ this.handleResize();
+ }
+ }, 1000);
},
},
};
@@ -664,13 +711,10 @@
.boxEchars {
width: 100%;
- height: 480px;
+ height: 40vh;
margin-top: 45px;
display: flex;
.echars1 {
- flex: 1;
- }
- .echars2 {
flex: 1;
}
}
@@ -765,7 +809,7 @@
margin-top: 25px;
display: flex;
.pieChart {
- flex: 3;
+ flex: 1;
}
.Points {
width: 154px;
diff --git a/src/views/knowledge/education/compilequer/index.vue b/src/views/knowledge/education/compilequer/index.vue
index 9efd914..860ede0 100644
--- a/src/views/knowledge/education/compilequer/index.vue
+++ b/src/views/knowledge/education/compilequer/index.vue
@@ -408,6 +408,7 @@
];
export default {
+ name: "Educationinfo",
components: { OptionalForm },
data() {
return {
@@ -542,6 +543,13 @@
},
};
},
+ activated() {
+ if (this.id != this.$route.query.id) {
+ this.gettabList();
+ this.getList();
+ this.illnessUpdate();
+ }
+ },
created() {
this.gettabList();
diff --git a/src/views/knowledge/education/index.vue b/src/views/knowledge/education/index.vue
index c70696b..9216623 100644
--- a/src/views/knowledge/education/index.vue
+++ b/src/views/knowledge/education/index.vue
@@ -312,15 +312,15 @@
><i class="el-icon-edit"></i>浜岀淮鐮�</span
></el-button
> -->
- <!-- <el-button
+ <el-button
size="medium"
type="text"
@click="Vieweducation(scope.row)"
v-hasPermi="['system:user:edit']"
><span class="button-textck"
- ><i class="el-icon-edit"></i>鏌ョ湅</span
+ ><i class="el-icon-edit"></i>棰勮</span
></el-button
- > -->
+ >
<el-button
size="medium"
type="text"
@@ -444,6 +444,16 @@
<div class="qrcode-img"></div>
</div>
</el-dialog>
+ <el-dialog title="妯$増棰勮" :visible.sync="previewtf" width="60%">
+ <div class="preview-left">
+ <!-- 鍗曢�� -->
+ <div v-html="richText"></div>
+ </div>
+ <!-- <span slot="footer" class="dialog-footer">
+ <el-button @click="previewGo">鍓嶅線妯$増璇︽儏淇敼</el-button>
+ <el-button type="primary" @click="previewFn">纭浣跨敤</el-button>
+ </span> -->
+ </el-dialog>
</div>
</template>
@@ -465,7 +475,7 @@
import { listDept } from "@/api/system/dept";
import { getToken } from "@/utils/auth";
import store from "@/store";
-
+import axios from "axios";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
@@ -491,8 +501,10 @@
haoeducation: "",
indexid: null,
inputValue: "",
+ richText: "",
radio: "涓诲垎绫�",
inputVisible: false,
+ previewtf: false,
illnessVisible: false, //鎸囨爣鐤剧梾寮规
deptOptions: [],
courtyardlist: [],
@@ -628,22 +640,37 @@
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
this.$router.push({
- path: "/knowledge/education/compilequer/",
+ path: "/knowledge/educationinfo/",
});
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
this.$router.push({
- path: "/knowledge/education/compilequer/",
+ path: "/knowledge/educationinfo/",
query: { id: row.id },
});
},
// 鏌ョ湅瀹f暀
- Vieweducation() {
- this.$router.push({
- path: "/knowledge/education/examine/",
- query: { id: row.id },
- });
+ Vieweducation(row) {
+ this.richText = null;
+ this.previewtf = true;
+ axios
+ .get(row.richText)
+ .then((response) => {
+ console.log(response.data, "鏁版嵁"); // 杈撳嚭鑾峰彇鍒扮殑鏂囦欢鍐呭
+ this.richText = response.data;
+ this.richText = this.addStyleToImages(this.richText);
+ })
+ .catch((error) => {
+ this.$modal.msgError("鑾峰彇瀵屾枃鏈け璐�");
+ console.error("Failed to fetch file:", error);
+ });
+ },
+ addStyleToImages(html) {
+ return html.replace(
+ /<img([^>]*)style=(['"])(?:(?!\2).)*\2([^>]*)>/g,
+ '<img$1style="width:100%;height:auto;"$3>'
+ );
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
diff --git a/src/views/knowledge/questionnaire/compilequer/index.vue b/src/views/knowledge/questionnaire/compilequer/index.vue
index 85d3a9c..0eb6d7e 100644
--- a/src/views/knowledge/questionnaire/compilequer/index.vue
+++ b/src/views/knowledge/questionnaire/compilequer/index.vue
@@ -1149,7 +1149,7 @@
import { getToken } from "@/utils/auth";
export default {
- name: "Qcompilequer",
+ name: "Questionnaireinfo",
components: { OptionalForm },
@@ -1276,7 +1276,12 @@
],
};
},
-
+ activated() {
+ if (this.id != this.$route.query.id) {
+ this.gettabList();
+ this.getissueinfo();
+ }
+ },
created() {
this.gettabList();
this.getissueinfo();
diff --git a/src/views/knowledge/questionnaire/index.vue b/src/views/knowledge/questionnaire/index.vue
index a77ca7e..7866a88 100644
--- a/src/views/knowledge/questionnaire/index.vue
+++ b/src/views/knowledge/questionnaire/index.vue
@@ -647,14 +647,14 @@
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
this.$router.push({
- path: "/knowledge/questionnaire/compilequer/",
+ path: "/knowledge/questionnaireinfo/",
query: { categoryid: this.queryParams.categoryid },
});
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
this.$router.push({
- path: "/knowledge/questionnaire/compilequer/",
+ path: "/knowledge/questionnaireinfo/",
query: { id: row.svyid },
});
},
diff --git a/src/views/patient/propaganda/Missioncreation.vue b/src/views/patient/propaganda/Missioncreation.vue
index f616624..4ef34a9 100644
--- a/src/views/patient/propaganda/Missioncreation.vue
+++ b/src/views/patient/propaganda/Missioncreation.vue
@@ -465,7 +465,7 @@
>
<el-form-item
label="瀹f暀鍚嶇О"
- v-if="currenttype == 1 || currenttype == 8"
+
>
<el-input v-model="topqueryParams.preachname"></el-input>
</el-form-item>
@@ -862,7 +862,6 @@
submitForm(formName) {
this.form.preachform = this.checkList.join(",");
// this.formatFn(1);
- this.form.hospType = this.currenttype;
if (!this.form.patTaskRelevances[0]) {
this.$modal.msgError("璇烽�夋嫨鐥呬汉");
return;
diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index a66736f..fceefd2 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -14,7 +14,6 @@
title="浠诲姟涓讳綋"
description="鍦ㄦ湰閮ㄩ�夋嫨鏈嶅姟鎮h��"
></el-step>
- <el-step icon="el-icon-user" title="妯$増纭"></el-step>
</el-steps>
</div>
</div>
@@ -67,7 +66,7 @@
placeholder="璇疯緭鍏ヤ换鍔℃弿杩�"
/>
</el-form-item>
- <el-form-item label="鍙戦�佽缃細" v-if="currenttype != 2">
+ <el-form-item label="鍙戦�佽缃細">
<el-radio-group v-model="form.sendType">
<el-radio :label="1">鏃堕棿娈靛彂閫�</el-radio>
<el-radio :label="3">鏃堕棿鐐瑰彂閫�</el-radio>
@@ -462,86 +461,18 @@
v-show="showSearch"
label-width="98px"
>
- <el-form-item
- label="瀹f暀涓婚"
- v-if="currenttype == 1 || currenttype == 8"
- >
- <el-input v-model="topqueryParams.name"></el-input>
- </el-form-item>
- <el-form-item
- label="闂嵎鍚嶇О"
- v-if="currenttype == 2 || currenttype == 3 || currenttype == 7"
- >
+ <el-form-item label="闂嵎鍚嶇О">
<el-input
v-model="topqueryParams.name"
></el-input> </el-form-item
- ><el-form-item
- label="閫氱煡鍚嶇О"
- v-if="currenttype == 4 || currenttype == 5"
- >
- <el-input
- v-model="topqueryParams.name"
- ></el-input> </el-form-item
- ><el-form-item label="浣撴濂楅" v-if="currenttype == 5">
+ ><el-form-item label="閫氱煡鍚嶇О">
<el-input v-model="topqueryParams.name"></el-input>
</el-form-item>
- <el-form-item label="闂嵎涓婚" v-if="currenttype == 6">
- <el-input v-model="topqueryParams.name"></el-input>
- </el-form-item>
- <el-form-item label="閫傜敤鐤剧梾" v-if="currenttype != 5">
+ <el-form-item label="闂嵎涓婚">
<el-input v-model="topqueryParams.name"></el-input>
</el-form-item>
- <el-form-item
- label="瀹f暀绫诲瀷"
- prop="status"
- v-if="currenttype == 1 || currenttype == 8"
- >
- <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in taskoptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item
- label="閫氱煡绫诲瀷"
- prop="status"
- v-if="currenttype == 4 || currenttype == 5"
- >
- <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in taskoptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item
- label="闂嵎绫诲瀷"
- prop="status"
- v-if="currenttype == 2 || currenttype == 3 || currenttype == 7"
- >
- <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in taskoptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item
- label="闂嵎绫诲瀷"
- prop="status"
- v-if="currenttype == 6"
- >
+ <el-form-item label="闂嵎绫诲瀷" prop="status">
<el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
<el-option
v-for="item in taskoptions"
@@ -930,7 +861,6 @@
this.$modal.msgError("璇烽�夋嫨鐥呬汉");
return;
}
- this.form.hospType = this.currenttype;
const filteredArray = this.variableList.filter(
(item) =>
item.name !== "濮撳悕" && item.name !== "鐢佃瘽" && item.name !== "鍦板潃"
@@ -1276,9 +1206,8 @@
this.Tasktemplate.id = null;
console.log(this.Tasktemplate);
- this.Tasktemplate.svyTemplateLibScripts.forEach((item) => {
- item.svyTaskTemplateTargetoptions =
- item.svyLibTemplateTargetoptions;
+ this.Tasktemplate.svyTemplateLibScripts.forEach((item) => {
+ item.svyTaskTemplateTargetoptions = item.svyLibTemplateTargetoptions;
});
this.Tasktemplate.svyTaskTemplateScriptVOS =
this.Tasktemplate.svyTemplateLibScripts;
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index 6972a8f..7e846f9 100644
--- a/src/views/patient/propaganda/particty.vue
+++ b/src/views/patient/propaganda/particty.vue
@@ -14,7 +14,6 @@
title="浠诲姟涓讳綋"
description="鍦ㄦ湰閮ㄩ�夋嫨鏈嶅姟鎮h��"
></el-step>
- <el-step icon="el-icon-user" title="妯$増纭"></el-step>
</el-steps>
</div>
</div>
@@ -67,7 +66,7 @@
placeholder="璇疯緭鍏ヤ换鍔℃弿杩�"
/>
</el-form-item>
- <el-form-item label="鍙戦�佽缃細" v-if="currenttype != 2">
+ <el-form-item label="鍙戦�佽缃細">
<el-radio-group v-model="form.sendType">
<el-radio :label="1">鏃堕棿娈靛彂閫�</el-radio>
<el-radio :label="3">鏃堕棿鐐瑰彂閫�</el-radio>
@@ -335,6 +334,17 @@
@keyup.enter.native="handleQuery"
></el-input>
</el-form-item>
+ <el-form-item label="鍒涘缓鏃堕棿">
+ <el-date-picker
+ v-model="dateRange"
+ style="width: 240px"
+ value-format="yyyy-MM-dd"
+ type="daterange"
+ range-separator="-"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ ></el-date-picker>
+ </el-form-item>
<el-form-item>
<el-button
@@ -348,7 +358,7 @@
icon="el-icon-refresh"
size="medium"
@click="resetQuery"
- >鍙栨秷鍒涘缓</el-button
+ >閲嶇疆</el-button
>
</el-form-item>
</el-form>
@@ -437,16 +447,10 @@
v-show="showSearch"
label-width="98px"
>
- <el-form-item
- label="闅忚涓婚"
- v-if="currenttype == 1 || currenttype == 8"
- >
+ <el-form-item label="闅忚涓婚">
<el-input v-model="topqueryParams.name"></el-input>
</el-form-item>
- <el-form-item
- label="闅忚鍚嶇О"
- v-if="currenttype == 2 || currenttype == 3 || currenttype == 7"
- >
+ <el-form-item label="闅忚鍚嶇О">
<el-input v-model="topqueryParams.name"></el-input>
</el-form-item>
@@ -523,13 +527,18 @@
export default {
name: "ServiceDetails",
data() {
+ const endDate = new Date();
+ const startDate = new Date();
+ startDate.setDate(endDate.getDate() - 7); // 璁剧疆寮�濮嬫棩鏈熶负褰撳墠鏃ユ湡鍓�7澶�
return {
title: "闅忚鍐呭鍒楄〃",
- currenttype: 1, //1闅忚2闂ㄨ瘖3鍑洪櫌4澶嶈瘖5浣撴6闂嵎
+ currenttype: 1, //1闅忚2闂嵎3閫氱煡瀹f暀
id: "", //
previewid: "", //浠诲姟妯$増浼犻�抜d
libName: "",
overallCase: [], //閫夋嫨鎮h�呮��
+ // 鏃ユ湡鑼冨洿
+ dateRange: [startDate, endDate],
allpids: [],
libId: null, //妯℃澘搴撴ā鐗坕d
nhh: null, //鏄惁渚濈収鏂板
@@ -545,12 +554,11 @@
questionList: [],
// 鎮h�呰〃鍗�
tableLabelhz: [
- { label: "搴忓彿", width: "", prop: "patid" },
{ label: "鎮h�呭悕绉�", width: "", prop: "name" },
{ label: "鎬у埆", width: "", prop: "sex" },
{ label: "骞撮緞", width: "", prop: "age" },
{ label: "灏辫瘖绉戝", width: "", prop: "deptName" },
- { label: "鍏ラ櫌鏃ユ湡", width: "", prop: "inhosptime" },
+ { label: "鍏ラ櫌鏃ユ湡", width: "", prop: "birthdate" },
{ label: "鍒涘缓浜猴紙缂猴級", width: "", prop: "update_by" },
],
@@ -723,7 +731,6 @@
isavailable: "",
};
this.currenttype = this.$route.query.type;
- console.log(this.currenttype, "1");
// 鍑洪櫌銆侀棬璇娿�佷笓鐥呴殢璁�
this.title = "闅忚鍐呭鍒楄〃";
this.tableLabel = this.tableLabelmz;
@@ -887,7 +894,7 @@
{ label: "骞撮緞", width: "", prop: "age" },
{ label: "涓讳换鍖诲笀", width: "", prop: "drname" },
{ label: "灏辫瘖绉戝", width: "", prop: "deptName" },
- { label: "鍏ラ櫌鏃ユ湡", width: "", prop: "inhosptime" },
+ { label: "鍏ラ櫌鏃ユ湡", width: "", prop: "birthdate" },
{ label: "鍒涘缓浜�", width: "", prop: "createBy" },
];
} else if (this.patientqueryParams.allhosp == 2) {
@@ -898,7 +905,7 @@
{ label: "骞撮緞", width: "", prop: "age" },
{ label: "璇婃柇", width: "", prop: "diagname" },
{ label: "灏辫瘖绉戝", width: "", prop: "deptName" },
- { label: "鍏ラ櫌鏃ユ湡", width: "", prop: "inhosptime" },
+ { label: "鍏ラ櫌鏃ユ湡", width: "", prop: "birthdate" },
{ label: "鍒涘缓浜�", width: "", prop: "createBy" },
];
}
@@ -909,8 +916,9 @@
this.patientqueryParams.pids = null;
}
- getTaskpatient(this.patientqueryParams).then((response) => {
- console.log(response);
+ getTaskpatient(
+ this.addDateRange(this.patientqueryParams, this.dateRange)
+ ).then((response) => {
this.patientuserList = response.rows;
this.patienttotal = response.total;
this.loading = false;
@@ -989,7 +997,18 @@
handleQuery() {
this.handleAddpatient();
},
- resetQuery() {},
+ resetQuery() {
+ this.dateRange = [];
+ // 鏌ヨ鍙傛暟
+ this.queryParams = {
+ pageNum: 1,
+ pageSize: 10,
+ userName: undefined,
+ phonenumber: undefined,
+ status: undefined,
+ deptId: undefined,
+ };
+ },
handleClosehz() {
this.dialogVisiblepatient = false;
},
@@ -1130,6 +1149,7 @@
}
this.form.sendTimeslot = combinedData;
// 灞曠ず鏁版嵁涓存椂瀛樺偍鏃ユ湡銆佹棭銆佷腑銆佹櫄
+ console.log(this.daytime);
this.form.showDate = this.daytime.join(",");
if (this.time1) this.form.showTimeMorn = this.time1.join(",");
diff --git a/src/views/repositoryai/templateku/configurat/index.vue b/src/views/repositoryai/templateku/configurat/index.vue
index e33ab1e..be649eb 100644
--- a/src/views/repositoryai/templateku/configurat/index.vue
+++ b/src/views/repositoryai/templateku/configurat/index.vue
@@ -75,16 +75,20 @@
</el-form-item>
</el-col>
</el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="妯$増绠�浠�" prop="note">
+ <div>
+ <el-input
+ type="textarea"
+ placeholder="璇疯緭鍏ョ畝浠�"
+ v-model="ruleForm.note"
+ ></el-input>
+ </div>
+ </el-form-item>
+ </el-col>
+ </el-row>
- <el-form-item label="妯$増绠�浠�" prop="note">
- <div style="width: 50%">
- <el-input
- type="textarea"
- placeholder="璇疯緭鍏ョ畝浠�"
- v-model="ruleForm.note"
- ></el-input>
- </div>
- </el-form-item>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="鐗堟湰鍙�" prop="version">
@@ -808,7 +812,6 @@
<!-- 鍗曢�� -->
<div
class="scriptTopic-dev"
-
:key="item.sort"
v-if="item.valueType == 1"
>
@@ -829,7 +832,6 @@
<!-- 澶氶�� -->
<div
class="scriptTopic-dev"
-
:key="item.sort"
v-if="item.valueType == 2"
>
@@ -851,7 +853,6 @@
<!-- 濉┖ -->
<div
class="scriptTopic-dev"
-
:key="item.sort"
v-if="item.valueType == 3"
>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 6f1d6d2..bb206c6 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -307,8 +307,9 @@
<el-col :span="12">
<el-form-item label="褰掑睘閮ㄩ棬" prop="deptId">
<treeselect
- v-model="form.deptId"
+ v-model="deptIds"
:options="deptOptions"
+ :multiple="true"
:show-count="true"
placeholder="璇烽�夋嫨褰掑睘閮ㄩ棬"
/>
@@ -536,6 +537,7 @@
initPassword: undefined,
// 鏃ユ湡鑼冨洿
dateRange: [],
+ deptIds: [],
// 宀椾綅閫夐」
postOptions: [],
// 瑙掕壊閫夐」
@@ -746,9 +748,11 @@
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
this.reset();
+ this.deptIds = [];
const userId = row.userId || this.ids;
getUser(userId).then((response) => {
this.form = response.data;
+
this.postOptions = response.posts;
this.roleOptions = response.roles;
this.$set(this.form, "postIds", response.postIds);
--
Gitblit v1.9.3