From d44268b78361eeda6ba54bc7dc0252934c5c40fc Mon Sep 17 00:00:00 2001
From: lijingyu007 <904564792@qq.com>
Date: Thu, 27 Jun 2024 18:29:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=88=E8=B5=84=E6=8A=A5=E5=90=8D=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                         |   2 +-
 package.json                             |   2 +-
 src/components/jsonTool/index.vue        |  78 ++++++++++++++++
 src/main.js                              |   5 ++
 src/views/trainService/signlist.vue      |  11 ++-
 src/views/trainService/signupStudent.vue | 110 ++++++++++++++++-------
 6 files changed, 174 insertions(+), 34 deletions(-)
 create mode 100644 src/components/jsonTool/index.vue

diff --git a/.env.development b/.env.development
index 32f1e1f..8bff949 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ ENV = 'development'
 VUE_APP_BASE_API = '/prod-api'
 
 # VUE_APP_BASE_TARGET = 'http://www.bjkeyware.com/test-api'
-VUE_APP_BASE_TARGET = 'http://192.168.0.229:9999'
+VUE_APP_BASE_TARGET = 'http://192.168.0.129:9999'
 # VUE_APP_BASE_TARGET = 'http://192.168.0.129:9999'
 # VUE_APP_BASE_TARGET = 'http://172.16.36.180:9999'
 
diff --git a/package.json b/package.json
index 4fc2783..a7a7746 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
     "@riophae/vue-treeselect": "0.4.0",
     "axios": "^0.21.1",
     "babel-polyfill": "^6.26.0",
+    "bin-code-editor": "^0.9.0",
     "caniuse-lite": "^1.0.30001281",
     "clipboard": "2.0.6",
     "compression-webpack-plugin": "^5.0.1",
@@ -89,7 +90,6 @@
     "sass-loader": "^10.0.0",
     "script-ext-html-webpack-plugin": "2.1.5",
     "svg-sprite-loader": "5.1.1",
