From bb07c913aafd42fa2d6c4a2570e4d33d93295e2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E4=BB=95=E4=BC=9F?= <499672082@qq.com>
Date: Fri, 10 Feb 2023 11:55:28 +0000
Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=93=E5=8D=A1?=
 =?UTF-8?q?=E6=AC=A1=E6=95=B0=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/qianxinan/AppSignInfo/list.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/project/qianxinan/AppSignInfo/list.vue b/project/qianxinan/AppSignInfo/list.vue
index 5c1d95b3..5da8df2b 100644
--- a/project/qianxinan/AppSignInfo/list.vue
+++ b/project/qianxinan/AppSignInfo/list.vue
@@ -40,6 +40,7 @@
                 <el-date-picker v-model="search.createDateEnd" size="small" placeholder="结束时间" value-format="yyyy-MM-dd" @change="reloadTable"/>
               </ai-search>
               <ai-select placeholder="打卡状态" v-model="search.status" :selectList="dict.getDict('wxSignStatus')" @change="reloadTable"/>
+              <ai-input placeholder="打卡次数" type="number" v-model="search.times" @change="reloadTable"/>
             </template>
             <template #right>
               <el-input size="small" placeholder="搜索用户" v-model="search.wxUserName" clearable @change="page.current=1,getTableData()"/>
