zpy 11.3

75a42747 · zhaopanyu · 8cca9710 · 75a42747 · 75a42747 · 75a42747
Commit 75a42747 authored Nov 03, 2023 by zhaopanyu
3 changed files
--- a/ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/performance/index.vue
+++ b/ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/performance/index.vue
@@ -99,26 +99,24 @@
      <el-form :model="achievementForm" :rules="achievementRules" ref="achievementForm" label-width="80px"
        label-position="left">
        <el-row :gutter="30">
          <el-col :span="12">
-            <el-form-item label="学生姓名" prop="studentName">
+            <el-form-item label="学号" prop="studentNumber">
-              <el-input v-model="achievementForm.studentName" placeholder="请输入学生姓名"
+              <el-input v-model="achievementForm.studentNumber" placeholder="请输入学号"
-                :disabled="nowType == 1 ? true : false"></el-input>
+                :disabled="nowType == 1 ? true : false" @change="searchStudentInfo"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="12">
-            <el-form-item label="班级" prop="className">
+            <el-form-item label="学生姓名" prop="studentName">
-              <el-input v-model="achievementForm.className" placeholder="请输入班级"
+              <el-input v-model="achievementForm.studentName" placeholder="请输入学生姓名"
                :disabled="nowType == 1 ? true : false"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
-            <el-form-item label="学号" prop="studentNumber">
+            <el-form-item label="班级" prop="className">
-              <el-input v-model="achievementForm.studentNumber" placeholder="请输入学号"
+              <el-input v-model="achievementForm.className" placeholder="请输入班级"
-                :disabled="nowType == 1 ? true : false" @change="searchStudentInfo"></el-input>
+                :disabled="nowType == 1 ? true : false"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="12">

--- a/ruoyi-ui/src/views/smartSchool/gradeWork/questionnaireManagement/ActivityResult/index.vue
+++ b/ruoyi-ui/src/views/smartSchool/gradeWork/questionnaireManagement/ActivityResult/index.vue
@@ -2,33 +2,20 @@
  <div class="activity-result app-container">
    <el-tabs tab-position="left" style="height: 100%;">
      <el-tab-pane label="明细数据">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-                 label-width="80px">
          <el-form-item label="学生姓名" prop="studentName">
-            <el-input v-model="queryParams.studentName" placeholder="请搜索学生姓名" clearable
+            <el-input v-model="queryParams.studentName" placeholder="请搜索学生姓名" clearable @keyup.enter.native="handleQuery">
-                      @keyup.enter.native="handleQuery">
            </el-input>
          </el-form-item>
          <el-form-item label="填写状态" prop="ryZdzt">
            <el-select v-model="queryParams.ryZdzt" style="width: 100%" placeholder="请选择问卷填写状态">
-              <el-option
+              <el-option v-for="dict in dict.type.quiz_txzt" :key="dict.value" :label="dict.label" :value="dict.value">
-                v-for="dict in dict.type.quiz_txzt"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value">
              </el-option>
            </el-select>
          </el-form-item>
          <el-form-item label="填写时间">
-            <el-date-picker
+            <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
-              v-model="dateRange"
+              range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-              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 type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -48,31 +35,26 @@
          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
        </el-row>
        <el-table v-loading="loading" :data="activityList" @selection-change="handleSelectionChange">
-          <el-table-column type="index" label="序号" width="55" align="center"/>
+          <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column label="班级" align="center" prop="classAlias"/>
+          <el-table-column label="班级" align="center" prop="classAlias" />
-          <el-table-column label="学生姓名" align="center" prop="studentName"/>
+          <el-table-column label="学生姓名" align="center" prop="studentName" />
          <el-table-column label="填写状态" align="center" prop="ryZdzt">
            <template slot-scope="scope">
              <span>{{ scope.row.ryZdzt == 0 ? '未填写' : '已填写' }} </span>
            </template>
          </el-table-column>
-          <el-table-column label="填写时间" align="center" min-width="120px" prop="ryCtime"/>
+          <el-table-column label="填写时间" align="center" min-width="120px" prop="ryCtime" />
-          <el-table-column v-for="(item,index) in dynamicTitle" :label="item" min-width="150px" align="center">
+          <el-table-column v-for="(item, index) in dynamicTitle" :label="item" min-width="150px" align="center">
            <template slot-scope="scope">
