注释、培训校企增加字段

.env.development

@@ -5,13 +5,13 @@ ENV = 'development'
 VUE_APP_BASE_API = '/prod-api'
 
 
-# VUE_APP_BASE_TARGET = 'http://192.168.0.229:9999'
+VUE_APP_BASE_TARGET = 'http://192.168.0.229:9999'
 # VUE_APP_BASE_TARGET = 'http://192.168.0.129:9999'
 # VUE_APP_BASE_TARGET = 'http://172.16.36.180:9999'
 # VUE_APP_BASE_TARGET = 'http://172.16.36.176:9998'
 
 # VUE_APP_BASE_TARGET = 'https://www.keyitest.cn/test-api'
-VUE_APP_BASE_TARGET = 'http://www.bjkeyware.com/prod-api'
+# VUE_APP_BASE_TARGET = 'http://www.bjkeyware.com/prod-api'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.production

@@ -9,6 +9,6 @@ VUE_APP_BASE_API = '/prod-api'
 
 # VUE_APP_BASE_TARGET = 'https://www.keyitest.cn/prod-api'
 # VUE_APP_BASE_TARGET = 'http://www.bjkeyware.com/test-api'
-VUE_APP_BASE_TARGET = 'http://www.bjkeyware.com/prod-api'
+# VUE_APP_BASE_TARGET = 'http://www.bjkeyware.com/prod-api'
 
-# VUE_APP_BASE_TARGET = 'http://192.168.0.229:9999'
+VUE_APP_BASE_TARGET = 'http://192.168.0.229:9999'

src/page/homepage/crowdsourcing/crowd.vue

@@ -1,5 +1,6 @@
 <template>
     <div style="background: rgb(245, 246, 250)">
+        <!-- 企业用户发布任务入口 -->
         <div v-if="userinform.companyStatus == 2" class="ijaiorenwu" @click="publish">
             <img class="ijaoricon" src="/assets/home/fbrwicon.png" alt="" />
             发布众包任务
