From 29a89ff21b9b4cf2c860a800c5eccca0520a6e2e Mon Sep 17 00:00:00 2001
From: jiangzhe <244140623@qq.com>
Date: Mon, 27 May 2024 10:45:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  2 +-
 .../activity/component/schedule/index.vue     |  2 +-
 src/views/archive/information/index.vue       |  3 +-
 src/views/bigScreen/index.vue                 | 26 +++++----
 src/views/index.vue                           | 58 ++++++++-----------
 src/views/scale/SysScaleList/index.vue        | 10 +++-
 src/views/system/user/index.vue               | 16 +----
 7 files changed, 52 insertions(+), 65 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 41ffdd4..80172fa 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
 <template>
   <el-config-provider :locale="appStore.locale" :size="size">
-    <router-view />
+    <router-view :key="$route.fullPath" />
   </el-config-provider>
 </template>
 
diff --git a/src/views/activity/component/schedule/index.vue b/src/views/activity/component/schedule/index.vue
index c61fe9b..158c28d 100644
--- a/src/views/activity/component/schedule/index.vue
+++ b/src/views/activity/component/schedule/index.vue
@@ -24,7 +24,7 @@
       <el-descriptions-item label="活动名称">{{ info.sessionName }}</el-descriptions-item>
       <el-descriptions-item label="发起人">{{ info.createName }}</el-descriptions-item>
 
-      <el-descriptions-item label="过期时间">
+      <el-descriptions-item label="截止时间">
         {{ info.expireTime }}
       </el-descriptions-item>
 
