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 422498ecd4
commit df328fca73
12 changed files with 403 additions and 435 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. 2
      src/components/Sidebar.vue
  2. 2
      src/setting.js
  3. 72
      src/views/data/Data.vue
  4. 42
      src/views/data/Framework.vue
  5. 33
      src/views/data/Introduce.vue
  6. 52
      src/views/data/Product.vue
  7. 43
      src/views/serve/addModel.vue
  8. 8
      src/views/serve/backstage/index.vue
  9. 13
      src/views/serve/backstage/model.vue
  10. 8
      src/views/serve/projectList.vue
  11. 13
      src/views/system/addLog.vue
  12. 26
      src/views/system/manageLog.vue

2
src/components/Sidebar.vue
Unescape View File

@ -99,7 +99,7 @@ export default {
}, },
watch:{ watch:{
"$route.path":function(val){ "$route.path":function(val){
this.items.map(e=>{ this.menuList.map(e=>{
if(val.replace('/', '')===e.index){ if(val.replace('/', '')===e.index){
this.handleSelect(val.replace('/', '')) this.handleSelect(val.replace('/', ''))
this.$forceUpdate(); this.$forceUpdate();

2
src/setting.js
Unescape View File

@ -13,7 +13,7 @@ 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) {

72
src/views/data/Data.vue
Unescape View File

@ -1,18 +1,12 @@
<template> <template>
<div class="wrap"> <div class="page data">
<div class="tabs" v-if="showTabs"> <div class="tabs" v-if="showTabs">
<a class="item" v-for="(item,index) in tabs" :key="index" :class="{active: index == active}" @click="tabChange(index)">{{item}}</a> <a class="item" v-for="(item,index) in tabs" :key="index" :class="{active: index == active}" @click="tabChange(index)">{{item}}</a>
</div> </div>
<div class="score-table" v-if="active == 'first'"> <Product v-if="active == 'first'"></Product>
<Product></Product> <Framework v-else-if="active == 'second'"></Framework>
</div> <Introduce v-else></Introduce>
<div class="score-table" v-else-if="active == 'second'">
<Framework></Framework>
</div>
<div class="score-table" v-else>
<Introduce></Introduce>
</div>
</div> </div>
</template> </template>
@ -65,60 +59,8 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.wrap { .data {
width: 100%; min-height: 100%;
box-shadow: 0px 0px 21px 0px rgba(48, 115, 248, 0.1); padding: 0;
text-align: center;
overflow: hidden;
.header {
width: 97%;
display: flex;
justify-content: space-between;
margin: 0 auto;
margin-top: 16px;
p {
margin-top: 14px;
font-size: 20px;
font-family: MicrosoftYaHeil;
color: #333333;
}
}
.score-table {
margin: 18px auto 0;
position: relative;
.block {
position: absolute;
right: 0px;
bottom: -50px;
}
}
.el-pagination.is-background .el-pager li:not(.disabled).active {
background-color: #9278ff;
color: #fff;
}
}
/deep/.tabs{
display: flex;
align-items: center;
padding: 20px 1.5% 20px;
margin: 0;
z-index: 999;
background-color: #fff;
.item{
padding: 12px 20px;
margin-right: 10px;
color:#606266;
line-height: 1;
border-radius: 4px;
background-color: #fff;
border: 1px solid #dcdfe6;
cursor: pointer;
&.active{
color: #fff;
background-color: #9278ff;
border-color: #9278ff;
}
}
} }
</style> </style>

42
src/views/data/Framework.vue
Unescape View File

@ -1,8 +1,7 @@
<template> <template>
<div class="wrap"> <div class="wrap">
<el-container>
<!-- 左边的分类 --> <!-- 左边的分类 -->
<el-aside width="300px"> <div class="side">
<div class="plus"> <div class="plus">
<i class="el-icon-circle-plus-outline" @click.stop="addType(0)"></i> <i class="el-icon-circle-plus-outline" @click.stop="addType(0)"></i>
</div> </div>
@ -16,10 +15,9 @@
</span> </span>
</span> </span>
</el-tree> </el-tree>
</el-aside> </div>
<!-- 右边的表 --> <!-- 右边的表 -->
<el-main style="padding-top: 0"> <div class="right">
<el-card class="main-wrap" shadow="hover">
<el-form label-width="80px" class="flex-between mgb20"> <el-form label-width="80px" class="flex-between mgb20">
<div class="flex-center"> <div class="flex-center">
<el-form-item label="更新时间" style="margin: 0 20px 0 0"> <el-form-item label="更新时间" style="margin: 0 20px 0 0">
@ -62,9 +60,7 @@
<el-pagination background layout="total, prev, pager, next" :current-page="page" @current-change="handleCurrentChange" :total="total"> <el-pagination background layout="total, prev, pager, next" :current-page="page" @current-change="handleCurrentChange" :total="total">
</el-pagination> </el-pagination>
</div> </div>
</el-card> </div>
</el-main>
</el-container>
<!-- 导入数据 --> <!-- 导入数据 -->
<el-dialog title="导入" :visible.sync="importVisible" width="80%" center @close="closeImport" class="dialog" :close-on-click-modal="false"> <el-dialog title="导入" :visible.sync="importVisible" width="80%" center @close="closeImport" class="dialog" :close-on-click-modal="false">
<el-container style="padding: 20px 0 20px 20px;background-color: #f0f0f0;"> <el-container style="padding: 20px 0 20px 20px;background-color: #f0f0f0;">
@ -740,19 +736,19 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.wrap, .el-container{ .wrap {
min-height: calc(100vh - 290px); display: flex;
} padding: 0 24px;
.el-aside, .main-wrap{ .side {
height: calc(100vh - 290px); width: 300px;
overflow: auto; padding: 24px 10px 24px 0;
} margin-right: 24px;
/deep/.el-container{ border-right: 1px solid rgba(0, 0, 0, 0.06);
height: 100%; }
padding-bottom: 0; .right {
.el-aside{ width: calc(100% - 374px);
padding: 15px; padding: 24px 0;
background-color: #fff; }
.plus{ .plus{
text-align: right; text-align: right;
color: #9278FF; color: #9278FF;
@ -771,8 +767,4 @@ export default {
} }
} }
} }
.el-main{
height: 100%;
}
}
</style> </style>

33
src/views/data/Introduce.vue
Unescape View File

@ -1,12 +1,10 @@
<template> <template>
<div> <div class="wrap">
<el-container> <div class="side">
<el-aside width="350px">
<el-tree ref="type" :data="typeList" node-key="id" accordion :default-expanded-keys="defaultActive" :current-node-key="categoryId" :props="defaultProps" :highlight-current="true" @current-change="typeClick"></el-tree> <el-tree ref="type" :data="typeList" node-key="id" accordion :default-expanded-keys="defaultActive" :current-node-key="categoryId" :props="defaultProps" :highlight-current="true" @current-change="typeClick"></el-tree>
</el-aside> </div>
<el-main style="padding-top: 0"> <div class="right">
<el-card shadow="hover" class="card">
<div class="flex-between" style="margin-bottom: 10px;"> <div class="flex-between" style="margin-bottom: 10px;">
<p>数据简介</p> <p>数据简介</p>
<el-button v-if="introduceText && !editing" type="primary" @click="editing = !editing" v-auth="'/data:数据简介:编辑'">编辑</el-button> <el-button v-if="introduceText && !editing" type="primary" @click="editing = !editing" v-auth="'/data:数据简介:编辑'">编辑</el-button>
@ -48,9 +46,7 @@
<el-button @click="editing = false">取 消</el-button> <el-button @click="editing = false">取 消</el-button>
<el-button type="primary" @click="confirmData">确 定</el-button> <el-button type="primary" @click="confirmData">确 定</el-button>
</div> </div>
</el-card> </div>
</el-main>
</el-container>
</div> </div>
</template> </template>
<script> <script>
@ -214,15 +210,18 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.el-aside, .card { .wrap {
height: calc(100vh - 290px); display: flex;
overflow: auto; padding: 0 24px;
.side {
width: 300px;
padding: 24px 10px 24px 0;
margin-right: 24px;
border-right: 1px solid rgba(0, 0, 0, 0.06);
} }
/deep/.el-container{ .right {
background-color: #f0f0f0; width: calc(100% - 374px);
.el-aside{ padding: 24px 0;
padding: 15px;
background-color: #fff;
} }
.intro{ .intro{
padding: 20px; padding: 20px;

52
src/views/data/Product.vue
Unescape View File

@ -1,37 +1,26 @@
<template> <template>
<div> <div class="page">
<el-card shadow="hover" class="mgb20"> <h6 class="p-title">筛选</h6>
<div> <div class="tool">
<div class="flex-center mgb20"> <ul class="filter">
<p class="hr_tag"></p> <li>
<span>筛选</span> <label>创建日期</label>
</div>
<div>
<el-form label-width="80px" class="flex-between">
<div class="flex-center no-mb">
<el-form-item label="创建日期">
<el-date-picker v-model="date" align="right" unlink-panels type="daterange" start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" clearable></el-date-picker> <el-date-picker v-model="date" align="right" unlink-panels type="daterange" start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" clearable></el-date-picker>
</el-form-item> </li>
<el-form-item label="状态"> <li>
<label>状态</label>
<el-select v-model="status" clearable placeholder="请选择状态" @change="initData"> <el-select v-model="status" clearable placeholder="请选择状态" @change="initData">
<el-option v-for="(item,index) in statusList" :key="index" :label="item.name" :value="item.value"></el-option> <el-option v-for="(item,index) in statusList" :key="index" :label="item.name" :value="item.value"></el-option>
</el-select> </el-select>
</el-form-item> </li>
</div> </ul>
<el-form-item> <div>
<el-input placeholder="请输入产品名称" prefix-icon="el-icon-search" v-model="keyword" clearable></el-input> <el-input placeholder="请输入产品名称" prefix-icon="el-icon-search" v-model="keyword" clearable></el-input>
</el-form-item>
</el-form>
</div> </div>
</div> </div>
</el-card>
<el-card shadow="hover" class="card"> <div class="tool">
<div class="flex-between mgb20"> <div></div>
<div class="flex-center">
<p class="hr_tag"></p>
<span>产品列表</span>
</div>
<div> <div>
<el-button type="primary" round @click="add" v-auth="'/data:产品管理:新增'">新增</el-button> <el-button type="primary" round @click="add" v-auth="'/data:产品管理:新增'">新增</el-button>
<el-button type="primary" round @click="delAllSelection" v-auth="'/data:产品管理:批量删除'">批量删除</el-button> <el-button type="primary" round @click="delAllSelection" v-auth="'/data:产品管理:批量删除'">批量删除</el-button>
@ -62,7 +51,6 @@
<div class="pagination"> <div class="pagination">
<el-pagination background layout="total, prev, pager, next" @current-change="handleCurrentChange" :current-page="page" :total="totals"></el-pagination> <el-pagination background layout="total, prev, pager, next" @current-change="handleCurrentChange" :current-page="page" :total="totals"></el-pagination>
</div> </div>
</el-card>
<el-dialog :title="isDetail ? '查看产品' : (id ? '编辑产品' : '新增产品')" :visible.sync="productVisible" width="30%" center @close="closeProduct" class="dialog" :close-on-click-modal="false"> <el-dialog :title="isDetail ? '查看产品' : (id ? '编辑产品' : '新增产品')" :visible.sync="productVisible" width="30%" center @close="closeProduct" class="dialog" :close-on-click-modal="false">
<el-form ref="form" label-width="98px" :disabled="isDetail"> <el-form ref="form" label-width="98px" :disabled="isDetail">
@ -635,21 +623,9 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.card {
min-height: calc(100vh - 420px);
}
/deep/ .no-mb .el-form-item{
margin-bottom: 0;
}
/deep/.el-input--suffix .el-input__inner{ /deep/.el-input--suffix .el-input__inner{
padding-right: 56px; padding-right: 56px;
} }
/deep/.el-container{
.el-aside{
padding: 15px;
background-color: #fff;
}
}
.type-wrap{ .type-wrap{
height: 450px; height: 450px;
overflow:auto; overflow:auto;

43
src/views/serve/addModel.vue
Unescape View File

@ -16,16 +16,18 @@
<el-card shadow="hover"> <el-card shadow="hover">
<el-form label-width="80px" :disabled="isDetail"> <el-form label-width="80px" :disabled="isDetail">
<el-form-item label="模型名称"> <div class="item name">
<label>模型名称</label>
<el-input placeholder="请输入模型名称" v-model="form.modelName" maxlength="25" style="width: 400px"></el-input> <el-input placeholder="请输入模型名称" v-model="form.modelName" maxlength="25" style="width: 400px"></el-input>
</el-form-item> </div>
<el-form-item label="模型代码"> <div class="item code">
<label>模型代码</label>
<codemirror <codemirror
:key="codeKey" :key="codeKey"
:code.sync="form.modelDemo" :code.sync="form.modelDemo"
:readOnly="isDetail" :readOnly="isDetail"
></codemirror> ></codemirror>
</el-form-item> </div>
</el-form> </el-form>
</el-card> </el-card>
</div> </div>
@ -46,7 +48,8 @@ export default {
modelName: '', modelName: '',
modelDemo: '' modelDemo: ''
}, },
codeKey: 1 codeKey: 1,
submiting: false
}; };
}, },
mounted() { mounted() {
@ -75,10 +78,12 @@ export default {
}, },
// 保存 // 保存
submit(postStatus){ submit(postStatus){
if (this.submiting) return false
const { modelName, modelDemo } = this.form const { modelName, modelDemo } = this.form
const id = this.id const id = this.id
if (!modelName) return this.$message.error('请输入模型名称') if (!modelName) return this.$message.error('请输入模型名称')
if (!modelDemo) return this.$message.error('请输入模型代码') if (!modelDemo) return this.$message.error('请输入模型代码')
this.submiting = true
const data = { const data = {
categoryId: this.categoryId, categoryId: this.categoryId,
modelName, modelName,
@ -90,12 +95,16 @@ export default {
this.$post(this.api.updateSysModelDemo, data).then(res => { this.$post(this.api.updateSysModelDemo, data).then(res => {
this.$message.success('编辑成功') this.$message.success('编辑成功')
this.$router.back() this.$router.back()
}).catch(res => {}) }).catch(res => {
this.submiting = false
})
} else { } else {
this.$post(this.api.saveSysModelDemo, data).then(res => { this.$post(this.api.saveSysModelDemo, data).then(res => {
this.$message.success('新增成功') this.$message.success('新增成功')
this.$router.back() this.$router.back()
}).catch(res => {}) }).catch(res => {
this.submiting = false
})
} }
}, },
} }
@ -103,5 +112,23 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.item {
display: flex;
margin-bottom: 20px;
label {
padding: 0 15px 0 20px;
}
&.name {
align-items: center;
label {
text-align: right;
}
}
&.code {
flex-direction: column;
label {
margin-bottom: 15px;
}
}
}
</style> </style>

8
src/views/serve/backstage/index.vue
Unescape View File

@ -1,4 +1,8 @@
<template> <template>
<div>
<el-card shadow="hover" class="mgb20">
<el-page-header :content="'系统后台 / '+ $route.query.name" @back="back"></el-page-header>
</el-card>
<div class="page" style="padding: 0"> <div class="page" style="padding: 0">
<div class="tabs"> <div class="tabs">
<a class="item" v-for="(item,index) in tabs" :key="index" :class="{active: index == active}" @click="tabChange(index)">{{ item }}</a> <a class="item" v-for="(item,index) in tabs" :key="index" :class="{active: index == active}" @click="tabChange(index)">{{ item }}</a>
@ -7,6 +11,7 @@
<model v-if="active == 'model'"></model> <model v-if="active == 'model'"></model>
<sourceModel v-if="active == 'sourceModel'"></sourceModel> <sourceModel v-if="active == 'sourceModel'"></sourceModel>
</div> </div>
</div>
</template> </template>
<script> <script>
@ -40,6 +45,9 @@ export default {
type: index type: index
} }
}) })
},
back() {
this.$router.push('/configure')
} }
} }
}; };

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

