From b756033336018457f90dec2a6c78754ff199594d Mon Sep 17 00:00:00 2001
From: jiangzhe <244140623@qq.com>
Date: Thu, 23 May 2024 09:58:30 +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/api/scale/SysScaleQuestion/types.ts       |  2 +-
 .../activity/component/schedule/index.vue     |  4 +--
 src/views/bigScreen/index.vue                 |  4 +--
 src/views/index.vue                           | 26 +++----------------
 src/views/scale/SysScaleFactor/index.vue      |  1 +
 src/views/scale/SysScaleQuestion/index.vue    |  1 +
 6 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/src/api/scale/SysScaleQuestion/types.ts b/src/api/scale/SysScaleQuestion/types.ts
index 2c5ce4e..c54e5ed 100644
--- a/src/api/scale/SysScaleQuestion/types.ts
+++ b/src/api/scale/SysScaleQuestion/types.ts
@@ -88,7 +88,7 @@ export interface SysScaleQuestionQuery extends PageQuery {
   /**
    * 所属测评量表id
    */
-  scaleId?: string | number;
+  scaleId?: string | any;
 
   /**
    * 测评量表标题
diff --git a/src/views/activity/component/schedule/index.vue b/src/views/activity/component/schedule/index.vue
index 2c0e16c..85f6a1b 100644
--- a/src/views/activity/component/schedule/index.vue
+++ b/src/views/activity/component/schedule/index.vue
@@ -72,8 +72,8 @@
         <el-table-column prop="deptName" label="班级" />
         <el-table-column prop="status" label="状态">
           <template #default="scope">
-            <el-tag :type="scope.row.status == 1 ? 'success' : 'danger'">{{ scope.row.status == 0 ? '未测' :
-      '已测' }}</el-tag>
+            <el-tag :type="scope.row.status == 0 ? 'danger' : 'success'">{{ scope.row.status == 0 ? '未测' :
+              '已测' }}</el-tag>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue
index 8246534..fb51d60 100644
--- a/src/views/bigScreen/index.vue
+++ b/src/views/bigScreen/index.vue
@@ -65,7 +65,7 @@
         </div>
 
         <div class="item-center-2 boxall">
-          <div class="alltitle">近12月测评数统计</div>
+          <div class="alltitle">测评数统计</div>
           <div class="boxnav">
             <v-chart :option="centerLine2Option" autoresize />
           </div>
@@ -600,12 +600,10 @@ const centerLine2Option = ref({
   //   itemHeight: 10,
   //   // itemGap: 35
   // },
-
   xAxis: [{
     type: 'category',
     boundaryGap: false,
     axisLabel: {
-      rotate: -90,
       textStyle: {
         color: 'rgba(255,255,255,.7)',
         fontSize: '0.2rem',
diff --git a/src/views/index.vue b/src/views/index.vue
index 85cba31..448b332 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -180,12 +180,11 @@ const leftPieOption = ref({
     x: 'center',
     y: '40%',
     textStyle: {
-      color: '#95989D',
       fontSize: 20,
+      fontWeight: 'normal',
       lineHeight: 10,
     },
     subtextStyle: {
-      color: '#95989D',
       fontSize: 16,
       lineHeight: 10,
     },
@@ -216,13 +215,10 @@ const leftPieOption = ref({
         formatter: ['{c|{c}}', '{b|{b}}'].join('\n'),
         rich: {
           c: {
-            color: '#95989D',
             fontSize: 20,
-            fontWeight: 'bold',
             lineHeight: 5
           },
           b: {
-            color: '#95989D',
             fontSize: 14,
             height: 44
           },
@@ -263,8 +259,8 @@ const centerBarOption = ref({
     x: 'right',
     y: '1%',
     textStyle: {
-      color: '#95989D',
       fontSize: 20,
+      fontWeight: 'normal',
       lineHeight: 10,
     }
   },
@@ -278,9 +274,6 @@ const centerBarOption = ref({
     data: ['发布数', '测评数'],
     right: 'center',
     top: 0,
-    textStyle: {
-      color: "#95989D"
-    },
     itemWidth: 12,
     itemHeight: 10,
     // itemGap: 35
@@ -295,20 +288,10 @@ const centerBarOption = ref({
   xAxis: {
     type: 'category',
     data: [],
-    axisLine: {
-      lineStyle: {
-        color: '#95989D'
-      }
-    },
     axisLabel: {
-      //rotate:-90,
       formatter: function (value: any) { return value.split("").join("\n"); },
       textStyle: {
-        color: '#95989D',
         fontSize: 14,
-      },
-      lineStyle: {
-        color: '#95989D',
       }
     }
   },
@@ -359,8 +342,8 @@ const rightBarOption = ref({
     x: 'right',
     y: '1%',
     textStyle: {
-      color: '#95989D',
       fontSize: 20,
+      fontWeight: 'normal',
       lineHeight: 10,
     }
   },
@@ -386,9 +369,6 @@ const rightBarOption = ref({
     data: [],
     splitLine: {
       show: false,
-      lineStyle: {
-        color: '#95989D'
-      }
     },
   },
   series: [
diff --git a/src/views/scale/SysScaleFactor/index.vue b/src/views/scale/SysScaleFactor/index.vue
index 848936b..580da9e 100644
--- a/src/views/scale/SysScaleFactor/index.vue
+++ b/src/views/scale/SysScaleFactor/index.vue
@@ -338,6 +338,7 @@ const handleSelectionChange = (selection: SysScaleFactorVO[]) => {
 /** 新增按钮操作 */
 const handleAdd = () => {
   reset();
+  form.value.factorRangeList = []
   dialog.visible = true;
   dialog.title = "添加测评因子";
 }
diff --git a/src/views/scale/SysScaleQuestion/index.vue b/src/views/scale/SysScaleQuestion/index.vue
index 9b26814..64c1f7c 100644
--- a/src/views/scale/SysScaleQuestion/index.vue
+++ b/src/views/scale/SysScaleQuestion/index.vue
@@ -279,6 +279,7 @@ const handleSelectionChange = (selection: SysScaleQuestionVO[]) => {
 /** 新增按钮操作 */
 const handleAdd = () => {
   reset();
+  form.value.scaleAnswerList = []
   dialog.visible = true;
   dialog.title = "添加量问题内容";
 }