hcj
/
keysass_portal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

工具时长限制1+小修改

Browse Source
main
lijingyu007 11 months ago
parent 854d0b52fc
commit 32358526c5
5 changed files with 72 additions and 210 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      src/page/common/pagecomponent/commonheader.vue
  2. 12
      src/page/homepage/crowdsourcing/crowd.vue
  3. 2
      src/page/homepage/home/home.vue
  4. 174
      src/page/homepage/tool/tooldetails.vue
  5. 90
      src/page/personalpage/home/userUpgrade.vue

4
src/page/common/pagecomponent/commonheader.vue
Unescape View File

@ -85,7 +85,7 @@
<div class="predropdown"> <div class="predropdown">
<el-dropdown trigger="click" placement='bottom' > <el-dropdown trigger="click" placement='bottom' >
<div class="avatar-wrapper"> <div class="avatar-wrapper">
<img style="width:54px;height:54px;margin:13px 0 5px 0px;cursor:pointer;border-radius:50%" :src="avatar" alt=""> <img style="width:54px;height:54px;margin:13px 0 5px 0px;cursor:pointer;border-radius:50%" :src="userinform.avatar" alt="">
</div> </div>
<el-dropdown-menu slot="dropdown" style="top:66px!important"> <el-dropdown-menu slot="dropdown" style="top:66px!important">
<el-dropdown-item @click.native="mypermissions('imembers')">个人中心</el-dropdown-item> <el-dropdown-item @click.native="mypermissions('imembers')">个人中心</el-dropdown-item>
@ -127,7 +127,7 @@
} }
}, },
computed: { computed: {
...mapGetters(['token','logindate','avatar',]), ...mapGetters(['token','logindate','avatar','userinform']),
count() { count() {
return store.getters.messageCount;　　//需要监听的数据 return store.getters.messageCount;　　//需要监听的数据
}, },

12
src/page/homepage/crowdsourcing/crowd.vue
Unescape View File

@ -177,7 +177,7 @@
}}/{{task.needPerson}} }}/{{task.needPerson}}
</span> --> </span> -->
</p> </p>
<p>技能要求：{{ task.techNeed | limittechNeed }}</p> <p>技能要求：{{ task.techNeed }}</p>
<p>驻场要求：{{ findByvalue(onsiteTypelist, task.onsiteType) }}</p> <p>驻场要求：{{ findByvalue(onsiteTypelist, task.onsiteType) }}</p>
<p>地域要求：{{ task.area }}</p> <p>地域要求：{{ task.area }}</p>
<!-- <p>发布方：{{ task.companyName }}</p> --> <!-- <p>发布方：{{ task.companyName }}</p> -->
@ -306,15 +306,7 @@ export default {
} }
}, },
components: { CrowdsourceTask }, components: { CrowdsourceTask },
filters: {
limittechNeed(value) {
if (!value) return ''
if (value.length > 18) {
return value.slice(0, 18) + '...'
}
return value
},
},
computed: { computed: {
...mapGetters(['testtypelist', 'feescopelist', 'token', 'userinform']), ...mapGetters(['testtypelist', 'feescopelist', 'token', 'userinform']),
}, },

2
src/page/homepage/home/home.vue
Unescape View File

@ -277,7 +277,7 @@
}}/{{task.needPerson}} }}/{{task.needPerson}}
</span> --> </span> -->
</p> </p>
<p>技能要求：{{ task.techNeed | limittechNeed }}</p> <p>技能要求：{{ task.techNeed }}</p>
<p>驻场要求：{{ findByvalue(onsiteTypelist, task.onsiteType) }}</p> <p>驻场要求：{{ findByvalue(onsiteTypelist, task.onsiteType) }}</p>
<p>地域要求：{{ task.area }}</p> <p>地域要求：{{ task.area }}</p>
<!-- <p>发布方：{{ task.companyName }}</p> --> <!-- <p>发布方：{{ task.companyName }}</p> -->