-    
     "vue-template-compiler": "2.6.12"
   },
   "engines": {
diff --git a/src/components/jsonTool/index.vue b/src/components/jsonTool/index.vue
new file mode 100644
index 0000000..eade08c
--- /dev/null
+++ b/src/components/jsonTool/index.vue
@@ -0,0 +1,78 @@
+<template>
+    <div style="width: 100%; margin-top: 30px">
+        <b-code-editor
+            v-model="jsonData"
+            :auto-format="true"
+            :smart-indent="true"
+            theme="dracula"
+            :indent-unit="4"
+            :line-wrap="false"
+            ref="editor"
+        ></b-code-editor>
+        <br />
+        <!-- <el-button type="primary" @click="onSubumit">提交</el-button> -->
+    </div>
+</template>
+ 
+<script>
+export default {
+    props: {
+        jsonData: {
+            type: String,
+            default: `[
+                {
+                    "name": "姓名",
+                    "key": "name",
+                    "type": "input",
+                    "value": ""
+                },
+                {
+                    "title": "在校职务",
+                    "key": "title",
+                    "type": "input",
+                    "value": ""
+                },
+                {
+                    "mobile": "手机号",
+                    "key": "mobile",
+                    "type": "input",
+                    "value": ""
+                }
+            ]`,
+        },
+    },
+    data() {
+        return {
+        }
+    },
+    methods: {
+        // 检测json格式
+        isJSON(str) {
+            if (typeof str == 'string') {
+                try {
+                    var obj = JSON.parse(str)
+                    if (typeof obj == 'object' && obj) {
+                        return true
+                    } else {
+                        return false
+                    }
+                } catch (e) {
+                    return false
+                }
+            } else if (typeof str == 'object' && str) {
+                return true
+            }
+        },
+        onSubumit() {
+            if (!this.isJSON(this.jsonData)) {
+                this.$message.error(`json格式错误`)
+                return false
+            }
+            this.$message.success('json格式正确')
+        },
+    },
+}
+</script>
+ 
+<style>
+</style>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 3af3279..3ffa2c4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -32,6 +32,11 @@ import Distpicker from 'v-distpicker'
 
 Vue.component('v-distpicker', Distpicker)
 
+// json
+import CodeEditor from 'bin-code-editor';
+Vue.use(CodeEditor);
+// json
+
 // 防xss攻击
 import Xss from 'xss'
 Vue.prototype.Xss = Xss
diff --git a/src/views/trainService/signlist.vue b/src/views/trainService/signlist.vue
index 4749c66..94d730a 100644
--- a/src/views/trainService/signlist.vue
+++ b/src/views/trainService/signlist.vue
@@ -34,6 +34,7 @@
                         <el-option label="校企合作班" :value="0"></el-option>
                         <el-option label="线下培训进阶班" :value="1"></el-option>
                         <el-option label="可靠性人才培训班" :value="2"></el-option>
+                        <el-option label="师资培训班" :value="3"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item>
@@ -131,6 +132,7 @@
                         <el-option label="校企合作班" :value="0"></el-option>
                         <el-option label="线下培训进阶班" :value="1"></el-option>
                         <el-option label="可靠性人才培训班" :value="2"></el-option>
+                        <el-option label="师资培训班" :value="3"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="培训教师" prop="teacherName">
@@ -233,6 +235,8 @@
                         imageType="zip|rar"
                     />
                 </el-form-item>
+                <!-- 编辑json -->
+                <JsonTool ref="jsontool" v-if="form.classType == 3"/>
 
                 <el-form-item style="padding-left: 170px">
                     <el-button
@@ -276,6 +280,7 @@
                 @pagination="getStudentList"
             />
         </el-dialog>
+        
     </div>
 </template>
 <script>
@@ -291,9 +296,10 @@ import {
 import ImageUpload from '@/components/ImgUpload/index.vue'
 import NonimageUpload from '@/views/components/NonimageUpload'
 // 1 报名未开始、2 报名中、 3 报名结束未开课、4 开课中、5 已结束   status字段
+import JsonTool from '@/components/jsonTool'
 export default {
     name: 'peixunbaoming',
-    components: { ImageUpload, NonimageUpload },
+    components: { ImageUpload, NonimageUpload, JsonTool },
     data() {
         return {
             teacherList: [],
@@ -348,6 +354,9 @@ export default {
 
     mounted() {},
     methods: {
+        // json
+        // json
+        // 获取教师列表
         async getTeacherList() {
             const res = await listTeacherAll()
             this.teacherList = res
diff --git a/src/views/trainService/signupStudent.vue b/src/views/trainService/signupStudent.vue
index e415357..e0ab20a 100644
--- a/src/views/trainService/signupStudent.vue
+++ b/src/views/trainService/signupStudent.vue
@@ -1,43 +1,37 @@
 <template>
     <div class="container" style="padding: 30px">
-        <el-form
-            :model="queryParamss"
-            ref="queryForm"
-            inline
-            label-width="68px"
-        >
-                <el-form-item label="姓名" prop="studentName">
-                    <el-input v-model="queryParamss.studentName" placeholder="请输入姓名" clearable size="small" />
-                </el-form-item>
-                <el-form-item label="手机号" prop="mobile">
-                    <el-input v-model="queryParamss.mobile" placeholder="请输入手机号" clearable size="small" />
-                </el-form-item>
-                <!-- <el-form-item label="所属学院" prop="homeCollege" v-if="$route.query.type == 0">
+        <el-form :model="queryParamss" ref="queryForm" inline label-width="68px">
+            <el-form-item label="姓名" prop="studentName">
+                <el-input v-model="queryParamss.studentName" placeholder="请输入姓名" clearable size="small" />
+            </el-form-item>
+            <el-form-item label="手机号" prop="mobile">
+                <el-input v-model="queryParamss.mobile" placeholder="请输入手机号" clearable size="small" />
+            </el-form-item>
+            <!-- <el-form-item label="所属学院" prop="homeCollege" v-if="$route.query.type == 0">
                     <el-input v-model="queryParamss.homeCollege" placeholder="请输入所属学院" clearable size="small" />
                 </el-form-item> -->
-                <el-form-item label="辅导员" prop="counsellor" v-if="$route.query.type == 0">
-                    <el-input v-model="queryParamss.counsellor" placeholder="请输入辅导员姓名" clearable size="small" />
-                </el-form-item>
-                <el-form-item label="专业" prop="majorName" v-if="$route.query.type == 0">
-                    <el-input v-model="queryParamss.majorName" placeholder="请输入专业" clearable size="small" />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-                    <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-                </el-form-item>
+            <el-form-item label="辅导员" prop="counsellor" v-if="$route.query.type == 0">
+                <el-input v-model="queryParamss.counsellor" placeholder="请输入辅导员姓名" clearable size="small" />
+            </el-form-item>
+            <el-form-item label="专业" prop="majorName" v-if="$route.query.type == 0">
+                <el-input v-model="queryParamss.majorName" placeholder="请输入专业" clearable size="small" />
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
         </el-form>
 
         <!-- 详细学生信息弹层 -->
-
-        <el-table :data="studentList" v-loading="loading">
+        <el-table v-if="$route.query.type != 3" :data="studentList" v-loading="loading">
             <el-table-column label="序号" align="center" type="index" />
             <el-table-column label="学号" align="center" prop="studentCode" v-if="$route.query.type == 0" />
             <el-table-column label="姓名" align="center" prop="studentName" />
             <!-- <el-table-column label="所属学院" align="center" prop="homeCollege" v-if="$route.query.type == 0" /> -->
             <el-table-column label="专业名称" align="center" prop="majorName" v-if="$route.query.type == 0" />
             <el-table-column label="手机号" align="center" prop="mobile" />
-            <el-table-column label="辅导员" align="center" prop="counsellor" v-if="$route.query.type == 0"/>
-            <el-table-column label="辅导员联系方式" align="center" prop="counsellorTel" v-if="$route.query.type == 0"/>
+            <el-table-column label="辅导员" align="center" prop="counsellor" v-if="$route.query.type == 0" />
+            <el-table-column label="辅导员联系方式" align="center" prop="counsellorTel" v-if="$route.query.type == 0" />
             <el-table-column label="报名时间" align="center" prop="registrationTime" />
             <el-table-column label="备注" align="center" prop="remark" />
             <el-table-column label="操作" align="center">
@@ -49,6 +43,18 @@
                 </template>
             </el-table-column>
         </el-table>
+        <el-table v-else :data="teacherList" v-loading="loading">
+            <el-table-column label="序号" align="center" type="index" />
+            <el-table-column v-for="it in headerList" :key="it" :label="headerData[it]" align="center" :prop="it" />
+            <el-table-column label="操作" align="center">
+                <template slot-scope="scope">
+                    <el-button size="mini" type="text" v-if="scope.row.remark" @click="editRemark(scope.row)"
+                        >修改备注</el-button
+                    >
+                    <el-button size="mini" type="text" v-else @click="addRemark(scope.row)">添加备注</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
         <pagination
             v-show="totals > 0"
             :total="totals"
@@ -95,7 +101,7 @@ export default {
                 mobile: null,
                 majorName: null,
                 counsellor: null,
-                counsellorTel: null
+                counsellorTel: null,
             },
             totals: 0,
 
@@ -108,6 +114,10 @@ export default {
                 remark: [{ required: true, message: '请输入备注', trigger: 'blur' }],
             },
             rowId: null,
+            teacherList: [], //原始数据
+            // 表头数据
+            headerList: [],
+            headerData: {},
         }
     },
 
@@ -117,8 +127,46 @@ export default {
     methods: {
         async getStudentList() {
             this.loading = true
-            const res = await searchNum({ trainClassId: this.$route.query.id, ...this.queryParamss })
-            this.studentList = res.rows
+            const res = await searchNum({
+                classType: this.$route.query.type,
+                trainClassId: this.$route.query.id,
+                ...this.queryParamss,
+            })
+            if (this.$route.query.type == 3 && res.total > 0) {
+                // 处理json
+                if (res.rows[0].data) {
+                    this.headerList = []
+                    this.headerData ={}
+                    // 取第一项处理表头
+                    const firstData = JSON.parse(res.rows[0].data)
+                    firstData.forEach((it) => {
+                        // 循环标识
+                        this.headerList.push(it.key)
+                        // 表头文字
+                        this.headerData[it.key] = it[it.key]
+                    })
+                    // 处理备注列
+                    this.headerList.push('remark')
+                    this.headerData.remark = '备注'
+                    // 表格新数据
+                    const newData = []
+                    // 构造表格数据--解析每一条json串
+                    res.rows.forEach((item) => {
+                        if (item.data) {
+                            const obj = {}
+                            JSON.parse(item.data).forEach((ite) => {
+                                obj[ite.key] = ite.value
+                                obj.trainingStudentId = item.trainingStudentId
+                                obj.remark = item.remark
+                            })
+                            newData.push(obj)
+                        }
+                    })
+                    this.teacherList = newData
+                }
+            } else {
+                this.studentList = res.rows
+            }
             this.totals = res.total
             this.loading = false
         },
@@ -141,7 +189,7 @@ export default {
             this.rowId = row.trainingStudentId
             this.visibleopen = true
             this.title = '修改备注'
-            this.form = {remark: row.remark}
+            this.form = { remark: row.remark }
         },
         // 提交备注
         submitRemark() {