Skip to content

P
pica-sensitive-admin
提交 33d7ddee 编写于 作者: chengxiang.li's avatar chengxiang.li
浏览文件
操作

Merge branch 'dev-sensitive-20191111' of... 

Merge branch 'dev-sensitive-20191111' of 192.168.110.53:com.pica.cloud.foundation.frontend/pica-sensitive-admin into dev-sensitive-20191111
上级 7c84d810 5f59f95c
隐藏空白字符变更
内嵌 并排
正在显示 包含 145 行增加 和 86 行删除
package-lock.json
浏览文件 @ 33d7ddee
...@@ -3334,14 +3334,12 @@ ...@@ -3334,14 +3334,12 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -3356,20 +3354,17 @@ ...@@ -3356,20 +3354,17 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -3486,8 +3481,7 @@ ...@@ -3486,8 +3481,7 @@
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -3499,7 +3493,6 @@ ...@@ -3499,7 +3493,6 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -3514,7 +3507,6 @@ ...@@ -3514,7 +3507,6 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
...@@ -3522,14 +3514,12 @@ ...@@ -3522,14 +3514,12 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.2.4", "version": "2.2.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.1", "safe-buffer": "^5.1.1",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -3548,7 +3538,6 @@ ...@@ -3548,7 +3538,6 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -3629,8 +3618,7 @@ ...@@ -3629,8 +3618,7 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -3642,7 +3630,6 @@ ...@@ -3642,7 +3630,6 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -3764,7 +3751,6 @@ ...@@ -3764,7 +3751,6 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
......
src/common/utils.js
浏览文件 @ 33d7ddee
...@@ -581,7 +581,7 @@ export const htmlMessageBox = (self, title, content, confirmButton, confirmFunct ...@@ -581,7 +581,7 @@ export const htmlMessageBox = (self, title, content, confirmButton, confirmFunct
* */ * */
export const responseCheck = (res, self) => { export const responseCheck = (res, self) => {
closeLoading(self); closeLoading(self);
console.log(res.data); // console.log(res.data);
// setTimeout(function () { // setTimeout(function () {
let code = res.data ? res.data.code : 0; let code = res.data ? res.data.code : 0;
if (code === "000000" || code === '200') { if (code === "000000" || code === '200') {
......
src/main.js
浏览文件 @ 33d7ddee
import "babel-polyfill";
import Vue from 'vue'; import Vue from 'vue';
import App from './App'; import App from './App';
import router from './router'; import router from './router';
...@@ -5,7 +6,6 @@ import store from './vuex/store' ...@@ -5,7 +6,6 @@ import store from './vuex/store'
import axios from 'axios'; import axios from 'axios';
import ElementUI from 'element-ui'; import ElementUI from 'element-ui';
import 'element-ui/lib/theme-chalk/index.css'; // 默认主题 import 'element-ui/lib/theme-chalk/index.css'; // 默认主题
import "babel-polyfill";
import {getAddress, loadCommonFilter} from './common/env' import {getAddress, loadCommonFilter} from './common/env'
import vueFilter from './common/filter' import vueFilter from './common/filter'
......
src/views/sensitive-control/data-in.vue
浏览文件 @ 33d7ddee
...@@ -3,11 +3,17 @@ ...@@ -3,11 +3,17 @@
<el-form ref="form" :model="form" label-width="80px" :inline="true" :rules="rules"> <el-form ref="form" :model="form" label-width="80px" :inline="true" :rules="rules">
<el-form-item label="审批编号" prop="selectId"> <el-form-item label="审批编号" prop="selectId">
<!-- <span>审批编号:&#12288;&#12288;</span> --> <!-- <span>审批编号:&#12288;&#12288;</span> -->
<el-input <el-input
v-model="form.selectId" v-model="form.selectId"
type="number"
size="small"
style="width:220px" style="width:220px"
class="input"
placeholder="审批编号查询" placeholder="审批编号查询"
@input="handleIdChange" clearable
@input="handleIdChange"
@keydown.native="numInputLimit"
maxlength="21"
></el-input> ></el-input>
</el-form-item> </el-form-item>
...@@ -42,12 +48,12 @@ ...@@ -42,12 +48,12 @@
<el-button>数据查询</el-button> <el-button>数据查询</el-button>
</div> </div>
<template> <template>
<el-table :data="tableData" style="width: 100%"> <el-table :data="dataList" style="width: 100%">
<el-table-column prop="date" label="审批编号" width="180"></el-table-column> <el-table-column prop="dingdingDate" label="审批编号" width="180"></el-table-column>
<el-table-column prop="name" label="人员姓名" width="180"></el-table-column> <el-table-column prop="name" label="人员姓名" width="180"></el-table-column>
<el-table-column prop="address" label="附件名称"></el-table-column> <el-table-column prop="dataSheetName" label="附件名称"></el-table-column>
<el-table-column prop="status" label="状态"></el-table-column> <el-table-column prop="status" :formatter="formatStatus" label="状态"></el-table-column>
<el-table-column prop="noticstatus" label="通知状态状态"></el-table-column> <el-table-column prop="sendType" :formatter="formatSendType" label="通知状态"></el-table-column>
<!-- <el-table-column label="操作"> <!-- <el-table-column label="操作">
<template slot-scope="scoped"> <template slot-scope="scoped">
<span @click="dataview">查看</span> <span @click="dataview">查看</span>
...@@ -59,15 +65,29 @@ ...@@ -59,15 +65,29 @@
<el-table-column fixed="right" label="操作" width="200"> <el-table-column fixed="right" label="操作" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button @click="dataview(scope.row)" type="text" size="small">查看</el-button> <el-button @click="dataview(scope.row)" type="text" size="small">查看</el-button>
<el-button @click="reviseDialogVisible=true" type="text" size="small">修改</el-button> <template v-if="scope.row.status==1">
<el-button type="text" size="small">通知</el-button> <el-button @click="reviseDialogVisible=true" type="text" size="small">修改</el-button>
<el-button @click="closeDialogVisible = true" type="text" size="small">关闭</el-button> <el-button type="text" size="small">通知</el-button>
<el-button @click="closeDialogVisible = true" type="text" size="small">关闭</el-button>
</template>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination
v-if="dataList && dataList.length > 0"
class="pagination-style"
@size-change="handleSizeChange"
@current-change="dataListChange"
:total="total"
:current-page="currentPage"
:page-sizes="[15, 30, 50, 100]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper">
</el-pagination>
</template> </template>
<el-button type="text" >点击打开 Dialog</el-button> <!-- <el-button type="text" >点击打开 Dialog</el-button> -->
<el-dialog title="提示" :visible.sync="closeDialogVisible" width="30%" center> <el-dialog title="提示" :visible.sync="closeDialogVisible" width="30%" center>
<span>弹窗内容待定</span> <span>弹窗内容待定</span>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
...@@ -79,17 +99,14 @@ ...@@ -79,17 +99,14 @@
<el-dialog title="数据导入" :visible.sync="centerDialogVisible" width="700px" center> <el-dialog title="数据导入" :visible.sync="centerDialogVisible" width="700px" center>
<el-form ref="form" :model="form" label-width="150px" size="medium " :rules="rules"> <el-form ref="form" :model="form" label-width="150px" size="medium " :rules="rules">
<el-form-item label="审批编号" prop="leadId"> <el-form-item label="审批编号" prop="leadId">
<!-- <span>审批编号:</span> -->
<el-input style="width:220px" v-model="form.leadId" placeholder="请输入内容"></el-input> <el-input style="width:220px" v-model="form.leadId" placeholder="请输入内容"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="申请日期" prop="leadDate"> <el-form-item label="申请日期" prop="leadDate">
<!-- <span class="demonstration">申请日期:</span> -->
<el-date-picker v-model="form.leadDate" type="date" placeholder="选择日期"></el-date-picker> <el-date-picker v-model="form.leadDate" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="sheet名称" prop="leadsheet"> <el-form-item label="sheet名称" prop="leadsheet">
<!-- <span>sheet名称</span> -->
<el-select v-model="form.leadsheet" placeholder="请选择"> <el-select v-model="form.leadsheet" placeholder="请选择">
<el-option <el-option
v-for="item in options" v-for="item in options"
...@@ -99,10 +116,8 @@ ...@@ -99,10 +116,8 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="数据需求方类型" prop="leaddataDemand"> <el-form-item label="数据需求方类型" prop="leaddataDemand">
<!-- <span>数据方需求类型</span> -->
<el-radio-group v-model="form.leaddataDemand" @change="changeinout"> <el-radio-group v-model="form.leaddataDemand" @change="changeinout">
<el-radio :label="1" style="margin-right:50px">内部</el-radio> <el-radio :label="1" style="margin-right:50px">内部</el-radio>
<el-radio :label="2">外部</el-radio> <el-radio :label="2">外部</el-radio>
...@@ -144,7 +159,7 @@ ...@@ -144,7 +159,7 @@
<el-radio :label="1">管理员</el-radio> <el-radio :label="1">管理员</el-radio>
<el-radio :label="2">普通用户</el-radio> <el-radio :label="2">普通用户</el-radio>
</el-radio-group> </el-radio-group>
<router-view></router-view> <!-- <router-view></router-view> -->
</el-form-item> </el-form-item>
<div class="block" v-if="form.admintype_radio==1"> <div class="block" v-if="form.admintype_radio==1">
...@@ -175,7 +190,7 @@ ...@@ -175,7 +190,7 @@
</el-form-item> </el-form-item>
</div> </div>
<router-view></router-view> <!-- <router-view></router-view> -->
<el-form-item label="敏感信息查看" prop="warning_radio"> <el-form-item label="敏感信息查看" prop="warning_radio">
<div> <div>
...@@ -325,9 +340,29 @@ ...@@ -325,9 +340,29 @@
<script> <script>
const baseUrl = 'https://dev-sc.yunqueyi.com';
import { openLoading, closeLoading, } from '../../common/utils';
export default { export default {
data() { data() {
var checkNumLength = (rule, value, callback) => {
if (!value) {
return callback(new Error('请输入审批单号'));
}else if (value && (value+'').length != 21) {
callback(new Error('审批单号必须为21位数字值'));
} else {
// if (value.length == 21) {
// this.getApplyDate();
// }else{ //this.getcls();
// this.applyDate.splice(0,this.applyDate.length)
// }
callback();
}
};
return { return {
currentPage: 1,
pageSize: 15,
total: 50, // 默认分页总数
dataList: [],
input: "", input: "",
radio: "", radio: "",
radio: "选中且禁用", radio: "选中且禁用",
...@@ -339,39 +374,6 @@ export default { ...@@ -339,39 +374,6 @@ export default {
sum_input: "", sum_input: "",
applyDate: [], applyDate: [],
datechange: [], datechange: [],
tableData: [
{
date: "2016-05-02",
name: "王小虎",
address: "上海市普陀区金沙江路 1518 弄"
},
{
date: "2016-05-04",
name: "王小虎",
address: "上海市普陀区金沙江路 1517 弄"
},
{
date: "2016-05-01",
name: "王小虎",
address: "上海市普陀区金沙江路 1519 弄"
},
{
date: "2016-05-03",
name: "王小虎",
address: "上海市普陀区金沙江路 1516 弄"
},
{
date: "2016-05-04",
name: "王小虎",
address: "上海市普陀区金沙江路 1517 弄"
},
{
date: "2016-05-04",
name: "王小虎",
address: "上海市普陀区金沙江路 1517 弄"
}
],
options: [ options: [
{ {
value: "选项1", value: "选项1",
...@@ -426,15 +428,16 @@ export default { ...@@ -426,15 +428,16 @@ export default {
rules: { rules: {
selectId: [ selectId: [
{ {
required: true, required: false,
validator: checkNumLength,
message: "请输入正确格式的审批编号", message: "请输入正确格式的审批编号",
trigger: "blur" trigger: ['blur', 'change']
}, },
// { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }, // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' },
{ {
pattern: /^[5A-Za-z0-9-\_]+$/, pattern: /^[5A-Za-z0-9-\_]+$/,
message: "只能输入英文，数字，下划线，横线" message: "只能输入英文，数字，下划线，横线"
} },
], ],
leadId: [ leadId: [
{ {
...@@ -509,11 +512,64 @@ export default { ...@@ -509,11 +512,64 @@ export default {
sensitivePosition: [ sensitivePosition: [
{ required: true, message: "请填写敏感信息所在位置", trigger: "blur" } { required: true, message: "请填写敏感信息所在位置", trigger: "blur" }
], ],
upload: [
{ required: true, message: "请上传图片", trigger: "submit" }
]
} }
}; };
}, },
created(){
this.getDataList(this.currentPage);
},
methods: { methods: {
// 获取全部分页数据
getDataList(pageNum) {
openLoading(this);
this.$axios.post(`${baseUrl}/sensitive/visit`, {
"pageNum": pageNum,
"pageSize": this.pageSize
})
.then((res) => {
closeLoading(this);
let data = res.data;
if(data.code == "000000") {
this.dataList = data.data.list;
this.total = data.data.total;
}else {
this.$message.error(data.message);
}
}).catch((error) => {
this.$message.error('网络出现点问题')
})
},
handleSizeChange(size){
this.pageSize = size;
this.getDataList(this.currentPage);
},
dataListChange(num){
this.currentPage = num;
this.getDataList(num);
},
// 过滤状态显示
formatStatus(row, column){
let value;
if(row.status == 1){
value = '正常';
}else if(row.status == 2){
value = '关闭';
}
return value;
},
// 过滤同志状态显示
formatSendType(row, column){
let value;
if(row.sendType == 1){
value = '已通知';
}else if(row.sendType == 2){
value = '未通知';
}
return value;
},
dataview() { dataview() {
this.$router.push("/data-view"); this.$router.push("/data-view");
}, },
...@@ -523,17 +579,30 @@ export default { ...@@ -523,17 +579,30 @@ export default {
changeinout(value) { changeinout(value) {
console.log("handle value: ", value); console.log("handle value: ", value);
}, },
handleIdChange(value) { handleIdChange(val) {
if (value.length == 5) { if (value.length == 21) {
console.log(22222);
this.getApplyDate(); this.getApplyDate();
}else{ //this.getcls();
this.applyDate.splice(0,this.applyDate.length)
} }
else // if(val && val.length == 21){
{ //this.getcls(); // // this.getApplyDateList();
this.applyDate.splice(0,this.applyDate.length) // this.getApplyDate();
// }else if(val && val.length > 21){
// // this.applyDate.splice(0,this.applyDate.length)
// val = val.slice(0,21);
// this.ruleForm.number = val;
// }
},
numInputLimit (e) {
let key = e.key
// 不允许输入'e'和'.'
if (key === 'e' || key === '.') {
e.returnValue = false
return false
} }
return true
}, },
handleDatechange() { handleDatechange() {
console.log(333); console.log(333);
this.getDatechange(); this.getDatechange();
...@@ -586,5 +655,9 @@ export default { ...@@ -586,5 +655,9 @@ export default {
<style lang="less"> <style lang="less">
.data-in-wrap { .data-in-wrap {
.pagination-style{
margin-top: 30px;
float: right;
}
} }
</style> </style>
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或