174
src/page/homepage/tool/tooldetails.vue
Unescape View File

@ -14,78 +14,6 @@
<div class="keyda" style="margin: 35px; display: flex"> <div class="keyda" style="margin: 35px; display: flex">
<div style="width: 80px; height: 80px; margin-right: 35px"> <div style="width: 80px; height: 80px; margin-right: 35px">
<img :src="tool.newUrl" style="width: 80px; height: 80px; margin-right: 35px" alt="" /> <img :src="tool.newUrl" style="width: 80px; height: 80px; margin-right: 35px" alt="" />
<!-- <img
v-if="tool.name == '代码静态分析工具'"
src="/assets/toolmarket/EagleEye.png"
style="width: 80px; height: 80px; margin-right: 35px"
alt=""
/>
<img
v-if="tool.name == '源代码安全检测工具'"
src="/assets/toolmarket/wukong.png"
style="width: 80px; height: 80px; margin-right: 35px"
alt=""
/>
<img
v-if="tool.name == 'C/C++单元测试工具'"
src="/assets/toolmarket/EagleWing-C.png"
style="width: 80px; height: 80px; margin-right: 35px"
alt=""
/>
<img
v-if="tool.name == '接口测试工具'"
src="/assets/toolmarket/Kinterface.png"
style="width: 80px; height: 80px; margin-right: 35px"
alt=""
/>
<img
v-if="tool.name == 'JAVA单元测试工具'"
src="/assets/toolmarket/EagleWing-Java.png"
style="width: 80px; height: 80px; margin-right: 35px"
alt=""
/>
<img
v-if="tool.name == '功能测试工具AutoFun'"
src="/assets/toolmarket/AutoFun.png"
style="width: 80px; height: 80px; margin-right: 35px"
alt=""
/>
<img
v-if="tool.name == '代码组成分析平台'"
src="/assets/toolmarket/KeySwan.png"
style="width: 80px; height: 80px; margin-right: 35px"
alt=""
/>
<img
v-if="tool.name == '性能测试工具'"
src="/assets/toolmarket/KeySphere.png"
style="width: 80px; height: 80px; margin-right: 35px"
alt=""
/>
<img
v-if="tool.name == '自鉴-交互式应用安全测试系统IAST'"
src="/assets/toolmarket/自鉴交互式.png"
style="width: 80px; height: 80px; margin-right: 35px"
alt=""
/>
<img
v-if="tool.name == 'Web应用安全测试工具'"
src="/assets/toolmarket/web.png"
style="width: 80px; height: 80px; margin-right: 35px"
alt=""
/>
<img
v-if="tool.name == '资产识别及漏洞管理工具'"
src="/assets/toolmarket/资产识别.png"
style="width: 80px; height: 80px; margin-right: 35px"
alt=""
/>
<img
v-if="tool.name == '性能测试工具KeyTurbo'"
src="/assets/toolmarket/AutoLoad.jpg"
style="width: 80px; height: 80px; margin-right: 35px"
alt=""
/> -->
</div> </div>
<div> <div>
<div class="keydap" style="display: flex; justify-content: space-between"> <div class="keydap" style="display: flex; justify-content: space-between">
@ -447,84 +375,22 @@
<div v-for="(item, index) in toolslist" :key="index" style="margin: 20px"> <div v-for="(item, index) in toolslist" :key="index" style="margin: 20px">
<div style="display: flex; cursor: pointer" @click="switchTool(item)"> <div style="display: flex; cursor: pointer" @click="switchTool(item)">
<img :src="item.img" style="min-width: 63px; height: 63px; margin-right: 5px" alt="" /> <img :src="item.img" style="min-width: 63px; height: 63px; margin-right: 5px" alt="" />
<!-- <img
v-if="item.name == '代码静态分析工具'"
src="/assets/toolmarket/EagleEye.png"
style="width: 63px; height: 63px; margin-right: 5px"
alt=""
/>
<img
v-if="item.name == '源代码安全检测工具'"
src="/assets/toolmarket/wukong.png"
style="width: 63px; height: 63px; margin-right: 5px"
alt=""
/>
<img
v-if="item.name == 'C/C++单元测试工具'"
src="/assets/toolmarket/EagleWing-C.png"
style="width: 63px; height: 63px; margin-right: 5px"
alt=""
/>
<img
v-if="item.name == '接口测试工具'"
src="/assets/toolmarket/Kinterface.png"
style="width: 63px; height: 63px; margin-right: 5px"
alt=""
/>
<img
v-if="item.name == 'JAVA单元测试工具'"
src="/assets/toolmarket/EagleWing-Java.png"
style="width: 63px; height: 63px; margin-right: 5px"
alt=""
/>
<img
v-if="item.name == '功能测试工具AutoFun'"
src="/assets/toolmarket/AutoFun.png"
style="width: 63px; height: 63px; margin-right: 5px"
alt=""
/>
<img
v-if="item.name == '代码组成分析平台'"
src="/assets/toolmarket/KeySwan.png"
style="width: 63px; height: 63px; margin-right: 5px"
alt=""
/>
<img
v-if="item.name == '性能测试工具'"
src="/assets/toolmarket/KeySphere.png"
style="width: 63px; height: 63px; margin-right: 5px"
alt=""
/>
<img
v-if="item.name == '自鉴-交互式应用安全测试系统IAST'"
src="/assets/toolmarket/自鉴交互式.png"
style="width: 63px; height: 63px; margin-right: 5px"
alt=""
/>
<img
v-if="item.name == 'Web应用安全测试工具'"
src="/assets/toolmarket/web.png"
style="width: 63px; height: 63px; margin-right: 5px"
alt=""
/>
<img
v-if="item.name == '资产识别及漏洞管理工具'"
src="/assets/toolmarket/资产识别.png"
style="width: 63px; height: 63px; margin-right: 5px"
alt=""
/>
<img
v-if="item.name == '性能测试工具AutoLoad'"
src="/assets/toolmarket/AutoLoad.png"
style="width: 63px; height: 63px; margin-right: 5px"
alt=""
/> -->
<!-- <img :src="item.img" alt="" style="width:63px;height:63px;margin-right: 5px;"> -->
<div> <div>
<div style="font-size: 14px; font-weight: bold; color: #1a1a1a"> <div style="font-size: 14px; font-weight: bold; color: #1a1a1a">
{{ item.name }} {{ item.name }}
</div> </div>
<div style="font-size: 12px; font-weight: 400; color: #333333;display: -webkit-box;overflow: hidden;-webkit-box-orient: vertical;line-clamp: 2;-webkit-line-clamp: 2;"> <div
style="
font-size: 12px;
font-weight: 400;
color: #333333;
display: -webkit-box;
overflow: hidden;
-webkit-box-orient: vertical;
line-clamp: 2;
-webkit-line-clamp: 2;
"
>
{{ item.toolDesc }} {{ item.toolDesc }}
</div> </div>
</div> </div>
@ -564,17 +430,19 @@
</el-form-item> </el-form-item>
<el-form-item label="商品价格:"> <el-form-item label="商品价格:">
<span v-if="serviceType == '测试服务(按次计)' && buyTool.priceTime == 0">限时免费</span> <span v-if="serviceType == '测试服务(按次计)' && buyTool.priceTime == 0">限时免费</span>
<span v-if="serviceType == '使用时长(按月计)' && buyTool.price == 0">限时免费</span> <span v-else-if="serviceType == '使用时长(按月计)' && buyTool.price == 0">限时免费</span>
<span v-else>￥{{ serviceType == '测试服务(按次计)' ? buyTool.priceTime : buyTool.price }}</span> <span v-else>￥{{ serviceType == '测试服务(按次计)' ? buyTool.priceTime : buyTool.price }}</span>
</el-form-item> </el-form-item>
<el-form-item label="购买数量:"> <el-form-item label="购买数量:">
<el-input-number <el-input-number
v-if="serviceType == '测试服务(按次计)'"
size="mini" size="mini"
v-model="buyAmount" v-model="buyAmount"
:min="1" :min="1"
:max="999" :max="999"
label="购买数量" label="购买数量"
></el-input-number> ></el-input-number>
<span v-else>1</span>
</el-form-item> </el-form-item>
<el-form-item label="交付方式:"> <el-form-item label="交付方式:">
{{ buyTool.deliverType }} {{ buyTool.deliverType }}
@ -681,8 +549,8 @@ export default {
qianbaoShow: false, qianbaoShow: false,
jypassword: '', jypassword: '',
id: '', id: '',
amount: '', //购买数量 amount: 1, //购买数量
buyAmount: '', //弹窗购买数量 buyAmount: 1, //弹窗购买数量
goodsactive: '1', goodsactive: '1',
// swipcelist:[{id:0,imgurl:'/assets/tool/swipc.png'},{id:1,imgurl:'/assets/tool/swipc.png'},{id:2,imgurl:'/assets/tool/swipc.png'}], // swipcelist:[{id:0,imgurl:'/assets/tool/swipc.png'},{id:1,imgurl:'/assets/tool/swipc.png'},{id:2,imgurl:'/assets/tool/swipc.png'}],
tool: {}, //工具详情 tool: {}, //工具详情
@ -788,9 +656,7 @@ export default {
components: { components: {
qrcode: VueQrcode, qrcode: VueQrcode,
}, },
filters: { filters: {},
},
computed: { computed: {
...mapGetters(['paytype', 'tooltypelist', 'token', 'userinform']), ...mapGetters(['paytype', 'tooltypelist', 'token', 'userinform']),
addPriceAll() { addPriceAll() {
@ -877,7 +743,7 @@ export default {
goSetPassword() { goSetPassword() {
this.$router.push({ this.$router.push({
path: '/console/account', path: '/console/account',
query: {code: '3'} query: { code: '3' },
}) })
}, },
findByvalue, findByvalue,
@ -1053,7 +919,7 @@ export default {
param.userId = this.userinform.userId param.userId = this.userinform.userId
param.password = encrypt(this.jypassword) param.password = encrypt(this.jypassword)
param.priceType = this.serviceType == '使用时长(按月计)' ? 'month' : 'times' param.priceType = this.serviceType == '使用时长(按月计)' ? 'month' : 'times'
param.recordName = '购买工具：' + this.buyTool.name param.recordName = '购买工具：' + this.buyTool.name
orderPay(param).then((res) => { orderPay(param).then((res) => {
if (res.retcode == 'SUCCESS') { if (res.retcode == 'SUCCESS') {
this.qianbaoShow = false this.qianbaoShow = false

90
src/page/personalpage/home/userUpgrade.vue
Unescape View File

@ -51,7 +51,7 @@
> >
<span>注：</span> <span>注：</span>
<span style="color: #fa3534" <span style="color: #fa3534"
>{{ testerdata.auditOpinion ? testerdata.auditOpinion : '无' }}，</span >{{ testerdata.auditOpinion ? testerdata.auditOpinion +',' : '' }}</span
> >
<span>审核未能通过，请完善后再提交</span> <span>审核未能通过，请完善后再提交</span>
</div> </div>
@ -99,7 +99,7 @@
> >
<span>注：</span> <span>注：</span>
<span style="color: #fa3534">{{ <span style="color: #fa3534">{{
testerdata.auditOpinion ? testerdata.auditOpinion : '' testerdata.auditOpinion ? testerdata.auditOpinion+',' : ''
}}</span> }}</span>
<span>审核未能通过，请完善后再提交</span> <span>审核未能通过，请完善后再提交</span>
</div> </div>
@ -360,7 +360,7 @@ export default {
contactName: res.data.companyContactName, contactName: res.data.companyContactName,
} }
this.$emit('setTip', {dec: res.data.companyDesc,applyId: res.data.companyApplyId}) this.$emit('setTip', {dec: res.data.companyDesc,applyId: res.data.companyApplyId})
if (res.data.companyStatus == 1 && userinform.companyStatus !=2) { if (res.data.companyStatus == 1 && this.userinform.companyStatus != 2) {
getInfo().then((res) => { getInfo().then((res) => {
const user = res.user const user = res.user
this.$store.commit('SET_USERINFORM', user) this.$store.commit('SET_USERINFORM', user)
@ -389,8 +389,8 @@ export default {
} }
if (this.testerdata) { if (this.testerdata) {
if (this.testerdata.status == 0) { if (this.testerdata.status == 0) {
this.testerStatus = 1 this.testerStatus = 3
this.istest = true // this.istest = true
} else if (this.testerdata.status == 1) { } else if (this.testerdata.status == 1) {
this.testerStatus = 2 this.testerStatus = 2
this.istest = true this.istest = true
@ -404,44 +404,44 @@ export default {
}) })
}, },
x2ctChild() { x2ctChild() {
gettesterId(this.userinform.userId).then((res) => { this.certification = true
this.testerdata = res.data // gettesterId(this.userinform.userId).then((res) => {
if (this.testerdata) { // this.testerdata = res.data
let { applyId, name, idNumber, city, certificateUrl, testSkills, workExperience, userId } = // if (this.testerdata) {
this.testerdata // let { applyId, name, idNumber, city, certificateUrl, testSkills, workExperience, userId } =
// let setidNumber=idNumber.slice(0,2)+'************'+idNumber.slice(14) // this.testerdata
let imglist = [] // let imglist = []
if (certificateUrl) { // if (certificateUrl) {
imglist.push(certificateUrl) // imglist.push(certificateUrl)
} // }
this.certifform = { // this.certifform = {
applyId, // applyId,
name, // name,
idNumber, // idNumber,
city, // city,
certificateUrl: imglist, // certificateUrl: imglist,
testSkills, // testSkills,
workExperience, // workExperience,
userId, // userId,
} // }
this.certification = true // this.certification = true
if (this.testerdata) { // if (this.testerdata) {
if (this.testerdata.status == 0) { // if (this.testerdata.status == 0) {
this.testerStatus = 1 // this.testerStatus = 1
this.istest = true // this.istest = true
} else if (this.testerdata.status == 1) { // } else if (this.testerdata.status == 1) {
this.testerStatus = 2 // this.testerStatus = 2
this.istest = true // this.istest = true
} else if (this.testerdata.status == 2) { // } else if (this.testerdata.status == 2) {
this.testerStatus = 3 // this.testerStatus = 3
} else { // } else {
this.testerStatus = 0 // this.testerStatus = 0
} // }
} // }
} else { // } else {
this.certification = true // this.certification = true
} // }
}) // })
}, },
// 取消按钮 // 取消按钮
certCancel() { certCancel() {
@ -477,10 +477,12 @@ export default {
this.getcertinfor() this.getcertinfor()
this.certification = false this.certification = false
} else { } else {
this.certification = false
} }
}) })
.catch((error) => { .catch((error) => {
this.getcertinfor() this.getcertinfor()
this.certification = false
}) })
} else { } else {
addtesterApply(data) addtesterApply(data)
@ -491,10 +493,12 @@ export default {
this.getcertinfor() this.getcertinfor()
this.certification = false this.certification = false
} else { } else {
this.certification = false
} }
}) })
.catch((error) => { .catch((error) => {
this.getcertinfor() this.getcertinfor()
this.certification = false
}) })
} }
} }

Write Preview
Loading…
Cancel
Save