Merge branch 'master' of http://git.cc-lotus.info/service-platform/web-test

src/components/enterprise/appointment.vue

@@ -12,7 +12,7 @@
             </el-col>
           </el-col>
           <el-col :span="19" class="right">
-            <appointment v-on="$listeners" :resultTable="resultTable"></appointment>
+            <appointment :total="total" v-on="$listeners" :resultTable="resultTable" v-if="display === 'list'"></appointment>
           </el-col>
         </div>
         <el-col :span="24" class="foots">
@@ -36,6 +36,8 @@ export default {
     liebiaoList: null, //分类导航
     form: null,
     resultTable: null,
+    total: null,
+    display: { type: String, default: 'list' },
   },
   components: {
     heads,

src/components/enterprise/look.vue

@@ -12,7 +12,7 @@
             </el-col>
           </el-col>
           <el-col :span="19" class="right">
-            <look v-on="$listeners" :resultTable="resultTable"></look>
+            <look v-on="$listeners" :resultTable="resultTable" :pageSize="pageSize" :total="total" :limit="limit"></look>
           </el-col>
         </div>
         <el-col :span="24" class="foots">
@@ -36,6 +36,9 @@ export default {
     liebiaoList: null, //分类导航
     form: null,
     resultTable: null,
+    limit: null,
+    total: null,
+    pageSize: null,
   },
   components: {
     heads,
@@ -83,7 +86,7 @@ export default {
 }
 .right {
   width: 79%;
-  min-height: 520px;
+  min-height: 1520px;
   overflow: hidden;
   background-color: #fff;
 }

src/layout/enterprise/appointment.vue

@@ -2,7 +2,7 @@
   <div id="technical">
     <el-col :span="24" class="main">
       <el-col :span="24" class="left">
-        <el-col :span="24" class="leftTop"> <span>|</span> <span>事项管理</span> <span @click="add()">创建对接会</span></el-col>
+        <el-col :span="24" class="leftTop"> <span>|</span> <span>展会预约</span> <span @click="add()">创建对接会</span></el-col>
         <!-- <el-col :span="24" class="downLeftTop">
           <el-image :src="downLeftTopImage"></el-image>
           <span class="topText">
@@ -32,7 +32,7 @@
             </el-table-column>
             <el-table-column prop="desc" label="简介" :show-overflow-tooltip="true"> </el-table-column>
 
-            <el-table-column label="操作">
+            <el-table-column label="操作" style="width:200px">
               <template slot-scope="scope">
                 <el-button size="mini" type="text" @click.prevent="handleEdit(scope.row.id)"
                   ><el-tooltip class="item" effect="dark" content="编辑" placement="top-start"> <i class="el-icon-edit"></i> </el-tooltip
@@ -57,7 +57,7 @@
             </el-table-column>
           </el-table>
           <el-col :span="24">
-            <page :total="total" position="right"></page>
+            <page :total="total" position="center" v-on="$listeners"></page>
           </el-col>
         </el-col>
       </el-col>
@@ -69,13 +69,16 @@
 import _ from 'lodash';
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: news } = createNamespacedHelpers('news');
+import page from '@/components/pagination.vue';
 export default {
   name: 'technical',
   props: {
     resultTable: null,
     total: null,
   },
-  components: {},
+  components: {
+    page,
+  },
   data: () => ({
     downLeftTopImage: require('@/assets/live/square_big.png'),
     jishuImage: require('@/assets/live/main3.png'),
@@ -153,7 +156,7 @@ export default {
   height: 500px;
   overflow: hidden;
   margin: 0 auto;
-  padding: 20px 20px 20px 20px;
+  padding: 20px 10px 20px 10px;
 }
 .leftTitle {
   text-align: center;

src/layout/enterprise/duijiecontext.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="rightcont">
     <el-col class="zhengce">
-      <el-col :span="24" class="topTitle"> <span>详情</span></el-col>
+      <el-col :span="24" class="leftTop"> <span>|</span> <span>对接会详情</span></el-col>
       <el-col :span="24" class="info">
         <el-col :span="24" class="messgae">
           <el-form ref="form" :model="form" label-width="120px">
@@ -68,13 +68,22 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.leftTop {
+  font-size: 18px;
+  width: 96%;
+  height: 41px;
+  line-height: 35px;
+  border-bottom: 1px solid #e5e5e5;
+  position: relative;
+  bottom: 1px;
+  margin: 10px;
+  font-weight: 600;
+  color: #22529a;
+}
 p {
   padding: 0;
   margin: 0;
 }
-.zhengce {
-  padding: 20px;
-}
 .zhengce .topTitle {
   font-size: 22px;
   color: #22529a;
@@ -99,4 +108,8 @@ p {
   width: 100px;
   height: 100px;
 }
+.messgae {
+  padding: 20px;
+  width: 95%;
+}
 </style>

src/layout/enterprise/look.vue

@@ -46,6 +46,18 @@
               </template>
             </el-table-column>
           </el-table>
+          <el-col :span="24" class="page">
+            <el-pagination
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page="currentPage"
+              background
+              layout="total,  prev, pager, next, jumper"
+              :total="total"
+              :page-size="pageSize"
+            >
+            </el-pagination>
+          </el-col>
         </el-col>
       </el-col>
     </el-col>
@@ -54,17 +66,23 @@
 
 <script>
 import _ from 'lodash';
+
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: news } = createNamespacedHelpers('news');
+
 export default {
   name: 'technical',
   props: {
     resultTable: null,
+    limit: null,
+    total: null,
+    pageSize: null,
   },
   components: {},
   data: () => ({
     downLeftTopImage: require('@/assets/live/square_big.png'),
     jishuImage: require('@/assets/live/main3.png'),
+    currentPage: 1,
   }),
   created() {
     this.searchInfo();
@@ -94,6 +112,12 @@ export default {
     deleteRow(id) {
       this.$emit('deleteRow', id);
     },
+
+    handleSizeChange() {},
+    handleCurrentChange(currentPage) {
+      console.log(currentPage);
+      this.$emit('handleCurrentChange', { currentPage });
+    },
   },
 };
 </script>
@@ -103,6 +127,9 @@ export default {
   width: 100%;
   height: 100%;
 }
+.page {
+  margin: 20px 0 0 0;
+}
 .main {
   width: 100%;
   margin: 0 auto;
@@ -110,7 +137,7 @@ export default {
 }
 .left {
   float: left;
-  height: 500px;
+  height: 800px;
   overflow: hidden;
   margin: 0 auto;
   padding: 20px 20px 20px 20px;

src/layout/enterprise/xiugai.vue

@@ -2,11 +2,9 @@
   <div id="loginMain">
     <el-row class="loginMains">
       <el-col :span="24" class="top">
-        <el-col :span="12" class="context">
-          <el-col :span="24" class="topTitle">
-            修改密码
-          </el-col>
-          <el-col :span="24">
+        <el-col :span="12">
+          <el-col :span="24" class="leftTop"> <span>|</span> <span>修改密码</span></el-col>
+          <el-col :span="24" class="context">
             <el-form ref="form" :model="form" label-width="60px">
               <el-form-item label="新密码">
                 <el-input v-model="form.password" placeholder="请输入新密码" show-password></el-input>
@@ -41,17 +39,31 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.leftTop {
+  font-size: 18px;
+  width: 96%;
+  height: 41px;
+  line-height: 35px;
+  border-bottom: 1px solid #e5e5e5;
+  position: relative;
+  bottom: 1px;
+  margin: 10px;
+  font-weight: 600;
+  color: #22529a;
+}
 .topTitle {
   font-size: 22px;
   color: #22529a;
   margin: 0 0 20px 20px;
 }
 .loginMains {
-  padding: 20px 0;
   background-color: #fff;
 }
 
 .loginSubmit {
   text-align: center;
 }
+.context {
+  padding: 20px;
+}
 </style>

src/layout/live/head.vue

@@ -9,8 +9,8 @@
           <p>
             欢迎来到吉林省计算中心科技平台
           </p>
-          <p>
-            <span v-if="user && user.uid" @click="stnmae">{{ user.name }}</span>
+          <p class="username">
+            <span v-if="user && user.name" @click="stnmae">{{ user.name }}</span>
             <span v-else>
               {{ user.name }}
               <button type="button" class="logininfo" @click="btnLogin">登录</button>
@@ -107,4 +107,10 @@ export default {
   font-size: 20px;
   margin: 0 0 0 5px;
 }
+.username span {
+  cursor: pointer;
+}
+/deep/ button {
+  cursor: pointer;
+}
 </style>

src/views/enterprise/appointment.vue

@@ -1,6 +1,13 @@
 <template>
   <div id="adviserList">
-    <appointment-detail :liebiaoList="liebiaoList" @deleteRow="deleteRow" :resultTable="resultTable" @onsave="onsaveClick"></appointment-detail>
+    <appointment-detail
+      :liebiaoList="liebiaoList"
+      @query="search"
+      :total="total"
+      @deleteRow="deleteRow"
+      :resultTable="resultTable"
+      @onsave="onsaveClick"
+    ></appointment-detail>
   </div>
 </template>
 
@@ -16,6 +23,7 @@ export default {
     appointmentDetail,
   },
   data: () => ({
+    total: 0,
     info: {},
     liebiaoList: [
       { name: '基本信息' },
@@ -40,12 +48,18 @@ export default {
     ...dock(['query', 'delete', 'update']),
     ...login({ logout: 'logout', transactiondtetle: 'delete' }),
     //查询
-    async search() {
-      let res = await this.query();
+    async search({ skip = 0, limit = 4 } = { skip: 0, limit: 4 }) {
+      let res = await this.query({ skip, limit });
       console.log(res.data);
       this.$set(this, `resultTable`, res.data);
+      this.$set(this, `total`, res.total);
       console.log();
     },
+
+    search1({ skip, limit }) {
+      console.log(skip);
+    },
+
     async onsaveClick({ id }) {
       console.log(id);
       if (id === '基本信息') {

src/views/enterprise/look.vue

@@ -7,6 +7,10 @@
       @shibai="shibai"
       :resultTable="resultTable"
       @onsave="onsaveClick"
+      :limit="limit"
+      :total="total"
+      @handleCurrentChange="handleCurrentChange"
+      :pageSize="pageSize"
     ></look-detail>
   </div>
 </template>
@@ -23,6 +27,9 @@ export default {
     lookDetail,
   },
   data: () => ({
+    total: 0,
+    limit: 4,
+    pageSize: 4,
     info: {},
     liebiaoList: [
       { name: '基本信息' },
@@ -50,15 +57,28 @@ export default {
     ...apply(['query', 'delete', 'update']),
     ...login({ logout: 'logout', transactiondtetle: 'delete' }),
     //查询
-    async search() {
+    async search({ skip = 0, limit = 4, currentPage } = { skip: 0, limit: 10 }) {
       console.log(this.data);
-      // let id = this.data;
+      console.log(this.data.apply.length);
+      this.$set(this, `total`, this.data.apply.length);
 
-      // console.log(res.data);
-
-      this.$set(this, `resultTable`, this.data.apply);
       console.log();
+      const newProducts = [];
+      for (let index = skip; index < skip + limit; index++) {
+        if (this.data.apply[index]) {
+          newProducts.push(this.data.apply[index]);
+        }
+      }
+      console.log(newProducts);
+
+      this.$set(this, `resultTable`, newProducts);
     },
+
+    handleCurrentChange({ currentPage }) {
+      this.search({ skip: (currentPage - 1) * this.pageSize, limit: this.pageSize, currentPage });
+      console.log(currentPage);
+    },
+
     async onsaveClick({ id }) {
       console.log(id);
       if (id === '基本信息') {