修复问题

2024-04-29 16:03:37 +08:00 · 2024-04-29 16:03:37 +08:00 · 563ff89947
parent 62276dad9e
commit 563ff89947
4 changed files with 94 additions and 15 deletions
--- a/src/views/archive/information/index.vue
+++ b/src/views/archive/information/index.vue
@ -4,12 +4,12 @@
      :leave-active-class="proxy?.animate.searchAnimate.leave">
      <div class="search" v-show="showSearch">
        <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
-          <el-form-item label="姓名" prop="userId">
-            <el-input v-model="queryParams.userId" placeholder="请输入姓名" clearable style="width: 240px"
+          <el-form-item label="姓名" prop="nickName">
+            <el-input v-model="queryParams.nickName" placeholder="请输入姓名" clearable style="width: 240px"
              @keyup.enter="handleQuery" />
          </el-form-item>
-          <el-form-item label="手机号码" prop="userId">
-            <el-input v-model="queryParams.userId" placeholder="请输入手机号码" clearable style="width: 240px"
+          <el-form-item label="手机号码" prop="phonenumber">
+            <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px"
              @keyup.enter="handleQuery" />
          </el-form-item>
          <el-form-item>
@ -134,7 +134,19 @@
          <el-table :data="staticList" style="width: 100%">
            <el-table-column prop="sessionName" label="场次名称" />
            <el-table-column prop="scaleName" label="量表名称" />
