From a63e704b1e831309827c36dfd0b351d79c7eab5e Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Tue, 10 Jan 2023 10:40:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E9=97=AE=E7=AD=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fengdu/app/AppLearning/AppLearning.vue    |  4 +-
 .../app/AppLearning/components/Detail.vue     | 57 ++++++++-----------
 .../app/AppLearning/components/List.vue       | 27 +++++----
 3 files changed, 38 insertions(+), 50 deletions(-)

diff --git a/project/fengdu/app/AppLearning/AppLearning.vue b/project/fengdu/app/AppLearning/AppLearning.vue
index c23590f2..aed9924d 100644
--- a/project/fengdu/app/AppLearning/AppLearning.vue
+++ b/project/fengdu/app/AppLearning/AppLearning.vue
@@ -28,7 +28,7 @@ export default {
   },
   data() {
     return {
-      component: "Detail",
+      component: "List",
       params: {},
       include: []
     };
@@ -40,7 +40,7 @@ export default {
         this.params = data.params;
       }
 
-      if (data.type === "list") {
+      if (data.type === "List") {
         this.component = "List";
         this.params = data.params;
 
diff --git a/project/fengdu/app/AppLearning/components/Detail.vue b/project/fengdu/app/AppLearning/components/Detail.vue
index 06fe3812..7a5a4b63 100644
--- a/project/fengdu/app/AppLearning/components/Detail.vue
+++ b/project/fengdu/app/AppLearning/components/Detail.vue
@@ -6,29 +6,19 @@
     </template>
     <template slot="content">
       <ai-card title="基层治理需要关注什么？">
-        <div slot="right" class="right-text">汪周文发布于2023-01-09 <span>已有15个回答</span></div>
+        <div slot="right" class="right-text">{{info.createUserName}}发布于{{info.createTime}} <span>已有{{info.answerCount}}个回答</span></div>
         <template #content>
-          <div class="item">
+          <div class="item" v-for="(item, index) in info.answers" :key="index">
             <div class="flex">
-              <img src="https://img0.baidu.com/it/u=1705694933,4002952892&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=281" alt="">
+              <img :src="item.createUserAvatar" alt="">
               <div class="user-info">
-                <h3>汪周文</h3>
-                <p>中卫慧通-产品部</p>
+                <h3>{{item.createUserName}}</h3>
+                <p>{{item.createUserDeptName}}</p>
               </div>
             </div>
-            <div class="content">123</div>
-            <p class="time"><span>发布于 </span>2023-01-09 16:27</p>
-          </div>
-          <div class="item">
-            <div class="flex">
-              <img src="https://img0.baidu.com/it/u=1705694933,4002952892&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=281" alt="">
-              <div class="user-info">
-                <h3>汪周文</h3>
-                <p>中卫慧通-产品部</p>
-              </div>
-            </div>
-            <div class="content">123</div>
-            <p class="time"><span>发布于 </span>2023-01-09 16:27</p>
+            <div class="content" v-html="item.content"></div>
+            <ai-uploader :instance="instance" disabled v-model="item.files"></ai-uploader>
+            <p class="time"><span>发布于 </span>{{item.createTime}}</p>
           </div>
         </template>
       </ai-card>
@@ -39,37 +29,29 @@
 <script>
   export default {
     name: 'Detail',
-
     props: {
       instance: Function,
       dict: Object,
       params: Object
     },
-
     data () {
       return {
-
+        info: {}
       }
     },
-
     created () {
       this.getInfo()
     },
-
     methods: {
       getInfo () {
-        // this.instance.post(`/app/appvideovoteconfig/queryDetailByCorpId`).then(res => {
-        //   if (res.code == 0) {
-        //     if (res.data) {
-        //       this.id = res.data.id
-        //       this.form = {
-        //         ...res.data
-        //       }
-        //     }
-        //   }
-        // })
+        this.instance.post(`/app/applearningquestion/queryDetailById?id=${this.params.id}`).then(res => {
+          if (res.code == 0) {
+            if (res.data) {
+              this.info = {...res.data}
+            }
+          }
+        })
       },
-
       cancel () {
         this.$emit('change', {
           type: 'List',
@@ -115,6 +97,13 @@
   .time {
     margin-bottom: 16px;
   }
+  .img-list {
+    img {
+      width: 300px;
+      height: 300px;
+      margin: 0 8px 8px 0;
+    }
+  }
 }
 .item:nth-last-of-type(1) {
   border-bottom: 0;
diff --git a/project/fengdu/app/AppLearning/components/List.vue b/project/fengdu/app/AppLearning/components/List.vue
index 130f4962..dc3cff2f 100644
--- a/project/fengdu/app/AppLearning/components/List.vue
+++ b/project/fengdu/app/AppLearning/components/List.vue
@@ -6,11 +6,12 @@
     <template slot="content">
       <ai-table class="ai-table" :tableData="tableData" :col-configs="colConfigs" :total="page.total"
         :current.sync="page.current" :size.sync="page.size" @getList="getList" :dict="dict">
+        <el-table-column slot="index" type="index" width="100px" label="序号" align="center"></el-table-column>
         <el-table-column slot="options" label="操作" align="center" fixed="right" width="200">
           <template slot-scope="{ row }">
             <div class="table-options">
-              <el-button type="text" @click="add(row.id)">详情</el-button>
-              <el-button type="text" @click="toDelete(row.id)">删除</el-button>
+              <el-button type="text" @click="toDetail(row.id)">详情</el-button>
+              <el-button type="text" @click="del(row.id)">删除</el-button>
             </div>
           </template>
         </el-table-column>
@@ -26,11 +27,11 @@ export default {
     return {
       tableData: [],
       colConfigs: [
-        { prop: "name", label: "序号" },
-        { prop: "companyCategory", label: "问题", dict: "twoNewOrgCompanyCategory"},
-        { prop: "companyPhone", label: "提问人员" },
-        { prop: "administratorName", label: "提问时间" },
-        { prop: "administratorPhone", label: "回答数" },
+        { slot: 'index', label: '序号'},
+        { prop: "content", label: "问题"},
+        { prop: "createUserName", label: "提问人员" },
+        { prop: "createTime", label: "提问时间" },
+        { prop: "answerCount", label: "回答数" },
         { slot: "options" },
       ],
       page: {
@@ -53,11 +54,9 @@ export default {
   },
   methods: {
     getList() {
-      this.instance.post(`/app/apptwoneworganization/list`, null, {
+      this.instance.post(`/app/applearningquestion/list`, null, {
         params: {
           ...this.page,
-          ...this.search,
-          bizType: 0
         }
       }).then(res => {
         if (res.code == 0) {
@@ -66,17 +65,17 @@ export default {
         }
       })
     },
-    add(id) {
+    toDetail(id) {
       this.$emit("change", {
-        type: "Add",
+        type: "Detail",
         params: {
           id: id || ""
         }
       })
     },
-    toDelete(id) {
+    del(id) {
       this.$confirm("删除后不可恢复，确定删除该数据？").then(() => {
-        this.instance.post(`/app/apptwoneworganization/delete?ids=${id}`).then(res => {
+        this.instance.post(`/app/applearningquestion/deleteQuestion?id=${id}`).then(res => {
           if (res.code == 0) {
             this.$message.success("删除成功！");
             this.getList();