@@ -296,10 +297,10 @@ export default {
             // 项目金额
             loading: true,
             taskdrawer: false,
-            typeName: 'q', //测试类型
+            typeName: 'q', //任务类型
             amountrange: 'q', //金额范围
-            period: 'q',
-            onsiteType: 'q',
+            period: 'q', // 项目周期
+            onsiteType: 'q', //驻场要求
             paytypelist: [
                 { name: '2千以下', id: '1' },
                 { name: '2千-5千', id: '2' },
@@ -348,23 +349,27 @@ export default {
         this.getList()
     },
     methods: {
+        // 任务类型点击
         taskClick(q) {
             this.typeName = q
             this.getList()
         },
+        // 金额范围点击
         amoutClick(q) {
             this.amountrange = q
             this.getList()
         },
+        // 项目周期点击
         periodClick(q) {
             this.period = q
             this.getList()
         },
+        // 驻场要求点击
         onsiteTypeClick(q) {
             this.onsiteType = q
             this.getList()
         },
-        // 发布时间和项目金额排序
+        // 发布时间排序
         fabuTimeEsc() {
             this.priceOrder = null
             if (this.dateOrder == 'down') {
@@ -376,6 +381,7 @@ export default {
             }
             this.getList()
         },
+        // 项目金额排序
         proMoneyEsc() {
             this.dateOrder = null
             if (this.priceOrder == 'down') {
@@ -387,7 +393,7 @@ export default {
             }
             this.getList()
         },
-
+        // 地域省变化
         onChangeProvince(data) {
             if (data.value != '不限') {
                 this.province = data.value
@@ -400,6 +406,7 @@ export default {
             // if (data.value.indexOf('---') == -1) this.province = data.value
             // else this.province = ''
         },
+        // 地域城市变化
         onChangeCity(data) {
             if (data.value != '不限') {
                 this.myarea = this.province + '-' + data.value

src/page/homepage/crowdsourcing/crowddetails.vue

@@ -404,6 +404,7 @@ export default {
     },
     mounted() {
         let id = this.$route.query.id
+        // 获取详细信息
         getById(id, this.userId).then((response) => {
             // console.log('任务信息：',response)
             this.task = response.task
@@ -487,10 +488,12 @@ export default {
                 this.biddingobj.attachment = value
             }
         },
+        // 文件全路径下载
         openurl(url) {
             this.$message.success('下载成功')
             window.location.href = url
         },
+        // 竞标报名逻辑
         applyfor() {
             if (!this.token) {
                 this.$confirm('您未登录,请您先去登录', '提示', {
@@ -532,6 +535,7 @@ export default {
                 })
             }
         },
+        // 报名成功弹层确定
         resultFn() {
             this.resultOpen = false
             this.$nextTick(() => {
@@ -562,6 +566,7 @@ export default {
                 })
             })
         },
+        // 竞标提交 cancel取消
         sumbit(type) {
             if (type == 'cancel') {
                 this.paydiaopen = false

src/page/homepage/crowdsourcing/publishtasks.vue

@@ -291,6 +291,7 @@ export default {
     name: 'CrowdsourceTask',
     mixins: [mixin],
     data() {
+        // 校验规则
         const checkMaxVal = (rule, value, callback) => {
             var reg = /^[0-9]*[1-9][0-9]*$/
             if (!reg.test(value)) {
@@ -308,14 +309,7 @@ export default {
                 callback(new Error('必须小于200000或保留一位小数'))
             }
         }
-        const xiaoshu1 = (rule, value, callback) => {
-            var reg = /^\d+(\.\d{0,1})?$/
-            if (reg.test(value)) {
-                callback()
-            } else {
-                callback(new Error('允许整数或保留一位小数'))
-            }
-        }
+
         return {
             select: '1',
             str: 'static,security',
@@ -527,21 +521,7 @@ export default {
         this.$nextTick(() => {
             this.taskform.projectDesc = this.escapeStringHTML(this.editContent)
         })
-        // this
 
-        // 相关众包
-        // homecrowdlist()
-        //     .then((response) => {
-        //         // console.log('response----',response)
-        //         this.listcrowd = response.rows
-        //         if (this.listcrowd.length > 4) {
-        //             this.listcrowd = this.listcrowd.splice(0, 4)
-        //         }
-        //         this.total = response.total
-        //     })
-        //     .catch((err) => {
-        //         // console.log('异常1',err)
-        //     })
     },
 
     computed: {
@@ -557,6 +537,7 @@ export default {
         },
         findByvalue,
         findLabelValueByProp,
+        // 下载函数
         openurl(url) {
             this.$message.success('下载成功')
             window.location.href = url
@@ -577,6 +558,7 @@ export default {
                 this.$router.push(`/console/crowdinform?id=${id}`)
             }
         },
+        // 提交函数
         tasksubmit(payload) {
             // this.$router.push("/console/myrelease?tabtype=1")
             this.$refs['taskform'].validate((valid) => {

src/page/homepage/crowdsourcing/userhome.vue

@@ -209,9 +209,11 @@ export default {
         this.getTask()
     },
     methods: {
+        // 任务详情跳转
         gotaskDetail(id) {
             this.$router.push(`/crowdsourcing/crowddetails?id=${id}`)
         },
+        // tab切换
         tabfn(val) {
             this.active = val
             if (val == 0) {

src/page/homepage/home/home.vue

@@ -538,7 +538,6 @@
     </div>
 </template>
 <script>
-import $ from 'jquery'
 import store from '@/store'
 import { mapGetters } from 'vuex'
 import { listTools } from '@/api/toolInfo/market' //测试工具
@@ -633,6 +632,7 @@ export default {
         xqmouseEnter(val) {
             this.xqval = val
         },
+        // 工具
         getTestTool() {
             listTools({ portal: 'kw' })
                 .then((response) => {
@@ -695,6 +695,7 @@ export default {
         crowdinform(id) {
             this.$router.push(`/crowdsourcing/crowddetails?id=${id}`)
         },
+        // 页面跳转
         nextpage(type) {
             if (type == 'tool') {
                 // this.$message({
@@ -730,7 +731,7 @@ export default {
                 this.$router.push(item.url)
             }
         },
-        
+        // 立即注册
         nextreg() {
             this.$router.push(`/login?type=reg`)
         },

src/page/homepage/traininstitute/train.vue

@@ -377,12 +377,12 @@
                     </el-form-item>
                     <div v-if="calltext" class="infoadad" style="color: #e9941aff">{{ calltext }}</div>
                     <div v-else class="infoadad">培训班代号由校企合作老师统一发送，请联系培训老师</div>
-                    <el-form-item label="" prop="homeCollege">
+                    <!-- <el-form-item label="" prop="homeCollege">
                         <div class="rowboxi">
                             <span class="rowboxis">*</span>
                             <el-input v-model="form.homeCollege" placeholder="请输入您的学院名称"></el-input>
                         </div>
-                    </el-form-item>
+                    </el-form-item> -->
                     <el-form-item label="" prop="majorName">
                         <div class="rowboxi">
                             <span class="rowboxis">*</span>
@@ -395,12 +395,24 @@
                             <el-input v-model="form.studentName" placeholder="请输入您的姓名"></el-input>
                         </div>
                     </el-form-item>
-                    <el-form-item label="">
+                    <el-form-item label=""  prop="studentCode">
                         <div class="rowboxi">
-                            <span class="rowboxis"></span>
+                            <span class="rowboxis">*</span>
                             <el-input v-model="form.studentCode" placeholder="请输入您的学号"></el-input>
                         </div>
                     </el-form-item>
+                    <el-form-item label=""  prop="counsellor">
+                        <div class="rowboxi">
+                            <span class="rowboxis">*</span>
+                            <el-input v-model="form.counsellor" placeholder="请输入辅导员姓名"></el-input>
+                        </div>
+                    </el-form-item>
+                    <el-form-item label=""  prop="counsellorTel">
+                        <div class="rowboxi">
+                            <span class="rowboxis">*</span>
+                            <el-input v-model="form.counsellorTel" placeholder="请输入辅导员联系方式"></el-input>
+                        </div>
+                    </el-form-item>
                 </el-form>
             </div>
             <div class="rowitembtn" @click="subobtain">提交报名</div>
@@ -789,9 +801,11 @@ export default {
                     { required: true, message: '请输入培训班代号', trigger: 'blur' },
                     { validator: validateId, trigger: 'blur' },
                 ],
-                homeCollege: [{ required: true, message: '请输入您的学院名称', trigger: 'blur' }],
+                studentCode: [{ required: true, message: '请输入您的学号', trigger: 'blur' }],
                 majorNamec: [{ required: true, message: '请输入您的专业名称', trigger: 'blur' }],
                 studentName: [{ required: true, message: '请输入您的姓名', trigger: 'blur' }],
+                counsellor: [{ required: true, message: '请输入辅导员姓名', trigger: 'blur' }],
+                counsellorTel: [{ required: true, message: '请输入辅导员联系方式', trigger: 'blur' },{ validator: checkPhone, trigger: 'blur' }],
             },
             // 评测报名
             isPcshow: false,
@@ -1073,11 +1087,13 @@ export default {
                     let data = {
                         trainClassCode: this.form.trainClassCode,
                         mobile: this.userinform.phonenumber,
-                        homeCollege: this.form.homeCollege,
+                        // homeCollege: this.form.homeCollege,
                         majorName: this.form.majorName,
                         studentName: this.form.studentName,
                         trainClassId,
                         studentCode: this.form.studentCode,
+                        counsellor: this.form.counsellor,
+                        counsellorTel: this.form.counsellorTel,
                     }
                     console.log('data---', data)
                     // return;
@@ -1275,14 +1291,15 @@ export default {
 
 .maskdialogS {
     width: 592px;
-    height: 503px;
+    /* height: 503px; */
     background: #ffffff;
     box-shadow: 0px 4px 21px 4px rgba(19, 106, 189, 0.15);
     z-index: 2000;
     position: fixed;
-    top: 50%;
+    top: 45%;
     left: 50%;
     transform: translate(-50%, -50%);
+    padding-bottom: 10px;
 }
 .maskdialogS1 {
     height: auto;