1115 15:48

11

dist/static/css/chunk-d4ce2760.d5db005b.css → dist/static/css/chunk-218e097e.4f828d8e.css

@@ -1 +1 @@
-.m-core[data-v-e7b061bc]{margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-pack:distribute;justify-content:space-around}.m-core .el-input[data-v-e7b061bc]{width:180px}.m-core h4[data-v-e7b061bc]{font-size:16px;background-color:#ccc;color:#fff;text-align:center;width:100%;height:40px;line-height:40px;margin-bottom:20px}.m-core .center[data-v-e7b061bc],.m-core .right[data-v-e7b061bc],.m-core .vipLeft[data-v-e7b061bc]{width:400px}.planList[data-v-e7b061bc]{padding:0 25px}.planList .planTop[data-v-e7b061bc]{height:40px;line-height:40px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-e7b061bc]{font-size:14px}.planList .planCore .row[data-v-e7b061bc]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-e7b061bc]{width:87px}.okBtn[data-v-e7b061bc]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}
+.m-core[data-v-6ebd43cc]{margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-pack:distribute;justify-content:space-around}.m-core .el-input[data-v-6ebd43cc]{width:180px}.m-core h4[data-v-6ebd43cc]{font-size:16px;background-color:#ccc;color:#fff;text-align:center;width:100%;height:40px;line-height:40px;margin-bottom:20px}.m-core .center[data-v-6ebd43cc],.m-core .right[data-v-6ebd43cc],.m-core .vipLeft[data-v-6ebd43cc]{width:400px}.planList[data-v-6ebd43cc]{padding:0 25px}.planList .planTop[data-v-6ebd43cc]{height:40px;line-height:40px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-6ebd43cc]{font-size:14px}.planList .planCore .row[data-v-6ebd43cc]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-6ebd43cc]{width:87px}.okBtn[data-v-6ebd43cc]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}

src/api/task.js

@@ -0,0 +1,31 @@
+import request from '@/utils/request'
+import qs from 'qs'
+
+export function taskList (data) {
+  return request({
+    url: '/api-task/task/list',
+    method: 'get',
+    params: data
+  })
+}
+
+export function resume (data) {
+  return request({
+    url: '/api-task/task/resume/' + data.taskId,
+    method: 'post',
+  })
+}
+
+export function execute (data) {
+  return request({
+    url: '/api-task/task/execute/' + data.taskId,
+    method: 'post',
+  })
+}
+
+export function pause (data) {
+  return request({
+    url: '/api-task/task/pause/' + data.taskId,
+    method: 'post',
+  })
+}

src/router/index.js

@@ -44,6 +44,19 @@ export const constantRoutes = [
     ]
   },
   {
+    path: '/timedtask',
+    component: Layout,
+    // component: () => import('@/views/timedTask/index'),
+    hidden: false,
+    children: [
+      {
+        path: 'timedtask',
+        component: () => import('@/views/timedTask/index'),
+        hidden: false,
+      }
+    ]
+  },
+  {
     path: '/login',
     component: () => import('@/views/login/index'),
     hidden: true

src/utils/vueFilter.js

@@ -307,3 +307,13 @@ Vue.filter('teachMode', value => {
   }
   return template[value]
 })
+
+// 老师状态
+Vue.filter('teacherStatus', value => {
+  let template = {
+    "0": '正常',
+    "1": '冻结',
+    "9": '锁定'
+  }
+  return template[value]
+})

src/views/buildVip/index.vue

@@ -1,8 +1,9 @@
 <template>
   <div class="m-container">
     <h2>
-      <div class="squrt" />
-      VIP课申请
+      <el-page-header @back="onCancel" content="VIP课申请"></el-page-header>
+      <!-- <div class="squrt" /> -->
+      
     </h2>
     <div class="m-core">
       <div class="vipLeft">
@@ -944,6 +945,9 @@ export default {
         }
       })
     },
