首頁 探索 說明
登入
jianyu
/
qmx_page_admin
12
0
複刻 0
檔案 問題管理 0 合併請求 1 Wiki
瀏覽代碼

Merge branch 'dev1.2' of http://192.168.3.207:10080/group3/qmx_page_admin into dev1.2

Mr.ding 5 年之前
父節點
082fe96d3b 7603bdf58d
當前提交
c0d5632d5a
共有 12 個文件被更改，包括 380 次插入 和 16 次删除
分割檢視 顯示文件統計
  1. 2 2
      README.md
  2. 16 3
      public/index.html
  3. 15 0
      src/App.vue
  4. 1 1
      src/assets/css/base.css
  5. 53 1
      src/assets/css/element.css
  6. 0 0
      src/components/tableLists.vue
  7. 10 3
      src/router/index.js
  8. 177 0
      src/views/bus/bidMsg.vue
  9. 20 6
      src/views/bus/busMage.vue
  10. 19 0
      src/views/bus/export.vue
  11. 30 0
      src/views/bus/subMage.vue
  12. 37 0
      src/views/bus/subscribe.vue

+ 2 - 2
README.md
查看文件 

@@ -14,7 +14,6 @@ npm run serve
 
 ```
 
 npm run build
 
 ```
 
-
 
 ### Lints and fixes files
 
 ```
 
 npm run lint
 
@@ -23,4 +22,5 @@ npm run lint
 
 ### Customize configuration
 
 See [Configuration Reference](https://cli.vuejs.org/config/).
 
 
-v1.2 pc端商机管理增加数据导出限额
 
+v1.2 
+pc端商机管理增加数据导出限额

+ 16 - 3
public/index.html
查看文件 

@@ -50,6 +50,21 @@
 
       background-color: #166b87;
 
     }
 
 
+    .public-nav .tags {
 
+      width: 72px;
 
+      height: 22px;
 
+      line-height: 20px;
 
+      text-align: center;
 
+      color: #2ABED1;
 
+      font-size: 13px;
 
+      border: 1px solid #2ABED1;
 
+      border-radius: 10px;
 
+      position: absolute;
 
+      left: 150px;
 
+      top: 26px;
 
+      z-index: 9!important;
 
+    }
 
+
 
     .new-info {
 
       position: relative;
 
       padding-top: 4px;
 
@@ -103,7 +118,7 @@
 
 <body>
 
   <section class="public-nav" id="public-nav">
 
     <div class="iner clearfix">
 
-      <a class="logo" href="/"><img src="/images/pc/logo.png?v=1412" /></a>
 
+      <a class="logo" href="/"><img src="/images/pc/logo.png?v=1412" /><span class="tags">商机管理</span></a>
 
       <div class="fr">
 
         <ul class="jynav">
 
           <li>
 
@@ -220,9 +235,7 @@
 
   <script type="text/javascript">
 
     $(function () {
 
       haslogin("10")
 
-
 
       var href = window.location.pathname;
 
-      console.log(href)
 
       // if (href == "/entpc/myEnt" || href == "/entpc/bus" || href == "/jyxspc/pay-courser" ||
 
       //   href == "/jyxspc/pay-succ" ||
 
       //   href == "/jyxspc/my-courser" ||

+ 15 - 0
src/App.vue
查看文件 

@@ -27,5 +27,20 @@ export default {
 
   background: #F5F5FB;
 
   // min-height: calc(100vh - 260px);
 
   min-height: 700px;
 
+  a {
 
+    color: #1d1d1d;
 
+  }
 
+  a:link {
 
+    color: #1d1d1d;text-decoration: none;
 
+  } 
+  a:visited {
 
+    color: #1d1d1d;text-decoration: none;
 
+  } 
+  a:hover{
 
+    color: #1d1d1d;text-decoration: none;
 
+  }
 
+  a:active {
 
+    color: #1d1d1d;text-decoration: none;
 
+  }
 
 }
 
 </style>

+ 1 - 1
src/assets/css/base.css
查看文件 

@@ -58,7 +58,7 @@ a{
 
 
 /* a:link {color:#606060;} 
 a:visited {color:#606060;}  */
 
-a:hover{color: #1d1d1d;text-decoration: none;}
 
+/* a:hover{color: #1d1d1d;text-decoration: none;} */
 
 /* a:active {color:#606060;} */
 
 address,caption,cite,code,dfn,em,th,b,i {font-weight: normal;font-style: normal;}

+ 53 - 1
src/assets/css/element.css
查看文件 

@@ -48,4 +48,56 @@
 
 }
 
 .el-drawer {
 
     box-shadow: -8px 0px 8px rgba(0, 0, 0, 0.05);
 
-}
 
+}
 
+.el-button:hover {
 
+    color: #2CB7CA!important;
 
+    border: 1px solid #2CB7CA!important;
 
+}
 
+
 
+.el-breadcrumb .el-breadcrumb__item .el-breadcrumb__inner {
 
+    color: #2CB7CA;
 
+    font-size: 12px;
 
+}
 
+
 
+.el-breadcrumb .el-breadcrumb__item .el-breadcrumb__inner.is-link {
 
+    color: #999;
 
+    font-weight: normal;
 
+}
 
+
 
+.el-breadcrumb .el-breadcrumb__item .el-icon-arrow-right {
 
+    color: #2CB7CA;
 
+    margin: 0 3px;
 
+}
 
+.el-pagination {
 
+    margin-top: 20px;
 
+    text-align: right;
 
+    color: rgba(0, 0, 0, 0.65);
 
+}
 
+.el-pagination ul li {
 
+    width: 32px;
 
+    height: 32px;
 
+    line-height: 32px;
 
+    background: none!important;
 
+    border: 1px solid #D9D9D9;
 
+    font-weight: normal;
 
+    border-radius: 2px;
 
+    padding: 0;
 
+}
 
+.el-pagination ul li:hover {
 
+    color: #2CB7CA!important;
 
+}
 
+.el-pagination.is-background .btn-prev, .el-pagination.is-background .btn-next {
 
+    width: 32px;
 
+    height: 32px;
 
+    line-height: 32px;
 
+    background: none;
 
+    border: 1px solid #D9D9D9;
 
+}
 
+.el-pagination.is-background .el-pager li:not(.disabled).active {
 
+    background: #2CB7CA!important;
 
+    border-radius: 2px;
 
+    border-color: #2CB7CA;
 
+}
 
+.el-pagination.is-background .el-pager li:not(.disabled).active:hover {
 
+    color: #fff!important;
 
+}

+ 0 - 0
src/components/HelloWorld.vue → src/components/tableLists.vue
查看文件


+ 10 - 3
src/router/index.js
查看文件 

@@ -7,7 +7,7 @@ const routes = [
 
   {
 
     path: "/myent",
 
     name: "Myent",
 
-    component: () => import(/* webpackChunkName: "about" */ "../views/ent/myEnt.vue"),
 
+    component: () => import(/* webpackChunkName: "myEnt" */ "../views/ent/myEnt.vue"),
 
     meta:{
 
       title:'我的企业'
 
     }
 
@@ -15,12 +15,19 @@ const routes = [
 
   {
 
     path: "/bus",
 
     name: "Bus",
 
-    component: () => import(/* webpackChunkName: "about" */ "../views/bus/busMage.vue"),
 
+    component: () => import(/* webpackChunkName: "busMage" */ "../views/bus/busMage.vue"),
 
     meta:{
 
       title:'商机管理'
 
     }
 
   },
 
-
 
+  {
 
+    path: "/subscribe",
 
+    name: "Subscribe",
 
+    component: () => import(/* webpackChunkName: "subscribe" */ "../views/bus/subscribe.vue"),
 
+    meta:{
 
+      title:'订阅设置'
 
+    }
 
+  },
 
   
   {
 
     path: "/about",

+ 177 - 0
src/views/bus/bidMsg.vue
查看文件 

@@ -0,0 +1,177 @@
 
+<template>
 
+    <div class="bid_msg">
 
+        <h3>杭州琴月文创娱乐有限公司<span>已认证</span></h3>
 
+        <div class="filter_lis">
 
+            <div class="high">高级筛选</div>
 
+            <el-button plain class="btn1">导出结果</el-button>
 
+            <el-button plain class="btn1 btn2" @click="book">订阅设置</el-button>
 
+        </div>
 
+        <div class="list_data">
 
+            <ul>
 
+                <li :key="index" v-for="(item, index) in listData">
 
+                    <router-link to="/">
 
+                        <div class="tit">{{item.name}}</div>
 
+                        <div class="bot">
 
+                            <span class="spa1">{{item.area}}</span>
 
+                            <span class="spa1" style="margin: 0 10px">{{item.tips1}}</span>
 
+                            <span class="spa1 spa2" :class="{lActive:item.tips2 == '1'}">{{item.tips2 == '1'?"成交":"招标"}}</span>
 
+                            <span class="spa3">{{item.date}}</span>
 
+                        </div>
 
+                    </router-link>
 
+                </li>
 
+            </ul>
 
+            <el-pagination
 
+                background
 
+                layout="prev, pager, next"
 
+                :total="1000">
 
+            </el-pagination>
 
+        </div>
 
+    </div>
 
+</template>
 
+
 
+<script>
 
+export default {
 
+    data() {
 
+        return {
 
+            tips: false,
 
+            listData: [{
 
+                date: '13小时前',
 
+                name: '海市普陀区金沙江路海市普陀区金沙江路海市普陀区金沙江路海市普陀区金沙江路',
 
+                area: '上海',
 
+                tips1: '出版广电',
 
+                tips2: '0'
 
+            }, {
 
+                date: '13小时前',
 
+                name: '海市普陀区金沙江路海市普陀区金沙江路海市普陀区金沙江路海市普陀区金沙江路',
 
+                area: '上海',
 
+                tips1: '出版广电',
 
+                tips2: '1'
 
+            }, {
 
+                date: '13小时前',
 
+                name: '海市普陀区金沙江路海市普陀区金沙江路海市普陀区金沙江路海市普陀区金沙江路',
 
+                area: '上海',
 
+                tips1: '出版广电',
 
+                tips2: '0'
 
+            }]
 
+        }
 
+    },
 
+    methods: {
 
+        book() {
 
+            const news = this.$router.resolve({path: '/subscribe'});
 
+            window.open(news.href,'_blank');
 
+        },
 
+    }
 
+}
 
+</script>
 
+
 
+<style lang="scss" scoped>
 
+.bid_msg {
 
+    display: flex;
 
+    flex-direction: column;
 
+    padding: 30px;
 
+    h3 {
 
+        display: flex;
 
+        flex-direction: initial;
 
+        align-self: start;
 
+        align-items: center;
 
+        font-size: 20px;
 
+        span {
 
+            width: 56px;
 
+            height: 20px;
 
+            line-height: 20px;
 
+            text-align: center;
 
+            color: #2ABED1;
 
+            font-size: 13px;
 
+            border: 1px solid #2ABED1;
 
+            border-radius: 10px;
 
+            margin-left: 10px;
 
+        }
 
+    }
 
+    .filter_lis {
 
+        width: 1020px;
 
+        height: 50px;
 
+        line-height: 50px;
 
+        background: #F7F7F7;
 
+        border-radius: 4px;
 
+        margin-top: 20px;
 
+        margin-bottom: 20px;
 
+        padding: 0 20px 0 20px;
 
+        display: flex;
 
+        align-self: start;
 
+        align-items: center;
 
+        .high {
 
+            padding: 13px 0;
 
+            font-size: 14px;
 
+            color: #2CB7CA;
 
+            margin-right: 44px;
 
+            cursor: pointer;
 
+        }
 
+        .btn1 {
 
+            padding: 6px 17px;
 
+            font-size: 14px;
 
+            color: #1d1d1d;
 
+            border: 1px solid #E0E0E0;
 
+            box-sizing: border-box;
 
+            border-radius: 4px;
 
+        }
 
+        .btn2 {
 
+            position: absolute;
 
+            right: 50px;
 
+        }
 
+    }
 
+    .list_data {
 
+        ul {
 
+            display: flex;
 
+            flex-direction: column;
 
+            li {
 
+                text-align: left;
 
+                a {
 
+                    display: inline-block;
 
+                    width: 100%;
 
+                    line-height: 24px;
 
+                    box-shadow: inset 0px -1px 0px rgba(0, 0, 0, 0.05);
 
+                    padding: 18px 0;
 
+                    .tit {
 
+                        width: 800px;
 
+                        font-size: 16px;
 
+                        overflow: hidden;
 
+                        text-overflow:ellipsis;
 
+                        white-space: nowrap;
 
+                    }
 
+                    .bot {
 
+                        margin-top: 6px;
 
+                        .spa1 {
 
+                            border: 1px solid #ECECEC;
 
+                            box-sizing: border-box;
 
+                            border-radius: 4px;
 
+                            background: #F7F9FA;
 
+                            padding: 3px 10px;
 
+                            font-size: 12px;
 
+                            color: #686868;
 
+                        }
 
+                        .spa2 {
 
+                            color: #2CB7CA;
 
+                            border-color: #2CB7CA;
 
+                            background: none;
 
+                        }
 
+                        .spa3 {
 
+                            float: right;
 
+                            color: #999;
 
+                            font-size: 12px;
 
+                        }
 
+                        .lActive {
 
+                            color: #FF9F40;
 
+                            border-color: #FF9F40;
 
+                        }
 
+                    }
 
+                }
 
+                &:hover {
 
+                    .tit {
 
+                        color: #2CB7CA;
 
+                    }
 
+                }
 
+            }
 
+        }
 
+    }
 
+}
 
+</style>

+ 20 - 6
src/views/bus/busMage.vue
查看文件 

@@ -1,21 +1,35 @@
 
 <template>
 
     <div class="bus_mage">
 
         <el-tabs v-model="activeName" @tab-click="handleClick">
 
-            <el-tab-pane label="商机" name="first">商机</el-tab-pane>
 
-            <el-tab-pane label="公告" name="second">公告</el-tab-pane>
 
-            <el-tab-pane label="报告" name="third">报告</el-tab-pane>
 
-            <el-tab-pane label="数据导出" name="forth">数据导出</el-tab-pane>
 
+            <el-tab-pane label="招标信息" name="first">
 
+                <v-bid></v-bid>
 
+            </el-tab-pane>
 
+            <el-tab-pane label="数据导出记录" name="second">
 
+                <v-export></v-export>
 
+            </el-tab-pane>
 
         </el-tabs>
 
     </div>
 
 </template>
 
 
 <script>
 
+import vBid from './bidMsg.vue';
 
+import vExport from './export.vue';
 
 export default {
 
+    components: {
 
+        vBid,
 
+        vExport
 
+    },
 
     data() {
 
         return {
 
-            activeName: 'first'
 
+            activeName: 'first',
 
+            tip: 0
 
         }
 
-    }
 
+    },
 
+    methods: {
 
+        handleClick(tab, event) {
 
+            this.activeName = tab.name
 
+        }
 
+    },    
 }
 
 </script>

+ 19 - 0
src/views/bus/export.vue
查看文件 

@@ -0,0 +1,19 @@
 
+<template>
 
+    <div class="export_msg">
 
+        数据导出
 
+    </div>
 
+</template>
 
+
 
+<script>
 
+export default {
 
+    data() {
 
+        return {
 
+            activeName: 'first'
 
+        }
 
+    }
 
+}
 
+</script>
 
+
 
+<style lang="scss" scoped>
 
+
 
+</style>

+ 30 - 0
src/views/bus/subMage.vue
查看文件 

@@ -0,0 +1,30 @@
 
+<template>
 
+    <div class="sub_msg">
 
+        <el-breadcrumb separator-class="el-icon-arrow-right">
 
+            <el-breadcrumb-item :to="{ path: '/bus' }">招标信息</el-breadcrumb-item>
 
+            <el-breadcrumb-item>订阅设置</el-breadcrumb-item>
 
+        </el-breadcrumb>
 
+        <el-divider></el-divider>
 
+    </div>
 
+</template>
 
+
 
+<script>
 
+export default {
 
+    data() {
 
+        return {
 
+            // activeName: 'first'
 
+        }
 
+    }
 
+}
 
+</script>
 
+
 
+<style lang="scss" scoped>
 
+.sub_msg {
 
+    display: flex;
 
+    flex-direction: column;
 
+    padding: 20px 30px 40px 30px;
 
+    .el-divider {
 
+        margin: 20px 0;
 
+    }
 
+}
 
+</style>

+ 37 - 0
src/views/bus/subscribe.vue
查看文件 

@@ -0,0 +1,37 @@
 
+<template>
 
+    <div class="sub_set">
 
+        <el-tabs v-model="activeName" @tab-click="handleClick">
 
+            <el-tab-pane label="招标信息" name="first">
 
+                <v-sub></v-sub>
 
+            </el-tab-pane>
 
+            <el-tab-pane label="数据导出记录" name="second">
 
+                <v-export></v-export>
 
+            </el-tab-pane>
 
+        </el-tabs>
 
+    </div>
 
+</template>
 
+
 
+<script>
 
+import vExport from './export.vue';
 
+import vSub from './subMage.vue';
 
+export default {
 
+    components: {
 
+        vExport,
 
+        vSub
 
+    },
 
+    data() {
 
+        return {
 
+            activeName: 'first',
 
+        }
 
+    },
 
+    methods: {
 
+        handleClick(tab, event) {
 
+            this.activeName = tab.name
 
+        }
 
+    },    
+}
 
+</script>
 
+
 
+<style lang="scss" scoped>
 
+
 
+</style>