-              <ListImage v-if="scope.row[dynamicProp[index]] && scope.row[dynamicProp[index]].type==3"
+              <ListImage v-if="scope.row[dynamicProp[index]] && scope.row[dynamicProp[index]].type == 3"
-                         :image-url=" scope.row[dynamicProp[index]] && baseUrl+scope.row[dynamicProp[index]].datas"
+                :image-url="scope.row[dynamicProp[index]] && baseUrl + scope.row[dynamicProp[index]].datas"
                style="height: 50px"></ListImage>
              <span v-else> {{ scope.row[dynamicProp[index]] && scope.row[dynamicProp[index]].datas }}</span>
            </template>
          </el-table-column>
          <el-table-column label="操作" align="center" min-width="80" key="operate">
            <template slot-scope="scope">
-              <el-button
+              <el-button size="mini" type="text" icon="el-icon-view" @click="handleDetail(scope.row)">查看
-                size="mini"
-                type="text"
-                icon="el-icon-view"
-                @click="handleDetail(scope.row)"
-              >查看
              </el-button>
            </template>
          </el-table-column>
@@ -80,15 +62,14 @@
      </el-tab-pane>
      <el-tab-pane label="统计">
        <el-card style="width: 900px; height: 900px; ">
-          <div v-if="countList.length!=0" v-for="(item,index) in countList" :key="item.title"
+          <div v-if="countList.length != 0" v-for="(item, index) in countList" :key="item.title"
            style="height:270px ;width:800px;margin: 20px 0 0 0 ;">
            <b>{{ item.title }}</b>
-            <br/> <br/>
+            <br /> <br />
-            <el-table v-loading="loading" :data="item.detailsLit"
+            <el-table v-loading="loading" :data="item.detailsLit" :summary-method="(res) => getSummaries(res, index)"
-                      :summary-method="(res)=>getSummaries(res,index )" show-summary
+              show-summary>
-            >
+              <el-table-column label="选项" align="center" prop="selects" />
-              <el-table-column label="选项" align="center" prop="selects"/>
+              <el-table-column label="小计" align="center" prop="selectNum" />
-              <el-table-column label="小计" align="center" prop="selectNum"/>
              <el-table-column label="比例" align="center" sortable prop="proportion">
                <template slot-scope="scope">
                  <el-progress :percentage="scope.row.proportion"></el-progress>
@@ -101,9 +82,10 @@
      </el-tab-pane>
    </el-tabs>
+    <ExPagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
    <el-dialog title="调查问卷" :visible.sync="dialogQuestionire" width="860" append-to-body>
-      <el-form ref="form" disabled label-width="90px"
+      <el-form ref="form" disabled label-width="90px" style="width: 100%; margin: auto">
-               style="width: 100%; margin: auto">
        <el-row :gutter="20">
          <el-col :span="12">
            <el-form-item label="班级">
@@ -111,26 +93,18 @@
            </el-form-item>
            <el-form-item label="填写状态" prop="ryZdzt">
              <el-select v-model="formFix.ryZdzt" style="width: 100%" placeholder="请选择问卷填写状态">
-                <el-option
+                <el-option v-for="dict in dict.type.quiz_txzt" :key="dict.value" :label="dict.label" :value="dict.value">
-                  v-for="dict in dict.type.quiz_txzt"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value">
                </el-option>
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="姓名" prop="studentName">
-              <el-input :value="formFix.studentName"/>
+              <el-input :value="formFix.studentName" />
            </el-form-item>
            <el-form-item label="填写时间">
-              <el-date-picker
+              <el-date-picker v-model="formFix.ryCtime" style="width: 100%" value-format="yyyy-MM-dd HH:mm"
-                v-model="formFix.ryCtime"
+                type="date"></el-date-picker>
-                style="width: 100%"
-                value-format="yyyy-MM-dd HH:mm"
-                type="date"
-              ></el-date-picker>
            </el-form-item>
          </el-col>
        </el-row>
@@ -142,8 +116,8 @@
            :value="item.type"></dict-tag>
          )
          <b>{{ item.title }}</b>
-          <br/><br/>
+          <br /><br />
-          <el-image v-if="item.type==3" :src="baseUrl+item.datas"></el-image>
+          <el-image v-if="item.type == 3" :src="baseUrl + item.datas"></el-image>
          <b v-else>{{ item.datas }}</b>
          <el-divider></el-divider>
        </el-row>