@ -72,7 +72,8 @@ export default {
multipleSelection: [], multipleSelection: [],
modelVisible: false, modelVisible: false,
modelLoading: false, modelLoading: false,
modelData: [] modelData: [],
submiting: false
}; };
}, },
components: { components: {
@ -211,10 +212,13 @@ export default {
}, },
// 导入模型提交 // 导入模型提交
submit() { submit() {
if (this.submiting) return false
const data = [] const data = []
const systemId = this.systemId const systemId = this.systemId
const list = this.$refs.model.getCheckedNodes() // 获取选择的分类模型 const list = this.$refs.model.getCheckedNodes() // 获取选择的分类模型
const categoryId = this.$refs.tree.$refs.tree.getCurrentKey() // 获取当前分类 const categoryId = this.$refs.tree.$refs.tree.getCurrentKey() // 获取当前分类
if (!list.length) return this.$message.error('请选择模型')
this.submiting = true
list.map(e => { list.map(e => {
// 有categoryId的才是模型，只导入模型，不导入分类 // 有categoryId的才是模型，只导入模型，不导入分类
e.categoryId && data.push({ e.categoryId && data.push({
@ -226,7 +230,12 @@ export default {
this.$post(this.api.saveReferenceDemo, data).then(res => { this.$post(this.api.saveReferenceDemo, data).then(res => {
this.modelVisible = false this.modelVisible = false
this.initData() this.initData()
}).catch(res => {}) setTimeout(() => {
this.submiting = false
}, 2000)
}).catch(res => {
this.submiting = false
})
} }
} }
}; };

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

@ -1,13 +1,9 @@
<template> <template>
<div> <div>
<el-row :gutter="20">
<el-col :span="24">
<el-card v-if="showBack" shadow="hover" class="mgb20"> <el-card v-if="showBack" shadow="hover" class="mgb20">
<el-page-header :content="'实验项目管理 / '+titleName" @back="goBack"></el-page-header> <el-page-header :content="'实验项目管理 / '+titleName" @back="goBack"></el-page-header>
</el-card> </el-card>
</el-col>
<el-col :span="24">
<el-card shadow="hover" class="mgb20"> <el-card shadow="hover" class="mgb20">
<div> <div>
<div class="flex-center mgb20"> <div class="flex-center mgb20">
@ -55,9 +51,7 @@
</el-form> </el-form>
</div> </div>
</el-card> </el-card>
</el-col>
<el-col :span="24">
<el-card shadow="hover" class="mgb20"> <el-card shadow="hover" class="mgb20">
<div class="flex-between mgb20"> <div class="flex-between mgb20">
<div class="flex-center"> <div class="flex-center">
@ -117,8 +111,6 @@
<el-pagination background @current-change="handleCurrentChange" :current-page="page" layout="total, prev, pager, next" :total="total"></el-pagination> <el-pagination background @current-change="handleCurrentChange" :current-page="page" layout="total, prev, pager, next" :total="total"></el-pagination>
</div> </div>
</el-card> </el-card>
</el-col>
</el-row>
<!--复制对话框--> <!--复制对话框-->
<el-dialog title="复制" :visible.sync="copyVisible" width="24%" center :close-on-click-modal="false"> <el-dialog title="复制" :visible.sync="copyVisible" width="24%" center :close-on-click-modal="false">

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

@ -103,7 +103,8 @@ export default {
originContent: { originContent: {
type: '', type: '',
content: '' content: ''
} },
submiting: false
}; };
}, },
mounted() { mounted() {
@ -151,10 +152,12 @@ export default {
}, },
// 保存 // 保存
submit(draft){ submit(draft){
if (this.submiting) return false
const { versionName, logContents } = this.form const { versionName, logContents } = this.form
const id = this.id const id = this.id
if (!versionName) return this.$message.error('请输入版本标题') if (!versionName) return this.$message.error('请输入版本标题')
if (!logContents.length || !logContents.find(e => e.type !== '' && e.content)) return this.$message.error('请输入更新内容') if (!logContents.length || !logContents.find(e => e.type !== '' && e.content)) return this.$message.error('请输入更新内容')
this.submiting = true
const data = { const data = {
platformId: this.platformId, platformId: this.platformId,
versionName, versionName,
@ -168,12 +171,16 @@ export default {
this.$post(this.api.listUpdate, data).then(res => { this.$post(this.api.listUpdate, data).then(res => {
this.$message.success('编辑成功') this.$message.success('编辑成功')
this.$router.back() this.$router.back()
}).catch(res => {}) }).catch(res => {
this.submiting = false
})
} else { } else {
this.$post(this.api.logAdd, data).then(res => { this.$post(this.api.logAdd, data).then(res => {
this.$message.success('新增成功') this.$message.success('新增成功')
this.$router.back() this.$router.back()
}).catch(res => {}) }).catch(res => {
this.submiting = false
})
} }
}, },
} }

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

@ -140,15 +140,31 @@ export default {
}).catch(res => {}) }).catch(res => {})
}).catch(() => {}) }).catch(() => {})
}, },
// 禁用启用 changeStatus(logId, open, draft) {
switchOff(val, row) {
this.$post(this.api.listUpdate, { this.$post(this.api.listUpdate, {
logId: row.logId, logId,
open: val open,
draft
}).then(res => { }).then(res => {
this.$message.success(val ? '禁用成功' : '启用成功') this.$message.success(open ? '禁用成功' : '启用成功')
this.getData()
}).catch(res => {}) }).catch(res => {})
}, },
// 禁用启用
switchOff(val, row) {
const logId = row.logId
if (row.draft && !val) {
this.$confirm('是否要发布该日志？', '提示', {
type: 'success'
}).then(() => {
this.changeStatus(logId, val, 0)
}).catch(() => {
this.changeStatus(logId, val, 1)
})
} else {
this.changeStatus(logId, val, row.draft)
}
},
// 版本切换 // 版本切换
verChange(i) { verChange(i) {
document.querySelector(`#ver${i}`).scrollIntoView() document.querySelector(`#ver${i}`).scrollIntoView()

Write Preview
Loading…
Cancel
Save