+    onCancel() {
+      this.$router.push('/business/vipList')
+    },
     setCourse () {
       this.$refs['leftForm'].validate(vali => {
         if (vali) {

src/views/businessManager/shopManager/shopList.vue

@@ -48,6 +48,9 @@
           </el-table-column>
           <el-table-column align='center' prop="specification"
                            label="具体型号">
+            <template slot-scope="scope">
+              <span style="max-height: 64px; display: block;">{{ scope.row.specification }}</span>
+            </template>
           </el-table-column>
           <el-table-column align='center' prop="marketPrice"
                            label="商品价格">

src/views/categroyManager/insideSetting/branchManager.vue

@@ -80,7 +80,7 @@
           <el-input v-model="form.job" autocomplete="off"></el-input>
         </el-form-item>
         <el-form-item label="手机号" prop="mobileNo" :label-width="formLabelWidth">
-          <el-input v-model.number="form.mobileNo" autocomplete="off"></el-input>
+          <el-input v-model="form.mobileNo" autocomplete="off"></el-input>
         </el-form-item>
         <!-- <el-form-item label="权属类型" prop="ownershipType" :label-width="formLabelWidth">
           <el-select v-model="form.ownershipType">
@@ -101,6 +101,16 @@
 import pagination from '@/components/Pagination/index'
 import { cooperationOrganAdd, cooperationOrganUpdate, cooperationOrganDel, queryPage } from '@/api/systemManage'
 import store from '@/store'
+import { isvalidPhone } from '@/utils/validate'
+let validPhone = (rule, value,callback)=>{
+    if (!value){
+        callback(new Error('请输入电话号码'))
+    }else  if (!isvalidPhone(value)){
+        callback(new Error('请输入正确的11位手机号码'))
+    }else {
+        callback()
+    }
+}
 export default {
   components: { pagination },
   name: 'adminManager',
@@ -138,10 +148,7 @@ export default {
         name: [{ required: true, message: '请输入教学点名称', trigger: 'blur' }],
         linkman: [{required: true, message: '请输入联系人', trigger: 'blur'}],
         job: [{ required: true, message: '请输入职位', trigger: 'blur'}],
-        mobileNo: [
-          {required: true, message: '请输入手机号', trigger: 'blur'},
-          { type: 'number', message: '手机号必须为数字'},
-        ],
+        mobileNo: [{required: true, validator: validPhone, trigger: 'blur'}],
         // ownershipType: [{ required: true, message: '请选择权属类型', trigger: 'change' }]
       },
       
@@ -152,18 +159,25 @@ export default {
   },
   methods: {
     onDelete(rows) {
-      cooperationOrganDel(rows.id).then(res => {
-        if(res.code == 200) {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.teachingStatus = false
-          this.getList()
-        } else {
-          this.$message.error(res.msg)
-        }
-      })
+      this.$confirm('您确定删除合作单位?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        cooperationOrganDel(rows.id).then(res => {
+          if(res.code == 200) {
+            this.$message({
+              message: '删除成功',
+              type: 'success'
+            })
+            this.teachingStatus = false
+            this.getList()
+          } else {
+            this.$message.error(res.msg)
+          }
+        })
+      }).catch(() => { });
+      
     },
     onTeachingSubmit(formName) { // 添加数据
       this.$refs[formName].validate((valid) => {
@@ -233,7 +247,7 @@ export default {
           name: rows.name, // 教学点名称
           linkman: rows.linkman, // 来源
           job: rows.job,  // 费用
-          mobileNo: rows.mobileNo ? Number(rows.mobileNo) : null, // 合作单位
+          mobileNo: rows.mobileNo ? rows.mobileNo : null, 
           ownershipType: rows.ownershipType,
           organId: store.getters.organ
         }

src/views/studentManager/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="m-container">
     <h2>
-      学员详情
+      <el-page-header @back="onCancel" content="学员详情"></el-page-header>
     </h2>
     <div class="m-core">
       <!-- navMenu -->
@@ -66,6 +66,9 @@ export default {
     }
   },
   methods: {
+    onCancel() {
+      this.$router.push('/business/studentList')
+    },
     handleClick (val) {
       this.activeIndex = val.name
       this.acitveStatus[val.name - 1] = true

src/views/teacherManager/teacherList.vue

@@ -9,6 +9,10 @@
                class="searchForm"
                v-model="searchForm">
         <el-form-item>
+          <el-input v-model="searchForm.search"
+                    placeholder="老师姓名或电话"></el-input>
+        </el-form-item>
+        <el-form-item>
           <el-select v-model="searchForm.lockFlag"
                      placeholder="老师状态">
             <el-option v-for="item in teacherStatus"
@@ -81,7 +85,7 @@
                            prop="subjectId"
                            label="老师状态">
             <template slot-scope="scope">
-              {{ scope.row.lockFlag == 1 ? '冻结' : '正常' }}
+              {{ scope.row.lockFlag | teacherStatus }}
             </template>
           </el-table-column>
           <el-table-column align='center'
@@ -158,6 +162,7 @@ export default {
         jobNature: null,
         subjectId: null,
         organId: null,
+        search: null // 老师姓名或电话
       },
       jobNature: jobNature, // 工作类型
       teacherStatus: teacherStatus, // 老师状态
@@ -270,7 +275,8 @@ export default {
         isProbationPeriod: null,
         jobNature: null,
         organId: null,
-        subjectId: null
+        subjectId: null,
+        search: null
       }
     }
   }

src/views/teamBuild/signupList.vue

@@ -3,8 +3,10 @@
     <div class="topWrap">
       <div>
         <h2>
-          <div class="squrt"></div>
-          {{ teamName }}报名详情
+          <!-- <div class="squrt"></div> -->
+          <el-page-header @back="onCancel"
+                          :content="teamName + '报名详情'"></el-page-header>
+          <!-- {{ teamName }}报名详情 -->
         </h2>
         <div class="btnList">
           <div class='newBand close'
@@ -170,6 +172,7 @@
             <template slot-scope="scope">
               <div>
                 <el-button type='text'
+                           v-if="scope.row.paymentStatus != 2"
                            @click='resetSubject(scope.row)'>修改专业</el-button>
                 <!-- APPLY -->
                 <el-popover v-if='status == "APPLY" || scope.row.remark'
@@ -453,6 +456,9 @@ export default {
       this.rules.page = 1;
       this.getList();
     },
+    onCancel () {
+      this.$router.push('/business/teamDetail')
+    },
     getList () {
       let obj = {
         musicGroupId: this.id,

src/views/teamBuild/teamSeting/components/setImprovement.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="m-container">
     <h2>
-      <div class='squrt'></div>基础技能班报名详情 
+      <el-page-header @back="onCancel" content="基础技能班报名详情"></el-page-header>
+      <!-- <div class='squrt'></div>  -->
       <span @click="onCreateQRCode" style="font-size: 16px; padding-left: 20px; font-weight: 400;cursor: pointer; ">查看报名连接</span>
       <span @click="onApply" style="font-size: 16px; padding-left: 20px; font-weight: 400;cursor: pointer;">开启报名</span>
     </h2>
@@ -254,6 +255,9 @@ export default {
       })
 
     },
+    onCancel() {
+      this.$router.push('/business/teamDetail')
+    },
     resetClass (row) {
       console.log(this.activeClass, row.userId)
       this.activeStudent = row.userId;

src/views/teamBuild/teamSeting/index.vue

@@ -2,8 +2,9 @@
   <div class='set-container'>
     <div class="topWrap">
       <h2>
-        <div class="squrt"></div>
-        {{ name }}
+        <!-- <div class="squrt"></div> -->
+        <el-page-header @back="goBack" :content="name">
+        </el-page-header>
       </h2>
       <div class="stepbox">
         <span class='stepspan'
@@ -143,6 +144,9 @@ export default {
     gotoNav (val) {
       console.log(val)
       this.activeIndex = val;
+    },
+    goBack() {
+      this.$router.push('/business/teamDetail')
     }
   },
 }

src/views/teamDetail/teamDetailedList.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="m-container">
-    <h2>发放清单</h2>
+    <h2><el-page-header @back="onCancel" content="发放清单"></el-page-header></h2>
     <!-- <div class="headWrap">
       <div class="left">
         <div class="headItem">
@@ -78,6 +78,9 @@ export default {
     })
   },
   methods: {
+    onCancel() {
+      this.$router.push('/business/teamDetail')
+    },
     okDetailList () {
       verifyMusicalList({ musicGroupId: this.teamid }).then(res => {
         if (res.code == 200) {

src/views/timedTask/index.vue

@@ -0,0 +1,144 @@
+<template>
+  <div class="m-container">
+    <h2>定时任务 <div class="squrt"></div>
+    </h2>
+    <div class="m-core">
+      <div class="tableWrap">
+        <el-table style="width: 100%"
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}"
+                  :data='tableData'>
+          <el-table-column prop="id"
+                           align='center'
+                           label="任务编号">
+          </el-table-column>
+          <el-table-column prop="description"
+                           align='center'
+                           label="英文名">
+          </el-table-column>
+          <el-table-column prop="name"
+                           align='center'
+                           label="任务名">
+          </el-table-column>
+          <el-table-column align='center'
+                           prop="timeExp"
+                           label="表达式">
+          </el-table-column>
+          <el-table-column prop="status"
+                           align='center'
+                           label="任务状态">
+            <template slot-scope="scope">
+              <div>
+                {{ getStatus(scope.row.status) }}
+              </div>
+            </template>
+          </el-table-column>
+          
+          <el-table-column align='center'
+                           label="操作">
+            <template slot-scope="scope">
+              <el-button type="text" v-if="scope.row.status == 1 || scope.row.status == 3" @click="onPause(scope.row)">暂停</el-button>
+              <el-button type="text" v-if="scope.row.status == 1 || scope.row.status == 3"  @click="onExecute(scope.row)">执行</el-button>
+              <el-button type="text" v-if="scope.row.status == 0" @click="onResume(scope.row)">恢复</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { taskList, pause, execute, resume } from '@/api/task'
+export default {
+  data () {
+    return {
+      tableData: []
+    }
+  },
+  mounted () {
+    this.__init()
+  },
+  methods: {
+    __init () {
+      taskList().then(res => {
+        if(res.code == 200) {
+          let result = res.data
+          this.tableData = result.rows
+        }
+      })
+    },
+    onPause(row) {
+      this.$confirm('您确定暂停吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        pause({ taskId: row.id }).then(res => {
+          if(res.code == 200) {
+            this.$message({
+              type: 'success',
+              message: '暂停成功!'
+            })
+            this.__init()
+          } else {
+            this.$message.error(res.msg)
+          }
+        })
+      }).catch(() => { })
+    },
+    onExecute(row) {
+      this.$confirm('您确定执行吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        execute({ taskId: row.id }).then(res => {
+          if(res.code == 200) {
+            this.$message({
+              type: 'success',
+              message: '执行成功!'
+            })
+            this.__init()
+          } else {
+            this.$message.error(res.msg)
+          }
+        })
+      }).catch(() => { })
+    },
+    onResume(row) {
+      this.$confirm('您确定恢复吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        resume({ taskId: row.id }).then(res => {
+          if(res.code == 200) {
+            this.$message({
+              type: 'success',
+              message: '恢复成功!'
+            })
+            this.__init()
+          } else {
+            this.$message.error(res.msg)
+          }
+        })
+      }).catch(() => { })
+    },
+    getStatus(index) {
+      let template = {
+        // -1: "执行失败",
+        0: "暂停",
+        1: "准备就绪",
+        2: "执行中",
+        3: "执行成功"
+      }
+      if(index == -1) {
+        return '执行失败'
+      }
+      return template[index]
+    }
+  }
+}
+</script>
+<style lang="scss" scope>
+
+</style>

vue.config.js

@@ -6,7 +6,7 @@ function resolve (dir) {
   return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || 'vue Admin Template' // page title
+const name = defaultSettings.title || '大雅后台管理系统' // page title
 
 // If your port is set to 80,
 // use administrator privileges to execute the command line.
@@ -19,7 +19,7 @@ const name = defaultSettings.title || 'vue Admin Template' // page title
 // let target = 'http://192.168.3.27:8000' // 箭河
 // let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:8000' //勇哥
-// let target = 'http://admin.dayaedu.com:80' // 测试服
+// let target = 'http://47.99.212.176:18000' // 测试服
 let target = 'http://192.168.3.48:8000' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
@@ -54,6 +54,13 @@ module.exports = {
           '^api-auth': ''
         }
       },
+      '/api-task': {
+        target: target,
+        changeOrigin: true,
+        pathRewrite: {
+          '^api-task': ''
+        }
+      },
       '/api-web': {
         target: target,
         changeOrigin: true,