-            <el-table-column prop="situation" label="严重度" />
+            <el-table-column label="严重度" align="center" prop="situation">
+              <template #default="scope">
+                {{ handleSituation(scope.row.situation) }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+              <template #default="scope">
+                <el-tooltip content="导出" placement="top">
+                  <el-button link type="primary" icon="View" @click="handleExport(scope.row)"
+                    v-hasPermi="['evaluation:record:export']">导出</el-button>
+                </el-tooltip>
+              </template>
+            </el-table-column>
          </el-table>
          <pagination v-show="staticTotal > 0" :total="staticTotal" v-model:page="staticQuery.pageNum"
            v-model:limit="staticQuery.pageSize" @pagination="getStaticList" />
@ -188,6 +200,7 @@ const dialog = reactive<DialogOption>({
 });

 const activeName = ref('static')
+const current = ref({ userId: '', nickName: '' })

 const tableData = [
  {
@ -212,6 +225,20 @@ const tableData = [
  },
 ]

+function handleSituation(situation: any) {
+  if (situation == 1) {
+    return '未见异常'
+  } else if (situation == 2) {
+    return '低风险'
+  } else if (situation == 3) {
+    return '中风险'
+  } else if (situation == 4) {
+    return '高风险'
+  } else {
+    return '重大风险'
+  }
+}
+
 const initFormData: any = {

 }
@ -281,6 +308,11 @@ const staticList = ref<any[]>([])
 const handleUpdate = async (row?: any) => {
  reset();
  staticQuery.value.userId = row.userId;
+
+  current.value.userId = row.userId
+  current.value.nickName = row.nickName
+
+
  getStaticList()

  // const _warnId = row?.warnId || ids.value[0]
@ -314,6 +346,15 @@ const submitForm = () => {
  });
 }

+function handleExport(row: any) {
+  proxy?.download('scale/evaluation/record/export', {
+    scaleId: row.scaleId,
+    scaleName: row.scaleName,
+    recordId: row.recordId,
+    userId: current.value.userId,
+    nickName: current.value.nickName
+  }, `${current.value.nickName}.docx`)
+}

 onMounted(() => {
  getList();
--- a/src/views/archive/interveneRecord/index.vue
+++ b/src/views/archive/interveneRecord/index.vue
@ -35,7 +35,11 @@
          </template>
        </el-table-column>
        <el-table-column label="补充说明" align="center" prop="note" />
-
+        <el-table-column label="严重度" align="center" prop="situation">
+          <template #default="scope">
+            {{ handleSituation(scope.row.situation) }}
+          </template>
+        </el-table-column>
        <el-table-column label="操作" align="center" class-name="small-padding" width="280">
          <template #default="scope">
            <el-tooltip content="处理" placement="top">
@ -161,6 +165,20 @@ const data = reactive<PageData<WarnRecordForm, WarnRecordQuery>>({

 const { queryParams, form, rules } = toRefs(data);

+function handleSituation(situation: any) {
+  if (situation == 1) {
+    return '未见异常'
+  } else if (situation == 2) {
+    return '低风险'
+  } else if (situation == 3) {
+    return '中风险'
+  } else if (situation == 4) {
+    return '高风险'
+  } else {
+    return '重大风险'
+  }
+}
+
 /** 查询预警记录列表 */
 const getList = async () => {
  loading.value = true;
--- a/src/views/archive/warnRecord/index.vue
+++ b/src/views/archive/warnRecord/index.vue
@ -37,6 +37,11 @@
          </template>
        </el-table-column>
        <el-table-column label="补充说明" align="center" prop="note" />
+        <el-table-column label="严重度" align="center" prop="situation">
+          <template #default="scope">
+            {{ handleSituation(scope.row.situation) }}
+          </template>
+        </el-table-column>

        <el-table-column label="操作" align="center" class-name="small-padding" width="280">
          <template #default="scope">
@ -205,6 +210,20 @@ const resetQuery = () => {
 const resultList = ref([])
 const currentResult = ref([])

+function handleSituation(situation: any) {
+  if (situation == 1) {
+    return '未见异常'
+  } else if (situation == 2) {
+    return '低风险'
+  } else if (situation == 3) {
+    return '中风险'
+  } else if (situation == 4) {
+    return '高风险'
+  } else {
+    return '重大风险'
+  }
+}
+
 const activeTab = ref('')
 /** 修改按钮操作 */
 const handleUpdate = async (row?: WarnRecordVO) => {
--- a/src/views/scale/SysScalePublish/index.vue
+++ b/src/views/scale/SysScalePublish/index.vue
@ -4,16 +4,16 @@
      :leave-active-class="proxy?.animate.searchAnimate.leave">
      <div class="search" v-show="showSearch">
        <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
-          <el-form-item label="量表" prop="scaleNames">
-            <el-input v-model="queryParams.scaleNames" placeholder="请输入量表名称 以逗号隔开" clearable style="width: 240px"
-              @keyup.enter="handleQuery" />
-          </el-form-item>
-          <el-form-item label="部门名称" prop="sessionName">
+          <el-form-item label="量表" prop="sessionName">
            <el-input v-model="queryParams.sessionName" placeholder="请输入场次名称" clearable style="width: 240px"
              @keyup.enter="handleQuery" />
          </el-form-item>
-          <el-form-item label="发布时间" prop="deptId">
-            <el-input v-model="queryParams.deptId" placeholder="请输入部门分组id" clearable style="width: 240px"
+          <el-form-item label="量表" prop="scaleNames">
+            <el-input v-model="queryParams.scaleNames" placeholder="请输入量表名称" clearable style="width: 240px"
+              @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="部门名称" prop="deptNames">
+            <el-input v-model="queryParams.deptNames" placeholder="请输入部门名称" clearable style="width: 240px"
              @keyup.enter="handleQuery" />
          </el-form-item>
          <el-form-item>
@ -35,7 +35,7 @@
        <el-table-column label="场次名称" align="center" prop="sessionName" />
        <el-table-column label="量表名称 以逗号隔开" align="center" prop="scaleNames" />

-        <el-table-column label="部门名称" align="center" prop="deptId" />
+        <el-table-column label="部门名称" align="center" prop="deptNames" />
        <el-table-column label="截止日期" align="center" prop="expireTime" width="180">
          <template #default="scope">
            <span>{{ parseTime(scope.row.expireTime, '{y}-{m}-{d}') }}</span>
@ -60,7 +60,8 @@
            <el-tooltip content="查看测评结果" placement="top">
              <el-button link type="primary" icon="View" @click="handleUpdate(scope.row)"
                v-hasPermi="['evaluation:record:query']">
-                <router-link :to="'/activity/index/' + scope.row.batchNo" class="link-type">
+                <router-link :to="'/activity/index/' + scope.row.batchNo + '/' + scope.row.sessionName"
+                  class="link-type">
                  <span>查看测评结果</span>
                </router-link>
              </el-button>