Merge branch 'dev-coop-phase2.3-1012' into release

src/router/router.js

@@ -23,6 +23,7 @@ const dataAlignment = r => require.ensure([], () => r(require('../views/learning
 const exportDownload = r => require.ensure([], () => r(require('../views/learning/export-download.vue')), 'export-download')
 
 const itemShield = r => require.ensure([], () => r(require('../views/education/item-shield.vue')), 'item-shield')
+const entryManager = r => require.ensure([], () => r(require('../views/education/entry-manager.vue')), 'entry-manager')
 
 export default [{
     path: '/',
@@ -87,6 +88,10 @@ export default [{
             path: '/item-shield',
             component: itemShield,
         },
+        {
+            path: '/entry-manager',
+            component: entryManager,
+        },
       {
         path: '/msg-push',
         component: msgPush,

src/style/common.scss

@@ -253,4 +253,4 @@ html,body{
       font-size: 12px;
       color: #FF9A4B;
     }
-  }
+}

src/utils/env-config.js

@@ -29,7 +29,8 @@ export const envConfig = {
     // reportUrl: 'http://10.177.15.150:10401/',
     // reportUrl: 'http://192.168.140.13:10401/',
     // reportUrl: 'https://dev-sc-report.yunqueyi.com/',
-    reportUrl: 'https://uat-sc-report.yunqueyi.com/',
+    reportUrl: 'https://dev-sc-report.yunqueyi.com/',
+    // reportUrl: 'https://test1-sc-report.yunqueyi.com/',
     // reportUrl: 'https://uat-sc-report.yunqueyi.com/',
     excelUrl: 'https://uat-file.yunqueyi.com/File/template/portal/',
     itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',

src/utils/fetch.js

@@ -56,8 +56,7 @@ service.interceptors.request.use(config => {
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
       // config.headers['token'] = 'BFD804F3A3194FBBBE113962222839F6';
       // config.headers['token'] = 'F8209898391C40A0B8DBC1ED9E157291';
-      // config.headers['token'] = 'E5F82EDD958941C29BCDDDED410ACDB3';
-      config.headers['token'] = '04BEB8CAF7DE4E1AB861FC487E7ADAC8';
+      config.headers['token'] = '2E46B77D801C479DBA1C550CE70D348F';
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')
     }

src/views/education/entry-manager.vue

+<template>
+  <div class="entry-manager">
+    <bread-crumb :curmbFirst="curmbFirst"></bread-crumb>
+    <div class="component-content screenSet" id="screenSet">
+      <el-form :model="formInline" ref="formInline" label-width="75px" class="form-inline">
+        <el-col :span="6">
+          <el-form-item label="入口名称：">
+            <el-input size="small" v-model="formInline.name" placeholder="请输入名称"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="2"></el-col>
+        <el-col :span="2">
+          <el-button type="primary" size="small">查询</el-button>
+        </el-col>
+        <el-col :span="6" style="padding:0;text-align:right;padding-right:10px;">
+          <el-button type="primary" size="small">新建入口</el-button>
+        </el-col>
+      </el-form>
+      <el-table :data="tableData" style="width: 100%">
+        <el-table-column prop="id" label="ID编号" align="center"></el-table-column>
+        <el-table-column prop="project" label="入口名称" align="center"></el-table-column>
+        <el-table-column prop="name" label="创建人" align="center"></el-table-column>
+        <el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
+        <el-table-column prop="desc" label="入口介绍" align="center"></el-table-column>
+        <el-table-column prop="startTime" label="开始时间" align="center"></el-table-column>
+        <el-table-column prop="endTime" label="介绍时间" align="center"></el-table-column>
+        <el-table-column fixed="right" label="状态" align="center">
+          <template slot-scope="scope">{{ scope.row.status | shieldStatus }}</template>
+        </el-table-column>
+        <el-table-column fixed="right" label="操作" width="150" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small">编辑</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="pagination">
+        <el-pagination
+          background
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="formInline.pageNo"
+          :page-sizes="[10, 20, 30, 100]"
+          :page-size="formInline.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="totalRows"
+        ></el-pagination>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import BreadCrumb from "../../components/breadcrumb.vue";
+import { mapGetters } from "vuex";
+import { openLoading, closeLoading } from "../../utils/utils";
+import * as commonUtil from "../../utils/utils";
+import * as operationData from "../../utils/operation";
+let vm = null;
+export default {
+  components: {
+    BreadCrumb
+  },
+  data() {
+    return {
+      curmbFirst: "入口管理",
+      totalRows: 0,
+      formInline: {
+        name: "",
+        pageNo: 1,
+        pageSize: 10
+      },
+      tableData: [
+        {
+          id: 123,
+          project: "小何同学的项目",
+          name: "小王同学",
+          createTime: "2019-09-09",
+          desc: "小王同学",
+          startTime: "2019-10-10",
+          endTime: "2019-12-10",
+          status: 1
+        }
+      ]
+    };
+  },
+  computed: {
+    ...mapGetters(["_token"])
+  },
+  created() {
+    vm = this;
+  },
+  mounted: function() {
+    commonUtil.resizeHeight();
+  },
+  methods: {
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+      this.formInline.pageSize = val;
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+      this.formInline.pageNo = val;
+    }
+  }
+};
+</script>
+<style lang="scss">
+.entry-manager {
+  .component-content {
+    padding: 10px;
+    background: #fff;
+  }
+}
+</style>
\ No newline at end of file

src/views/education/item-manager.vue

@@ -532,4 +532,7 @@ export default {
     }
   }
 }
+.el-tooltip__popper { 
+  max-width:50% 
+}
 </style>
\ No newline at end of file

src/views/system/item-role.vue

@@ -1078,4 +1078,20 @@ export default {
     }
   }
 }
+.el-popover {
+    ::-webkit-scrollbar
+    {
+        width: 4px;
+        height: 10px;
+        background-color: #D8D8D8;
+    }
+    ::-webkit-scrollbar-thumb {
+        background-color: #D8D8D8;
+    }
+    .more-text {
+        padding: 0 5px 0 5px;
+        max-height: 55px;
+        overflow-y: scroll;
+    }
+}
 </style>
\ No newline at end of file

src/views/system/role.vue

@@ -217,4 +217,7 @@ export default {
     }
   }
 }
+.el-tooltip__popper { 
+  max-width:50% 
+}
 </style>
\ No newline at end of file