评估内容展示

2020-10-26 10:37:37 +08:00 · 2020-10-26 10:37:37 +08:00 · 1232b34932
commit 1232b34932
parent 3dbe1e5003
7 changed files with 287 additions and 21 deletions
--- a/ruoyi-ui/src/api/benyi/assessmentcontent.js
+++ b/ruoyi-ui/src/api/benyi/assessmentcontent.js
@ -17,6 +17,14 @@ export function treeselect() {
    })
 }

+// 查询流程下拉树结构
+export function treeselectstudy() {
+    return request({
+        url: '/benyi/assessmentcontent/treeselectstudy',
+        method: 'get'
+    })
+}
+

 // 查询评估内容详细
 export function getAssessmentcontent(id) {
@ -26,6 +34,15 @@ export function getAssessmentcontent(id) {
    })
 }

+
+// 查询评估内容详细
+export function getAssessmentcontentbyparentid(id) {
+    return request({
+        url: '/benyi/assessmentcontent/byparentid/' + id,
+        method: 'get'
+    })
+}
+
 // 新增评估内容
 export function addAssessmentcontent(data) {
    return request({
--- a/ruoyi-ui/src/views/benyi/assessmentstudy/index.vue
+++ b/ruoyi-ui/src/views/benyi/assessmentstudy/index.vue
@ -0,0 +1,185 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <el-col :span="4" :xs="24">
+        <div class="head-container">
+          <el-input
+            v-model="name"
+            placeholder="请输入名称"
+            clearable
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
+        </div>
+        <div class="head-container">
+          <el-tree
+            :data="treeOptions"
+            :props="defaultProps"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="tree"
+            default-expand-all
+            @node-click="handleNodeClick"
+          />
+        </div>
+      </el-col>
+      <el-col :span="20" :xs="24">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span class="box-card-title">{{ title }}</span>
+          </div>
+          <div class="text item">
+            <h3 class="box-card-title">内容</h3>
+            <div class="pad-left" v-html="note"></div>
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import {
+  treeselectstudy,
+  getAssessmentcontent,
+  getAssessmentcontentbyparentid,
+} from "@/api/benyi/assessmentcontent";
+
+export default {
+  name: "Assessmentstudy",
+  data() {
+    return {
+      // 一日流程名称
+      name: undefined,
+      //标题
+      title: "儿童学习与发展评估介绍",
+      //目的
+      note:
+        "儿童学习与发展评估对象是幼儿园3-6岁儿童。本一的“儿童学习与发展评估”（以下称“评估”），是完全基于教育部《3-6岁儿童学习与发展指南》所构建。尽管“评估”具备工具性质，但更重要的事实是，它“通过提出3-6岁各年龄儿童学习与发展目标和相应的教育建议，帮助幼儿园教师和家长了解3-6岁幼儿学习与发展的基本规律和特点，建立对幼儿发展的合理期望，实施科学的保育和教育，让幼儿度过快乐而有意义的童年”（《指南》）。3-6岁三个年龄段的“儿童学习与发展评估”包括5大领域，11个分支领域，32个指标，以及若干个评估元素。评估以班级中每个孩子为基本单位。建议在班长和教师之间分配所评估孩子的数量。评估过程以日常生活对孩子的观察为主，随时在线记录和标记满足于各个指标的元素。其最终评估结果，将会在线自动生成“雷达图”。需要注意的是，评估的基本目的，是为了更有效地对每个孩子实施个性化教育。因此，不要把评估结果当成“测验”或“考核”手段或工具，更不要直接将结果拿给家长看，以免造成误读。",
+      // 根据一日流程id查到的名下任务列表
+      dayflowtaskList: [],
+      // 树状显示类型
+      treeOptions: [],
+      // 树结构
+      defaultProps: {
+        children: "children",
+        label: "label",
+      },
+      // 查询参数
+      queryParams: {
+        id: undefined,
+      },
+    };
+  },
+  watch: {
+    // 根据名称筛选部门树
+    name(val) {
+      this.$refs.tree.filter(val);
+    },
+  },
+  created() {
+    this.getTreeselect();
+  },
+  methods: {
+    /** 查询部门下拉树结构 */
+    getTreeselect() {
+      treeselectstudy().then((response) => {
+        this.treeOptions = response.data;
+      });
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      console.log("node:" + data.id);
+      this.queryParams.id = data.id;
+      this.title = data.label;
+      this.getTaskList();
+      // console.log(this.dayflowtaskList[date.id])
+      // this.getStandardList();
+    },
+    /** 查询一日流程任务列表 */
+    getTaskList() {
+      getAssessmentcontentbyparentid(this.queryParams.id).then((response) => {
+        var tmp = "";
+        response.data.forEach((element) => {
+          tmp = tmp + element.name + "</br>";
+        });
+        this.note = tmp;
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.text {
+  font-size: 14px;
+}
+
+.item {
+  margin-bottom: 18px;
+  line-height: 22px;
+}
+
+.clearfix:before,
+.clearfix:after {
+  display: table;
+  content: "";
+}
+.clearfix:after {
+  clear: both;
+}
+.box-card-title {
+  display: flex;
+  align-items: center;
+  font-size: 16px;
+  &::before {
+    content: "";
+    margin-right: 8px;
+    width: 4px;
+    height: 16px;
+    background: #1890ff;
+  }
+  &.mr {
+    margin: 10px 0;
+  }
+}
+.box-card-case {
+  margin: 0;
+  font-size: 14px;
+  font-weight: 700;
+  display: flex;
+  align-items: center;
+  &::before {
+    content: "";
+    margin-right: 8px;
+    width: 4px;
+    height: 14px;
+    background: #2c3e50;
+  }
+  &.mr {
+    margin: 10px 0;
+  }
+}
+.box-card-info {
+  font-size: 14px;
+  font-weight: 700;
+}
+.pad-left {
+  padding-left: 15px;
+}
+
+// 禁止复制
+div {
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+</style>
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByAssessmentcontentController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByAssessmentcontentController.java
@ -32,33 +32,61 @@ import com.ruoyi.framework.web.page.TableDataInfo;
 */
@RestController
@RequestMapping("/benyi/assessmentcontent")
-public class ByAssessmentcontentController extends BaseController
-{
+public class ByAssessmentcontentController extends BaseController {
    @Autowired
    private IByAssessmentcontentService byAssessmentcontentService;
    @Autowired
    private TokenService tokenService;

-/**
+    /**
     * 查询评估内容列表
     */
-@PreAuthorize("@ss.hasPermi('benyi:assessmentcontent:list')")
-@GetMapping("/list")
-        public TableDataInfo list(ByAssessmentcontent byAssessmentcontent)
-    {
+    @PreAuthorize("@ss.hasPermi('benyi:assessmentcontent:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ByAssessmentcontent byAssessmentcontent) {
        startPage();
        List<ByAssessmentcontent> list = byAssessmentcontentService.selectByAssessmentcontentList(byAssessmentcontent);
        return getDataTable(list);
    }

+    /**
+     * 查询评估内容列表
+     */
+    @PreAuthorize("@ss.hasPermi('benyi:assessmentstudy:list')")
+    @GetMapping("/treeselectstudy")
+    public AjaxResult treeselectstudy(ByAssessmentcontent byAssessmentcontent) {
+        List<ByAssessmentcontent> list = byAssessmentcontentService.selectByAssessmentcontentstudyList(byAssessmentcontent);
+        return AjaxResult.success(byAssessmentcontentService.buildByAssessmentcontentTreeSelect(list));
+    }
+
+    /**
+     * 获取评估内容详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('benyi:assessmentcontent:query')")
+    @GetMapping(value = "/byparentid/{id}")
+    public AjaxResult getInfobyparentId(@PathVariable("id") Long id) {
+        System.out.println("start:"+id);
+        ByAssessmentcontent byAssessmentcontent=new ByAssessmentcontent();
+        byAssessmentcontent.setParentId(id);
+        return AjaxResult.success(byAssessmentcontentService.selectByAssessmentcontentList(byAssessmentcontent));
+    }
+
+//    /**
+//     * 获取部门下拉树列表
+//     */
+//    @GetMapping("/treeselect")
+//    public AjaxResult treeselect(ByDayFlowDetail byDayFlowDetail) {
+//        List<ByDayFlowDetail> byDayFlowDetails = byDayFlowDetailService.selectByDayFlowDetailListTree(byDayFlowDetail);
+//        return AjaxResult.success(byDayFlowDetailService.buildDayFlowDetailTreeSelect(byDayFlowDetails));
+//    }
+
    /**
     * 导出评估内容列表
     */
    @PreAuthorize("@ss.hasPermi('benyi:assessmentcontent:export')")
    @Log(title = "评估内容", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
-    public AjaxResult export(ByAssessmentcontent byAssessmentcontent)
-    {
+    public AjaxResult export(ByAssessmentcontent byAssessmentcontent) {
        List<ByAssessmentcontent> list = byAssessmentcontentService.selectByAssessmentcontentList(byAssessmentcontent);
        ExcelUtil<ByAssessmentcontent> util = new ExcelUtil<ByAssessmentcontent>(ByAssessmentcontent.class);
        return util.exportExcel(list, "assessmentcontent");
@ -69,13 +97,11 @@ public class ByAssessmentcontentController extends BaseController
     */
    @PreAuthorize("@ss.hasPermi('benyi:assessmentcontent:query')")
    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(byAssessmentcontentService.selectByAssessmentcontentById(id));
    }


-
    /**
     * 获取部门下拉树列表
     */
@ -92,8 +118,7 @@ public class ByAssessmentcontentController extends BaseController
    @PreAuthorize("@ss.hasPermi('benyi:assessmentcontent:add')")
    @Log(title = "评估内容", businessType = BusinessType.INSERT)
    @PostMapping
-    public AjaxResult add(@RequestBody ByAssessmentcontent byAssessmentcontent)
-    {
+    public AjaxResult add(@RequestBody ByAssessmentcontent byAssessmentcontent) {
        return toAjax(byAssessmentcontentService.insertByAssessmentcontent(byAssessmentcontent));
    }

@ -103,8 +128,7 @@ public class ByAssessmentcontentController extends BaseController
    @PreAuthorize("@ss.hasPermi('benyi:assessmentcontent:edit')")
    @Log(title = "评估内容", businessType = BusinessType.UPDATE)
    @PutMapping
-    public AjaxResult edit(@RequestBody ByAssessmentcontent byAssessmentcontent)
-    {
+    public AjaxResult edit(@RequestBody ByAssessmentcontent byAssessmentcontent) {
        return toAjax(byAssessmentcontentService.updateByAssessmentcontent(byAssessmentcontent));
    }

@ -114,8 +138,7 @@ public class ByAssessmentcontentController extends BaseController
    @PreAuthorize("@ss.hasPermi('benyi:assessmentcontent:remove')")
    @Log(title = "评估内容", businessType = BusinessType.DELETE)
    @DeleteMapping("/{id}")
-    public AjaxResult remove(@PathVariable Long id)
-    {
+    public AjaxResult remove(@PathVariable Long id) {
        if (byAssessmentcontentService.hasChildByAssessmentcontentId(id)) {
            return AjaxResult.error("存在下级内容,不允许删除");
        }
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByAssessmentcontentMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByAssessmentcontentMapper.java
@ -27,6 +27,14 @@ public interface ByAssessmentcontentMapper {
     */
    public List<ByAssessmentcontent> selectByAssessmentcontentList(ByAssessmentcontent byAssessmentcontent);

+    /**
+     * 查询评估内容列表
+     *
+     * @param byAssessmentcontent 评估内容
+     * @return 评估内容集合
+     */
+    public List<ByAssessmentcontent> selectByAssessmentcontentstudyList(ByAssessmentcontent byAssessmentcontent);
+
    /**
     * 新增评估内容
     *
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByAssessmentcontentService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByAssessmentcontentService.java
@ -28,6 +28,14 @@ public interface IByAssessmentcontentService {
     */
    public List<ByAssessmentcontent> selectByAssessmentcontentList(ByAssessmentcontent byAssessmentcontent);

+    /**
+     * 查询评估内容列表
+     *
+     * @param byAssessmentcontent 评估内容
+     * @return 评估内容集合
+     */
+    public List<ByAssessmentcontent> selectByAssessmentcontentstudyList(ByAssessmentcontent byAssessmentcontent);
+
    /**
     * 构建前端所需要树结构
     *
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByAssessmentcontentServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByAssessmentcontentServiceImpl.java
@ -47,6 +47,17 @@ public class ByAssessmentcontentServiceImpl implements IByAssessmentcontentServi
        return byAssessmentcontentMapper.selectByAssessmentcontentList(byAssessmentcontent);
    }

+    /**
+     * 查询评估内容列表
+     *
+     * @param byAssessmentcontent 评估内容
+     * @return 评估内容集合
+     */
+    @Override
+    public List<ByAssessmentcontent> selectByAssessmentcontentstudyList(ByAssessmentcontent byAssessmentcontent){
+        return byAssessmentcontentMapper.selectByAssessmentcontentstudyList(byAssessmentcontent);
+    }
+
    /**
     * 构建前端所需要树结构
     *
--- a/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentcontentMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentcontentMapper.xml
@ -28,6 +28,20 @@
        </where>
    </select>

+    <select id="selectByAssessmentcontentstudyList" parameterType="ByAssessmentcontent"
+            resultMap="ByAssessmentcontentResult">
+select -1 as id, -2 as parentId, title as name, 'N' as iselement  from by_assessmentintroduce
+union all
+select dict_value,-1,dict_label,'N' from sys_dict_data where dict_type='sys_dm_pgyssyfw'
+union all
+select id,parentId,name,iselement from by_assessmentcontent where scope=1 and parentId!=0 and iselement='N'
+union all
+select id,parentId,name,iselement from by_assessmentcontent where scope=2 and parentId!=0 and iselement='N'
+union all
+select id,parentId,name,iselement from by_assessmentcontent where scope=3 and parentId!=0 and iselement='N'
+
+    </select>
+
    <select id="selectByAssessmentcontentById" parameterType="Long" resultMap="ByAssessmentcontentResult">
        <include refid="selectByAssessmentcontentVo"/>
        where id = #{id}