Commit a9efa251 authored by miaohaoyun's avatar miaohaoyun

Merge branch 'master' into 'mhy'

Master

See merge request !70
parents 1cfcbd9a 70d40017
This diff is collapsed.
This diff is collapsed.
...@@ -137,15 +137,15 @@ export const listAllBaseInfo = (data) => { ...@@ -137,15 +137,15 @@ export const listAllBaseInfo = (data) => {
method: 'post', method: 'post',
data data
}) })
} }
// //
export const selectflowState = (params) => { export const selectflowState = (params) => {
return axios({ return axios({
url: '/folw/selectflowState', url: '/folw/selectflowState',
method: 'get', method: 'get',
params params
}) })
} }
//缴费信息查询 //缴费信息查询
export const listPayInfo = (data) => { export const listPayInfo = (data) => {
return axios({ return axios({
...@@ -169,7 +169,7 @@ export const selectRoleflowNo = (params) => { ...@@ -169,7 +169,7 @@ export const selectRoleflowNo = (params) => {
method: 'get', method: 'get',
params params
}) })
} }
export const updatePassword = (data)=>{ export const updatePassword = (data)=>{
return axios({ return axios({
url: 'user/updatePassword', url: 'user/updatePassword',
...@@ -177,13 +177,44 @@ export const updatePassword = (data)=>{ ...@@ -177,13 +177,44 @@ export const updatePassword = (data)=>{
data data
}) })
} }
export const getTown = () => { export const getTown = () => {
return axios({ return axios({
url: '/dept/findTreeByUser', url: '/dept/findTreeByUser',
method: 'get', method: 'get',
}) })
} }
//交互中心信息查询
export const getInteracts = (params) => {
return axios({
url: '/news/listinteract',
method: 'get',
params
})
}
//上传文件
export const saveFile = (data)=>{
return axios({
url: 'news/add',
method: 'post',
data
})
}
//更新文件状态
export const updateFileState = (id,state)=>{
return axios({
url: 'news/update/' + id + '/' + state,
method: 'post'
})
}
//新闻预览
export const newsPreView = (id)=>{
return axios({
url: 'news/view/'+id,
method: 'get'
})
}
// //
//参保注销导出 //参保注销导出
export const selecbzxdc = (data) => { export const selecbzxdc = (data) => {
......
...@@ -10,8 +10,9 @@ import 'element-ui/lib/theme-chalk/index.css' ...@@ -10,8 +10,9 @@ import 'element-ui/lib/theme-chalk/index.css'
import 'font-awesome/css/font-awesome.min.css' import 'font-awesome/css/font-awesome.min.css'
import '@/assets/iconfont/iconfont.css' import '@/assets/iconfont/iconfont.css'
import getType from "@/utils/type.js" import getType from "@/utils/type.js"
import charts from 'echarts'; import axios from 'axios';
Vue.prototype.$echarts = charts
Vue.prototype.$axios = axios;
Vue.prototype.getType =getType.getType Vue.prototype.getType =getType.getType
Vue.prototype.regetType =getType.regetType Vue.prototype.regetType =getType.regetType
......
...@@ -25,16 +25,18 @@ import receivePersonnel from "@/views/Myvue/receivePersonnel"; ...@@ -25,16 +25,18 @@ import receivePersonnel from "@/views/Myvue/receivePersonnel";
import AllbaseInfo from "@/views/Myvue/allbaseInfo" import AllbaseInfo from "@/views/Myvue/allbaseInfo"
import PayInfo from "@/views/Myvue/payInfo" import PayInfo from "@/views/Myvue/payInfo"
import application from "@/views/Myvue/application" import application from "@/views/Myvue/application"
import authRecordphone from "@/views/Myvue/authRecordphone" import importByExcel from "@/views/Myvue/importByExcel"
import importByExcel from "@/views/Myvue/importByExcel"; import insuranceCancellationAudit from "@/views/Myvue/insuranceCancellationAudit"
import supPaymentAudit from "@/views/Myvue/supPaymentAudit"
import traRelationsAudit from "@/views/Myvue/traRelationsAudit"
import upgradeReoAudit from "@/views/Myvue/upgradeReoAudit"
import interact from "@/views/Myvue/interact"
import preView from "@/views/Myvue/preView"
import treatmentApplicationAudit from "@/views/Myvue/treatmentApplicationAudit"; import treatmentApplicationAudit from "@/views/Myvue/treatmentApplicationAudit";
import insuranceCancellationAudit from "@/views/Myvue/insuranceCancellationAudit";
import supPaymentAudit from "@/views/Myvue/supPaymentAudit";
import traRelationsAudit from "@/views/Myvue/traRelationsAudit";
import upgradeReoAudit from "@/views/Myvue/upgradeReoAudit";
import drcbzx from "@/views/Myvue/drcbzx"; import drcbzx from "@/views/Myvue/drcbzx";
import drbjbf from "@/views/Myvue/drbjbf"; import drbjbf from "@/views/Myvue/drbjbf";
import drtsyw from "@/views/Myvue/drtsyw"; import drtsyw from "@/views/Myvue/drtsyw";
import authRecordphone from "@/views/Myvue/authRecordphone";
Vue.use(Router) Vue.use(Router)
...@@ -165,6 +167,15 @@ const router = new Router({ ...@@ -165,6 +167,15 @@ const router = new Router({
component: traRelationsAudit component: traRelationsAudit
}, },
{ {
path:"/interact",
name:"交互中心",
component: interact
},
{
path:"/preView",
name:"预览",
component:preView
},{
path:"/insCanExport", path:"/insCanExport",
name:"参保注销导出", name:"参保注销导出",
component: drcbzx component: drcbzx
......
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
// 后台管理系统服务器地址 // 后台管理系统服务器地址
// export const baseUrl2 = 'http://xclc.rensheju.com' // export const baseUrl2 = 'http://xclc.rensheju.com'
// //export const baseUrl = 'http://xc.rensheju.com'
// export const baseUrl = 'http://172.16.10.33:9002'
export const baseUrl2 = 'http://xclc.rensheju.com'
export const baseUrl = 'http://xc.rensheju.com' export const baseUrl = 'http://xc.rensheju.com'
//export const baseUrl = 'http://172.16.10.33:9002'
export const baseUrl2 = 'http://xclc.rensheju.com'
//export const baseUrl = 'http://xc.rensheju.com'
export default { export default {
baseUrl, baseUrl,
......
function utf8ByteToUnicodeStr(utf8Bytes){
var unicodeStr ="";
for (var pos = 0; pos < utf8Bytes.length;){
var flag= utf8Bytes[pos];
var unicode = 0 ;
if ((flag >>>7) === 0 ) {
unicodeStr+= String.fromCharCode(utf8Bytes[pos]);
pos += 1;
} else if ((flag &0xFC) === 0xFC ){
unicode = (utf8Bytes[pos] & 0x3) << 30;
unicode |= (utf8Bytes[pos+1] & 0x3F) << 24;
unicode |= (utf8Bytes[pos+2] & 0x3F) << 18;
unicode |= (utf8Bytes[pos+3] & 0x3F) << 12;
unicode |= (utf8Bytes[pos+4] & 0x3F) << 6;
unicode |= (utf8Bytes[pos+5] & 0x3F);
unicodeStr+= String.fromCharCode(unicode) ;
pos += 6;
}else if ((flag &0xF8) === 0xF8 ){
unicode = (utf8Bytes[pos] & 0x7) << 24;
unicode |= (utf8Bytes[pos+1] & 0x3F) << 18;
unicode |= (utf8Bytes[pos+2] & 0x3F) << 12;
unicode |= (utf8Bytes[pos+3] & 0x3F) << 6;
unicode |= (utf8Bytes[pos+4] & 0x3F);
unicodeStr+= String.fromCharCode(unicode) ;
pos += 5;
} else if ((flag &0xF0) === 0xF0 ){
unicode = (utf8Bytes[pos] & 0xF) << 18;
unicode |= (utf8Bytes[pos+1] & 0x3F) << 12;
unicode |= (utf8Bytes[pos+2] & 0x3F) << 6;
unicode |= (utf8Bytes[pos+3] & 0x3F);
unicodeStr+= String.fromCharCode(unicode) ;
pos += 4;
} else if ((flag &0xE0) === 0xE0 ){
unicode = (utf8Bytes[pos] & 0x1F) << 12;;
unicode |= (utf8Bytes[pos+1] & 0x3F) << 6;
unicode |= (utf8Bytes[pos+2] & 0x3F);
unicodeStr+= String.fromCharCode(unicode) ;
pos += 3;
} else if ((flag &0xC0) === 0xC0 ){ //110
unicode = (utf8Bytes[pos] & 0x3F) << 6;
unicode |= (utf8Bytes[pos+1] & 0x3F);
unicodeStr+= String.fromCharCode(unicode) ;
pos += 2;
} else{
unicodeStr+= String.fromCharCode(utf8Bytes[pos]);
pos += 1;
}
}
return unicodeStr;
}
function getType(s){ function getType(s){
let a= s==1?"参保登记":s==2?"信息变更":s==3?"待遇申请":s==4?"参保注销":s==5?"补缴保费":s==6?"升档改办":s==7?"关系转移":"" let a= s==1?"参保登记":s==2?"信息变更":s==3?"待遇申请":s==4?"参保注销":s==5?"补缴保费":s==6?"升档改办":s==7?"关系转移":s==8?"特殊业务":""
return a return a
} }
function regetType(s){ function regetType(s){
let a= s=="参保登记"?1:s=="信息变更"?2:s=="待遇申请"?3:s=="参保注销"?4:s=="补缴保费"?5:s=="升档改办"?6:s=="关系转移"?7:"" let a= s=="参保登记"?1:s=="信息变更"?2:s=="待遇申请"?3:s=="参保注销"?4:s=="补缴保费"?5:s=="升档改办"?6:s=="关系转移"?7:s==8?"特殊业务":""
return a return a
} }
export default{ export default{
......
...@@ -127,7 +127,7 @@ export default { ...@@ -127,7 +127,7 @@ export default {
} }
}, },
updatePassword: function () { updatePassword: function () {
var rex = /^[\w_-]{6,8}$/ var rex = /^[\w_-]{6,18}$/
if(this.item.password == ''){ if(this.item.password == ''){
this.$message({message: '请输入原密码', type: 'error'}) this.$message({message: '请输入原密码', type: 'error'})
return; return;
......
<template> <template>
<div> <div>
<el-cascader <el-cascader
:props="{ checkStrictly: true }" :props="{ checkStrictly: true }"
clearable clearable
...@@ -10,7 +9,6 @@ ...@@ -10,7 +9,6 @@
size="mini" size="mini"
@change="handleChange"></el-cascader> @change="handleChange"></el-cascader>
</div> </div>
</template> </template>
...@@ -28,6 +26,7 @@ ...@@ -28,6 +26,7 @@
handleChange(value) { handleChange(value) {
this.$emit('childByValue', value) this.$emit('childByValue', value)
}, },
}, },
created(){ created(){
this.$api.getlist.getTown().then((res) => { this.$api.getlist.getTown().then((res) => {
......
<template> <template>
<el-carousel :interval="100000000000000000" style="margin-top:30px;" align=center type="card" class="carousel" height="70vh" > <el-carousel :interval="3000" style="margin-top:30px;" align=center type="card" class="carousel" height="70vh" >
<el-carousel-item class="carousel-item-intro" style="width:85%; height:100%;position:absolute;left:-18%;"> <el-carousel-item class="carousel-item-intro" style="width:85%; height:100%;position:absolute;left:-18%;">
<div class="ddiv1"> <div class="ddiv1">
<div class="div1" height=100% :style="{width: '90%', height: '100%'}" id="echartContainer1"> <div class="div1" :style="{width: '90%', height: '90%'}" id="echartContainer1"></div>
</div> <div class="nextpage">
<div class="nextpage" style="margin-top:-50px">
<p style="display:none">{{count}}</p> <p style="display:none">{{count}}</p>
<el-button size="mini" class="gopagediv1" @click="goPageClick1"> 上一页</el-button> <el-button size="mini" class="gopagediv1" @click="goPageClick1"> 上一页</el-button>
<el-button size="mini" class="gopagediv1" @click="nextPageClick1"> 下一页</el-button> <el-button size="mini" class="gopagediv1" @click="nextPageClick1"> 下一页</el-button>
</div> </div>
</div> </div>
</el-carousel-item> </el-carousel-item>
<!-- <el-carousel-item class="carousel-item-func" style="width:85%;height:100%;position:absolute;left:-18%">
<el-carousel-item class="carousel-item-func" style="width:85%;height:100%;position:absolute;left:-18%">
<div class="ddiv2"> <div class="ddiv2">
<div class="div2" id="echartContainer2" ></div> <div class="div2" :style="{width: '90%', height: '90%'}" id="echartContainer2" ></div>
</div>
<div class="nextpage"> <div class="nextpage">
<p style="display:none"></p>
<el-button size="mini" class="gopagediv1" @click="goPageClick2"> 上一页</el-button>
<el-button size="mini" class="gopagediv1" @click="nextPageClick2"> 下一页</el-button>
</div>
</div> </div>
</el-carousel-item> </el-carousel-item>
<el-carousel-item class="carousel-item-env" style="width:85%;height:100%;position:absolute;left:-18%;">
</el-carousel-item> -->
</el-carousel> </el-carousel>
</template> </template>
<script> <script>
import Axios from "axios"
import {baseUrl2} from "../../utils/global"
var echarts = require('echarts'); var echarts = require('echarts');
export default { export default {
components:{ components:{
...@@ -51,6 +57,7 @@ ...@@ -51,6 +57,7 @@
containLabel: true containLabel: true
}, },
xAxis: { xAxis: {
name:"数量",
type: 'value' type: 'value'
}, },
yAxis: { yAxis: {
...@@ -145,13 +152,15 @@ ...@@ -145,13 +152,15 @@
}, },
] ]
}, },
count: 1, count: 1,
chartdata:{ chartdata:{
chartnum:'', chartnum:'',
chartsize:'', chartsize:'',
}, },
total:'', total:'',
fycount:'',
fysize:10,
fynum:0,
echartrz:{ echartrz:{
title : { title : {
...@@ -167,19 +176,25 @@ ...@@ -167,19 +176,25 @@
legend: { legend: {
x:'center', x:'center',
top:'10%', top:'10%',
data: ['已认证', '未认证','认证比例'] data: ['已认证', '未认证','认证比例'],
selected: {
已认证:true,
未认证:true,
认证比例:false,
},
}, },
grid: { grid: {
top: '30%', top: '30%',
containLabel: true containLabel: true
}, },
xAxis: { xAxis: {
type: 'value' type: 'value',
name:"数量"
}, },
yAxis: { yAxis: {
type: 'category', type: 'category',
name:'乡镇名称', name:'乡镇名称',
data: ['周一','周二','周三','周四','周五','周六','周日'] data: []
}, },
series: [ series: [
{ {
...@@ -192,7 +207,7 @@ ...@@ -192,7 +207,7 @@
position: 'insideRight' position: 'insideRight'
} }
}, },
data: [320, 302, 301, 334, 390, 330, 320] data: []
}, },
{ {
name: '未认证', name: '未认证',
...@@ -204,7 +219,7 @@ ...@@ -204,7 +219,7 @@
position: 'insideRight' position: 'insideRight'
} }
}, },
data: [120, 132, 101, 134, 90, 230, 210] data: []
}, },
{ {
name: '认证比例', name: '认证比例',
...@@ -216,7 +231,7 @@ ...@@ -216,7 +231,7 @@
position: 'insideRight' position: 'insideRight'
} }
}, },
data: [0.56, 0.35, 0.91, 0.34, 0.9, 0.3, 0.31] data: []
}, },
] ]
}, },
...@@ -224,14 +239,79 @@ ...@@ -224,14 +239,79 @@
}, },
mounted(){ mounted(){
sessionStorage.setItem("zz",JSON.stringify(this.echartzz));
sessionStorage.setItem("lj",JSON.stringify(this.echartzz)); sessionStorage.setItem("rz",JSON.stringify(this.echartrz));
this.chartinfo(); this.chartinfo();
this.chart11(); this.chartCertification();
}, },
methods:{ methods:{
chart11(){ chartCertification(){
Axios.get(baseUrl2+'/chart/timingselect',{
})
.then(res => {
this.icount = res.data.obj.pagetotal;
res.data.obj.result.length=this.fysize;
for (var i = this.fynum ; i <res.data.obj.result.length ; i++) {
this.echartrz.yAxis.data.push(res.data.obj.result[i].townName+" ");
this.echartrz.series[0].data.push(res.data.obj.result[i].verified);
this.echartrz.series[1].data.push(res.data.obj.result[i].unverified);
this.echartrz.series[2].data.push(res.data.obj.result[i].rzl);
}
//console.log("分页linit"+this.fynum+","+this.fysize);
//console.log("首次=="+this.fynum+","+this.fysize+"/////"+res.data.obj.result.length+"总数"+this.icount)
let myChart1 = echarts.init(document.getElementById('echartContainer2'));
myChart1.setOption(this.echartrz);
/* myChart1.on('legendselectchanged',function (parms) {
var option = this.getOption();
alert(123)
})*/
console.log()
})
.catch(res => {
console.log('报错了');
});
},
goPageClick2(){
if(this.fynum==0){
this.$message.error('已经第一页了');
}else{
this.echartrz=JSON.parse(sessionStorage.getItem("rz"));
if(this.fysize==this.icount){
this.fysize=this.fynum;
this.fynum=this.fynum-10;
this.chartCertification();
// console.log("上一页linit"+this.fynum+","+this.fysize);
}else {
this.fysize = this.fysize-10;
this.fynum=this.fynum-10;
this.chartCertification();
// console.log("上一页linit"+this.fynum+","+this.fysize);
}
}
},
nextPageClick2(){
if(this.fysize<this.icount){
this.fysize = this.fysize+10;
this.fynum=this.fynum+10;
this.echartrz=JSON.parse(sessionStorage.getItem("rz"));
if(this.fysize>this.icount){
this.fysize=this.icount
// console.log("下一页linit"+this.fynum+","+this.fysize);
this.chartCertification();
}else{
// console.log("下一页linit"+this.fynum+","+this.fysize);
this.chartCertification();
}
}else{
this.$message.error('已经是最后一页了');
}
}, },
chartinfo(){ chartinfo(){
...@@ -250,53 +330,47 @@ ...@@ -250,53 +330,47 @@
this.total = res.data.pagetotal; this.total = res.data.pagetotal;
let myChart1 = echarts.init(document.getElementById('echartContainer1')); let myChart1 = echarts.init(document.getElementById('echartContainer1'));
myChart1.setOption(this.echartzz); myChart1.setOption(this.echartzz);
/* let myChart2 = echarts.init(document.getElementById('echartContainer2'));
myChart2.setOption(this.echartrz);*/
}).catch((res) => { }).catch((res) => {
console.log('报错了'); console.log('报错了');
}); });
}, },
nextPageClick1(){ nextPageClick1(){
this.count++; this.count++;
this.chartdata.chartnum = this.count; this.chartdata.chartnum = this.count;
this.chartdata.chartsize=10; this.chartdata.chartsize=10;
console.log(this.count); console.log(this.count);
if(this.total>(this.chartdata.chartnum-1)*this.chartdata.chartsize){ if(this.total>(this.chartdata.chartnum-1)*this.chartdata.chartsize){
this.echartzz=JSON.parse(sessionStorage.getItem("lj")); this.echartzz=JSON.parse(sessionStorage.getItem("zz"));
this.chartinfo(this.chartdata); this.chartinfo(this.chartdata);
}else { }else {
this.count--;
this.$message.error('已经是最后一页了'); this.$message.error('已经是最后一页了');
} }
}, },
goPageClick1(){ goPageClick1(){
this.count--; this.count--;
this.chartdata.chartnum = this.count; this.chartdata.chartnum = this.count;
this.chartdata.chartsize=10; this.chartdata.chartsize=10;
console.log(this.count); console.log(this.count);
if(this.count<1){ if(this.count<1){
this.count++;
this.$message.error('已经是第一页了'); this.$message.error('已经是第一页了');
}else{ }else{
this.echartzz=JSON.parse(sessionStorage.getItem("lj")); this.echartzz=JSON.parse(sessionStorage.getItem("zz"));
this.chartinfo(this.chartdata); this.chartinfo(this.chartdata);
} }
} }
}, },
} }
</script> </script>
<style> <style>
.carousel-item-intro { .carousel-item-intro {
background-color:#a3b3b965; background-color:#D9E0E1;
-webkit-border-radius: 25px; -webkit-border-radius: 25px;
border-radius: 25px; border-radius: 25px;
-moz-border-radius: 15px; -moz-border-radius: 15px;
...@@ -304,7 +378,7 @@ ...@@ -304,7 +378,7 @@
box-shadow: 0 0 25px #a3b3b965; box-shadow: 0 0 25px #a3b3b965;
} }
.carousel-item-func { .carousel-item-func {
background-color: #52c578; background-color: #D9E0E1;
-webkit-border-radius: 25px; -webkit-border-radius: 25px;
border-radius: 25px; border-radius: 25px;
-moz-border-radius: 15px; -moz-border-radius: 15px;
...@@ -312,7 +386,8 @@ ...@@ -312,7 +386,8 @@
box-shadow: 0 0 25px #a3b3b965; box-shadow: 0 0 25px #a3b3b965;
} }
.carousel-item-env { .carousel-item-env {
background-color: #41a7b9; /*background-color: #41a7b9;*/
background-color: #D9E0E1;
-webkit-border-radius: 25px; -webkit-border-radius: 25px;
border-radius: 25px; border-radius: 25px;
-moz-border-radius: 15px; -moz-border-radius: 15px;
...@@ -321,23 +396,17 @@ ...@@ -321,23 +396,17 @@
} }
.ddiv1{ .ddiv1{
margin: auto; margin: auto;
width: 90%;
height: 90%; height: 90%;
} }
.div1{ .div1{
height:65%; height:65%;
margin-top: 5%; margin-top: 5%;
} }
.ddiv2{ .ddiv2{
margin: auto; margin: auto;
height: 90%; height: 90%;
} }
.div2{ .div2{
height:65%; height:65%;
margin-top: 5%; margin-top: 5%;
} }
......
...@@ -33,12 +33,26 @@ ...@@ -33,12 +33,26 @@
<el-table-column <el-table-column
prop="match_stateStr" prop="match_stateStr"
label="认证状态"> label="认证状态"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="操作">
prop="nowAddress" <template slot-scope="scope">
label="认证地区"> <el-button
v-if="scope.row.match_stateStr=='已认证'"
size="mini"
disabled
>去认证</el-button>
<el-button
v-else
size="mini"
type="success"
@click="toc(scope.$index, scope.row)"
>去认证</el-button>
</template>
</el-table-column> </el-table-column>
...@@ -139,6 +153,9 @@ import Candode from "../Core/candode" ...@@ -139,6 +153,9 @@ import Candode from "../Core/candode"
},{ },{
value:"3", value:"3",
label:"未认证", label:"未认证",
},{
value:"3",
label:"今年未认证"
}], }],
//时间 //时间
time:"", time:"",
...@@ -187,6 +204,11 @@ import Candode from "../Core/candode" ...@@ -187,6 +204,11 @@ import Candode from "../Core/candode"
} }
}, },
methods: { methods: {
//去认证
toc(s,d){
console.log(d)
window.location.replace("../own/auth/lib/nocrentry.html?idcard="+d.idNumber+"&&name="+encodeURI(d.userName))
},
childByValue(val){ childByValue(val){
this.townList=val this.townList=val
}, },
...@@ -196,20 +218,29 @@ import Candode from "../Core/candode" ...@@ -196,20 +218,29 @@ import Candode from "../Core/candode"
this.serchs(1) this.serchs(1)
}, },
serchs(p){ serchs(p){
var start="" var start=""
var end="" var end=""
if(this.time){ if(this.state==3){
var d=this.time[0]
var s=this.time[1]
console.log(d)
var mon=(parseInt(d.getMonth()) + 1)
var emon=(parseInt(s.getMonth()) + 1)
start = d.getFullYear()+"-"+mon+"-"+d.getDate()
end=s.getFullYear()+"-"+emon+"-"+s.getDate()
start="2019-01-01"
end="2019-12-31"
}else{
start=""
end=""
} }
// var start=""
// var end=""
// if(this.time){
// var d=this.time[0]
// var s=this.time[1]
// console.log(d)
// var mon=(parseInt(d.getMonth()) + 1)
// var emon=(parseInt(s.getMonth()) + 1)
// start = d.getFullYear()+"-"+mon+"-"+d.getDate()
// end=s.getFullYear()+"-"+emon+"-"+s.getDate()
// }
console.log(this.townList) console.log(this.townList)
var data={ var data={
province_name:"四川省", province_name:"四川省",
...@@ -253,6 +284,7 @@ import Candode from "../Core/candode" ...@@ -253,6 +284,7 @@ import Candode from "../Core/candode"
}, },
current_change(ss){ current_change(ss){
Loading.service();
this.serchs(ss) this.serchs(ss)
}, },
// //
...@@ -305,6 +337,8 @@ import Candode from "../Core/candode" ...@@ -305,6 +337,8 @@ import Candode from "../Core/candode"
}, },
created(){ created(){
Loading.service();
this.serchs(1)
// for(var i in listtown){ // for(var i in listtown){
// this.list.push({ // this.list.push({
// value:listtown[i].town_name, // value:listtown[i].town_name,
......
...@@ -195,9 +195,6 @@ ...@@ -195,9 +195,6 @@
for(var i in res.data.list){ for(var i in res.data.list){
res.data.list[i].idcard=this.decrypt(res.data.list[i].idcard) res.data.list[i].idcard=this.decrypt(res.data.list[i].idcard)
res.data.list[i].name=this.decrypt(res.data.list[i].name) res.data.list[i].name=this.decrypt(res.data.list[i].name)
var d=new Date(res.data.list[i].createtime)
var mon=(parseInt(d.getMonth()) + 1)
res.data.list[i].createtime=d.getFullYear()+"-"+mon+"-"+d.getDate()+" "+d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
res.data.list[i].recordtype=this.getType(res.data.list[i].recordtype) res.data.list[i].recordtype=this.getType(res.data.list[i].recordtype)
} }
this.tableData=res.data.list this.tableData=res.data.list
...@@ -277,9 +274,6 @@ ...@@ -277,9 +274,6 @@
for(var i in res.data.list){ for(var i in res.data.list){
res.data.list[i].idcard=this.decrypt(res.data.list[i].idcard) res.data.list[i].idcard=this.decrypt(res.data.list[i].idcard)
res.data.list[i].name=this.decrypt(res.data.list[i].name) res.data.list[i].name=this.decrypt(res.data.list[i].name)
var d=new Date(res.data.list[i].createtime)
var mon=(parseInt(d.getMonth()) + 1)
res.data.list[i].createtime=d.getFullYear()+"-"+mon+"-"+d.getDate()+" "+d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
res.data.list[i].recordtype=this.getType(res.data.list[i].recordtype) res.data.list[i].recordtype=this.getType(res.data.list[i].recordtype)
} }
this.tableData=res.data.list this.tableData=res.data.list
...@@ -482,9 +476,6 @@ ...@@ -482,9 +476,6 @@
for(var i in res.data.list){ for(var i in res.data.list){
res.data.list[i].idcard=this.decrypt(res.data.list[i].idcard) res.data.list[i].idcard=this.decrypt(res.data.list[i].idcard)
res.data.list[i].name=this.decrypt(res.data.list[i].name) res.data.list[i].name=this.decrypt(res.data.list[i].name)
var d=new Date(res.data.list[i].createtime)
var mon=(parseInt(d.getMonth()) + 1)
res.data.list[i].createtime=d.getFullYear()+"-"+mon+"-"+d.getDate()+" "+d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
res.data.list[i].recordtype=this.getType(res.data.list[i].recordtype) res.data.list[i].recordtype=this.getType(res.data.list[i].recordtype)
} }
this.tableData=res.data.list this.tableData=res.data.list
......
...@@ -262,7 +262,7 @@ this.$api.getlist.selectflowState(data).then((res) => { ...@@ -262,7 +262,7 @@ this.$api.getlist.selectflowState(data).then((res) => {
console.log(d) console.log(d)
if(s==1){ if(s==1){
this.flowTitle="新增流程" this.flowTitle="新增流程"
for(var i =1;i<=6;i++){ for(var i =1;i<=8;i++){
this.titleList.push({ this.titleList.push({
label:this.getType(i), label:this.getType(i),
value:i+","+this.getType(i) value:i+","+this.getType(i)
......
<template>
<div>
<div class="op" style="margin-left: 10px">
<el-button type="success" plain size="mini" @click="dialogNewsFormVisible = true">上传<i class="el-icon-upload el-icon--right"></i></el-button>
</div>
<el-dialog title="发布信息" :visible.sync="dialogNewsFormVisible" >
<el-form ref="pushForm" enctype="multipart/form-data" :model="pushForm" label-width="100px" size="mini" :rules = "formrules" >
<el-form-item label="主题" prop = "newsName">
<el-input v-model="pushForm.newsName" placeholder="请输入主题" size = "medium" ></el-input>
</el-form-item>
<el-form-item label="描述" prop = "remark">
<el-input type = "textarea" :rows="8" placeholder="请输入内容 " v-model="pushForm.remark"></el-input>
</el-form-item>
<el-form-item label="附件上传" prop = "file">
<el-upload
ref="upload"
action=""
:auto-upload="false"
:limit="1"
align="left"
:on-change = "selectFile"
>
<el-button slot="trigger" size="small" class = "el-icon-upload2" type="success" >选取文件</el-button><span style="margin-left: 10px" class="el-upload__tip">不能超过10Mb</span>
</el-upload>
</el-form-item>
<el-form-item size="large">
<el-button size = "mini" type = "primary" @click = "upload('pushForm')">立即发布</el-button>
<el-button size = "mini" @click="closeDialog('pushForm')">取消</el-button>
</el-form-item>
</el-form>
</el-dialog>
<el-table
:data="tableData"
stripe
style="width: 100%">
<el-table-column
label="ID"
prop="id"
v-if = "false"
></el-table-column>
<el-table-column
prop="newsName"
label="标题"
align="center"
width = "180"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
align="center"
width = "180"
>
</el-table-column>
<el-table-column
prop="createBy"
label="操作人"
align="center"
>
</el-table-column>
<el-table-column
prop="remark"
label="描述"
align="center"
width = "300"
>
</el-table-column>
<el-table-column
prop="fileName"
label="文件名"
align="center"
width = "150"
>
</el-table-column>
<el-table-column label="状态" align="center" width="150">
<template slot-scope="scope">
<el-switch
v-model="scope.row.state"
active-color="#13ce66" inactive-color="#ff4949"
active-text = "启用" inactive-text="禁用"
:inactive-value = "0" :active-value = "2"
@change="changeSwitch(scope.row.state,scope.$index)">
</el-switch>
</template>
</el-table-column>
<el-table-column label="操作" align="center"
min-width="80">
<template slot-scope="scope">
<el-button
size="mini"
type="info"
@click="download(scope.$index, scope.row)">下载
</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination
class="pone"
:page-size='10'
layout="total, prev, pager, next, jumper"
:total="totals"
:current-page.sync="Page"
@current-change="current_change">
</el-pagination>
</div>
</template>
<style>
.op{
display: flex;
align-items: center;
}
</style>
<script>
import Cookies from "js-cookie";
import {baseUrl} from "../../utils/global"
import axios from "axios"
let base64 = require('js-base64').Base64
export default {
data() {
let checkFile = (rule, value, callback) => {
let size = value.size/1024/1024
if(size > 10) {
//callback(new Error('上传文件不能超过10Mb'))
this.$message({
message: '上传文件不能超过10Mb',
type: 'error'
});
return;
} else {
callback()
}
};
return {
totals:0,
Page:1,
tableData: [],
dialogNewsFormVisible:false,
pushForm:{
newsName:"",
file:"",
fileName:"",
remark:"",
urlName:"interact",
fileType: 1,
state:0,
toType:2,
},
formrules:{
newsName:[
{required: true, message: '请输入主题', trigger: 'blur'}
],
remark:[
{required: true, message: '请输入描述'}
],
file:[
{required:true,message:'请选择文件'},
{ validator: checkFile}
]
}
}
},
methods:{
closeDialog(form){
this.dialogNewsFormVisible = false
this.$refs[form].resetFields();
this.$refs.upload.clearFiles();
},
selectFile(file){
let This = this;
let reader = new FileReader();
reader.readAsDataURL(file.raw);
this.converBase64(file,function (base64) {
This.pushForm.file = base64;
});
this.pushForm.fileName = file.name;
},
converBase64(file,callback) {
let reader = new FileReader();
reader.readAsDataURL(file.raw);
reader.onload = function (e) {
callback.call(this, this.result.substring(this.result.indexOf(",") + 1));
}
},
download(index,row){
axios.get(baseUrl + '/news/download/'+row.id, {
headers: {
"token": Cookies.get("token")
},
responseType: 'blob'
})
.then(res => {
let a = document.createElement("a");
let blob = new Blob([res.data],{type:""});
a.href = URL.createObjectURL(blob);
a.download = row.fileName;
a.click();
})
.catch(err => {
console.log(err);
});
},
upload(form){
this.$refs[form].validate((valid) => {
if (valid) {
this.$confirm('确认提交吗?', '提示', {}).then(() => {
this.$api.getlist.saveFile(this.pushForm).then((res) => {
if(res.code == 200) {
this.$message({message: '操作成功', type: 'success'})
this.closeDialog('pushForm');
this.current_change(0);
}else {
this.$message({message: '操作失败, ' + res.message, type: 'error'})
}
}).catch((res) => {
});
})
}
})
},
changeSwitch(value, index) {
let str = value == 2 ? '启用':value == 0 ? '禁用': '';
this.$confirm('确认'+ str +'?', '提示', {}).then(() => {
this.$api.getlist.updateFileState(this.tableData[index].id,value).then((res) => {
if(res.code == 200) {
this.$message({message: '操作成功', type: 'success'})
this.current_change(this.pageNum);
}else {
this.$message({message: '操作失败, ' + res.message, type: 'error'})
this.tableData[index].state = this.tableData[index].state == 0 ? 2 : 0;
}
}).catch((res) => {
});
}).catch(() => {
this.tableData[index].state = this.tableData[index].state == 0 ? 2 : 0;
})
},
current_change(s){
var data={
pageNum:s,
pageSize:10
}
this.$api.getlist.getInteracts(data).then((res) => {
this.totals=res.data.total
this.page=res.data.total.pageNum
this.tableData=res.data.list
}).catch((res) => {
});
},
stateFormat(row, column) {
if (row.state === 0) {
return '停用'
} else if (row.state === 1) {
return '默认'
} else if (row.state === 2) {
return '启用'
}
}
},
created(){
var data={
pageNum:1,
pageSize:10
}
this.$api.getlist.getInteracts(data).then((res) => {
this.totals = res.data.total
this.page = res.data.total.pageNum
this.tableData = res.data.list
this.tableData.forEach(element => {
this.tableData.state = this.tableData.state !== 0;
});
}).catch((res) => {
});
}
}
</script>
<template> <template>
<div> <div>
<div class="op" style="margin-left: 10px">
<el-button type="primary" size="mini" @click="dialogNewsFormVisible = true">发布<i class="el-icon-upload el-icon--right"></i></el-button>
</div>
<el-dialog title="发布新闻" width="40%" :visible.sync="dialogNewsFormVisible">
<el-form ref="pushForm" :model="pushForm" label-width="100px" size="mini" :rules = "formrules">
<el-form-item label="新闻主题" prop = "newsName">
<el-input v-model="pushForm.newsName" size = "medium"></el-input>
</el-form-item>
<el-form-item label="访问地址" prop = "urlName">
<el-select v-model="pushForm.urlName" placeholder="请选择"
style="width: 100%;">
<el-option v-for="item in urlNameData" :key="item.val"
:label="item.text" :value="item.val">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="附件上传" prop = "file">
<el-upload
ref="upload"
action=""
:auto-upload="false"
:limit="1"
align="left"
accept = "application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document"
:on-change = "selectFile"
>
<el-button slot="trigger" size="small" class = "el-icon-upload2" type="success">选取文件</el-button><span style="margin-left: 10px" class="el-upload__tip">只能上传word文件,且不超过5Mb</span>
</el-upload>
</el-form-item>
<el-form-item size="large">
<el-button type = "info" @click = "upload('pushForm')">立即发布</el-button>
<el-button @click = "closeDialog('pushForm')">取消</el-button>
</el-form-item>
</el-form>
</el-dialog>
<el-table <el-table
:data="tableData" :data="tableData"
stripe stripe
style="width: 100%"> style="width: 100%">
<el-table-column
prop="id"
v-if="false"
>
</el-table-column>
<el-table-column <el-table-column
prop="newsName" prop="newsName"
label="标题" label="标题"
align="center"
>
</el-table-column>
<el-table-column
prop="urlName"
label="地址"
align="center"
:formatter="urlFormat"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="createTime" prop="createTime"
label="时间" label="创建时间"
align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="createBy" prop="createBy"
label="操作人" label="操作人"
align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
width="180" prop="todayCount"
label="操作"> label="今日访问量"
align = "right"
>
</el-table-column>
<el-table-column
prop="allCount"
label="总访问量"
align = "right"
>
</el-table-column>
<el-table-column label="状态" align="center">
<template slot-scope="scope">
<el-switch
v-model="scope.row.state"
active-color="#13ce66" inactive-color="#ff4949"
active-text = "启用" inactive-text="禁用"
:inactive-value = "0" :active-value = "2"
@change="changeSwitch(scope.row.state,scope.$index)">
</el-switch>
</template>
</el-table-column>
<el-table-column label="操作" align="center"
min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="primary"
size="mini" size="mini"
icon="el-icon-edit-outline" type="info"
@click="handle(scope.$index, scope.row)">编辑</el-button> @click="preview(scope.$index, scope.row)">预览
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -39,34 +110,178 @@ ...@@ -39,34 +110,178 @@
layout="total, prev, pager, next, jumper" layout="total, prev, pager, next, jumper"
:total="totals" :total="totals"
:current-page.sync="Page" :current-page.sync="Page"
@current-change="current_change" @current-change="current_change">
>
</el-pagination> </el-pagination>
<el-dialog width="60%" :visible.sync="preViewVisible">
<div v-html = "content"></div>
</el-dialog>
</div> </div>
</template> </template>
<style>
.op{
display: flex;
align-items: center;
}
</style>
<script> <script>
import Cookies from "js-cookie";
import {baseUrl} from "../../utils/global"
import axios from "axios"
let base64 = require('js-base64').Base64
export default { export default {
data() { data() {
let checkFile = (rule, value, callback) => {
let size = value.size/1024/1024
if(size > 5) {
this.$message({
message: '上传文件不能超过5Mb',
type: 'error'
});
return;
} else {
callback()
}
};
return { return {
totals:0, totals:0,
Page:1, Page:1,
tableData: [] tableData: [],
dialogNewsFormVisible:false,
preViewVisible:false,
content:"",
urlNameData:[{val:'policy',text:'政策解读'},{val:'index',text:'主页'}],
pushForm:{
newsName:"",
file:"",
fileName:"",
remark:"",
urlName:"",
fileType: 1,
state:0,
toType:1
},
formrules:{
newsName:[
{required: true, message: '请输入主题', trigger: 'blur'}
],
urlName:[
{required: true, message: '请选择地址',trigger: 'change blur'}
],
file:[
{required:true,message:'请选择文件'},
{ validator: checkFile}
]
}
} }
}, },
methods:{ methods:{
closeDialog(form){
this.dialogNewsFormVisible = false;
this.$refs[form].resetFields();
this.$refs.upload.clearFiles();
},
selectFile(file){
let This = this;
let reader = new FileReader();
reader.readAsDataURL(file.raw);
this.converBase64(file,function (base64) {
This.pushForm.file = base64;
});
this.pushForm.fileName = file.name;
},
converBase64(file,callback) {
let reader = new FileReader();
reader.readAsDataURL(file.raw);
reader.onload = function (e) {
callback.call(this, this.result.substring(this.result.indexOf(",") + 1));
}
},
urlFormat(row,column) {
switch (row.urlName){
case 'index':
return '主页'
case 'policy':
return '政策解读'
default :
return '';
}
},
preview(index,row){
this.preViewVisible = true;
this.$api.getlist.newsPreView(row.id).then((res)=>{
if(res.code == 200) {
this.content = res.data.htmlStr;
}
}).catch((res)=>{
})
},
changeSwitch(value,index) {
let str = value == 2 ? '启用':value == 0 ? '禁用': '';
this.$confirm('确认'+ str +'?', '提示', {}).then(() => {
this.$api.getlist.updateFileState(this.tableData[index].id,value).then((res) => {
if(res.code == 200) {
this.$message({message: '操作成功', type: 'success'})
this.current_change(this.pageNum);
}else {
this.$message({message: '操作失败, ' + res.message, type: 'error'})
this.tableData[index].state = this.tableData[index].state == 0 ? 2 : 0;
}
}).catch((res) => {
});
}).catch(() => {
this.tableData[index].state = this.tableData[index].state == 0 ? 2 : 0;
})
},
upload(form){
this.$refs[form].validate((valid) => {
if (valid) {
this.$confirm('确认提交吗?', '提示', {}).then(() => {
this.$api.getlist.saveFile(this.pushForm).then((res) => {
if(res.code == 200) {
this.$message({message: '操作成功', type: 'success'})
this.closeDialog('pushForm');
this.current_change(0);
}else {
this.$message({message: '操作失败, ' + res.message, type: 'error'})
}
}).catch((res) => {
});
})
}
})
},
current_change(s){ current_change(s){
var data={ var data={
pageNum:s, pageNum:s,
pageSize:10 pageSize:10
} }
this.$api.getlist.newsList(data).then((res) => { this.$api.getlist.newsList(data).then((res) => {
this.tableData=res.data.list if(res.code == 200) {
this.totals = res.data.total
this.page = res.data.total.pageNum
this.tableData = res.data.list
}
}).catch((res) => { }).catch((res) => {
}); });
},
stateFormat(row, column) {
if (row.state === 0) {
return '停用'
} else if (row.state === 1) {
return '默认'
} else if (row.state === 2) {
return '启用'
}
} }
}, },
created(){ created(){
...@@ -75,11 +290,18 @@ ...@@ -75,11 +290,18 @@
pageSize:10 pageSize:10
} }
this.$api.getlist.newsList(data).then((res) => { this.$api.getlist.newsList(data).then((res) => {
this.tableData=res.data.list if(res.code == 200) {
this.totals = res.data.total
this.page = res.data.total.pageNum
this.tableData = res.data.list
this.tableData.forEach(element => {
this.tableData.state = this.tableData.state !== 0;
});
}
}).catch((res) => { }).catch((res) => {
}); });
} }
} }
</script> </script>
<template>
<div :v-html="content"></div>
</template>
<script>
export default {
data() {
return {
content:""
}
},
methods: {
created() {
}
}
}
</script>
...@@ -169,9 +169,6 @@ ...@@ -169,9 +169,6 @@
for(var i in res.data.list){ for(var i in res.data.list){
res.data.list[i].idcard=this.decrypt(res.data.list[i].idcard) res.data.list[i].idcard=this.decrypt(res.data.list[i].idcard)
res.data.list[i].name=this.decrypt(res.data.list[i].name) res.data.list[i].name=this.decrypt(res.data.list[i].name)
var d=new Date(res.data.list[i].createtime)
var mon=(parseInt(d.getMonth()) + 1)
res.data.list[i].createtime=d.getFullYear()+"-"+mon+"-"+d.getDate()+" "+d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
res.data.list[i].recordtype=this.getType(res.data.list[i].recordtype) res.data.list[i].recordtype=this.getType(res.data.list[i].recordtype)
} }
this.tableData=res.data.list this.tableData=res.data.list
...@@ -241,9 +238,6 @@ ...@@ -241,9 +238,6 @@
for(var i in res.data.list){ for(var i in res.data.list){
res.data.list[i].idcard=this.decrypt(res.data.list[i].idcard) res.data.list[i].idcard=this.decrypt(res.data.list[i].idcard)
res.data.list[i].name=this.decrypt(res.data.list[i].name) res.data.list[i].name=this.decrypt(res.data.list[i].name)
var d=new Date(res.data.list[i].createtime)
var mon=(parseInt(d.getMonth()) + 1)
res.data.list[i].createtime=d.getFullYear()+"-"+mon+"-"+d.getDate()+d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
res.data.list[i].recordtype=this.getType(res.data.list[i].recordtype) res.data.list[i].recordtype=this.getType(res.data.list[i].recordtype)
} }
this.tableData=res.data.list this.tableData=res.data.list
...@@ -434,9 +428,6 @@ ...@@ -434,9 +428,6 @@
for(var i in res.data.list){ for(var i in res.data.list){
res.data.list[i].idcard=this.decrypt(res.data.list[i].idcard) res.data.list[i].idcard=this.decrypt(res.data.list[i].idcard)
res.data.list[i].name=this.decrypt(res.data.list[i].name) res.data.list[i].name=this.decrypt(res.data.list[i].name)
var d=new Date(res.data.list[i].createtime)
var mon=(parseInt(d.getMonth()) + 1)
res.data.list[i].createtime=d.getFullYear()+"-"+mon+"-"+d.getDate()+" "+d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
res.data.list[i].recordtype=this.getType(res.data.list[i].recordtype) res.data.list[i].recordtype=this.getType(res.data.list[i].recordtype)
} }
console.log(12312312) console.log(12312312)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment