Skip to content

P
pica-sensitive-admin
提交 37126ace 编写于 作者: huangwensu's avatar huangwensu
浏览文件
操作

页面修改

上级 66c59dc1
隐藏空白字符变更
内嵌 并排
正在显示 包含 111 行增加 和 60 行删除
src/main.js
浏览文件 @ 37126ace
...@@ -9,6 +9,7 @@ import 'element-ui/lib/theme-chalk/index.css'; // 默认主题 ...@@ -9,6 +9,7 @@ import 'element-ui/lib/theme-chalk/index.css'; // 默认主题
import {getAddress, loadCommonFilter} from './common/env' import {getAddress, loadCommonFilter} from './common/env'
import vueFilter from './common/filter'; import vueFilter from './common/filter';
import vViewer from 'v-viewer'; import vViewer from 'v-viewer';
import 'viewerjs/dist/viewer.css';
//加载环境变量 //加载环境变量
......
src/views/strack-data/create-point.vue
浏览文件 @ 37126ace
...@@ -108,7 +108,9 @@ ...@@ -108,7 +108,9 @@
<el-table-column prop="releaseTime" label="发布时间" min-width="100" align="left"></el-table-column> <el-table-column prop="releaseTime" label="发布时间" min-width="100" align="left"></el-table-column>
<el-table-column prop="img" label="图例" min-width="100" align="left"> <el-table-column prop="img" label="图例" min-width="100" align="left">
<template slot-scope="scope"> <template slot-scope="scope">
<img :src="scope.row.actionPath" style="width: 80px;" v-viewer/> <span v-viewer>
<img :src="scope.row.actionPath" style="width: 80px;"/>
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="handlerName" label="当前处理人" min-width="100" align="left"></el-table-column> <el-table-column prop="handlerName" label="当前处理人" min-width="100" align="left"></el-table-column>
...@@ -276,6 +278,7 @@ ...@@ -276,6 +278,7 @@
label-width="150px" label-width="150px"
label-suffix=":" label-suffix=":"
label-position="right" label-position="right"
:rules="downRules"
size="mini"> size="mini">
<el-col :span="20"> <el-col :span="20">
<el-form-item label="事件名"> <el-form-item label="事件名">
...@@ -297,7 +300,7 @@ ...@@ -297,7 +300,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="downForm.implementMethodId == 1" label="下线时间" prop="offTime"> <el-form-item v-if="downForm.implementMethodId != 2" label="下线时间" prop="offTime">
<el-date-picker <el-date-picker
type="date" type="date"
placeholder="请选择下线时间" placeholder="请选择下线时间"
...@@ -358,17 +361,18 @@ ...@@ -358,17 +361,18 @@
width="30%"> width="30%">
<el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;"> <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">
<el-form ref="tagForm" <el-form ref="tagForm"
rules="tagRules"
:model="tagForm" :model="tagForm"
label-width="150px" label-width="150px"
label-suffix=":" label-suffix=":"
label-position="right" label-position="right"
size="mini"> size="mini">
<el-col :span="20"> <el-col :span="24">
<el-form-item label="投递对象名" prop=""> <el-form-item label="投递对象名" prop="tagName">
<el-input v-model="tagForm.tagName"></el-input> <el-input v-model="tagForm.tagName" maxlength="15" placeholder="请输入投递对象名称" style="width: 200px;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="投递方法定义" prop="member"> <el-form-item label="投递方法定义" prop="tagDesc">
<el-input v-model="tagForm.tagDesc"></el-input> <el-input type="textarea" maxlength="500" v-model="tagForm.tagDesc" style="width: 200px;"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form> </el-form>
...@@ -458,10 +462,23 @@ export default { ...@@ -458,10 +462,23 @@ export default {
actionPath: [ actionPath: [
{ required: true, message: '请上传位置图片', trigger: 'change' } { required: true, message: '请上传位置图片', trigger: 'change' }
], ],
// tagCodeList: [
// { required: true, message: '请选择额外投递', trigger: 'change' }
// ]
}, },
tagRules: {
tagName: [
{ required: true, message: '请输入投递名称', trigger: 'change' }
],
tagDesc: [
{ required: true, message: '请输入投递方法定义', trigger: 'change' }
]
},
downRules: {
offVersion: [
{ required: true, message: '请选择下线版本', trigger: 'change' }
],
offTime: [
{ required: true, message: '请选择下线时间', trigger: 'change' }
]
},
imageUrl: '', imageUrl: '',
detailVisible: false, detailVisible: false,
detailForm: {} detailForm: {}
...@@ -514,12 +531,16 @@ export default { ...@@ -514,12 +531,16 @@ export default {
} }
}, },
confirmAddTag() { confirmAddTag() {
this.getData( this.$refs.tagForm.validate((valid) => {
"post", `/basic-data/bi/actionTag/insert`, this.tagForm, if(valid) {
res => { this.getData(
this.tagVisible = false; "post", `/basic-data/bi/actionTag/insert`, this.tagForm,
res => {
this.tagVisible = false;
}
);
} }
); })
}, },
// 获取页面列表 // 获取页面列表
getPageList() { getPageList() {
...@@ -651,14 +672,18 @@ export default { ...@@ -651,14 +672,18 @@ export default {
}, },
// 保存下线页面 // 保存下线页面
updateConfim() { updateConfim() {
this.getData( this.$refs.downForm.validate((valid) => {
"post", `/basic-data/bi/pageAction/offLine`, this.downForm, if(valid) {
res => { this.getData(
this.$message.success("下线成功"); "post", `/basic-data/bi/pageAction/offLine`, this.downForm,
this.downPageVisible = false; res => {
this.search(); this.$message.success("下线成功");
this.downPageVisible = false;
this.search();
}
);
} }
); })
}, },
// 指派 // 指派
assignDialog(row) { assignDialog(row) {
......
src/views/strack-data/strack-list.vue
浏览文件 @ 37126ace
...@@ -111,8 +111,10 @@ ...@@ -111,8 +111,10 @@
<el-table-column prop="releaseTime" label="发布时间" min-width="100" align="left"></el-table-column> <el-table-column prop="releaseTime" label="发布时间" min-width="100" align="left"></el-table-column>
<el-table-column prop="releaseVersion" label="发布版本" min-width="80" align="left"></el-table-column> <el-table-column prop="releaseVersion" label="发布版本" min-width="80" align="left"></el-table-column>
<el-table-column label="图例" min-width="120" align="left"> <el-table-column label="图例" min-width="120" align="left">
<template slot-scope="scope" v-viewer> <template slot-scope="scope">
<img :src="scope.row.imageUrl" style="width: 80px;"/> <span v-viewer>
<img :src="scope.row.imageUrl" style="width: 80px;"/>
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="handlerNames" label="处理人" min-width="100" align="left"></el-table-column> <el-table-column prop="handlerNames" label="处理人" min-width="100" align="left"></el-table-column>
...@@ -157,14 +159,6 @@ ...@@ -157,14 +159,6 @@
<el-input v-model="pageForm.name" placeholder="请输入页面名" maxlength="15" style="width:200px"></el-input> <el-input v-model="pageForm.name" placeholder="请输入页面名" maxlength="15" style="width:200px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="归属模块" required> <el-form-item label="归属模块" required>
<!-- <el-select v-model="pageForm.moduleId" clearable placeholder="请选择归属模块" style="width:200px">
<el-option
v-for="(eItem,eIndex) in moduleSelect"
:key="eIndex"
:label="eItem.name"
:value="eItem.id">
</el-option>
</el-select> -->
<el-cascader <el-cascader
v-model="pageForm.moduleIdArr" v-model="pageForm.moduleIdArr"
:options="moduleSelect" :options="moduleSelect"
...@@ -194,7 +188,7 @@ ...@@ -194,7 +188,7 @@
<img v-if="pageForm.imageUrl" class="bg-img" :src="pageForm.imageUrl"> <img v-if="pageForm.imageUrl" class="bg-img" :src="pageForm.imageUrl">
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<el-form-item v-if="pageForm.implementMethodId == 1" label="发布时间" prop="releaseTime"> <el-form-item v-if="pageForm.implementMethodId != 2" label="发布时间" prop="releaseTime">
<el-date-picker <el-date-picker
type="date" type="date"
placeholder="请选择发布时间" placeholder="请选择发布时间"
...@@ -242,7 +236,7 @@ ...@@ -242,7 +236,7 @@
<span>{{form.pageCode}}</span> <span>{{form.pageCode}}</span>
</el-form-item> </el-form-item>
<el-form-item label="事件名" prop="actionName"> <el-form-item label="事件名" prop="actionName">
<el-input v-model="form.actionName" placeholder="请输入事件名" style="width:200px"></el-input> <el-input v-model="form.actionName" maxlength="15" placeholder="请输入事件名" style="width:200px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="事件类型" prop="actionType"> <el-form-item label="事件类型" prop="actionType">
<el-select v-model="form.actionType" clearable placeholder="请选择事件类型" style="width:200px"> <el-select v-model="form.actionType" clearable placeholder="请选择事件类型" style="width:200px">
...@@ -264,7 +258,7 @@ ...@@ -264,7 +258,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="form.implementMethodId == 1" label="发布时间" prop="releaseTime"> <el-form-item v-if="form.implementMethodId != 2" label="发布时间" prop="releaseTime">
<el-date-picker <el-date-picker
type="date" type="date"
placeholder="请选择发布时间" placeholder="请选择发布时间"
...@@ -286,7 +280,7 @@ ...@@ -286,7 +280,7 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<div v-for="(item, index) in form.actionTagResqs" :key="index" style="width: 400px;"> <div v-for="(item, index) in form.actionTagResqs" :key="index" style="width: 400px;">
<el-form-item :label="'额外投递' + parseInt(index + 1)" prop="actionTagResqs"> <el-form-item :label="'额外投递' + parseInt(index + 1)" prop="actionTagResqs" required>
<el-select <el-select
v-model="item.tagCode" v-model="item.tagCode"
clearable clearable
...@@ -325,7 +319,7 @@ ...@@ -325,7 +319,7 @@
label-position="right" label-position="right"
:rules="downRules" :rules="downRules"
size="mini"> size="mini">
<el-col :span="20"> <el-col :span="24">
<el-form-item label="页面名"> <el-form-item label="页面名">
<span>{{downForm.pageName}}</span> <span>{{downForm.pageName}}</span>
</el-form-item> </el-form-item>
...@@ -339,7 +333,7 @@ ...@@ -339,7 +333,7 @@
<span>{{downForm.moduleName2}}</span> <span>{{downForm.moduleName2}}</span>
</el-form-item> </el-form-item>
<el-form-item v-if="downForm.implementMethodId == 2" label="下线版本" prop="offVersion"> <el-form-item v-if="downForm.implementMethodId == 2" label="下线版本" prop="offVersion">
<el-select v-model="downForm.offVersion" clearable placeholder="请选择下线版本" style="width:200px"> <el-select v-model="downForm.offVersion" clearable placeholder="请选择下线版本" style="width:240px">
<el-option <el-option
v-for="(eItem,eIndex) in versionSelect" v-for="(eItem,eIndex) in versionSelect"
:key="eIndex" :key="eIndex"
...@@ -348,12 +342,12 @@ ...@@ -348,12 +342,12 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="downForm.implementMethodId == 1" label="下线时间" prop="offTime"> <el-form-item v-if="downForm.implementMethodId != 2" label="下线时间" prop="offTime">
<el-date-picker <el-date-picker
type="date" type="date"
placeholder="请选择下线时间" placeholder="请选择下线时间"
v-model="downForm.offTime" v-model="downForm.offTime"
style="width: 140px;" style="width: 240px;"
value-format="yyyy-MM-dd"> value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
...@@ -414,17 +408,18 @@ ...@@ -414,17 +408,18 @@
width="30%"> width="30%">
<el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;"> <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">
<el-form ref="tagForm" <el-form ref="tagForm"
rules="tagRules"
:model="tagForm" :model="tagForm"
label-width="150px" label-width="150px"
label-suffix=":" label-suffix=":"
label-position="right" label-position="right"
size="mini"> size="mini">
<el-col :span="20"> <el-col :span="24">
<el-form-item label="投递对象名" prop=""> <el-form-item label="投递对象名" prop="tagName">
<el-input v-model="tagForm.tagName"></el-input> <el-input v-model="tagForm.tagName" maxlength="15" placeholder="请输入投递对象名称" style="width: 200px;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="投递方法定义" prop="member"> <el-form-item label="投递方法定义" prop="tagDesc">
<el-input v-model="tagForm.tagDesc"></el-input> <el-input type="textarea" maxlength="500" v-model="tagForm.tagDesc" style="width: 200px;"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form> </el-form>
...@@ -439,6 +434,14 @@ ...@@ -439,6 +434,14 @@
<script> <script>
import { doUpload, getFilePath } from "../../common/qiniuUtil"; import { doUpload, getFilePath } from "../../common/qiniuUtil";
import { isEmptyUtils, openLoading, closeLoading } from '../../common/utils'; import { isEmptyUtils, openLoading, closeLoading } from '../../common/utils';
function isNormalWorld(rule, value,callback) {
var regEn = /[`~!@#$%^&*()_+<>?:"{},.\/;'[\]]/im,
regCn = /[·！#￥（——）：；“”‘、，|《。》？、【】[\]]/im;
if(regEn.test(value) || regCn.test(value)) {
return callback("名称不能包含特殊字符")
}
callback();
}
export default { export default {
data() { data() {
return { return {
...@@ -536,7 +539,8 @@ export default { ...@@ -536,7 +539,8 @@ export default {
}, },
pageRules: { pageRules: {
name: [ name: [
{ required: true, message: '请输入页面名称', trigger: 'blur' } { required: true, message: '请输入页面名称', trigger: 'blur' },
{ validator: isNormalWorld ,trigger: true}
], ],
moduleIdArr: [ moduleIdArr: [
{ required: true, message: '请选择模块归类', trigger: 'change' } { required: true, message: '请选择模块归类', trigger: 'change' }
...@@ -555,15 +559,28 @@ export default { ...@@ -555,15 +559,28 @@ export default {
] ]
}, },
downRules: { downRules: {
offVersion: [
{ required: true, message: '请选择下线版本', trigger: 'change' }
],
offTime: [
{ required: true, message: '请选择下线时间', trigger: 'change' }
]
}, },
assignRule: { assignRule: {
status: [ status: [
{ required: true, message: '请选择任务状态', trigger: 'change' } { required: true, message: '请选择任务状态', trigger: 'change' }
], ],
handlerIds: [ handlerIds: [
{ required: true, message: '请选择指派人', trigger: 'change' } { required: true, message: '请选择指派人', trigger: 'change' }
], ],
},
tagRules: {
tagName: [
{ required: true, message: '请输入投递名称', trigger: 'change' }
],
tagDesc: [
{ required: true, message: '请输入投递方法定义', trigger: 'change' }
]
} }
} }
}, },
...@@ -616,12 +633,16 @@ export default { ...@@ -616,12 +633,16 @@ export default {
} }
}, },
confirmAddTag() { confirmAddTag() {
this.getData( this.$refs.tagForm.validate((valid) => {
"post", `/basic-data/bi/actionTag/insert`, this.tagForm, if(valid) {
res => { this.getData(
this.tagVisible = false; "post", `/basic-data/bi/actionTag/insert`, this.tagForm,
res => {
this.tagVisible = false;
}
);
} }
); })
}, },
// 获取版本号 // 获取版本号
getVersionList() { getVersionList() {
...@@ -776,14 +797,18 @@ export default { ...@@ -776,14 +797,18 @@ export default {
}, },
// 保存下线页面 // 保存下线页面
updateConfim() { updateConfim() {
this.getData( this.$refs.downForm.validate((valid) => {
"post", `/basic-data/bi/page/offLine`, this.downForm, if(valid) {
res => { this.getData(
this.$message.success("下线成功"); "post", `/basic-data/bi/page/offLine`, this.downForm,
this.downPageVisible = false; res => {
this.searchList(); this.$message.success("下线成功");
this.downPageVisible = false;
this.searchList();
}
);
} }
); })
}, },
// 新建埋点 // 新建埋点
createPoing(row) { createPoing(row) {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或