@@ -154,9 +128,9 @@
 </template>
 <script>
-import {activityTypesEnum, departmentEnum} from "@/enums/questionnaire/content";
+import { activityTypesEnum, departmentEnum } from "@/enums/questionnaire/content";
-import {getList, getCount} from "@/api/smartSchool/questionnaireManagement/ActivityResult/request.js";
+import { getList, getCount } from "@/api/smartSchool/questionnaireManagement/ActivityResult/request.js";
-import {closeCurrentTab} from "@/utils/utilLibrary/routerBatch/routerBatch.js";
+import { closeCurrentTab } from "@/utils/utilLibrary/routerBatch/routerBatch.js";
 import {
  getQuestionResultQueryOne
 } from "@/api/smartSchool/gradeWork/questionnaireManagement/ActivityResult/request";
@@ -189,7 +163,7 @@ export default {
      // 显示搜索条件
      showSearch: true,
      // 总条数
-      // total: 0,
+      total: 0,
      // 办公申购表格数据
      activityList: [],
      // 弹出层标题
@@ -242,6 +216,7 @@ export default {
      this.loading = true;
      getList(this.addDateRange(this.queryParams, this.dateRange), this.dcwjId).then(response => {
        this.activityList = response.data
+        this.total = response.total
        //获取标题
        let title = Object.values(response.titles)
        this.dynamicTitle = title.filter((item) => {
@@ -361,7 +336,7 @@ export default {
    //查看按钮
    handleDetail(row) {
      this.dialogQuestionire = true
-      let {classAlias, ryZdzt, studentName, ryCtime} = row
+      let { classAlias, ryZdzt, studentName, ryCtime } = row
      this.formFix.classAlias = classAlias
      this.formFix.ryZdzt = ryZdzt
      this.formFix.studentName = studentName
@@ -392,7 +367,7 @@ export default {
    },
    getSummaries(param, index) {
      // console.log(index,778)
-      const {columns, data} = param;
+      const { columns, data } = param;
      const sums = [];
      columns.forEach((column, columnIndex) => {
        if (columnIndex === 0) {
@@ -411,6 +386,5 @@ export default {
 </script>
 <style scoped lang="scss">
-div.activity-result {
+div.activity-result {}
-}
 </style>
--- a/ruoyi-ui/src/views/smartSchool/teachAffairAdministration/affairStudentManage/index.vue
+++ b/ruoyi-ui/src/views/smartSchool/teachAffairAdministration/affairStudentManage/index.vue
@@ -704,16 +704,16 @@ export default {
          { required: true, message: "身份证号不能为空", trigger: 'blur' },
          { validator: this.validID, trigger: 'blur' }
        ],
-        nation: [{ required: true, message: '民族不能为空', trigger: 'blur' }],
+        // nation: [{ required: true, message: '民族不能为空', trigger: 'blur' }],
        studentName: [{ required: true, message: '学生姓名不能为空', trigger: 'blur' }],
-        birthday: [{ required: true, message: '出生日期不能为空', trigger: 'blur' }],
+        // birthday: [{ required: true, message: '出生日期不能为空', trigger: 'blur' }],
-        nativePlace: [{ required: true, message: '籍贯不能为空', trigger: 'blur' }],
+        // nativePlace: [{ required: true, message: '籍贯不能为空', trigger: 'blur' }],
-        sex: [{ required: true, message: '学生姓名不能为空', trigger: 'blur' }],
+        // sex: [{ required: true, message: '学生性别不能为空', trigger: 'blur' }],
        schoolNo: [{ required: true, message: '注册序号不能为空', trigger: 'blur' }],
-        studentType: [{ required: true, message: '学生类型不能为空', trigger: 'change' }],
+        // studentType: [{ required: true, message: '学生类型不能为空', trigger: 'change' }],
-        studentStatus: [{ required: true, message: '学生状态不能为空', trigger: 'change' }],
+        // studentStatus: [{ required: true, message: '学生状态不能为空', trigger: 'change' }],
        classAlias: [{ required: true, message: '班级不能为空', trigger: 'change' }],
-        provincialNumber: [{ required: true, message: '省学籍辅号不能为空', trigger: 'blur' }],
+        // provincialNumber: [{ required: true, message: '省学籍辅号不能为空', trigger: 'blur' }],
      },
      // 班级编辑表单
      classForm: {