@@ -66,7 +67,7 @@ export default {
   },
   data() {
     return {
-      search: {name: "", createDateStart: "", createDateEnd: "", departmentId: ""},
+      search: {name: "", createDateStart: "", createDateEnd: "", times: "", departmentId: ""},
       page: {current: 1, size: 10, total: 0},
       tableData: [],
       colConfigs: [

From f9e2fa0222246afe11ea6ee4c29c09b2bd80f706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E4=BB=95=E4=BC=9F?= <499672082@qq.com>
Date: Fri, 10 Feb 2023 12:07:41 +0000
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9input=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/qianxinan/AppSignInfo/list.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/qianxinan/AppSignInfo/list.vue b/project/qianxinan/AppSignInfo/list.vue
index 5da8df2b..2fd671cc 100644
--- a/project/qianxinan/AppSignInfo/list.vue
+++ b/project/qianxinan/AppSignInfo/list.vue
@@ -40,7 +40,7 @@
                 <el-date-picker v-model="search.createDateEnd" size="small" placeholder="结束时间" value-format="yyyy-MM-dd" @change="reloadTable"/>
               </ai-search>
               <ai-select placeholder="打卡状态" v-model="search.status" :selectList="dict.getDict('wxSignStatus')" @change="reloadTable"/>
-              <ai-input placeholder="打卡次数" type="number" v-model="search.times" @change="reloadTable"/>
+              <ai-input placeholder="打卡次数" size="small" type="number" v-model="search.times" @change="reloadTable"/>
             </template>
             <template #right>
               <el-input size="small" placeholder="搜索用户" v-model="search.wxUserName" clearable @change="page.current=1,getTableData()"/>

From a17182c918d7bf0a901c3f00cbb0124434c8a278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E4=BB=95=E4=BC=9F?= <499672082@qq.com>
Date: Fri, 10 Feb 2023 12:15:56 +0000
Subject: [PATCH 3/5] el-input

---
 project/qianxinan/AppSignInfo/list.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/qianxinan/AppSignInfo/list.vue b/project/qianxinan/AppSignInfo/list.vue
index 2fd671cc..2a36bce8 100644
--- a/project/qianxinan/AppSignInfo/list.vue
+++ b/project/qianxinan/AppSignInfo/list.vue
@@ -40,7 +40,7 @@
                 <el-date-picker v-model="search.createDateEnd" size="small" placeholder="结束时间" value-format="yyyy-MM-dd" @change="reloadTable"/>
               </ai-search>
               <ai-select placeholder="打卡状态" v-model="search.status" :selectList="dict.getDict('wxSignStatus')" @change="reloadTable"/>
-              <ai-input placeholder="打卡次数" size="small" type="number" v-model="search.times" @change="reloadTable"/>
+              <el-input placeholder="打卡次数" size="small" type="number" v-model="search.times" @change="reloadTable"/>
             </template>
             <template #right>
               <el-input size="small" placeholder="搜索用户" v-model="search.wxUserName" clearable @change="page.current=1,getTableData()"/>

From 670ceae73c2211506dc834220e506ae893f850b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E4=BB=95=E4=BC=9F?= <499672082@qq.com>
Date: Fri, 10 Feb 2023 17:54:22 +0000
Subject: [PATCH 4/5] Update list.vue

---
 project/qianxinan/AppSignInfo/list.vue | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/project/qianxinan/AppSignInfo/list.vue b/project/qianxinan/AppSignInfo/list.vue
index 2a36bce8..da4bf48e 100644
--- a/project/qianxinan/AppSignInfo/list.vue
+++ b/project/qianxinan/AppSignInfo/list.vue
@@ -14,9 +14,6 @@
                 <el-form-item label="晚提醒时间">
                   <el-time-picker v-model="form.nightTime" placeholder="请选择" value-format="HH:mm:ss"/>
                 </el-form-item>
-                <el-form-item label="打卡间隔时间">
-                  <el-input type="number" v-model="form.doInterval" placeholder="打卡间隔时间(单位:小时)"/>
-                </el-form-item>
               </el-form>
             </ai-dialog-btn>
           </div>
@@ -40,7 +37,6 @@
                 <el-date-picker v-model="search.createDateEnd" size="small" placeholder="结束时间" value-format="yyyy-MM-dd" @change="reloadTable"/>
               </ai-search>
               <ai-select placeholder="打卡状态" v-model="search.status" :selectList="dict.getDict('wxSignStatus')" @change="reloadTable"/>
-              <el-input placeholder="打卡次数" size="small" type="number" v-model="search.times" @change="reloadTable"/>
             </template>
             <template #right>
               <el-input size="small" placeholder="搜索用户" v-model="search.wxUserName" clearable @change="page.current=1,getTableData()"/>
@@ -67,15 +63,14 @@ export default {
   },
   data() {
     return {
-      search: {name: "", createDateStart: "", createDateEnd: "", times: "", departmentId: ""},
+      search: {name: "", createDateStart: "", createDateEnd: "", departmentId: ""},
       page: {current: 1, size: 10, total: 0},
       tableData: [],
       colConfigs: [
         {prop: "wxUserName", label: "用户"},
         {prop: "departmentName", label: "部门"},
         {prop: "createDate", label: "打卡日期"},
-        {prop: "createTime", label: "最新打卡时间"},
-        {prop: "times", label: "打卡次数"},
+        {prop: "createTime", label: "打卡时间"},
         {prop: "status", label: "状态", dict: "wxSignStatus"}
       ],
       treeData: [],

From 708a2193b041840b3ce5d36583d435c38176ff1a Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 13 Feb 2023 10:22:26 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=AF=95=E9=A2=98?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/AppQuestionBank/components/Add.vue    | 93 ++++++++++++-------
 .../app/AppQuestionBank/components/Detail.vue | 38 ++++----
 .../app/AppQuestionBank/components/List.vue   | 14 +--
 ui/packages/basic/AiArticle.vue               |  4 +-
 4 files changed, 90 insertions(+), 59 deletions(-)

diff --git a/project/qujing/app/AppQuestionBank/components/Add.vue b/project/qujing/app/AppQuestionBank/components/Add.vue
index 49284e16..818cff9b 100644
--- a/project/qujing/app/AppQuestionBank/components/Add.vue
+++ b/project/qujing/app/AppQuestionBank/components/Add.vue
@@ -1,7 +1,7 @@
 <template>
   <ai-detail class="AppQuestionBank-add" v-loading="isLoading">
     <template slot="title">
-      <ai-title :title="params.id ? '编辑' + '试题库' : '添加' + '试题库'" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
+      <ai-title :title="params.id ? '编辑' + '试题' : '添加' + '试题'" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
     </template>
     <template slot="content">
       <ai-card title="基本信息">
@@ -12,37 +12,35 @@
             </el-form-item>
             <el-form-item prop="type" label="题目类型" :rules="[{required: true, message: '请选择题目类型', trigger: 'change'}]">
               <el-radio-group v-model="form.type" @change="onTypeChange">
-                <el-radio label="1">单选题</el-radio>
-                <el-radio label="2">多选题</el-radio>
-                <el-radio label="3">判断题</el-radio>
+                <el-radio :label="item.dictValue" :key="item.dictValue" v-for="item in dict.getDict('qjQBType')">{{ item.dictName }}</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item prop="options" v-if="form.type !== '3'" style="width: 100%;" label="题目选项" :rules="[{required: true, message: '请输入题目选项', trigger: 'change'}]">
-              <div class="options" v-for="(item, index) in form.options" :key="index">
+            <el-form-item prop="items" v-if="form.type !== '2'" style="width: 100%;" label="题目选项" :rules="[{required: true, message: '请输入题目选项', trigger: 'change'}]">
+              <div class="options" v-for="(item, index) in form.items" :key="index">
                 <span>选项{{ index + 1 }}</span>
-                <el-input placeholder="请输入选项名" size="small" :maxlength="100" show-word-limit v-model="item.label"></el-input>
+                <el-input placeholder="请输入选项名" size="small" :maxlength="100" show-word-limit v-model="item.content"></el-input>
                 <i class="iconfont iconDelete" @click="removeOptions(index)"></i>
               </div>
               <el-button type="text" class="add-select" @click="addOptions">添加选项</el-button>
             </el-form-item>
-            <el-form-item style="width: 100%;" v-if="form.options.length && form.type !== '3'" prop="answer" label="题目答案" :rules="[{required: true, message: '请选择题目答案', trigger: 'change'}]">
-              <el-select :multiple="form.type === '2'" v-model="form.answer" size="small" placeholder="请选择题目答案">
+            <el-form-item style="width: 100%;" v-if="form.items.length && form.type !== '2'" prop="answer" label="题目答案" :rules="[{required: true, message: '请选择题目答案', trigger: 'change'}]">
+              <el-select :multiple="form.type === '1'" v-model="form.answer" size="small" placeholder="请选择题目答案">
                 <el-option
-                  v-for="(item, index) in form.options"
+                  v-for="(item, index) in form.items"
                   :key="index"
-                  :label="item.label"
-                  :value="item.label">
+                  :label="item.content"
+                  :value="item.content">
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item v-if="form.type === '3'" style="width: 100%;" prop="answer" label="题目答案" :rules="[{required: true, message: '请选择题目答案', trigger: 'change'}]">
+            <el-form-item v-if="form.type === '2'" style="width: 100%;" prop="answer" label="题目答案" :rules="[{required: true, message: '请选择题目答案', trigger: 'change'}]">
               <el-radio-group v-model="form.answer">
                 <el-radio label="1">正确</el-radio>
                 <el-radio label="0">错误</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item label="答案解析" prop="content" style="width: 100%;" :rules="[{required: true, message: '请输入内容', trigger: 'change'}]">
-              <ai-editor v-model="form.content" :instance="instance"/>
+            <el-form-item label="答案解析" prop="analysis" style="width: 100%;" :rules="[{required: true, message: '请输入内容', trigger: 'change'}]">
+              <ai-editor v-model="form.analysis" :instance="instance"/>
             </el-form-item>
           </el-form>
         </template>
@@ -71,13 +69,14 @@
         info: {},
         form: {
           title: '',
-          content: '',
-          type: '1',
+          analysis: '',
+          type: '0',
           answer: '',
-          options: []
+          items: []
         },
         isLoading: false,
-        id: ''
+        id: '',
+        sort: ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I']
       }
     },
 
@@ -86,17 +85,28 @@
     },
 
     created () {
-      if (this.params && this.params.id) {
-        this.id = this.params.id
-        this.getInfo(this.params.id)
-      }
+      this.dict.load('qjQBType').then(() => {
+        if (this.params && this.params.id) {
+          this.id = this.params.id
+          this.getInfo(this.params.id)
+        }
+      })
     },
 
     methods: {
       getInfo (id) {
-        this.instance.post(`/app/appcontentinfo/queryDetailById?id=${id}`).then(res => {
+        this.instance.post(`/app/appquestionbank/queryDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
-            this.form = res.data
+            this.form = {
+              ...res.data,
+              answer: res.data.type === '1' ?
+                res.data.items.filter(v => v.checked === '1').map(v => v.content)
+                : res.data.items.filter(v => v.checked === '1')[0].content
+            }
+
+            if (res.data.type === '2') {
+              this.form.answer = this.form.answer === '正确' ? '1' : '0'
+            }
           }
         })
       },
@@ -110,32 +120,45 @@
       },
 
       addOptions () {
-        this.form.options.push({
-          label: ''
+        this.form.items.push({
+          content: ''
         })
       },
 
       removeOptions (index) {
-        this.form.options.splice(index, 1)
+        this.form.items.splice(index, 1)
       },
 
       confirm () {
         this.$refs.form.validate((valid) => {
           if (valid) {
-            this.isLoading = true
-            this.instance.post(`/app/appcontentinfo/addOrUpdate`, {
-              ...this.form
+            const items = this.form.type !== '2' ? this.form.items.map((v, index) => {
+              return {
+                ...v,
+                sort: this.sort[index],
+                checked: this.form.type === '0' ? (this.form.answer === v.content ? '1' : '0') : (this.form.answer.indexOf(v.content) !== -1 ? '1' : 0)
+              }
+            }) : [{
+              content: '正确',
+              sort: 'A',
+              checked: this.form.answer === '1' ? 1 : 0
+            }, {
+              content: '错误',
+              sort: 'B',
+              checked: this.form.answer === '0' ? 1 : 0
+            }]
+
+            this.instance.post(`/app/appquestionbank/addOrUpdate`, {
+              ...this.form,
+              items,
+              id: this.params.id || ''
             }).then(res => {
               if (res.code == 0) {
                 this.$message.success('提交成功')
                 setTimeout(() => {
                   this.cancel(true)
                 }, 600)
-              } else {
-                this.isLoading = false
               }
-            }).catch(() => {
-              this.isLoading = false
             })
           }
         })
diff --git a/project/qujing/app/AppQuestionBank/components/Detail.vue b/project/qujing/app/AppQuestionBank/components/Detail.vue
index 6b7dbab0..59445942 100644
--- a/project/qujing/app/AppQuestionBank/components/Detail.vue
+++ b/project/qujing/app/AppQuestionBank/components/Detail.vue
@@ -10,11 +10,18 @@
           <ai-wrapper
             label-width="120px">
             <ai-info-item label="题目描述" isLine :value="info.title"></ai-info-item>
-            <ai-info-item label="题目类型" isLine :value="info.title"></ai-info-item>
-            <ai-info-item label="正确答案" isLine :value="info.areaName"></ai-info-item>
-            <ai-info-item label="题目选项" isLine :value="info.contentType"></ai-info-item>
-            <ai-info-item label="正文" isLine>
-              <AiArticle :value="info.content"></AiArticle>
+            <ai-info-item label="题目类型" :value="dict.getLabel('qjQBType', info.type)"></ai-info-item>
+            <ai-info-item label="正确答案" :value="info.answer"></ai-info-item>
+            <ai-info-item label="题目选项" isLine>
+              <div class="">
+                <div class="options" v-for="(item, index) in info.items" :key="index">
+                  <span>{{ item.sort }}：</span>
+                  <span>{{ item.content }}</span>
+                </div>
+              </div>
+            </ai-info-item>
+            <ai-info-item label="答案解析" isLine>
+              <AiArticle :value="info.analysis"></AiArticle>
             </ai-info-item>
           </ai-wrapper>
         </template>
@@ -30,32 +37,29 @@
     props: {
       instance: Function,
       dict: Object,
-      params: Object,
-      moduleId: String
+      params: Object
     },
 
     data () {
       return {
-        info: {},
-        id: ''
+        info: {}
       }
     },
 
     created () {
-      if (this.params && this.params.id) {
-        this.id = this.params.id
+      this.dict.load('qjQBType').then(() => {
         this.getInfo(this.params.id)
-      }
+      })
     },
 
     methods: {
       getInfo (id) {
-        this.instance.post(`/app/appcontentinfo/queryDetailById?id=${id}`).then(res => {
+        this.instance.post(`/app/appquestionbank/queryDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
-            this.info = res.data
-            this.info.pictureUrl = res.data.pictureUrl ? [{
-              url: res.data.pictureUrl
-            }] : []
+            this.info = {
+              ...res.data,
+              answer: res.data.items.filter(v => v.checked === '1').map(v => v.content).join(',')
+            }
           }
         })
       },
diff --git a/project/qujing/app/AppQuestionBank/components/List.vue b/project/qujing/app/AppQuestionBank/components/List.vue
index 06299692..ad66faf4 100644
--- a/project/qujing/app/AppQuestionBank/components/List.vue
+++ b/project/qujing/app/AppQuestionBank/components/List.vue
@@ -29,7 +29,7 @@
         :current.sync="search.current"
         :size.sync="search.size"
         @getList="getList">
-        <el-table-column slot="options" width="120px" fixed="right" label="操作" align="center">
+        <el-table-column slot="options" width="160px" fixed="right" label="操作" align="center">
           <template slot-scope="{ row }">
             <div class="table-options">
               <el-button type="text" @click="toAdd(row.id)">编辑</el-button>
@@ -63,19 +63,21 @@
         total: 10,
         colConfigs: [
           { prop: 'title',  label: '题目', align: 'left' },
-          { prop: 'createUserName',  label: '题目类型', align: 'center' }
+          { prop: 'type',  label: '题目类型', align: 'center', format: v => this.dict.getLabel('qjQBType', v) + '题' }
         ],
         tableData: []
       }
     },
 
     created() {
-      this.getList()
+      this.dict.load('qjQBType').then(() => {
+        this.getList()
+      })
     },
 
     methods: {
       getList() {
-        this.instance.post(`/app/appmarketingactivityinfo/list`, null, {
+        this.instance.post(`/app/appquestionbank/list`, null, {
           params: {
             ...this.search
           }
@@ -88,8 +90,8 @@
       },
 
       remove (id) {
-        this.$confirm('确定删除该活动？').then(() => {
-          this.instance.post(`/app/appmarketingactivityinfo/delete?id=${id}`).then(res => {
+        this.$confirm('确定删除该试题？').then(() => {
+          this.instance.post(`/app/appquestionbank/delete?id=${id}`).then(res => {
             if (res.code == 0) {
               this.$message.success('删除成功！')
               this.getList()
diff --git a/ui/packages/basic/AiArticle.vue b/ui/packages/basic/AiArticle.vue
index a5a0986b..26f1d5a4 100644
--- a/ui/packages/basic/AiArticle.vue
+++ b/ui/packages/basic/AiArticle.vue
@@ -175,7 +175,9 @@
       margin-top: 18px;
       margin-bottom: 18px
     }
-
+    :deep( p:first-child){
+      margin-top: 0!important;
+    }
     :deep( img ){
       max-height: none
     }