3 Commits f2bbbb9f42 ... 9fb1773dd4

Author SHA1 Message Date
  yueyazhui 9fb1773dd4 知识 9 months ago
  yueyazhui 629f35176a Merge branch 'main' of https://git.sxidc.com/gov_cloud_unify_manager_system/jnpf_360_version_web 9 months ago
  yueyazhui 7569544c03 知识 9 months ago

+ 1 - 1
src/api/governmentCloud/knowledgeBase/knowledgeBase.js

@@ -54,7 +54,7 @@ export function getKnowledgeList(data) {
 // 获取知识信息
 export function getKnowledgeInfo(id) {
   return request({
-    url: `/api/web/knowledge/${id}/Info`,
+    url: `/api/web/knowledge/${id}`,
     method: 'GET'
   })
 }

+ 1 - 1
src/components/Generator/index/RightComponents/RSelect.vue

@@ -233,4 +233,4 @@ export default {
     border-color: #dcdfe6;
   }
 }
-</style>
+</style>

+ 2 - 2
src/utils/apiUrl.js

@@ -1,6 +1,6 @@
 module.exports = {
   // 开发环境接口配置
-  APIURl: "https://test.api.shidaiyun.net"
-  // APIURl: "http://10.21.12.169:30000"
+  // APIURl: "https://test.api.shidaiyun.net"
+  APIURl: "http://localhost:30000"
   // APIURl: "https://api.shidaiyun.net"
 };

+ 36 - 4
src/views/governmentCloud/knowledgeBase/Detail.vue

@@ -1,10 +1,31 @@
 <template>
-  <el-drawer :visible.sync="drawerDetail" :wrapperClosable="false" ref="drawerDetail" size="700px"
-    :before-close="handleDrawerClose" class="JNPF-common-drawer" append-to-body>
-    <div class="JNPF-flex-main"></div>
+  <el-drawer title="知识文档" :visible.sync="drawerDetail" :wrapperClosable="false" ref="drawerDetail"
+    size="100%" :before-close="handleDrawerClose" class="JNPF-common-drawer" append-to-body>
+    <div class="JNPF-flex-main">
+      <div class="box">
+        <div class="title"><h1>{{ dataForm.title }}</h1></div>
+        <div class="publishTime">发布时间:{{ dataForm.publishTime }}</div>
+        <div class="label">{{ dataForm.label }}</div>
+        <div class="content">
+          <div v-html="dataForm.content"></div>
+        </div>
+      </div>
+    </div>
   </el-drawer>
 </template>
 
+<style lang="scss" scoped>
+.box {
+  margin: 20px 0 20px 50px;
+}
+.content {
+  width: 100%;
+  margin-top: 20px;
+  height: 80vh;
+  overflow-y: auto;
+}
+</style>
+
 <script>
 import { getKnowledgeInfo } from "@/api/governmentCloud/knowledgeBase/knowledgeBase";
 
@@ -12,15 +33,26 @@ export default {
   data() {
     return {
       drawerDetail: false,
+      loading: false,
       dataForm: {
         id: "",
+        title: "",
+        label: "",
+        content: "",
+        publishTime: null,
+        relatedKnowledgeList: []
       },
     };
   },
   methods: {
     init(id) {
-      getKnowledgeInfo(id).then((res) => {
+      this.drawerDetail = true
+      this.loading = true
+      getKnowledgeInfo(id).then(res => {
         this.dataForm = res.data
+        this.loading = false
+      }).catch(() => {
+        this.loading = false
       })
     },
     handleDrawerClose(done) {

+ 10 - 1
src/views/governmentCloud/knowledgeBase/components/Form.vue

@@ -3,7 +3,7 @@
     :visible.sync="visible" :append-to-body="true" class="JNPF-dialog JNPF-dialog_center"
     lock-scroll width="600px">
     <el-form ref="dataForm" :model="dataForm" :rules="dataRule" v-loading="formLoading"
-      label-width="60px">
+      label-width="80px">
       <el-form-item label="上级" prop="parentId">
         <JnpfTreeSelect v-model="dataForm.parentId" :options="treeData" :props="{
             value: 'id',
@@ -17,6 +17,11 @@
       <el-form-item label="名称" prop="name">
         <el-input v-model="dataForm.name" placeholder="输入名称" />
       </el-form-item>
+      <el-form-item label="审核用户" prop="checkUserId">
+        <JnpfUserSelect v-model="dataForm.checkUserId" placeholder="请选择审核用户" selectType="all"
+          :style='{"width":"100%"}'>
+        </JnpfUserSelect>
+      </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">{{ $t("common.cancelButton") }}</el-button>
@@ -43,6 +48,7 @@ export default {
         id: "",
         parentId: "",
         name: "",
+        checkUserId: "",
       },
       formLoading: false,
       btnLoading: false,
@@ -52,6 +58,9 @@ export default {
           { required: true, message: "请输入名称", trigger: "blur" },
           { max: 10, message: "名称最多为10个字符!", trigger: "blur" },
         ],
+        checkUserId: [
+          { required: true, message: "请选择审核用户", trigger: "change" },
+        ],
       },
     };
   },

+ 2 - 1
src/views/governmentCloud/knowledgeBase/index.vue

@@ -52,8 +52,9 @@
           <el-table-column prop="title" label="标题" />
           <el-table-column label="操作" width="100">
             <template slot-scope="scope">
-              <tableOpts :hasEdit="false" @del="handleDel(scope.row.id)" />
               <el-button type="text" @click="handleDetail(scope.row.id)">详情</el-button>
+              <el-button style="color: #F56C6C;" type="text"
+                @click="handleDel(scope.row.id)">删除</el-button>
             </template>
           </el-table-column>
         </JNPF-table>