소스 검색

Merge branch 'http_mock' into bug_fix

qinzhipeng_v 5 년 전
부모
커밋
94190d3707

BIN
src/assets/home_images/logo@2x.png


BIN
src/assets/homepage_logo@2x.png


BIN
src/assets/thoth_logopattern.png


BIN
src/assets/质惠logo.png


+ 3 - 1
src/layout/components/AppMain.vue

@@ -1,7 +1,9 @@
 <template>
   <section class="app-main">
     <transition name="fade-transform" mode="out-in">
-      <router-view :key="key" />
+      <keep-alive>
+        <router-view :key="key" />
+      </keep-alive>
     </transition>
   </section>
 </template>

+ 6 - 2
src/layout/components/Navbar.vue

@@ -41,6 +41,7 @@ import Breadcrumb from '@/components/Breadcrumb'
 import Hamburger from '@/components/Hamburger'
 import navbarLogo from '@/icons/rabbit-logo.gif'
 import { settingQueryBizTypeList } from '@/api/settingQueryBizTypeList.js'
+import Utils from '../../util.js'
 export default {
   components: {
     Breadcrumb,
@@ -89,12 +90,15 @@ export default {
     get_bizArr() {
       settingQueryBizTypeList({}).then(res => {
         this.bizOptions = res.data.list
-        this.bizShow.id = Number(localStorage.getItem('key'))
+        var int = Number(localStorage.getItem('key'))
+        int === 0 ? int = '' : ''
+        this.bizShow.id = int
       })
     },
     bizchnage(ele) {
+      Utils.$emit('demo', ele)
       localStorage.setItem('key', ele)
-      window.location.reload()
+      // window.location.reload()
     }
   }
 }

+ 5 - 5
src/layout/components/Sidebar/Logo.vue

@@ -3,11 +3,11 @@
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
         <img v-if="logo" :src="logo" class="sidebar-logo">
-        <h1 v-else class="sidebar-title">{{ title }} </h1>
+        <h6 v-else class="sidebar-title">{{ title }} </h6>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
         <img v-if="logo" :src="logo" class="sidebar-logo">
-        <h1 class="sidebar-title">{{ title }} </h1>
+        <h6 class="sidebar-title">{{ title }} </h6>
       </router-link>
     </transition>
   </div>
@@ -26,7 +26,7 @@ export default {
   },
   data() {
     return {
-      title: '质惠平台',
+      title: '质惠',
       logo: logoUrl
     }
   }
@@ -65,11 +65,11 @@ export default {
 
     & .sidebar-title {
       display: inline-block;
-      margin: 0;
+      margin: 1% 0 0 0 ;
       color: #fff;
       font-weight: 600;
       line-height: 50px;
-      font-size: 14px;
+      font-size: 24px;
       font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
       vertical-align: middle;
     }

+ 2 - 0
src/util.js

@@ -0,0 +1,2 @@
+import Vue from 'vue'
+export default new Vue()

+ 71 - 50
src/views/Platform/presentation/Assumptions.vue

@@ -1,50 +1,55 @@
 <template>
-  <div style="margin:2% 7%;">
-    <!--提测报告-->
-    <div style="float:right; margin: 30px 0;">
-      <el-input v-model="state" filterable placeholder="搜索" style="width:50%;margin-right:30px;" @change="clickQuery(state)" />
-      <el-button type="primary" @click="getQueryData(), centerDialogVisible = true">新建提测报告</el-button>
+  <div class="eleStyle">
+    <div style="height:100%;width:94%; background:#ffffff; margin: 4%; border-radius: 8px; overflow: hidden;">
+      <!--提测报告-->
+      <div style="margin: 2%; min-height: 73vh; font-size: 14px;">
+        <div style="margin: 30px 0;">搜索
+          <el-input v-model="state" filterable placeholder="搜索" style="width:20%; margin: 0 10px;" @change="clickQuery(state)" />
+          <el-button type="primary" @click="getQueryData(), centerDialogVisible = true">新建提测报告</el-button>
+        </div>
+        <template>
+          <el-table :data="tableData" :header-cell-style="{ background: '#F2F3F6' }" fit border style="width: 100%">
+            <el-table-column label="报告名称" min-width="230" align="center">
+              <template slot-scope="scope">
+                <a href="javascript:void(0)" style="color:#20a0ff" @click="toReportView(tableData, scope.row.id)">{{ scope.row.name }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column label="报告人" min-width="150" align="center">
+              <template slot-scope="scope">{{ scope.row.submitter }}</template>
+            </el-table-column>
+            <el-table-column label="日期" min-width="280" align="center">
+              <template slot-scope="scope">{{ scope.row.gmtCreate }}</template>
+            </el-table-column>
+            <el-table-column label="状态" min-width="150" align="center">
+              <template slot-scope="scope">{{ scope.row.statusString }}</template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="230">
+              <template slot-scope="scope">
+                <el-button size="mini" @click="queryPresentation(scope.row)">更新</el-button>
+                <el-tooltip content="功能正在实现中···" placement="top"><el-button type="primary" size="mini">权限</el-button></el-tooltip>
+                <el-button size="mini" type="danger" @click="delePresentation(scope.row.id)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </template>
+        <el-pagination style="margin-top:30px;" align="center" :current-page="curIndex" :page-sizes="[5, 10, 20]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+        <el-dialog title="提示" :visible.sync="centerDialogVisible" width="30%" center>
+          选择任务 :
+          <el-select v-model="queryData.state" filterable placeholder="搜索" style="width:80%;" @change="handleSelect($event)">
+            <el-option v-for="item in restaurants" :key="item.id" :label="item.value" :value="item.id" />
+          </el-select>
+          <span slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="selectionReport(queryData.state)">创建</el-button>
+          </span>
+        </el-dialog>
+      </div>
     </div>
-    <template>
-      <el-table :data="tableData" fit border style="width: 100%">
-        <el-table-column label="报告名称" min-width="230" align="center">
-          <template slot-scope="scope">
-            <a href="javascript:void(0)" style="color:#20a0ff" @click="toReportView(tableData, scope.row.id)">{{ scope.row.name }}</a>
-          </template>
-        </el-table-column>
-        <el-table-column label="报告人" min-width="150" align="center">
-          <template slot-scope="scope">{{ scope.row.submitter }}</template>
-        </el-table-column>
-        <el-table-column label="日期" min-width="280" align="center">
-          <template slot-scope="scope">{{ scope.row.gmtCreate }}</template>
-        </el-table-column>
-        <el-table-column label="状态" min-width="150" align="center">
-          <template slot-scope="scope">{{ scope.row.statusString }}</template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" fixed="right" min-width="230">
-          <template slot-scope="scope">
-            <el-button size="mini" @click="queryPresentation(scope.row)">更新</el-button>
-            <el-tooltip content="功能正在实现中···" placement="top"><el-button size="mini">权限</el-button></el-tooltip>
-            <el-button size="mini" @click="delePresentation(scope.row.id)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </template>
-    <el-pagination style="margin-top:30px;" align="center" :current-page="curIndex" :page-sizes="[5, 10, 20]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
-    <el-dialog title="提示" :visible.sync="centerDialogVisible" width="30%" center>
-      选择任务 :
-      <el-select v-model="queryData.state" filterable placeholder="搜索" style="width:80%;" @change="handleSelect($event)">
-        <el-option v-for="item in restaurants" :key="item.id" :label="item.value" :value="item.id" />
-      </el-select>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="selectionReport(queryData.state)">创建</el-button>
-      </span>
-    </el-dialog>
   </div>
 </template>
 
 <script>
 import { launchTestList, launchTestDelete, taskListCreate } from '@/api/InterfaceReport'
+import Utils from '../../../util.js'
 
 export default {
   name: 'Assumptions',
@@ -53,7 +58,7 @@ export default {
       userInformation: localStorage.getItem('username'),
       userNames: localStorage.getItem('realname'),
       bizJson: localStorage.getItem('key'),
-      pageSize: 20,
+      pageSize: 5,
       curIndex: 1,
       total: 0,
       state: '',
@@ -65,7 +70,7 @@ export default {
       centerDialogVisible: false,
       queryData: {},
       indexPage: {
-        pageSize: 20,
+        pageSize: 5,
         curIndex: 1
       },
       tableData: [],
@@ -74,21 +79,31 @@ export default {
     }
   },
   created() {
-    this.getList()
+    this.getList(localStorage.getItem('key'))
   },
   mounted() {
+    var that = this
+    Utils.$on('demo', function(msg) {
+      that.getList(msg)
+    })
     this.getQueryData()
   },
   methods: {
-    getList() {
+    getList(e) {
       this.indexPage = {
-        bizId: this.bizJson,
+        bizId: e,
         pageSize: this.pageSize,
         curIndex: this.curIndex
       }
       launchTestList(this.indexPage).then(res => {
-        this.tableData = res.data
-        this.total = res.total
+        if (res.code === 200) {
+          this.tableData = res.data
+          this.total = res.total
+        } else {
+          this.$message({ message: res.msg, type: 'error', duration: 1000, offset: 150 })
+        }
+        // this.tableData = res.data
+        // this.total = res.total
       })
     },
     // 删除报告
@@ -101,7 +116,7 @@ export default {
         .then(() => {
           this.userData = { id: '', ename: this.userInformation, name: this.userNames }
           launchTestDelete(this.userData, e).then(res => {
-            this.getList()
+            this.getList(localStorage.getItem('key'))
           })
           this.$message({ type: 'success', message: '已删除' })
         })
@@ -163,11 +178,11 @@ export default {
     },
     handleSizeChange(size) {
       this.pageSize = size
-      this.getList()
+      this.getList(localStorage.getItem('key'))
     },
     handleCurrentChange(curIndex) {
       this.curIndex = curIndex
-      this.getList()
+      this.getList(localStorage.getItem('key'))
     },
     toReportView(ele, e) {
       for (var vel of ele) {
@@ -185,4 +200,10 @@ export default {
 </script>
 
 <style scoped>
+.eleStyle {
+    width: 100%;
+    height:100%;
+    background:#F2F3F6;
+    display: inline-block;
+  }
 </style>

+ 76 - 57
src/views/Platform/presentation/ResultPage.vue

@@ -1,58 +1,63 @@
 <template>
-  <div style="margin:2% 7%;">
-    <!--准出报告-->
-    <div style="float:right; margin: 30px 0;">
-      <el-input v-model="state" filterable placeholder="搜索" style="width:50%;margin-right:30px;" @change="clickQuery(state)" />
-      <el-button type="primary" @click="getQueryData(), centerDialogVisible = true">新建准出报告</el-button>
-    </div>
-    <template>
-      <el-table :data="tableData" fit border style="width: 100%">
-        <el-table-column label="报告名称" min-width="150" align="center">
-          <template slot-scope="scope">
-            <a href="javascript:void(0)" style="color:#20a0ff" @click="toReportView(tableData, scope.row.id)">{{ scope.row.reportName }}</a>
-          </template>
-        </el-table-column>
-        <el-table-column label="报告人" min-width="150" align="center">
-          <template slot-scope="scope">{{ scope.row.ownner }}</template>
-        </el-table-column>
-        <el-table-column label="日期" min-width="150" align="center">
-          <template slot-scope="scope">{{ scope.row.gmtCreate }}</template>
-        </el-table-column>
-        <el-table-column label="状态" min-width="150" align="center">
-          <template slot-scope="scope">{{ scope.row.statusString }}</template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" fixed="right" min-width="230">
-          <template slot-scope="scope">
-            <el-button size="mini" @click="queryPresentation(scope.row)">更新</el-button>
-            <el-tooltip content="功能正在实现中···" placement="top">
-              <el-button size="mini">权限</el-button>
-            </el-tooltip>
-            <el-button size="mini" @click="delePresentation(scope.row.id)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </template>
-    <el-pagination style="margin-top:30px;" align="center" :current-page="curIndex" :page-sizes="[20, 30, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
-    <el-dialog title="选择任务" :visible.sync="centerDialogVisible" width="30%" center @close="closeChange">
-      <div style="text-align:text;margin:10px 0;">
-        <el-button ref="btn1" size="mini" @click="getQueryData(1)">项目</el-button>
-        <el-button ref="btn2" size="mini" @click="getQueryData(2)">任务</el-button>
-      </div>
-      <div>
-        <el-select v-model="states" filterable placeholder="请选择项目还是任务" style="width:100%;">
-          <el-option v-for="item in restaurants" :key="item.id" :label="item.value" :value="item.id" />
-        </el-select>
+  <div class="eleStyle">
+    <div style="height:100%;width:94%; background:#ffffff; margin: 4%; border-radius: 8px; overflow: hidden;">
+      <!--准出报告-->
+      <div style="margin: 2%; min-height: 73vh; font-size: 14px;">
+        <div style="margin: 30px 0;">搜索
+          <el-input v-model="state" filterable placeholder="搜索" style="width:20%; margin: 0 10px;" @change="clickQuery(state)" />
+          <el-button type="primary" @click="getQueryData(), centerDialogVisible = true">新建准出报告</el-button>
+        </div>
+        <template>
+          <el-table :data="tableData" :header-cell-style="{ background: '#F2F3F6' }" fit border style="width: 100%">
+            <el-table-column label="报告名称" min-width="150" align="center">
+              <template slot-scope="scope">
+                <a href="javascript:void(0)" style="color:#20a0ff" @click="toReportView(tableData, scope.row.id)">{{ scope.row.reportName }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column label="报告人" min-width="150" align="center">
+              <template slot-scope="scope">{{ scope.row.ownner }}</template>
+            </el-table-column>
+            <el-table-column label="日期" min-width="150" align="center">
+              <template slot-scope="scope">{{ scope.row.gmtCreate }}</template>
+            </el-table-column>
+            <el-table-column label="状态" min-width="150" align="center">
+              <template slot-scope="scope">{{ scope.row.statusString }}</template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="230">
+              <template slot-scope="scope">
+                <el-button size="mini" @click="queryPresentation(scope.row)">更新</el-button>
+                <el-tooltip content="功能正在实现中···" placement="top">
+                  <el-button size="mini" type="primary">权限</el-button>
+                </el-tooltip>
+                <el-button size="mini" type="danger" @click="delePresentation(scope.row.id)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </template>
+        <el-pagination style="margin-top:30px;" align="center" :current-page="curIndex" :page-sizes="[5, 10, 20]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+        <el-dialog title="选择任务" :visible.sync="centerDialogVisible" width="30%" center @close="closeChange">
+          <div style="text-align:text;margin:10px 0;">
+            <el-button ref="btn1" size="mini" @click="getQueryData(1)">项目</el-button>
+            <el-button ref="btn2" size="mini" @click="getQueryData(2)">任务</el-button>
+          </div>
+          <div>
+            <el-select v-model="states" filterable placeholder="请选择项目还是任务" style="width:100%;">
+              <el-option v-for="item in restaurants" :key="item.id" :label="item.value" :value="item.id" />
+            </el-select>
+          </div>
+          <span slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="selectionReport(states)">创建</el-button>
+          </span>
+        </el-dialog>
       </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="selectionReport(states)">创建</el-button>
-      </span>
-    </el-dialog>
+    </div>
   </div>
 </template>
 
 <script>
 import { projectTestReportList, projectTestReportDelete } from '@/api/ResultPage'
 import { taskListCreate } from '@/api/InterfaceReport'
+import Utils from '../../../util.js'
 
 export default {
   name: 'Assumptions',
@@ -61,7 +66,7 @@ export default {
       userInformation: localStorage.getItem('username'),
       userNames: localStorage.getItem('realname'),
       bizJson: localStorage.getItem('key'),
-      pageSize: 20,
+      pageSize: 5,
       curIndex: 1,
       total: 0,
       state: '',
@@ -69,28 +74,36 @@ export default {
       centerDialogVisible: false,
       states: '',
       indexPage: {
-        pageSize: 20,
+        pageSize: 5,
         curIndex: 1
       },
       tableData: [{}]
     }
   },
   created() {
-    this.getList()
+    this.getList(localStorage.getItem('key'))
   },
   mounted() {
+    var that = this
+    Utils.$on('demo', function(msg) {
+      that.getList(msg)
+    })
     this.getQueryData()
   },
   methods: {
-    getList() {
+    getList(e) {
       this.indexPage = {
-        bizId: this.bizJson,
+        bizId: e,
         pageSize: this.pageSize,
         curIndex: this.curIndex
       }
       projectTestReportList(this.indexPage).then(res => {
-        this.tableData = res.data
-        this.total = res.total
+        if (res.code === 200) {
+          this.tableData = res.data
+          this.total = res.total
+        } else {
+          this.$message({ message: res.msg, type: 'error', duration: 1000, offset: 150 })
+        }
       })
     },
     toReportView(ele, e) {
@@ -112,7 +125,7 @@ export default {
         .then(() => {
           this.userData = { id: '', ename: this.userInformation, name: this.userNames }
           projectTestReportDelete(this.userData, e).then(res => {
-            this.getList()
+            this.getList(localStorage.getItem('key'))
           })
           this.$message({ type: 'success', message: '已删除' })
         })
@@ -203,11 +216,11 @@ export default {
     },
     handleSizeChange(size) {
       this.pageSize = size
-      this.getList()
+      this.getList(localStorage.getItem('key'))
     },
     handleCurrentChange(curIndex) {
       this.curIndex = curIndex
-      this.getList()
+      this.getList(localStorage.getItem('key'))
     },
     errorFun() {
       this.$notify({ title: 'Failed', message: 'Created Failed', type: 'error', duration: 2000 })
@@ -217,4 +230,10 @@ export default {
 </script>
 
 <style scoped>
+.eleStyle {
+    width: 100%;
+    height:100%;
+    background:#F2F3F6;
+    display: inline-block;
+  }
 </style>

+ 75 - 54
src/views/Platform/presentation/testPresentation.vue

@@ -1,55 +1,60 @@
 <template>
-  <div style="margin:2% 7%;">
-    <!--日报报告-->
-    <div style="float:right; margin: 30px 0;">
-      <el-input v-model="state" filterable placeholder="搜索" style="width:50%;margin-right:30px;" @change="clickQuery(state)" />
-      <el-button type="primary" @click="centerDialogVisible = true">新建日报报告</el-button>
-    </div>
-    <template>
-      <el-table :data="tableData" fit border style="width: 100%">
-        <el-table-column label="报告名称" min-width="280" align="center">
-          <template slot-scope="scope">
-            <a href="javascript:void(0)" style="color:#20a0ff" @click="toReportView(scope.row.id)">{{ scope.row.reportName }}</a>
-          </template>
-        </el-table-column>
-        <el-table-column label="报告人" min-width="180" align="center">
-          <template slot-scope="scope">{{ scope.row.ownner }}</template>
-        </el-table-column>
-        <el-table-column label="日期" min-width="280" align="center">
-          <template slot-scope="scope">{{ scope.row.gmtCreate }}</template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" fixed="right" min-width="230">
-          <template slot-scope="scope">
-            <el-button size="mini" @click="queryPresentation(scope.row)">更新</el-button>
-            <el-tooltip content="功能正在实现中···" placement="top">
-              <el-button size="mini">权限</el-button>
-            </el-tooltip>
-            <el-button size="mini" @click="delePresentation(scope.row.id)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </template>
-    <el-pagination style="margin-top:30px;" align="center" :current-page="curIndex" :page-sizes="[20, 30, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
-    <el-dialog title="选择任务" :visible.sync="centerDialogVisible" width="30%" center @close="closeChange">
-      <div style="text-align:text;margin:10px 0;">
-        <el-button ref="btn1" size="mini" @click="getQueryData(1)">项目</el-button>
-        <el-button ref="btn2" size="mini" @click="getQueryData(2)">任务</el-button>
-      </div>
-      <div>
-        <el-select v-model="queryDataState" filterable placeholder="请选择项目还是任务" style="width:100%;">
-          <el-option v-for="item in restaurants" :key="item.id" :label="item.value" :value="item.id" />
-        </el-select>
+  <div class="eleStyle">
+    <div style="height:100%;width:94%; background:#ffffff; margin: 4%; border-radius: 8px; overflow: hidden;">
+      <!--日报报告-->
+      <div style="margin: 2%; min-height: 73vh; font-size: 14px;">
+        <div style="margin: 30px 0;">搜索
+          <el-input v-model="state" size="medium" filterable placeholder="请搜索" style="width:20%;margin: 0 10px;" @change="clickQuery(state)" />
+          <el-button type="primary" size="medium" @click="centerDialogVisible = true">新建日报报告</el-button>
+        </div>
+        <template>
+          <el-table :data="tableData" :header-cell-style="{ background: '#F2F3F6' }" fit border style="width: 100%">
+            <el-table-column label="报告名称" min-width="280" align="center">
+              <template slot-scope="scope">
+                <a href="javascript:void(0)" style="color:#20a0ff" @click="toReportView(scope.row.id)">{{ scope.row.reportName }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column label="报告人" min-width="180" align="center">
+              <template slot-scope="scope">{{ scope.row.ownner }}</template>
+            </el-table-column>
+            <el-table-column label="创建时间" min-width="280" align="center">
+              <template slot-scope="scope">{{ scope.row.gmtCreate }}</template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="230">
+              <template slot-scope="scope">
+                <el-button size="mini" @click="queryPresentation(scope.row)">更新</el-button>
+                <el-tooltip content="功能正在实现中···" placement="top">
+                  <el-button size="mini" type="primary">权限</el-button>
+                </el-tooltip>
+                <el-button size="mini" type="danger" @click="delePresentation(scope.row.id)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </template>
+        <el-pagination style="margin-top:30px;" align="center" :current-page="curIndex" :page-sizes="[5, 10, 20]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+        <el-dialog title="选择任务" :visible.sync="centerDialogVisible" width="30%" center @close="closeChange">
+          <div style="text-align:text;margin:10px 0;">
+            <el-button ref="btn1" size="mini" @click="getQueryData(1)">项目</el-button>
+            <el-button ref="btn2" size="mini" @click="getQueryData(2)">任务</el-button>
+          </div>
+          <div>
+            <el-select v-model="queryDataState" filterable placeholder="请选择项目还是任务" style="width:100%;">
+              <el-option v-for="item in restaurants" :key="item.id" :label="item.value" :value="item.id" />
+            </el-select>
+          </div>
+          <span slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="createPresentation(queryDataState)">创建</el-button>
+          </span>
+        </el-dialog>
       </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="createPresentation(queryDataState)">创建</el-button>
-      </span>
-    </el-dialog>
+    </div>
   </div>
 </template>
 
 <script>
 import { dailyReportList, dailyReportDelete } from '@/api/testPresentetion'
 import { taskListCreate } from '@/api/InterfaceReport'
+import Utils from '../../../util.js'
 
 export default {
   name: 'TestPresentation',
@@ -62,7 +67,7 @@ export default {
       centerDialogVisible1: false,
       getListAllData: [],
       queryDataState: '',
-      pageSize: 20,
+      pageSize: 5,
       curIndex: 1,
       total: 0,
       state: '',
@@ -71,28 +76,36 @@ export default {
         state: ''
       },
       indexPage: {
-        pageSize: 20,
+        pageSize: 5,
         curIndex: 1
       },
       tableData: []
     }
   },
   created() {
-    this.getList()
+    this.getList(localStorage.getItem('key'))
   },
   mounted() {
+    var that = this
+    Utils.$on('demo', function(msg) {
+      that.getList(msg)
+    })
     this.getQueryData()
   },
   methods: {
-    getList() {
+    getList(e) {
       this.indexPage = {
-        bizId: this.bizJson,
+        bizId: e,
         pageSize: this.pageSize,
         curIndex: this.curIndex
       }
       dailyReportList(this.indexPage).then(res => {
-        this.tableData = res.data
-        this.total = res.total
+        if (res.code === 200) {
+          this.tableData = res.data
+          this.total = res.total
+        } else {
+          this.$message({ message: res.msg, type: 'error', duration: 1000, offset: 150 })
+        }
       })
     },
     // 查看跳转
@@ -109,7 +122,7 @@ export default {
         .then(() => {
           this.userData = { id: '', ename: this.userInformation, name: this.userNames }
           dailyReportDelete(this.userData, e).then(res => {
-            this.getList()
+            this.getList(localStorage.getItem('key'))
           })
           this.$message({ type: 'success', message: '已删除' })
         })
@@ -181,12 +194,20 @@ export default {
     },
     handleSizeChange(size) {
       this.pageSize = size
-      this.getList()
+      this.getList(localStorage.getItem('key'))
     },
     handleCurrentChange(curIndex) {
       this.curIndex = curIndex
-      this.getList()
+      this.getList(localStorage.getItem('key'))
     }
   }
 }
 </script>
+<style scoped>
+.eleStyle {
+    width: 100%;
+    height:100%;
+    background:#F2F3F6;
+    display: inline-block;
+  }
+</style>

+ 10 - 9
src/views/Platform/useCase/createUse.vue

@@ -81,8 +81,8 @@
             <el-col :span="20" style="margin:2% 0 0 0; white-space:nowrap;">
               <el-form-item label="执行步骤">
                 <el-input v-model="item.description" type="textarea" :rows="4" placeholder="请输入内容" />
-                <el-button v-show="plus" size="mini" type="primary" icon="el-icon-plus" style="margin-bottom: 6%;" @click="add" />
-                <el-button v-show="plus" size="mini" icon="el-icon-minus" @click="deleteData(index)" />
+                <el-button size="mini" type="primary" icon="el-icon-plus" style="margin-bottom: 6%;" @click="add" />
+                <el-button size="mini" icon="el-icon-minus" @click="deleteData(index)" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -147,13 +147,12 @@ export default {
   data() {
     return {
       data: [{ description: '', expectedResult: '', remark: '', accessory: '' }],
-      userNames: localStorage.getItem('realname'),
+      userNames: localStorage.getItem('username'),
       bizJson: localStorage.getItem('key'),
       startId: '',
       caseFolderId: '',
       caseData: {},
-      btn_show: true,
-      plus: true,
+      btn_show: false,
       dis: false,
       form_Query: false,
       form_created: false,
@@ -198,12 +197,14 @@ export default {
       if (this.$route.query.id) { // 编辑
         this.titleName = '编辑'
         this.form_Query = true
-        this.startId = this.$route.query.id
-        this.plus = false
-        queryCasesData({ caseFolderId: this.startId }).then(res => {
+        this.url = window.location.href // 获取url中"?"符后的字串
+        this.id = this.url.split('?id=')
+        this.startId = this.id[1]
+        queryCasesData({ caseFolderId: this.id[1] }).then(res => {
           for (var el of res.data.list) {
-            el.caseFolderId === this.startId ? this.caseData = el : ''
+            el.caseFolderId === Number(this.id[1]) ? this.caseData = el : ''
             if (this.caseData.accessory !== '') {
+              this.btn_show = true
               var obj = JSON.parse(this.caseData.accessory.split('{}')[0])
               for (var a of obj) {
                 this.uptataKey.push(a)

+ 9 - 12
src/views/Platform/useCase/queryUse.vue

@@ -41,7 +41,7 @@
           </el-form-item>
         </el-form>
         <div align="center" style="margin: 5% 0;">
-          <el-button @click="Return">返 回</el-button>
+          <el-button @click="$router.go(-1)">返 回</el-button>
         </div>
       </el-main>
     </el-container>
@@ -56,7 +56,8 @@ export default {
       formLabelAlign: {},
       caseFolderId: '',
       id: '',
-      uptataKey: []
+      uptataKey: [],
+      url: ''
     }
   },
   created() {
@@ -65,24 +66,20 @@ export default {
 
   methods: {
     initCode() {
-      this.id = this.$route.query.data.id
-      this.caseFolderId = this.$route.query.data.caseFolderId
-      queryCase({ id: this.id, caseFolderId: this.caseFolderId }).then(res => {
+      this.url = window.location.href // 获取url中"?"符后的字串
+      this.caseFolderId = this.url.split('&caseFolderId=')
+      this.id = this.caseFolderId[0].split('?id=')
+      queryCase({ id: this.id[1], caseFolderId: this.caseFolderId[1] }).then(res => {
         for (var el of res.data.list) {
-          el.id === this.id ? this.formLabelAlign = el : ''
+          el.id === Number(this.id[1]) ? this.formLabelAlign = el : ''
+          console.log(this.formLabelAlign)
           var obj = JSON.parse(this.formLabelAlign.accessory.split('{}')[0])
           for (var a of obj) {
             this.uptataKey.push(a)
           }
-          console.log(this.uptataKey)
           break
         }
       })
-    },
-
-    // 返回
-    Return() {
-      this.$router.go(-1)
     }
   }
 }

+ 130 - 106
src/views/Platform/useCasePage.vue

@@ -4,17 +4,18 @@
     <div style="position: absolute;width: 100%;">
       <div style="background:#F2F3F6;">
         <el-container>
-          <el-aside width="15%" style="margin:2.5% 0 2.5% 2.5%; border-radius:8px;">
-            <div v-show="createCaseCode" style="background: #FFF; height:78vh; text-align:center; padding:50% 0;">
-              <p>空空如也</p>
-              <el-input v-show="Folder_Show" ref="input1" v-model="add_Folder" size="mini" placeholder="新建文件夹" @blur="hide_input(add_Folder)" />
-            </div>
-            <div v-show="dataShow" class="nav_Input" style="background: #fff; min-height:78vh;border-radius:8px;" @click="click_fa" @mouseout="blues">
+          <el-aside width="15%" style=" background: #FFF;margin: 1% 0 1% 1%; border-radius:8px;">
+            <div class="nav_Input" style="min-height:81vh;" @click="click_fa" @mouseout="blues">
+              <br>
+              <p v-show="node_Data" style="color: #DCDFE6; margin: 100% 0;font-size:14px; text-align:center;">空空如也</p>
               <el-tree
+                v-if="dataShow"
                 :data="data1"
                 node-key="id"
                 draggable
                 :expand-on-click-node="true"
+                :default-expanded-keys="[1]"
+                :default-checked-keys="[5]"
                 @node-drag-start="handleDragStart"
                 @node-drag-enter="handleDragEnter"
                 @node-drag-leave="handleDragLeave"
@@ -29,18 +30,18 @@
                   <el-button v-show="data.del" type="text" size="mini" icon="el-icon-delete" @click="() => remove(node, data)" />
                 </span>
               </el-tree>
-              <el-input v-show="Folder_Show" ref="input1" v-model="add_Folder" size="mini" placeholder="新建文件夹" @blur="hide_input(add_Folder)" />
+              <el-input v-if="Folder_Show" ref="input1" v-model="add_Folder" size="mini" placeholder="新建文件夹" @blur="hide_input(add_Folder)" />
             </div>
-            <div style="background: #fff; padding: 0% 15% 15% 15%; text-align: center;"><el-button icon="el-icon-circle-plus" style="border:none;" @click="createFolder">新建文件夹</el-button></div>
+            <div style="padding: 0% 15% 15% 15%; text-align: center;"><el-button icon="el-icon-circle-plus" style="border:none;" @click="createFolder">新建文件夹</el-button></div>
           </el-aside>
           <el-container>
-            <el-header style="background:#ffffff;height:auto; width:94%;margin:3%; font-size:13px; border-radius:8px;">
+            <el-header style="background:#ffffff;height:auto; width:98%;margin: 1%; font-size:13px; border-radius:8px;">
               <el-row>
                 <el-col style="white-space:nowrap; display: flex; justify-content: center; align-items: center;margin-top:1.3%;">
                   前置条件
                   <el-input v-model="createParticipation.caseCondition" clearable placeholder="请输入内容" style="margin-left:1%;" />
                   <el-button style="margin-left:1%;" type="primary" @click="queryCaseData(createParticipation)">查询</el-button>
-                  <el-button @click="createGetShow">新增</el-button>
+                  <el-button @click="queryUpdateCreatd('', 3)">新增</el-button>
                 </el-col>
               </el-row>
               <el-row>
@@ -67,12 +68,13 @@
                 </el-col>
               </el-row>
             </el-header>
-            <el-main style="background:#ffffff; width:94%;margin:0% 3% 3% 3%; font-size:14px;border-radius:8px;">
+            <el-main style="background:#ffffff; width:98%;margin:0% 1% 1% 1%; font-size:14px;border-radius:8px;">
               <el-button type="primary" style="margin-left:1%;width:10%;" @click="uploadFile()">导入</el-button>
-              <el-button style="margin-left:2%;width:10%;" @click="exportExcel">导出</el-button>
-              <el-button style="margin-left:2%;width:10%;" @click="exportExcel">导出模版</el-button>
+              <el-tooltip class="item" effect="light" content="导出勾选项,没有勾选将导出模版" placement="top">
+                <el-button style="margin-left:2%;width:10%;" @click="exportExcel">导出</el-button>
+              </el-tooltip>
               <!-- 主页table -->
-              <el-table :data="gridData" :header-cell-style="{ background: '#EBEEF5' }" style="width: 100%; font-size:13px;margin-top:1%;" border @select-all="clickAllData" @selection-change="handleSelectionChange">
+              <el-table :data="gridData" :header-cell-style="{ background: '#F0F2F4', color: '#333B4A' }" style="width: 100%; font-size:13px;margin-top:1%;" border @select-all="clickAllData" @selection-change="handleSelectionChange">
                 <el-table-column type="selection" min-width="50" align="center" @change="clickAllData(gridData)" />
                 <el-table-column prop="id" label="序列号" min-width="80" align="center">
                   <template slot-scope="scope">{{ scope.row.id }}</template>
@@ -94,9 +96,9 @@
                 </el-table-column>
                 <el-table-column label="操作" min-width="220px" align="center">
                   <template slot-scope="scope">
-                    <el-button size="mini" type="primary" @click="queryGetShow(scope.row)">查看</el-button>
-                    <el-button size="mini" type="primary" @click="updateGetShow(scope.row)">编辑</el-button>
-                    <el-button size="mini" type="primary" @click="deleteCaseData(scope.row.id)">删除</el-button>
+                    <el-button size="mini" class="btn_query" plain @click="queryUpdateCreatd(scope.row, 1)">查看</el-button>
+                    <el-button size="mini" type="primary" plain @click="queryUpdateCreatd(scope.row, 2)">编辑</el-button>
+                    <el-button size="mini" type="danger" plain @click="deleteCaseData(scope.row.id)">删除</el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -111,7 +113,9 @@
                 <el-table-column prop="casePriority" label="用例优先级" />
                 <el-table-column prop="remark" label="备注" />
               </el-table>
-              <el-pagination :current-page="curIndex" :page-sizes="[5]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+              <div align="center">
+                <el-pagination :current-page="curIndex" :page-sizes="[5]" :page-size="pageSize" layout="total, prev, pager, next" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+              </div>
             </el-main>
           </el-container>
         </el-container>
@@ -126,6 +130,7 @@ import { mockUrl } from '@/apiConfig/api'
 import FileSaver from 'file-saver'
 import axios from 'axios'
 import XLSX from 'xlsx'
+import Utils from '../../util.js'
 
 export default {
   name: 'UseCasePage',
@@ -145,17 +150,12 @@ export default {
       node_Name: {},
       Folder_Show: false,
       add_Folder: '',
-      moduleTypeShow: false,
+      node_Data: false,
       dataShow: true,
-      titleName: '',
-      createCaseCode: false,
       priorityStrings: [{ name: 'p0', value: 0 }, { name: 'p1', value: 1 }, { name: 'p2', value: 2 }, { name: 'p3', value: 3 }],
-      projectTypeStrings: [{ name: 'B端', value: 1 }, { name: 'C端', value: 2 }],
-      taskTypeStrings: [{ name: '客户端', value: 1 }, { name: '服务端', value: 2 }],
       userInformation: localStorage.getItem('username'),
       userNames: localStorage.getItem('realname'),
       bizJson: localStorage.getItem('key'),
-      createTimeData: '',
       userData: '',
       caseInfo: '',
       pageSize: 5,
@@ -167,11 +167,9 @@ export default {
       createParticipation: {},
       moduleTypeStr: [],
       gridData: [],
-      caseData: {},
       formData: {},
       data1: [],
       tableData: [],
-      excelData: [],
       imFile: '',
       failNum: '',
       successNum: '',
@@ -181,14 +179,78 @@ export default {
     }
   },
   created() {
-    this.AllQueryFolderData()
     this.moduleTypeArr()
   },
   mounted() {
+    var that = this
+    Utils.$on('demo', function(msg) {
+      that.AllQueryFolderData(msg)
+    })
     this.imFile = document.getElementById('imFile')
     this.initWindow()
+    this.AllQueryFolderData(localStorage.getItem('key'))
   },
   methods: {
+    // 左侧导航栏
+    AllQueryFolderData(e) {
+      if (e !== '') {
+        this.gridData = []
+        this.data1 = []
+        this.formData = { bizId: e }
+        queryAllFolderData(this.formData).then(res => {
+          if (res.code === 200) {
+            for (var ele of res.data) {
+              var arr = {}
+              arr.id = ele.id
+              arr.label = ele.folderName
+              arr.children = []
+              if (ele.subCaseFolderInfos !== null) {
+                for (var vel of ele.subCaseFolderInfos) {
+                  var add = {}
+                  add.id = vel.id
+                  add.label = vel.folderName
+                  add.children = []
+                  if (vel.subCaseFolderInfos !== null) {
+                    for (var v of vel.subCaseFolderInfos) {
+                      var as = {}
+                      as.id = v.id
+                      as.label = v.folderName
+                      as.children = []
+                      if (v.subCaseFolderInfos != null) {
+                        for (var a of v.subCaseFolderInfos) {
+                          var add4 = {}
+                          add4.id = a.id
+                          add4.label = a.folderName
+                          as.children.push(add4)
+                        }
+                      }
+                      add.children.push(as)
+                    }
+                  }
+                  arr.children.push(add)
+                }
+              }
+              this.data1.push(arr)
+            }
+            if (this.data1.length === 0) {
+              this.node_Data = true
+              this.dataShow = false
+            } else {
+              this.node_Data = false
+              this.dataShow = true
+            }
+          } else {
+            this.dataShow = false
+            this.node_Data = true
+            this.$message({ message: res.msg, type: 'error', duration: 1000, offset: 150 })
+          }
+        })
+      } else {
+        this.dataShow = false
+        this.node_Data = true
+        this.$message({ message: '请先选择业务线', type: 'error', duration: 1000, offset: 150 })
+      }
+    },
 
     blues() {
       console.log('blue')
@@ -201,6 +263,7 @@ export default {
       this.$set(data, 'label', '')
       this.$set(data, 'que', true)
       this.$set(data, 'del', false)
+      this.$set(this.node_Name, 'name', this.label)
       setTimeout(() => { this.$refs.get_Input.focus() }, 100)
       this.$nextTick(() => {
         this.$refs.get_Input.focus()
@@ -219,9 +282,9 @@ export default {
       }
       if (val === '') { // 判断用户是否有输入
         val = this.label // 没有输入拿之前的label替代
-        this.end_Data = { parentFolderId: mun, folderName: val, xmindUrl: '', id: data.id, bizId: this.bizJson, modifier: this.userInformation, creator: this.userInformation }
+        this.end_Data = { parentFolderId: mun, folderName: val, xmindUrl: '', id: data.id, bizId: localStorage.getItem('key'), modifier: this.userInformation, creator: this.userInformation }
       } else {
-        this.end_Data = { parentFolderId: mun, folderName: val, xmindUrl: '', id: data.id, bizId: this.bizJson, modifier: this.userInformation, creator: this.userInformation }
+        this.end_Data = { parentFolderId: mun, folderName: val, xmindUrl: '', id: data.id, bizId: localStorage.getItem('key'), modifier: this.userInformation, creator: this.userInformation }
       }
       this.$set(data, 'que', false) // 失去焦点隐藏input
       this.$set(this.node_Name, 'name', '') // 清空input
@@ -229,11 +292,11 @@ export default {
         if (res.code === 200) {
           this.$message({ type: 'success', message: res.msg, duration: 1000 })
           this.data1 = []
-          this.AllQueryFolderData()
+          this.AllQueryFolderData(localStorage.getItem('key'))
         } else {
           this.$message({ type: 'error', message: res.msg, duration: 1000 })
           this.data1 = []
-          this.AllQueryFolderData()
+          this.AllQueryFolderData(localStorage.getItem('key'))
         }
       })
     },
@@ -254,50 +317,6 @@ export default {
         document.getElementById('init-window').parentNode.style.overflow = 'hidden'
       }
     },
-
-    // 左侧导航栏
-    AllQueryFolderData() {
-      this.formData = { bizId: this.bizJson }
-      queryAllFolderData(this.formData).then(res => {
-        for (var ele of res.data) {
-          var arr = {}
-          arr.id = ele.id
-          arr.label = ele.folderName
-          arr.children = []
-          if (ele.subCaseFolderInfos !== null) {
-            for (var vel of ele.subCaseFolderInfos) {
-              var add = {}
-              add.id = vel.id
-              add.label = vel.folderName
-              add.children = []
-              if (vel.subCaseFolderInfos !== null) {
-                for (var v of vel.subCaseFolderInfos) {
-                  var as = {}
-                  as.id = v.id
-                  as.label = v.folderName
-                  as.children = []
-                  if (v.subCaseFolderInfos != null) {
-                    for (var a of v.subCaseFolderInfos) {
-                      var add4 = {}
-                      add4.id = a.id
-                      add4.label = a.folderName
-                      as.children.push(add4)
-                    }
-                  }
-                  add.children.push(as)
-                }
-              }
-              arr.children.push(add)
-            }
-          }
-          this.data1.push(arr)
-        }
-        if (this.data1.length === 0) {
-          this.createCaseCode = true
-          this.dataShow = false
-        }
-      })
-    },
     moduleTypeArr() {
       settingQueryModuleInfoListData(this.formData).then(res => {
         this.moduleTypeStr = res.data
@@ -340,6 +359,7 @@ export default {
     createFolder() {
       this.Folder_Show = true
       this.add_Folder = ''
+      this.node_Data = false
       setTimeout(() => { this.$refs.input1.focus() }, 100)
     },
 
@@ -358,10 +378,11 @@ export default {
         createFolderData(this.formData).then(res => {
           if (res.code === 200) {
             this.$message({ message: res.msg, type: 'success', duration: 1000, offset: 150 })
-            this.createCaseCode = false
+            // this.createCaseCode = false
             this.dataShow = true
+            this.node_Data = false
             this.data1 = []
-            this.AllQueryFolderData()
+            this.AllQueryFolderData(this.bizJson)
             this.created_id = ''
           } else {
             this.$message({ message: res.msg, type: 'error', duration: 1000, offset: 150 })
@@ -372,6 +393,7 @@ export default {
       } else {
         this.$message({ message: '取消创建文件夹', type: 'success', duration: 1000, offset: 150 })
         this.Folder_Show = false
+        this.node_Data = true
       }
     },
 
@@ -383,34 +405,29 @@ export default {
       } else {
         this.createParticipation = ele
         this.createParticipation.caseFolderId = this.startId
+        this.createParticipation.pageSize = this.pageSize
+        this.createParticipation.curIndex = this.curIndex
         queryCasesData(this.createParticipation).then(res => {
           this.gridData = res.data.list
         })
       }
     },
-    // 查看
-    queryGetShow(ele) {
-      var data = {
-        id: ele.id,
-        caseFolderId: ele.caseFolderId
-      }
-      this.$router.push({ path: '/Platform/useCasePage/queryUse', query: { data: data }})
-    },
-    // 编辑
-    updateGetShow(ele) {
-      if (this.startId === '') {
-        this.$message({ message: '提示, 👈请选择目录', type: 'success', duration: 1000, offset: 150 })
-      } else {
-        this.$router.push({ path: '/Platform/useCasePage/createUse', query: { id: this.startId }})
-      }
-    },
 
-    // 新增
-    createGetShow() {
+    queryUpdateCreatd(ele, e) {
       if (this.startId === '') {
         this.$message({ message: '提示, 👈请选择目录', type: 'success', duration: 1000, offset: 150 })
       } else {
-        this.$router.push({ path: '/Platform/useCasePage/createUse', query: { data: this.startId }})
+        switch (e) {
+          case 1: // 查看
+            this.$router.push({ path: '/Platform/useCasePage/queryUse', query: { id: ele.id, caseFolderId: ele.caseFolderId }})
+            break
+          case 2: // 编辑
+            this.$router.push({ path: '/Platform/useCasePage/createUse', query: { id: this.startId }})
+            break
+          case 3: // 新增
+            this.$router.push({ path: '/Platform/useCasePage/createUse', query: { data: this.startId }})
+            break
+        }
       }
     },
     handleSelectionChange(val) {
@@ -436,19 +453,20 @@ export default {
     },
     handleDrop(draggingNode, dropNode, dropType, ev) {
       console.log('拖拽成功完成时触发的事件', dropNode.key, dropType)
+      var startEnd = { parentFolderId: dropNode.key, id: this.startKey, bizId: localStorage.getItem('key'), modifier: this.userInformation, creator: this.userInformation, xmindUrl: '' }
+      this.ConfirmSubmission(startEnd)
     },
 
     ConfirmSubmission(vel) {
-      // var startEnd = { parentFolderId: vel, id: this.startKey, bizId: this.bizJson, modifier: this.userInformation, creator: this.userInformation, xmindUrl: '' }
       updateFolderData(vel).then(res => {
         if (res.code === 200) {
           this.$message({ type: 'success', message: res.msg, duration: 1000 })
           this.data1 = []
-          this.AllQueryFolderData()
+          this.AllQueryFolderData(localStorage.getItem('key'))
         } else {
           this.$message({ type: 'error', message: res.msg, duration: 1000 })
           this.data1 = []
-          this.AllQueryFolderData()
+          this.AllQueryFolderData(localStorage.getItem('key'))
         }
       })
     },
@@ -468,7 +486,7 @@ export default {
             if (res.code === 200) {
               this.$message({ type: 'success', message: '已删除' })
               this.data1 = []
-              this.AllQueryFolderData()
+              this.AllQueryFolderData(localStorage.getItem('key'))
             } else {
               this.$message({ type: 'error', message: res.msg, duration: 1000 })
             }
@@ -479,7 +497,6 @@ export default {
         })
     },
     clickFun(e) {
-      console.log(e)
       this.startId = e.id
       this.created_id = e.id
       this.formData = {
@@ -506,7 +523,7 @@ export default {
             deleteCaseData(this.caseInfo).then(res => {
               if (res.code === 200) {
                 this.data1 = []
-                this.AllQueryFolderData()
+                this.AllQueryFolderData(localStorage.getItem('key'))
                 var data = {
                   pageSize: this.pageSize,
                   curIndex: this.curIndex,
@@ -587,9 +604,9 @@ export default {
     },
     uploadFile() { // 按钮导入
       if (this.startId === '') {
-        this.$notify({ title: '提示', message: '请选择目录', duration: 2000 })
+        this.$message({ message: '提示,👈请选择目录', type: 'success', duration: 1000, offset: 150 })
       } else {
-        this.$refs.imFile.click() // this.imFile.click()
+        this.$refs.imFile.click()
       }
     },
     updateCaseListData() {
@@ -621,6 +638,13 @@ export default {
     /* white-space: nowrap; */
     text-overflow: ellipsis;
   }
-  .block >>> th{ background-color: #F0F2F4 !important;}
-
+  .btn_query .el-button--primary.is-plain {
+    color: #000000 !important;
+    background: #F9F9FA !important;
+    border-color: #F9F9FA !important;
+  }
+  .button_query :hover{
+    background: #409EFF;
+    color: #FFFFFF;
+  }
 </style>

+ 4 - 10
src/views/Platform/workbench.vue

@@ -4,20 +4,14 @@
     <el-tabs v-model="activeName" class="abc" @tab-click="handleClick">
       <el-tab-pane label="待处理" name="first">
         <div class="titStyle">近期代办</div>
-        <div style="height:6em;margin: 1.5% 0% 0% 2%;">
+        <div style="height:6em;margin: 1% 0% 0% 2%;">
           <el-button v-show="show1" type="primary" class="itemName" size="small" plain @click="clickNum(1)">{{ oneData.name }}</el-button>
           <el-button v-show="show2" type="primary" class="itemName" size="small" plain @click="clickNum(2)">{{ oneData1.name }}</el-button>
           <el-button v-show="show3" type="primary" class="itemName" size="small" plain @click="clickNum(3)">{{ oneData2.name }}</el-button>
           <el-button v-show="show1" style="margin-bottom:24px;" type="primary" size="mini" @click="clickNum(4)"> · · · </el-button>
         </div>
-        <!-- <div style="height:6em;margin: 2%;">
-          <el-badge v-show="show1" :value="num1" class="item"><el-button type="primary" class="itemName" size="small" plain @click="clickNum(1)">{{ oneData.name }}</el-button></el-badge>
-          <el-badge v-show="show2" :value="num2" class="item"><el-button type="primary" class="itemName" size="small" plain @click="clickNum(2)">{{ oneData1.name }}</el-button></el-badge>
-          <el-badge v-show="show3" :value="num3" class="item"><el-button type="primary" class="itemName" size="small" plain @click="clickNum(3)">{{ oneData2.name }}</el-button></el-badge>
-          <el-badge v-show="show1" style="margin-bottom:24px;"><el-button type="primary" size="mini" @click="clickNum(4)"> · · · </el-button></el-badge>
-        </div> -->
-        <div style="background:#F2F3F6;padding: 1%;" />
-        <div style="height:50vh%; text-align:center; border-radius:8px;">
+        <div style="background:#F2F3F6; padding: 0.5%;" />
+        <div style="height:64vh; text-align:center; border-radius:8px;">
           <div align="center" style="height:55vh;">
             类型
             <el-select v-model="bugOrTask1.isBugOrTask" size="medium" style="width: 13%;margin: 2% 5% 2% 1%;" clearable placeholder="类型" @change="getstatus(bugOrTask1.isBugOrTask)">
@@ -495,7 +489,7 @@ export default {
   .abc {
     background:#FFFFFF;
     border-radius:8px;
-    margin: 0 3%;
+    margin: 0 1%;
     width: 100%;
   }