From e64bd73bbad0f60fa5debdb8b8e7268f4aea9fe1 Mon Sep 17 00:00:00 2001
From: jiangzhe <244140623@qq.com>
Date: Fri, 12 Apr 2024 10:16:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=A0=E5=AD=90=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/user.ts                 |   1 +
 src/views/login.vue                       |   2 -
 src/views/scale/SysScale/index.vue        |  10 +--
 src/views/scale/SysScaleFactor/index.vue  | 100 ++++++++++++++--------
 src/views/scale/SysScalePublish/index.vue |   2 +-
 5 files changed, 69 insertions(+), 46 deletions(-)

diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 7c02de0..87a689c 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -20,6 +20,7 @@ export const useUserStore = defineStore('user', () => {
    * @returns
    */
   const login = async (userInfo: LoginData): Promise<void> => {
+    console.log('login', userInfo);
     const [err, res] = await to(loginApi(userInfo));
     if (res) {
       const data = res.data;
diff --git a/src/views/login.vue b/src/views/login.vue
index 974c864..1506660 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -76,8 +76,6 @@ const captchaEnabled = ref(true);
 const register = ref(false);
 const redirect = ref(undefined);
 const loginRef = ref<ElFormInstance>();
-// 租户列表
-const tenantList = ref<TenantVO[]>([]);
 
 watch(() => router.currentRoute.value, (newRoute: any) => {
   redirect.value = newRoute.query && newRoute.query.redirect;
diff --git a/src/views/scale/SysScale/index.vue b/src/views/scale/SysScale/index.vue
index 0af7b65..35553ce 100644
--- a/src/views/scale/SysScale/index.vue
+++ b/src/views/scale/SysScale/index.vue
@@ -69,7 +69,7 @@
         <el-table-column label="状态" align="center" prop="status">
           <template #default="scope">
             <el-tag :type="scope.row.status === '0' ? 'success' : 'danger'" disable-transitions>
-              {{ scope.row.status === '0' ? '正常' : '停用' }}
+              {{ scope.row.status === '1' ? '正常' : '停用' }}
             </el-tag>
           </template>
         </el-table-column>
@@ -164,8 +164,8 @@
           <el-col :span="12">
             <el-form-item label="状态" prop="status">
               <el-radio-group v-model="form.status">
-                <el-radio value="0">正常</el-radio>
-                <el-radio value="1">停用</el-radio>
+                <el-radio value="0">停用</el-radio>
+                <el-radio value="1">正常</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -278,8 +278,8 @@ const queryFormRef = ref<ElFormInstance>();
 const SysScaleFormRef = ref<ElFormInstance>();
 
 const statusOptions = [
-  { label: '正常', value: 0 },
-  { label: '停用', value: 1 }
+  { label: '停用', value: 0 },
+  { label: '正常', value: 1 }
 ]
 
 const dimensionTypeOptions = [
diff --git a/src/views/scale/SysScaleFactor/index.vue b/src/views/scale/SysScaleFactor/index.vue
index f924cf4..e2bbbb4 100644
--- a/src/views/scale/SysScaleFactor/index.vue
+++ b/src/views/scale/SysScaleFactor/index.vue
@@ -8,13 +8,6 @@
             <el-input v-model="queryParams.factorName" placeholder="请输入因子名称" clearable style="width: 240px"
               @keyup.enter="handleQuery" />
           </el-form-item>
-          <el-form-item label="因子分计算公式" prop="formulaId" label-width="110px">
-            <el-select v-model="queryParams.formulaId" placeholder="请输入因子分计算公式" style="width: 240px"
-              @keyup.enter="handleQuery">
-              <el-option v-for="item in scaleFormulaList" :key="item.formulaId" :label="item.formulaName"
-                :value="item.formulaId" />
-            </el-select>
-          </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
             <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -50,8 +43,12 @@
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="因子名称" align="center" prop="factorName" />
         <el-table-column label="所属量表" align="center" prop="scaleTitle" />
-        <el-table-column label="分数范围及结果提示" align="center" prop="factorResult" />
-        <el-table-column label="因子分计算公式" align="center" prop="formulaName" />
+        <el-table-column label="计算规则" align="center" prop="ruleType">
+          <template #default="scope">
+            {{ getRuleType(scope.row) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="权重" align="center" prop="weight" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
@@ -78,26 +75,37 @@
               <div class="title">基础信息</div>
             </div>
           </template>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="因子名称" prop="factorName">
+                <el-input v-model="form.factorName" placeholder="请输入因子名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="计算规则" prop="ruleType">
+                <el-select v-model="form.ruleType" placeholder="请输入计算规则" style="width: 100%">
+                  <el-option v-for="item in ruleTypeList" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="权重" prop="weight">
+                <el-input-number v-model="form.weight" placeholder="请输入权重" style="width: 100%" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="选择题目" prop="questionIds">
+                <el-checkbox-group v-model="form.questionIds">
+                  <el-checkbox v-for="item in scaleQuestionList" :key="item.questionId" :label="item.questionOrder"
+                    :value="item.questionId" />
+                </el-checkbox-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
 
-          <el-form-item label="因子名称" prop="factorName">
-            <el-input v-model="form.factorName" placeholder="请输入因子名称" />
-          </el-form-item>
-          <el-form-item label="分数范围及结果解释" prop="factorResult">
-            <el-input v-model="form.factorResult" placeholder="请输入分数范围及结果解释" :autosize="{ minRows: 5, maxRows: 10 }"
-              type="textarea" />
-          </el-form-item>
-          <el-form-item label="计分公式" prop="formulaId">
-            <el-select v-model="form.formulaId" placeholder="请输入计分公式" style="width: 100%">
-              <el-option v-for="item in scaleFormulaList" :key="item.formulaId" :label="item.formulaName"
-                :value="item.formulaId" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="选择题目" prop="questionIds">
-            <el-checkbox-group v-model="form.questionIds">
-              <el-checkbox v-for="item in scaleQuestionList" :key="item.questionId" :label="item.questionOrder"
-                :value="item.questionId" />
-            </el-checkbox-group>
-          </el-form-item>
         </el-card>
 
         <el-card style="margin-top: 20px;">
@@ -173,14 +181,12 @@
 </template>
 
 <script setup name="SysScaleFactor" lang="ts">
+import {computed} from 'vue'
 import { useRoute } from 'vue-router';
 import { nanoid } from 'nanoid'
 import { listSysScaleFactor, getSysScaleFactor, delSysScaleFactor, addSysScaleFactor, updateSysScaleFactor } from '@/api/scale/SysScaleFactor';
 import { SysScaleFactorVO, SysScaleFactorQuery, SysScaleFactorForm } from '@/api/scale/SysScaleFactor/types';
 
-import { listSysScaleFormula } from '@/api/scale/SysScaleFormula'
-import { SysScaleFormulaVO } from '@/api/scale/SysScaleFormula/types';
-
 import { listSysScaleQuestion } from '@/api/scale/SysScaleQuestion'
 import { SysScaleQuestionVO } from '@/api/scale/SysScaleQuestion/types';
 
@@ -267,6 +273,16 @@ const getList = async () => {
   loading.value = false;
 }
 
+function getRuleType(row:any) {
+  if (row.ruleType === 0) {
+    return '求和型';
+  } else if (row.ruleType === 1) {
+    return '均值型';
+  } else {
+    return '求和取整';
+  }
+}
+
 /** 取消按钮 */
 const cancel = () => {
   reset();
@@ -356,11 +372,21 @@ const handleExport = () => {
   }, `SysScaleFactor_${new Date().getTime()}.xlsx`)
 }
 
-const scaleFormulaList = ref<SysScaleFormulaVO[]>([]);
-async function getScaleFormulaList() {
-  const res = await listSysScaleFormula()
-  scaleFormulaList.value = res.rows
-}
+const ruleTypeList = [
+  {
+    label: '求和型',
+    value: 0
+  },
+  {
+    label: '均值型',
+    value: 1
+  },
+  {
+    label: '求和取整',
+    value: 2
+  }
+]
+
 
 const scaleQuestionList = ref<SysScaleQuestionVO[]>([]);
 async function getScaleQuestionList() {
@@ -391,8 +417,6 @@ function handleRangeDelete(row: any) {
 
 onMounted(() => {
   getList();
-
-  getScaleFormulaList()
 });
 </script>
 
diff --git a/src/views/scale/SysScalePublish/index.vue b/src/views/scale/SysScalePublish/index.vue
index faa2c4b..271f976 100644
--- a/src/views/scale/SysScalePublish/index.vue
+++ b/src/views/scale/SysScalePublish/index.vue
@@ -61,7 +61,7 @@
         <el-table-column label="状态" align="center" prop="status">
           <template #default="scope">
             <el-tag :type="scope.row.status === 0 ? 'success' : 'danger'" disable-transitions>
-              {{ scope.row.status === 0 ? '正常' : '停用' }}
+              {{ scope.row.status === 1 ? '正常' : '停用' }}
             </el-tag>
           </template>
         </el-table-column>