diff --git a/package.json b/package.json index 5e0eb38..85c10fb 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "quill-image-drop-module": "^1.0.3", "quill-image-extend-module": "^1.1.2", "quill-image-resize-module": "^3.0.0", + "svg-sprite-loader": "^6.0.11", "uuid": "^3.4.0", "vue": "^2.6.11", "vue-axios": "^3.4.0", diff --git a/src/api/modules/dictionary.js b/src/api/modules/dictionary.js index e1e94a6..8138474 100644 --- a/src/api/modules/dictionary.js +++ b/src/api/modules/dictionary.js @@ -1,6 +1,7 @@ import { instance as request } from '@/utils/request' export default { + //外层 addDic (data) { return request({ url: '/api/sys/dict/add', @@ -29,4 +30,40 @@ export default { params:data }) }, + //内层 + addItemDic (data) { + return request({ + url: '/api/sys/dictItem/add', + method: 'post', + data + }) + }, + editItemDic (data) { + return request({ + url: '/api/sys/dictItem/edit', + method: 'put', + data + }) + }, + getItemDic (data) { + return request({ + url: '/api/sys/dictItem/page', + method: 'get', + params:data + }) + }, + delItemDic (data) { + return request({ + url: '/api/sys/dictItem/delete', + method: 'delete', + params:data + }) + }, + // 获取字典值 + getCode(data) { + return request({ + url: '/api/sys/dictItem/'+data, + method: 'get', + }) + } } diff --git a/src/api/modules/org.js b/src/api/modules/org.js new file mode 100644 index 0000000..013c412 --- /dev/null +++ b/src/api/modules/org.js @@ -0,0 +1,35 @@ +import { instance as request } from '@/utils/request' + +export default { + // 新增|编辑 + sysOrgAddUser (data) { + return request({ + url: '/api/sys/org/saveOrUpdate', + method: 'POST', + data + }) + }, + // // 用户启用或禁用 + // sysUserIsUse (data) { + // return request({ + // url: `/api/sys/user/isUse/${data.USID}/${data.type}`, + // method: 'POST' + // }) + // }, + // 获取所有部门 + sysOrgList (data) { + return request({ + url: '/api/sys/org/page', + method: 'POST', + data + }) + }, + // 删除部门 + sysOrgDelete (data) { + return request({ + url: '/api/sys/org/delete', + method: 'POST', + params: data + }) + } +} diff --git a/src/components/Header.vue b/src/components/Header.vue index 501905a..616c108 100644 --- a/src/components/Header.vue +++ b/src/components/Header.vue @@ -86,6 +86,7 @@ export default { this.$store.commit('saveUserInfo', null) this.$store.commit('setHandleProcess', null) this.$store.commit('savePathUrl', null) + this.$store.commit('removeDicts', null) // var sevice = "http://"+window.location.host+"/"; // var serviceUrl = encodeURIComponent(sevice); // 正式 diff --git a/src/components/ProcessMixin.vue b/src/components/ProcessMixin.vue index 796e336..6dfc558 100644 --- a/src/components/ProcessMixin.vue +++ b/src/components/ProcessMixin.vue @@ -9,9 +9,21 @@ return { processTypeList: [ { - label: '权限申请流程', + label: '下载申请流程', value: '1' }, + { + label: '预览申请流程', + value: '2' + }, + { + label: '预览+下载申请流程', + value: '3' + }, + { + label: '上传审批流程', + value: '4' + }, ], formDisableFlag: false, nowOrder: '', diff --git a/src/components/SvgIcon.vue b/src/components/SvgIcon.vue new file mode 100644 index 0000000..27da76c --- /dev/null +++ b/src/components/SvgIcon.vue @@ -0,0 +1,43 @@ + + + + + diff --git a/src/components/dict.js b/src/components/dict.js new file mode 100644 index 0000000..0da9263 --- /dev/null +++ b/src/components/dict.js @@ -0,0 +1,58 @@ +// 混入字典方法 做到按需加载 +import interfaces from "@/api/modules/dictionary"; +import store from "@/store"; +import Vue from "vue"; + +class Dict { + constructor(dict) { + this.dict = dict; + } + + async init(names) { + const ps = []; + names.forEach((name) => { + if (store.getters.dicts[name]) { + Vue.set(this.dict, name, store.getters.dicts[name]); + } else { + Vue.set(this.dict, name, []); + ps.push( + interfaces.getCode(name).then((res) => { + this.dict[name] = Object.freeze(res.data); + store.dispatch('setDicts_a', { + label: name, + value: Object.freeze(res.data), + }) + }) + ); + + } + }); + await Promise.all(ps); + } +} + +const install = function (Vue) { + Vue.mixin({ + data() { + if ( + this.$options.dicts instanceof Array && + this.$options.dicts.length > 0 + ) { + return { dict: {} }; + } else { + return {}; + } + }, + created() { + if ( + this.$options.dicts instanceof Array && + this.$options.dicts.length > 0 + ) { + new Dict(this.dict).init(this.$options.dicts); + } + }, + }); +}; + +export default { install }; + diff --git a/src/icon/index.js b/src/icon/index.js new file mode 100644 index 0000000..2c6b309 --- /dev/null +++ b/src/icon/index.js @@ -0,0 +1,9 @@ +import Vue from 'vue' +import SvgIcon from '@/components/SvgIcon'// svg component + +// register globally +Vue.component('svg-icon', SvgIcon) + +const req = require.context('./svg', false, /\.svg$/) +const requireAll = requireContext => requireContext.keys().map(requireContext) +requireAll(req) diff --git a/src/icon/svg/pointe.svg b/src/icon/svg/pointe.svg new file mode 100644 index 0000000..e5cc7b0 --- /dev/null +++ b/src/icon/svg/pointe.svg @@ -0,0 +1 @@ + diff --git a/src/icon/svg/pointe_fill.svg b/src/icon/svg/pointe_fill.svg new file mode 100644 index 0000000..5c82f5e --- /dev/null +++ b/src/icon/svg/pointe_fill.svg @@ -0,0 +1 @@ + diff --git a/src/main.js b/src/main.js index 26b2d10..558b169 100644 --- a/src/main.js +++ b/src/main.js @@ -35,13 +35,14 @@ import VueQuillEditor from 'vue-quill-editor' import 'quill/dist/quill.core.css' import 'quill/dist/quill.snow.css' import 'quill/dist/quill.bubble.css' - +import dict from '@/components/dict' +import './icon' VXETable.setup({ table: { resizable: true } }) - +Vue.use(dict); Vue.use(VXETable) Vue.use(VueQuillEditor) Vue.use(ElementUI, { size: 'mini', zIndex: 3000 }) diff --git a/src/router/modules/system.js b/src/router/modules/system.js index e2d3c41..ca0262e 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -32,6 +32,15 @@ const routes = [ crumb: ['角色管理'] } }, + // 组织机构管理 + { + path: 'Org', + name: 'Org', + component: () => import('../../views/System/Org.vue'), + meta: { + crumb: ['组织机构管理'] + } + }, // // 角色管理 // { // path: 'mail', diff --git a/src/store/index.js b/src/store/index.js index 56fb363..c57283a 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -14,7 +14,8 @@ export default new Vuex.Store({ menuName: '', activeTab: '', handleProcess: '', - marketpre:'' + marketpre:'', + dicts:{} }, getters: { marketpre: (state) => state.marketpre, @@ -22,9 +23,16 @@ export default new Vuex.Store({ menuName: (state) => state.menuName, userInfo: (state) => state.userInfo, activeTab: (state) =>state.activeTab, - handleProcess: (state) =>state.handleProcess + handleProcess: (state) =>state.handleProcess, + dicts: (state) =>state.dicts }, mutations: { + setDicts(state, obj) { + state.dicts[obj.label] = obj.value; + }, + removeDicts(state, obj) { + state.dicts = {} + }, setMarketpre(state, data){ state.marketpre = data }, @@ -53,7 +61,11 @@ export default new Vuex.Store({ state.menuName = data } }, - actions: {}, + actions: { + setDicts_a({ commit }, obj) { + commit('setDicts', obj) + }, + }, modules: {}, plugins: [createPersistedState()] }) diff --git a/src/utils/request.js b/src/utils/request.js index 2e411ef..fa68921 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -82,6 +82,7 @@ instance.interceptors.response.use(function (response) { if (error.response.data.status == 401) { store.commit('savePathUrl', null) store.commit('setHandleProcess', null) + store.commit('removeDicts', null) router.push('/login') Message.error('登录超时过期') // window.open(BASE_URL.BASE_CHANGAN + "/logout?service=" + BASE_URL.BASE_LOCAL + "/login?loginType=1", '_self'); @@ -95,6 +96,7 @@ instance.interceptors.response.use(function (response) { if (error.response.status === 500) { store.commit('savePathUrl', null) store.commit('setHandleProcess', null) + store.commit('removeDicts', null) router.push('/login') Message.error('登录超时过期') // window.open(BASE_URL.BASE_CHANGAN + "/logout?service=" + BASE_URL.BASE_LOCAL + "/login?loginType=1", '_self'); diff --git a/src/utils/waterMark.js b/src/utils/waterMark.js index 6cbe521..5818d16 100644 --- a/src/utils/waterMark.js +++ b/src/utils/waterMark.js @@ -22,11 +22,12 @@ Vue.directive('watermark', { can.style.display = 'none' const cans = can.getContext('2d') cans.rotate(-20 * Math.PI / 180) - cans.font = font || '13px Microsoft Yahei' + cans.font = font || '13px Helvetica Neue' cans.fillStyle = textColor || 'rgba(100, 100, 100, 0.2)' cans.textAlign = 'left' cans.textBaseline = 'Middle' cans.fillText(str, fillTextX, can.height) + console.log(cans) // 设置背景图（整个项目中都添加水印建议使用此方法） // parentNode.style.backgroundImage = "url(" + can.toDataURL("image/png") + ")"; diff --git a/src/views/Report/ReportDetail.vue b/src/views/Report/ReportDetail.vue index 7cb966b..fd4c33e 100644 --- a/src/views/Report/ReportDetail.vue +++ b/src/views/Report/ReportDetail.vue @@ -7,6 +7,10 @@
+ + +
{{ row.createUserName }}
+
{{ getKeyContent(row.keyContent) }}
@@ -19,6 +23,14 @@
{{ row.department || '-' }}
 + + +
{{ row.confidentialLevel || '-' }}
+ + + +
{{ row.labelList || '-' }}
+
@@ -28,6 +40,43 @@
+
+
+ 报告满意度: +
+
+ + + +
+
+
+ + + 评论 + + + + + + 发表评论 + + +
+
sss
+
+
ssss
+
+
time
+ 删除 +
+
+ +
+
+
+ +
@@ -39,6 +88,8 @@ export default { name: 'ReportDetail', data () { return { + isShow: false, + value1:'', watermarkText: '', // 水印 content: '', row: {} @@ -81,10 +132,13 @@ export default { // cancelButtonText: '取消', // type: 'warning' // }).then(() => { - this.$api.report.reportDownload({ fileId: row.fileId }).then(res => { + this.$api.report.reportDownload({ fileId: row.fileId,repostId:row.id }).then(res => { downloadFile(res) }) // }) + }, + saveScore(){ + } }, created () { @@ -179,6 +233,64 @@ export default { } } + .report-jug{ + display: flex; + justify-content: space-between; + padding: 10px; + .report-jug-left{ + display: flex; + } + } + .juggle_box{ + padding: 10px; + .all_juggle{ + margin-top: 20px; + display: flex; + width: 100%; + border: 1px solid #e6f6fe; + min-height: 150px; + .juggle_left{ + width: 15%; + text-align: center; + border-right: 1px solid #e6f6fe; + margin: 0 auto; + } + .juggle_right{ + position: relative; + width: 85%; + padding: 20px; + .content{ + width: 100%; + } + .bottom{ + position: absolute; + display: flex; + justify-content: space-between; + width: calc(100% - 40px); + bottom: 10px; + left: 20px; + height: 30px; + .time{ + line-height: 30px; + color: #ccc; + } + .delbtn{ + vertical-align: center; + } + } + } + } + .fabiaoBtn{ + margin-left: 20px; + height: 100%; + } + } + .isBackground{ + background-color: pink; + } + } + .pointclick{ + cursor: pointer; } diff --git a/src/views/Report/ReportList.vue b/src/views/Report/ReportList.vue index 59645ce..56bb9bf 100644 --- a/src/views/Report/ReportList.vue +++ b/src/views/Report/ReportList.vue @@ -97,8 +97,16 @@ - 权限申请 + + 权限申请 + +
+ 时间 + 点击量 + 下载量 +
+
@@ -172,16 +180,30 @@ + + - - - - - + + + + + @@ -68,22 +70,23 @@
-
- - - +
+ + + + + + - - - - - + + - - + +
@@ -99,55 +102,114 @@ export default { name: 'standLawsAttrDetails', data(){ + const validateData= (rule, value, callback) =>{ + let test=/^[0-9]*$/ + if (!test.test(value)) { + callback(new Error('请输入数字值')); + }else{ + callback() + } + } return{ form:{ - + itemName:'', + itemValue:'', + itemDescription:'', + itemOrder:'' }, total:0, q:{ pageNo:1, pageSize:10, - account:'' + itemName:'' }, tableData:[{inde:1}], mode:'', - dialogUser:false + dialogUser:false, + dicId:'', + dicName:'', + formRule:{ + itemName:[{ + required:true, + message:'选项不能为空', + trigger:'change' + }], + itemValue:[{ + required:true, + message:'选项值不能为空', + trigger:'change' + }], + itemOrder:[{ + required:true, + message:'排序不能为空', + trigger:'change' + },{ + validator:validateData, trigger:'change' + }], + } } }, + mounted() { + this.dicName=this.$route.query.pName + this.dicId=this.$route.query.pId + this.loadData() + }, methods:{ // 编辑查看用户 openRowData (mode, row) { this.mode = mode - this.form = { - account: row.ACCOUNT, // 用户名 - cellPhoneNumber: row.CELLPHONE_NUMBER, // 手机号 - department: row.DEPARTMENT, // 部门 - email: row.EMAIL, // 邮箱 - password: '', // 密码 - usid: row.USID, // 用户ID - usname: row.USNAME, // 姓名 - roleIdList: [row.ROLEID] // 角色 - } + this.form=JSON.parse(JSON.stringify(row)) this.dialogUser = true }, sysUserAddUser(){ + if( this.checkUserForm()){ + if(this.mode=='add'){ + this.$api.dictionary.addItemDic(this.form).then((res)=>{ + this.$message.success("新增成功") + this.loadData() + }) + }else{ + this.$api.dictionary.editItemDic(this.form).then((res)=>{ + this.$message.success("编辑成功") + this.loadData() + }) + } + + this.dialogUser = false + } + + + + }, + checkUserForm () { + if (!this.form.itemName) { + return this.$message.warning('请检查选项') && false + } + if (!this.form.itemValue) { + return this.$message.warning('请检查选项值') && false + } + if (this.form.itemOrder && !(/^[0-9]*$/.test(this.form.itemOrder))) { + return this.$message.warning('请检查排序') && false + } + return true }, // 新增 add () { this.mode = 'add' this.form = { - account: '', // 用户名 - cellPhoneNumber: '', // 手机号 - department: '', // 部门 - email: '', // 邮箱 - password: '', // 密码 - usid: '', - usname: '', // 姓名 - roleIdList: [''] // 角色 + itemName:'', + itemValue:'', + itemDescription:'', + itemOrder:'', + dicId:this.dicId } this.dialogUser = true + this.$nextTick(()=>{ + this.$refs.addForm.clearValidate() + + }) }, // 批量删除 getSelectUser () { @@ -169,9 +231,9 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - this.$api.user.sysUserDelete({ ids }).then(_ => { + this.$api.dictionary.delItemDic({ ids }).then(_ => { this.$message.success('操作成功') - this.sysUserList() + this.loadData() }) }) }, @@ -184,7 +246,10 @@ export default { this.loadData() }, loadData(){ - + this.$api.dictionary.getItemDic({...this.q,dicId:this.dicId}).then((res)=>{ + this.tableData = res.data.records + this.total=res.data.total + }) }, search() { this.q.pageNo = 1 @@ -194,7 +259,8 @@ export default { this.q = { pageNo:1, pageSize:10, - account:'' + itemName:'', + dicId: this.dicId } this.loadData() }, @@ -312,7 +378,7 @@ export default { padding-right: 79px; .el-form-item { - margin-bottom: 10px; + //margin-bottom: 10px; .el-form-item__label { height: 36px; diff --git a/src/views/permissionApplication/components/reportTable.vue b/src/views/permissionApplication/components/reportTable.vue index f1cb5d4..7faec31 100644 --- a/src/views/permissionApplication/components/reportTable.vue +++ b/src/views/permissionApplication/components/reportTable.vue @@ -156,7 +156,7 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - if (this.$route.query.taskDefinitionKey == 'aid4' ){ + if (this.$route.query.taskDefinitionKey == 'reEdit' ){ // 有idde console.log(this.value) debugger @@ -217,7 +217,7 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - if (this.$route.query.taskDefinitionKey == 'aid4' ){ + if (this.$route.query.taskDefinitionKey == 'reEdit' ){ if(row.id && row.id !=''){ // this.$api.permissionProcess.deletReport({ids:[row.id]}).then(()=>{ this.$emit('updateTable',this.value.filter(item => item.id !== row.id),[row.reportId]) diff --git a/src/views/permissionApplication/launch.vue b/src/views/permissionApplication/launch.vue index 2d10ca8..7e1997c 100644 --- a/src/views/permissionApplication/launch.vue +++ b/src/views/permissionApplication/launch.vue @@ -236,7 +236,7 @@ export default { }) } - if (this.$route.query.taskDefinitionKey == 'aid4' ) { + if (this.$route.query.taskDefinitionKey == 'reEdit' ) { this.taskId = this.$store.getters.handleProcess.taskId this.prcNum = this.$store.getters.handleProcess.prcNum this.prcId = this.$store.getters.handleProcess.prcId @@ -376,7 +376,7 @@ export default { }, handleReset() { this.processForm.prcName = '' - if(this.$route.query.taskDefinitionKey == 'aid4'){ + if(this.$route.query.taskDefinitionKey == 'reEdit'){ this.processForm.prcName = this.prcName } this.applicationForm = { diff --git a/src/views/reportProcess/components/reportForm.vue b/src/views/reportProcess/components/reportForm.vue index 9a2a3c2..10c9a49 100644 --- a/src/views/reportProcess/components/reportForm.vue +++ b/src/views/reportProcess/components/reportForm.vue @@ -35,8 +35,8 @@ - + @@ -67,7 +67,7 @@ - + @@ -148,6 +148,7 @@ import newTranslate from "../../../components/newTranslate"; import VueTagsInput from '@johmun/vue-tags-input'; export default { + dicts:['classified_level','privacy_level'], components: { VueTagsInput, newTranslate @@ -244,6 +245,12 @@ export default { fileList:[] } }, + watch:{ + processForm(val){ + debugger + this.form=this.processForm + } + }, methods: { loadMore(){ this.q.pageNo++ diff --git a/src/views/reportProcess/examine.vue b/src/views/reportProcess/examine.vue index a0240b5..e1ddbf6 100644 --- a/src/views/reportProcess/examine.vue +++ b/src/views/reportProcess/examine.vue @@ -102,7 +102,7 @@ export default { }, PERMISSION, submitjson:{}, - prcType:1 + prcType:2 } }, created () { @@ -110,7 +110,7 @@ export default { this.prcNum=this.$store.getters.handleProcess.prcNum this.prcId=this.$store.getters.handleProcess.prcId this.prcName=this.$store.getters.handleProcess.prcName - this.$set(this.processForm,'prcName',this.prcName) + let params={ prcId: this.prcId, @@ -121,7 +121,7 @@ export default { } this.getProcessDetail(params).then(res=>{ this.processForm = JSON.parse(this.processOld.dataJson) - + this.$set(this.processForm,'prcName',this.prcName) this.disabled=false this.formControl= true if(this.$route.query.type=='yiban'){ diff --git a/src/views/reportProcess/launch.vue b/src/views/reportProcess/launch.vue index 284260c..62c6db8 100644 --- a/src/views/reportProcess/launch.vue +++ b/src/views/reportProcess/launch.vue @@ -188,7 +188,7 @@ export default { }) } - if (this.$route.query.taskDefinitionKey == 'aid4' ) { + if (this.$route.query.taskDefinitionKey == 'reEdit' ) { this.taskId = this.$store.getters.handleProcess.taskId this.prcNum = this.$store.getters.handleProcess.prcNum this.prcId = this.$store.getters.handleProcess.prcId @@ -231,7 +231,7 @@ export default { methods: { handleReset() { this.processForm.prcName = '' - if(this.$route.query.taskDefinitionKey == 'aid4'){ + if(this.$route.query.taskDefinitionKey == 'reEdit'){ this.processForm.prcName = this.prcName } this.applicationForm = { @@ -244,7 +244,6 @@ export default { twoApprove: '' } this.$nextTick(() => { - this.$refs.applicationFormRef.clearValidate() this.$refs.assignFormRef.clearValidate() }) diff --git a/src/views/userCenter/processCenter/finishProcess.vue b/src/views/userCenter/processCenter/finishProcess.vue index dec8084..321e193 100644 --- a/src/views/userCenter/processCenter/finishProcess.vue +++ b/src/views/userCenter/processCenter/finishProcess.vue @@ -118,7 +118,7 @@ export default { this.$store.commit('setHandleProcess',params) switch (row.prcType) { case '1' : - if (row.taskDefinitionKey == 'aid1' || row.taskDefinitionKey == 'aid4') { + if (row.taskDefinitionKey == 'start' || row.taskDefinitionKey == 'reEdit') { this.$router.push({ path: '/permission/launch', query: { @@ -136,7 +136,27 @@ export default { taskDefinitionKey:row.taskDefinitionKey } }) - } + };break; + case '2' : + if (row.taskDefinitionKey == 'start' || row.taskDefinitionKey == 'reEdit') { + this.$router.push({ + path: '/reportprocess/launch', + query: { + id: this.$route.query.id, + type:'yiban', + taskDefinitionKey:row.taskDefinitionKey + } + }) + }else{ + this.$router.push({ + path: '/reportprocess/examine', + query: { + id: this.$route.query.id, + type:'yiban', + taskDefinitionKey:row.taskDefinitionKey + } + }) + };break; } }, } diff --git a/src/views/userCenter/processCenter/gencyProcess.vue b/src/views/userCenter/processCenter/gencyProcess.vue index 564a99d..ca3e83e 100644 --- a/src/views/userCenter/processCenter/gencyProcess.vue +++ b/src/views/userCenter/processCenter/gencyProcess.vue @@ -109,7 +109,7 @@ export default { switch (row.prcType) { case '1' : debugger - if (row.taskDefinitionKey == 'aid4') { + if (row.taskDefinitionKey == 'reEdit') { this.$router.push({ path: '/permission/launch', query: { @@ -127,7 +127,27 @@ export default { prcName: row.prcName } }) - } + };break; + case '2' : + if (row.taskDefinitionKey == 'start' || row.taskDefinitionKey == 'reEdit') { + this.$router.push({ + path: '/reportprocess/launch', + query: { + id: this.$route.query.id, + prcName: row.prcName, + taskDefinitionKey:row.taskDefinitionKey + } + }) + }else{ + this.$router.push({ + path: '/reportprocess/examine', + query: { + id: this.$route.query.id, + prcName: row.prcName, + taskDefinitionKey:row.taskDefinitionKey + } + }) + };break; } }, }, diff --git a/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue b/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue index 1d4109b..38fbeef 100644 --- a/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue +++ b/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue @@ -121,7 +121,7 @@ export default { pId: this.pId } if(this.prcType == '1'){ - if(this.aid=='aid2'){ + if(this.aid=='oneApply'){ params.replaceMap="oneApprove:"+ this.form.assignee+','+"oneApproveName:"+ this.form.assigneeName }else{ params.replaceMap="twoApprove:"+ this.form.assignee+','+"twoApproveName:"+ this.form.assigneeName diff --git a/src/views/userCenter/processCenter/sentProcess.vue b/src/views/userCenter/processCenter/sentProcess.vue index 138690e..f7011bc 100644 --- a/src/views/userCenter/processCenter/sentProcess.vue +++ b/src/views/userCenter/processCenter/sentProcess.vue @@ -106,8 +106,8 @@ export default { res.isViewDetails = 1 res.prcType = prcType res.prcNum = row.prcNum - if (res.taskDefinitionKey == 'aid1' || - res.taskDefinitionKey == 'aid4' ) { + if (res.taskDefinitionKey == 'start' || + res.taskDefinitionKey == 'reEdit' ) { this.$router.push({ path: '/permission/launch', query: res, diff --git a/vue.config.js b/vue.config.js index 41d24d5..1f3e690 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,6 +1,9 @@ const webpack = require('webpack') +const path = require('path') +function resolve (dir) { + return path.join(__dirname, dir) +} module.exports = { - lintOnSave: false, // publicPath: '/mi', outputDir: 'dist', // 运行时生成的生产环境构建文件的目录(默认''dist''，构建之前会被清除) assetsDir: 'static', // 放置生成的静态资源(s、css、img、fonts)的(相对于 outputDir 的)目录(默认'') @@ -18,13 +21,28 @@ module.exports = { }, // 请求静态图片配置项 '/api/home/pic': { - target: 'http://localhost:7061', // 图片请求的nginx网址 + target: 'http://10.94.1.164:7061', // 图片请求的nginx网址 changeOrigin: true } } }, chainWebpack: config => { + config.module + .rule('svg') + .exclude.add(resolve('src/icon')) + .end() + config.module + .rule('icons') + .test(/\.svg$/) + .include.add(resolve('src/icon')) + .end() + .use('svg-sprite-loader') + .loader('svg-sprite-loader') + .options({ + symbolId: 'icon-[name]' + }) + .end() config.plugin('html').tap(args => { args[0].title = '大众' return args @@ -50,5 +68,6 @@ module.exports = { // Enumerable: "linq" }) ] - } + }, + }