Merge branch 'master' of http://git.zhiqiyun.com/liucheng/open-platform-admin-ui

src/views/apidocs/DialogDetail.vue

@@ -0,0 +1,48 @@
+<template>
+  <el-dialog
+    v-if="visible"
+    width="900px"
+    :title="currentDetail.title+'['+currentDetail.method+':'+currentDetail.version+']'"
+    :visible.sync="visible"
+  >
+
+    <el-table
+      :data="currentDetail.listFields"
+      border
+      highlight-current-row
+    >
+      <el-table-column label="参数名" prop="name" width="150"/>
+      <el-table-column label="类型" prop="type" width="100"/>
+      <el-table-column label="必须">
+        <template slot-scope="scope">
+          {{ scope.row.required ? '是' : '否' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="说明" prop="describe"/>
+    </el-table>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">关 闭</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+
+export default {
+  data() {
+    return {
+      visible: false,
+      isLoading: false,
+      currentDetail: undefined
+    }
+  },
+  created() {
+  },
+  methods: {
+    open(data) {
+      this.visible = true
+      this.currentDetail = data
+    }
+  }
+}
+</script>

src/views/apidocs/index.vue

@@ -7,9 +7,9 @@
       fit
       highlight-current-row
     >
-      <el-table-column label="标题" prop="title" />
-      <el-table-column label="方法名" prop="method" width="300" />
-      <el-table-column label="版本号" prop="version" width="150" />
+      <el-table-column label="标题" prop="title"/>
+      <el-table-column label="方法名" prop="method" width="300"/>
+      <el-table-column label="版本号" prop="version" width="150"/>
       <el-table-column label="操作" width="70">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click.native="showDetail(scope.row)">详情</el-button>
@@ -17,43 +17,43 @@
       </el-table-column>
     </el-table>
 
-    <el-drawer
-      :title="currentDetail.title+'['+currentDetail.method+':'+currentDetail.version+']'"
-      :visible.sync="showDrawer"
-      direction="ltr"
-    >
-      <el-table
-        v-loading="isLoading"
-        :data="currentDetail.listFields"
-        border
-        fit
-        highlight-current-row
-      >
-        <el-table-column label="参数名" prop="name" width="150" />
-        <el-table-column label="类型" prop="type" width="100" />
-        <el-table-column label="必须">
-          <template slot-scope="scope">
-            {{ scope.row.required ? '是' : '否' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="说明" prop="describe" />
-      </el-table>
-    </el-drawer>
+    <dialog-detail ref="dialogDetail"/>
+    <!--    <el-drawer-->
+    <!--      :title="currentDetail.title+'['+currentDetail.method+':'+currentDetail.version+']'"-->
+    <!--      :visible.sync="showDrawer"-->
+    <!--    >-->
+    <!--      <el-table-->
+    <!--        v-loading="isLoading"-->
+    <!--        :data="currentDetail.listFields"-->
+    <!--        border-->
+    <!--        highlight-current-row-->
+    <!--      >-->
+    <!--        <el-table-column label="参数名" prop="name" width="150" />-->
+    <!--        <el-table-column label="类型" prop="type" width="100" />-->
+    <!--        <el-table-column label="必须">-->
+    <!--          <template slot-scope="scope">-->
+    <!--            {{ scope.row.required ? '是' : '否' }}-->
+    <!--          </template>-->
+    <!--        </el-table-column>-->
+    <!--        <el-table-column label="说明" prop="describe" />-->
+    <!--      </el-table>-->
+    <!--    </el-drawer>-->
   </div>
 </template>
 
 <script>
 import { getApis } from '@/api/docsApis'
+import DialogDetail from '@/views/apidocs/DialogDetail'
 
 export default {
   name: 'Dashboard',
-  components: {},
+  components: { DialogDetail },
   data() {
     return {
       listData: [],
-      isLoading: false,
-      showDrawer: false,
-      currentDetail: {}
+      isLoading: false
+      // showDrawer: false,
+      // currentDetail: {}
     }
   },
   created() {
@@ -66,8 +66,9 @@ export default {
   },
   methods: {
     showDetail(row) {
-      this.showDrawer = true
-      this.currentDetail = row
+      this.$refs.dialogDetail.open(row)
+      // this.showDrawer = true
+      // this.currentDetail = row
     }
   }
 }

src/views/category/organization/index.vue

@@ -42,7 +42,7 @@
       <el-table-column label="公司名称" prop="name" width="200">
         <template slot-scope="scope">
           {{ scope.row.name }}
-          <el-tooltip placement="top">
+          <el-tooltip v-if="scope.row.remark && scope.row.remark!==''" placement="top">
             <div slot="content">{{ scope.row.remark }}</div>
             <i class="el-icon-info" />
           </el-tooltip>