huoran
/
FE_middlePlatform_server
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

模型等修复

Browse Source
dev_2022-03-03
Jo 3 years ago
parent ccd39e3ef2
commit 2374bba98b
9 changed files with 48 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/components/Header.vue
  2. 4
      src/setting.js
  3. 32
      src/utils/api.js
  4. 30
      src/views/order/AddOrder.vue
  5. 4
      src/views/serve/backstage/model.vue
  6. 2
      src/views/serve/backstage/sourceModel.vue
  7. 2
      src/views/serve/projectList.vue
  8. 2
      src/views/system/addLog.vue
  9. 5
      src/views/system/manageLog.vue

8
src/components/Header.vue
Unescape View File

@ -49,7 +49,7 @@ export default {
}, },
}; };
</script> </script>
<style scoped> <style lang="scss" scoped>
.header { .header {
position: relative; position: relative;
box-sizing: border-box; box-sizing: border-box;
@ -85,6 +85,7 @@ export default {
.user-avator { .user-avator {
cursor: pointer; cursor: pointer;
margin-left: 10px; margin-left: 10px;
font-size: 12px;
} }
.ml20{ .ml20{
margin-left: 20px; margin-left: 20px;
@ -95,8 +96,11 @@ export default {
height: 40px; height: 40px;
border-radius: 50%; border-radius: 50%;
} }
.header-right .el-button--text{ /deep/.header-right .el-button--text{
color: #333; color: #333;
span {
font-size: 12px;
}
} }
.header-right .el-divider--vertical{ .header-right .el-divider--vertical{
width: 2px; width: 2px;

4
src/setting.js
Unescape View File

@ -13,8 +13,8 @@ if (isDev) {
// jumpPath = "http://39.108.250.202/judgmentPoint/"; // jumpPath = "http://39.108.250.202/judgmentPoint/";
jumpPath = "http://192.168.31.125:8087/"; // 本地调试-需要启动本地判分点系统 jumpPath = "http://192.168.31.125:8087/"; // 本地调试-需要启动本地判分点系统
// host = "http://www.huorantech.cn:9000";//线上 // host = "http://www.huorantech.cn:9000";//线上
// host = "http://39.108.250.202:9000";//测试 host = "http://39.108.250.202:9000";//测试
host = 'http://192.168.31.151:9000/'// 榕 // host = 'http://192.168.31.151:9000/'// 榕
// host = 'http://192.168.31.137:9000'// 赓 // host = 'http://192.168.31.137:9000'// 赓
} else if (isTest) { } else if (isTest) {
// jumpPath = "http://124.71.12.62/judgmentPoint/"; // jumpPath = "http://124.71.12.62/judgmentPoint/";

32
src/utils/api.js
Unescape View File

@ -5,8 +5,8 @@ const host1 = 'http://192.168.31.137:9000'
export default { export default {
logins: `${host1}/users/users/user/login`, //登录 logins: `users/users/user/login`, //登录
verification: `${host1}/users/users/user/captcha`,// 验证码图片 verification: `${Setting.host}/users/users/user/captcha`,// 验证码图片
bindPhoneOrEmail: `users/users/userAccount/bindPhoneOrEmail`,// 绑定手机 bindPhoneOrEmail: `users/users/userAccount/bindPhoneOrEmail`,// 绑定手机
sendPhoneOrEmailCode: `users/users/userAccount/sendPhoneOrEmailCode`,// 手机验证码 sendPhoneOrEmailCode: `users/users/userAccount/sendPhoneOrEmailCode`,// 手机验证码
@ -211,20 +211,20 @@ export default {
getKeywordByCategoryId: `data/keyword/getKeywordByCategoryId`, getKeywordByCategoryId: `data/keyword/getKeywordByCategoryId`,
// 角色管理 // 角色管理
batchRemove: `${host1}/users/role/batchRemove`, //批量删除角色 batchRemove: `users/role/batchRemove`, //批量删除角色
checkRoleIsExist: `${host1}/users/role/checkRoleIsExist`, //判断该角色是否存在 checkRoleIsExist: `users/role/checkRoleIsExist`, //判断该角色是否存在
delRoleByAccountId: `${host1}/users/role/delRoleByAccountId`, //删除某用户下的某个角色 delRoleByAccountId: `users/role/delRoleByAccountId`, //删除某用户下的某个角色
roleList: `${host1}/users/role/list`, //角色分页列表查询 roleList: `users/role/list`, //角色分页列表查询
obtainDetails: `${host1}/users/role/obtainDetails`, //获取角色详情 obtainDetails: `users/role/obtainDetails`, //获取角色详情
saveOrUpdate: `${host1}/users/role/saveOrUpdate`, //新增或更新角色 saveOrUpdate: `users/role/saveOrUpdate`, //新增或更新角色
queryAllMenus: `${host1}/users/users/permission/queryAllMenus`, //查询所有菜单 queryAllMenus: `users/users/permission/queryAllMenus`, //查询所有菜单
getUserRolesPermissionMenu: `${host1}/users/user-role/getUserRolesPermissionMenu`, getUserRolesPermissionMenu: `users/user-role/getUserRolesPermissionMenu`,
// 日志管理 // 日志管理
logAdd: `${host1}/nakadai/log/add`, logAdd: `nakadai/log/add`,
logDel: `${host1}/nakadai/log/delete`, logDel: `nakadai/log/delete`,
logGet: `${host1}/nakadai/log/get`, logGet: `nakadai/log/get`,
logManagementList: `${host1}/nakadai/log/logManagementList`, logManagementList: `nakadai/log/logManagementList`,
platformLogList: `${host1}/nakadai/log/platformLogList`, platformLogList: `nakadai/log/platformLogList`,
listUpdate: `${host1}/nakadai/log/update`, listUpdate: `nakadai/log/update`,
}; };

30
src/views/order/AddOrder.vue
Unescape View File

@ -115,7 +115,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="productName" label="课程名称" align="center" min-width="150" show-overflow-tooltip> <el-table-column prop="productName" label="课程名称" align="center" min-width="150" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column label="使用期限" align="center" min-width="150"> <el-table-column label="使用期限" align="center" min-width="170">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="small"> <div class="small">
<el-input <el-input
@ -136,7 +136,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="起止日期" align="center" min-width="150"> <el-table-column label="起止日期" align="center" min-width="240">
<template slot-scope="scope"> <template slot-scope="scope">
<p v-if="!scope.row.startTime"> <p v-if="!scope.row.startTime">
<el-date-picker <el-date-picker
@ -160,7 +160,7 @@
<span v-if="scope.row.startTime"><span v-if='scope.row.endTime'> - </span>{{ scope.row.endTime }}</span></p> <span v-if="scope.row.startTime"><span v-if='scope.row.endTime'> - </span>{{ scope.row.endTime }}</span></p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="剩余期限" align="center" min-width="80"> <el-table-column label="剩余期限" align="center" min-width="110">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="small"> <div class="small">
<el-input disabled v-model="scope.row.remainingPeriod" placeholder="" <el-input disabled v-model="scope.row.remainingPeriod" placeholder=""
@ -169,7 +169,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="市场价" align="center" min-width="80"> <el-table-column label="市场价" align="center" min-width="110">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="small"> <div class="small">
<el-input disabled v-model="scope.row.marketValue" placeholder="" <el-input disabled v-model="scope.row.marketValue" placeholder=""
@ -178,7 +178,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="成交价" align="center" min-width="80"> <el-table-column label="成交价" align="center" min-width="110">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="small"> <div class="small">
<el-input :class="scope.row.finalPrice === '' && whetherSubmit?'red':''" <el-input :class="scope.row.finalPrice === '' && whetherSubmit?'red':''"
@ -191,15 +191,13 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="折扣率 " align="center" min-width="80"> <el-table-column label="折扣率 " align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="small">
<el-input disabled v-model="scope.row.discountRate" placeholder="" <el-input disabled v-model="scope.row.discountRate" placeholder=""
type="text"></el-input> type="text" size="small" style="width: 100%"></el-input>
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="端口地址 " align="center" min-width="80"> <el-table-column label="端口地址 " align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button @click="configure(scope.row)">配置</el-button> <el-button @click="configure(scope.row)">配置</el-button>
</template> </template>
@ -257,7 +255,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="productName" label="产品名称" align="center" min-width="100"> <el-table-column prop="productName" label="产品名称" align="center" min-width="100">
</el-table-column> </el-table-column>
<el-table-column label="使用期限" align="center" min-width="120"> <el-table-column label="使用期限" align="center" min-width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="small"> <div class="small">
<el-input onkeyup="value=this.value.replace(/\D+/g,'')" <el-input onkeyup="value=this.value.replace(/\D+/g,'')"
@ -276,7 +274,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="起止日期" align="center" min-width="180"> <el-table-column label="起止日期" align="center" min-width="240">
<template slot-scope="scope"> <template slot-scope="scope">
<p v-if="!scope.row.startTime"> <p v-if="!scope.row.startTime">
<el-date-picker <el-date-picker
@ -300,7 +298,7 @@
<span v-if="scope.row.startTime"><span v-if='scope.row.endTime'> - </span>{{ scope.row.endTime }}</span></p> <span v-if="scope.row.startTime"><span v-if='scope.row.endTime'> - </span>{{ scope.row.endTime }}</span></p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="剩余期限" align="center" min-width="70"> <el-table-column label="剩余期限" align="center" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="small"> <div class="small">
<el-input disabled v-model="scope.row.remainingPeriod" placeholder="" <el-input disabled v-model="scope.row.remainingPeriod" placeholder=""
@ -309,7 +307,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="市场价" align="center" min-width="120"> <el-table-column label="市场价" align="center" min-width="160">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="small"> <div class="small">
<el-input disabled v-model="scope.row.marketValue" placeholder="" <el-input disabled v-model="scope.row.marketValue" placeholder=""
@ -318,7 +316,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="成交价" align="center" min-width="120"> <el-table-column label="成交价" align="center" min-width="170">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="small"> <div class="small">
<el-input :class="scope.row.finalPrice === '' && whetherSubmit?'red':''" <el-input :class="scope.row.finalPrice === '' && whetherSubmit?'red':''"
@ -331,7 +329,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="折扣率" align="center" min-width="80"> <el-table-column label="折扣率" align="center" min-width="140">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <div class="discountRate"> --> <!-- <div class="discountRate"> -->
<div class="small"> <div class="small">

4
src/views/serve/backstage/model.vue
Unescape View File

@ -22,7 +22,7 @@
<el-table-column type="selection" width="55" align="center"></el-table-column> <el-table-column type="selection" width="55" align="center"></el-table-column>
<el-table-column type="index" label="序号" width="55" align="center"></el-table-column> <el-table-column type="index" label="序号" width="55" align="center"></el-table-column>
<el-table-column prop="modelName" label="模型名称" align="center"></el-table-column> <el-table-column prop="modelName" label="模型名称" align="center"></el-table-column>
<el-table-column prop="categoryName" label="分类" width="150" align="center"></el-table-column> <el-table-column v-if="isTopLevel" prop="categoryName" label="分类" width="150" align="center"></el-table-column>
<el-table-column prop="createTime" label="导入时间" align="center"></el-table-column> <el-table-column prop="createTime" label="导入时间" align="center"></el-table-column>
<el-table-column label="状态" align="center"> <el-table-column label="状态" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@ -63,6 +63,7 @@ export default {
data() { data() {
return { return {
systemId: this.$route.query.systemId, systemId: this.$route.query.systemId,
isTopLevel: true, // 是否是在顶级分类
listData: [], listData: [],
keyword: '', keyword: '',
page: 1, page: 1,
@ -89,6 +90,7 @@ export default {
methods: { methods: {
getData() { getData() {
const curNode = this.$refs.tree.$refs.tree.getCurrentNode() // 获取当前选中的分类 const curNode = this.$refs.tree.$refs.tree.getCurrentNode() // 获取当前选中的分类
this.isTopLevel = !curNode.level
// 如果是首级，要调另一个接口 // 如果是首级，要调另一个接口
if (!curNode.level) { if (!curNode.level) {
this.$post(this.api.getAllModelList, { this.$post(this.api.getAllModelList, {

2
src/views/serve/backstage/sourceModel.vue
Unescape View File

@ -24,7 +24,7 @@
<el-table-column type="selection" width="55" align="center"></el-table-column> <el-table-column type="selection" width="55" align="center"></el-table-column>
<el-table-column type="index" label="序号" width="55" align="center"></el-table-column> <el-table-column type="index" label="序号" width="55" align="center"></el-table-column>
<el-table-column prop="modelName" label="模型名称" align="center"></el-table-column> <el-table-column prop="modelName" label="模型名称" align="center"></el-table-column>
<el-table-column prop="categoryName" label="分类" width="150" align="center"></el-table-column> <el-table-column v-if="isTopLevel" prop="categoryName" label="分类" width="150" align="center"></el-table-column>
<el-table-column prop="modifyName" label="编辑人" align="center"></el-table-column> <el-table-column prop="modifyName" label="编辑人" align="center"></el-table-column>
<el-table-column prop="updateTime" label="最新编辑时间" width="150" align="center"></el-table-column> <el-table-column prop="updateTime" label="最新编辑时间" width="150" align="center"></el-table-column>
<el-table-column prop="workNumber" label="状态" width="100" align="center"> <el-table-column prop="workNumber" label="状态" width="100" align="center">

2
src/views/serve/projectList.vue
Unescape View File

@ -93,7 +93,7 @@
{{ stateKeys[scope.row.state] }} {{ stateKeys[scope.row.state] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作"> <el-table-column label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="edit(scope.row)"> <el-button type="text" @click="edit(scope.row)">
编辑 编辑

2
src/views/system/addLog.vue
Unescape View File

@ -160,7 +160,7 @@ export default {
versionName, versionName,
coverUrl: this.form.coverUrl, coverUrl: this.form.coverUrl,
logContents, logContents,
draft draft // 0:发布，1:草稿
} }
if (id) { if (id) {
data.logId = id data.logId = id

5
src/views/system/manageLog.vue
Unescape View File

@ -30,7 +30,7 @@
</div> </div>
<el-timeline class="timeline"> <el-timeline class="timeline">
<el-timeline-item placement="top" v-for="(item, i) in listData" :key="i"> <el-timeline-item placement="top" v-for="(item, i) in listData" :key="i">
<p class="sign" :id="'ver' + i">{{ item.updateTime }}</p> <p :class="['sign', {draft: item.draft}]" :id="'ver' + i">{{ item.draft ? '未发布' : item.updateTime }}</p>
<div class="ver"> <div class="ver">
<div> <div>
{{ platformName + item.versionName }} {{ platformName + item.versionName }}
@ -164,6 +164,9 @@ export default {
font-size: 14px; font-size: 14px;
color: #9076FF; color: #9076FF;
} }
.draft {
color: #ccc;
}
.ver { .ver {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;

Write Preview
Loading…
Cancel
Save