diff --git a/src/views/archive/information/index.vue b/src/views/archive/information/index.vue
index c5f556e..9c8c288 100644
--- a/src/views/archive/information/index.vue
+++ b/src/views/archive/information/index.vue
@@ -289,7 +289,6 @@ const handleUpdate = async (row?: any) => {
   current.value.userId = row.userId
   current.value.nickName = row.nickName
 
-
   getStaticList()
 
   // const _warnId = row?.warnId || ids.value[0]
@@ -330,7 +329,7 @@ function handleExport(row: any) {
     recordId: row.recordId,
     userId: current.value.userId,
     nickName: current.value.nickName
-  }, `${current.value.nickName}.pdf`)
+  }, `${current.value.nickName}-${row.scaleName}.pdf`)
 }
 
 onMounted(() => {
diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue
index fb51d60..8f120e6 100644
--- a/src/views/bigScreen/index.vue
+++ b/src/views/bigScreen/index.vue
@@ -81,7 +81,7 @@
               <span>完成数量</span>
               <span>时间</span>
             </div>
-            <vue3-seamless-scroll :list="list" class="scroll">
+            <vue3-seamless-scroll :list="list" class="scroll" :classOptions="classOptions">
               <div class="item" v-for="(item, index) in list" :key="index">
                 <span>{{ item.sessionName }}</span>
                 <span>{{ item.value }} / {{ item.total }}</span>
@@ -99,7 +99,7 @@
         </div>
 
         <div class="item-right-2 boxall">
-          <div class="alltitle">预警统计</div>
+          <div class="alltitle">风险统计</div>
           <div class="box-btn">
             <el-radio-group v-model="rightPie2Radio" fill="#031D50" @change="rightPie2RadioChange">
               <el-radio-button value="year">当年</el-radio-button>
@@ -143,6 +143,10 @@ use([
 let showTime = ref('')
 let timer: any = null
 
+const classOptions = {
+  step: 20
+}
+
 function time() {
   let dt = new Date();
   let y = dt.getFullYear();
@@ -364,9 +368,9 @@ const centerBar1Option = ref({
   },
   grid: {
     top: "20%",
-    right: "50",
+    right: "40",
     bottom: "30",
-    left: "30",
+    left: "40",
   },
   legend: {
     data: [],
@@ -710,9 +714,9 @@ const rightBar1Option = ref({
     axisPointer: { type: 'shadow' },
   }, "grid": {
     "top": "15%",
-    "right": "10%",
+    "right": "6%",
     "bottom": "30",
-    "left": "10%",
+    "left": "6%",
   },
   legend: {
     data: ['预警数', '干预数'],
@@ -842,8 +846,8 @@ async function getHalfMonthData() {
 
   res.data.forEach(v => {
     xAxisData.push(v.name)
-    warnData.push(v.value)
-    interveneData.push(v.spareValue)
+    warnData.push(v.spareValue)
+    interveneData.push(v.value)
   });
 
   rightBar1Option.value.xAxis[0].data = xAxisData
@@ -884,11 +888,11 @@ const rightPie2Option = ref({
     }
   },
   series: [{
-    name: '预警统计',
+    name: '风险统计',
     type: 'pie',
     radius: ['50%', '70%'],
     center: ['50%', '50%'],
-    color: ['rgb(131,249,103)', '#FBFE27', '#FE5050', '#1DB7E5'], //'#FBFE27','rgb(11,228,96)','#FE5050'
+    // color: ['rgb(131,249,103)', '#FBFE27', '#FE5050', '#1DB7E5'], //'#FBFE27','rgb(11,228,96)','#FE5050'
     data: [],
     roseType: 'radius',
     label: {
@@ -1278,4 +1282,4 @@ li {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/index.vue b/src/views/index.vue
index 448b332..31b2cca 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-card>
-      <el-row justify="space-around" align="center">
+      <el-row justify="space-around">
         <el-col :span="12">
           <img class="avater" :src="userStore.avatar" />{{ getGreeting() }}
         </el-col>
@@ -207,34 +207,29 @@ const leftPieOption = ref({
     type: 'pie',
     radius: ['50%', '70%'],
     center: ['50%', '50%'],
-    color: ['rgb(131,249,103)', '#FBFE27', '#FE5050', '#1DB7E5'], //'#FBFE27','rgb(11,228,96)','#FE5050'
+    // color: ['rgb(131,249,103)', '#FBFE27', '#FE5050', '#1DB7E5'], //'#FBFE27','rgb(11,228,96)','#FE5050'
     data: [],
     roseType: 'radius',
     label: {
-      normal: {
-        formatter: ['{c|{c}}', '{b|{b}}'].join('\n'),
-        rich: {
-          c: {
-            fontSize: 20,
-            lineHeight: 5
-          },
-          b: {
-            fontSize: 14,
-            height: 44
-          },
+      formatter: ['{c|{c}}', '{b|{b}}'].join('\n'),
+      rich: {
+        c: {
+          fontSize: 20,
+          lineHeight: 5
         },
-      }
+        b: {
+          fontSize: 14,
+          height: 44
+        },
+      },
     },
     labelLine: {
-      normal: {
-        lineStyle: {
-          color: 'rgb(98,137,169)',
-        },
-        smooth: 0.2,
-        length: 10,
-        length2: 20,
-
-      }
+      lineStyle: {
+        color: 'rgb(98,137,169)',
+      },
+      smooth: 0.2,
+      length: 10,
+      length2: 20,
     }
   }]
 })
@@ -271,7 +266,7 @@ const centerBarOption = ref({
     }
   },
   legend: {
-    data: ['发布数', '测评数'],
+    data: [],
     right: 'center',
     top: 0,
     itemWidth: 12,
@@ -290,9 +285,7 @@ const centerBarOption = ref({
     data: [],
     axisLabel: {
       formatter: function (value: any) { return value.split("").join("\n"); },
-      textStyle: {
-        fontSize: 14,
-      }
+      fontSize: 14,
     }
   },
 
@@ -307,14 +300,11 @@ const centerBarOption = ref({
       }
     },
     axisLabel: {
-      textStyle: {
-        color: '#95989D',
-        fontSize: 14,
-      }
+      color: '#95989D',
+      fontSize: 14,
     },
     axisLine: { show: false },
   },
-
   series: [
   ]
 })
@@ -332,6 +322,7 @@ async function getGradeData() {
   });
 
   const seriesData = [{ name: '发布数', data: seriesPublishData, type: 'bar' }, { name: '测评数', data: seriesEvaluationData, type: 'bar' }]
+  centerBarOption.value.legend.data = ['发布数', '测评数']
   centerBarOption.value.xAxis.data = xAxisData
   centerBarOption.value.series = seriesData
 }
@@ -427,10 +418,7 @@ onMounted(() => {
   getInterveneNumData()
 
   initChart()
-})
 
-onUnmounted(() => {
-  disposeChart()
 })
 
 // import { initWebSocket } from '@/utils/websocket';
diff --git a/src/views/scale/SysScaleList/index.vue b/src/views/scale/SysScaleList/index.vue
index 84a6225..35924ee 100644
--- a/src/views/scale/SysScaleList/index.vue
+++ b/src/views/scale/SysScaleList/index.vue
@@ -275,10 +275,16 @@ const resetQuery = () => {
 const publishType = ref();
 const handleAdd = (type: any) => {
   reset();
-  dialog.visible = true;
-  dialog.title = "量表测评发布";
 
   publishType.value = type
+
+  dialog.visible = true;
+
+  if (publishType.value == 0) {
+    dialog.title = "量表个测发布";
+  } else {
+    dialog.title = "量表普测发布";
+  }
 }
 
 /** 提交按钮 */
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 7c59671..f1131a7 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -229,10 +229,9 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="岗位">
-              <el-select v-model="form.postIds" multiple placeholder="请选择">
-                <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId"
-                  :disabled="item.status == '1'"></el-option>
+            <el-form-item label="用户类型">
+              <el-select v-model="form.userType" placeholder="请选择" style="width: 100%">
+                <el-option v-for="item in userTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -245,15 +244,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="用户类型">
-              <el-select v-model="form.userType" placeholder="请选择" style="width: 100%">
-                <el-option v-for="item in userTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注">