Skip to content

G
gdtel-gztel-school-center-ui
Commit 53cef792 by 董有沛
Options

菜单调整

parent 79e9e336
Showing with 22 additions and 295 deletions
public/UE/third-party/SyntaxHighlighter/shCore.js
...@@ -2389,7 +2389,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ...@@ -2389,7 +2389,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter :
{ {
// Created by Peter Atoria @ http://iAtoria.com // Created by Peter Atoria @ http://iAtoria.com
var inits = 'class interface function packageManagement'; var inits = 'class interface function productManagement';
var keywords = '-Infinity ...rest Array as AS3 Boolean break case catch const continue Date decodeURI ' + var keywords = '-Infinity ...rest Array as AS3 Boolean break case catch const continue Date decodeURI ' +
'decodeURIComponent default delete do dynamic each else encodeURI encodeURIComponent escape ' + 'decodeURIComponent default delete do dynamic each else encodeURI encodeURIComponent escape ' +
...@@ -2926,7 +2926,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ...@@ -2926,7 +2926,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter :
// http://jroller.com/aalmiray/entry/nice_source_code_syntax_highlighter // http://jroller.com/aalmiray/entry/nice_source_code_syntax_highlighter
var keywords = 'as assert break case catch class continue def default do else extends finally ' + var keywords = 'as assert break case catch class continue def default do else extends finally ' +
'if in implements import instanceof interface new packageManagement property return switch ' + 'if in implements import instanceof interface new productManagement property return switch ' +
'throw throws try while public protected private static'; 'throw throws try while public protected private static';
var types = 'void boolean byte char short int long float double'; var types = 'void boolean byte char short int long float double';
var constants = 'null'; var constants = 'null';
...@@ -2977,7 +2977,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ...@@ -2977,7 +2977,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter :
'continue default do double else enum extends ' + 'continue default do double else enum extends ' +
'false final finally float for goto if implements import ' + 'false final finally float for goto if implements import ' +
'instanceof int interface long native new null ' + 'instanceof int interface long native new null ' +
'packageManagement private protected public return ' + 'productManagement private protected public return ' +
'short static strictfp super switch synchronized this throw throws true ' + 'short static strictfp super switch synchronized this throw throws true ' +
'transient try void volatile while'; 'transient try void volatile while';
...@@ -3023,7 +3023,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ...@@ -3023,7 +3023,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter :
var keywords = 'abstract after and as assert at before bind bound break catch class ' var keywords = 'abstract after and as assert at before bind bound break catch class '
+ 'continue def delete else exclusive extends false finally first for from ' + 'continue def delete else exclusive extends false finally first for from '
+ 'function if import in indexof init insert instanceof into inverse last ' + 'function if import in indexof init insert instanceof into inverse last '
+ 'lazy mixin mod nativearray new not null on or override packageManagement postinit ' + 'lazy mixin mod nativearray new not null on or override productManagement postinit '
+ 'protected public public-init public-read replace return reverse sizeof ' + 'protected public public-init public-read replace return reverse sizeof '
+ 'step super then this throw true try tween typeof var where while with ' + 'step super then this throw true try tween typeof var where while with '
+ 'attribute let private readonly static trigger' + 'attribute let private readonly static trigger'
...@@ -3119,7 +3119,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ...@@ -3119,7 +3119,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter :
var keywords = var keywords =
'bless caller continue dbmclose dbmopen die do dump else elsif eval exit ' + 'bless caller continue dbmclose dbmopen die do dump else elsif eval exit ' +
'for foreach goto if import last local my next no our packageManagement redo ref ' + 'for foreach goto if import last local my next no our productManagement redo ref ' +
'require return sub tie tied unless untie until use wantarray while ' + 'require return sub tie tied unless untie until use wantarray while ' +
// feature // feature
'given when default ' + 'given when default ' +
...@@ -3143,7 +3143,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ...@@ -3143,7 +3143,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter :
{ regex: SyntaxHighlighter.regexLib.doubleQuotedString, css: 'string' }, { regex: SyntaxHighlighter.regexLib.doubleQuotedString, css: 'string' },
{ regex: SyntaxHighlighter.regexLib.singleQuotedString, css: 'string' }, { regex: SyntaxHighlighter.regexLib.singleQuotedString, css: 'string' },
// currently ignoring single quote packageManagement separator and utf8 names // currently ignoring single quote productManagement separator and utf8 names
{ regex: /(?:&|[$@%*]|\$#)[a-zA-Z_](\w+|::)*/g, css: 'variable' }, { regex: /(?:&|[$@%*]|\$#)[a-zA-Z_](\w+|::)*/g, css: 'variable' },
{ regex: /\b__(?:END|DATA)__\b[\s\S]*$/g, css: 'comments' }, { regex: /\b__(?:END|DATA)__\b[\s\S]*$/g, css: 'comments' },
{ regex: /(^|\n)=\w[\s\S]*?(\n=cut\s*\n|$)/g, css: 'comments' }, // pod { regex: /(^|\n)=\w[\s\S]*?(\n=cut\s*\n|$)/g, css: 'comments' }, // pod
...@@ -3486,7 +3486,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter : ...@@ -3486,7 +3486,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter :
var keywords = 'val sealed case def true trait implicit forSome import match object null finally super ' + var keywords = 'val sealed case def true trait implicit forSome import match object null finally super ' +
'override try lazy for var catch throw type extends class while with new final yield abstract ' + 'override try lazy for var catch throw type extends class while with new final yield abstract ' +
'else do if return protected private this packageManagement false'; 'else do if return protected private this productManagement false';
var keyops = '[_:=><%#@]+'; var keyops = '[_:=><%#@]+';
......
public/js/jsencrypt.js
...@@ -3290,7 +3290,7 @@ var KJUR = {}; ...@@ -3290,7 +3290,7 @@ var KJUR = {};
* <p> * <p>
* This is ITU-T X.690 ASN.1 DER encoder class library and * This is ITU-T X.690 ASN.1 DER encoder class library and
* class structure and methods is very similar to * class structure and methods is very similar to
* org.bouncycastle.asn1 packageManagement of * org.bouncycastle.asn1 productManagement of
* well known BouncyCaslte Cryptography Library. * well known BouncyCaslte Cryptography Library.
* <h4>PROVIDING ASN.1 PRIMITIVES</h4> * <h4>PROVIDING ASN.1 PRIMITIVES</h4>
* Here are ASN.1 DER primitive classes. * Here are ASN.1 DER primitive classes.
......
src/api/school-center/packageManagementAPI.js
...@@ -8,7 +8,7 @@ let findByList = (params) => postAction(prefix + "/packageManagement/package/lis ...@@ -8,7 +8,7 @@ let findByList = (params) => postAction(prefix + "/packageManagement/package/lis
let choosepages = (params) => postAction(prefix + "/packageManagement/package/choosepages" , params); let choosepages = (params) => postAction(prefix + "/packageManagement/package/choosepages" , params);
// 编辑 // 编辑
let modify = (params) => postAction(prefix + "/packageManagement/package/update" , params); let modify = (params) => postAction(prefix + "/productManagement/package/update" , params);
//新增 //新增
let insert= (params) => postAction(prefix + "/packageManagement/package/insert" , params); let insert= (params) => postAction(prefix + "/packageManagement/package/insert" , params);
......
src/api/school-center/schoolpackageAPI.js
...@@ -2,7 +2,7 @@ import {postAction,getAotion} from '@/api/manage' ...@@ -2,7 +2,7 @@ import {postAction,getAotion} from '@/api/manage'
const prefix = '/manager/ciop'; const prefix = '/manager/ciop';
// 获取活动列表 // 获取活动列表
let packagefindByList = (params) => postAction(prefix + "/school/packageManagement/list" , params); let packagefindByList = (params) => postAction(prefix + "/school/productManagement/list" , params);
export { export {
packagefindByList packagefindByList
......
src/views/poster/newPoster.vue → src/views/school-center/activity/newPoster.vue
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
</template> </template>
<script> <script>
import CodeMove from "../../components/sysmanage/codeMove"; import CodeMove from "../../../components/sysmanage/codeMove";
import html2canvas from "html2canvas"; import html2canvas from "html2canvas";
import ACol from "ant-design-vue/es/grid/Col"; import ACol from "ant-design-vue/es/grid/Col";
......
src/views/school-center/packageManagement/package.vue → src/views/school-center/productManagement/package.vue
...@@ -147,8 +147,8 @@ ...@@ -147,8 +147,8 @@
fileListxiaotu:[], fileListxiaotu:[],
fileid:{}, fileid:{},
brackgroundurl:"manager/ciop/packageManagement/package/backgroundUpload", brackgroundurl:"manager/ciop/productManagement/package/backgroundUpload",
xiaotuurl:"manager/ciop/packageManagement/package/xiaotuUpload", xiaotuurl:"manager/ciop/productManagement/package/xiaotuUpload",
Formtable: this.$form.createForm(this, {name: 'Formtable'}), Formtable: this.$form.createForm(this, {name: 'Formtable'}),
//输入框列表 //输入框列表
autoCompleteResult:[], autoCompleteResult:[],
......
src/views/school-center/schoolOther/schoolAllocation.vue deleted 100644 → 0
<template>
<div class="flex-container">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<!-- 搜索区域 -->
<a-form layout="inline">
<a-row :gutter="24">
<a-col :md="4" :sm="12">
<a-form-item label="姓名">
<a-input placeholder="姓名" v-model="queryParam.name"></a-input>
</a-form-item>
</a-col>
<a-col :md="4" :sm="12">
<a-form-item label="姓名1">
<a-input placeholder="姓名1" v-model="nam1"></a-input>
</a-form-item>
</a-col>
<a-col :md="4" :sm="12">
<a-form-item label="县分">
<a-input placeholder="县分" v-model="queryParam.substName"></a-input>
</a-form-item>
</a-col>
<a-col :md="4" :sm="12">
<a-form-item label="学校">
<a-input placeholder="学校" v-model="queryParam.schoolName"></a-input>
</a-form-item>
</a-col>
<span class="table-page-search-submitButtons" style="float: left; overflow: hidden;">
<a-col :md="6" :sm="24">
<a-button @click="search()" type="primary">查询1</a-button>
<a-button @click="openAllocation()" style="margin-left: 8px" icon="plus" type="primary">新增</a-button>
</a-col>
</span>
</a-row>
</a-form>
<!--列表-->
<s-table :columns="columns" :data="rowdata" bordered ref="table" size="small" class="flex-filling" :locale="emptyText">
<template slot="operation" slot-scope="text, record">
<a-divider type="vertical"/>
<a-popconfirm title="是否要删除此行？" @confirm="deleteAllocation(record.id)">
<a>删除</a>
</a-popconfirm>
<a-divider type="vertical"/>
</template>
</s-table>
<!--编辑----弹框-->
<a-modal :title="titleName" :visible="modifyvisible" @ok="createfunctionOk" @cancel="createfunctionCancel" html-type="submit" width="720px">
<a-form :form="Formtable">
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="账号">
<a-input placeholder="账号" v-decorator="[ 'account', {rules: [{ required: true, message: '账号不能为空！' ,whitespace:true}]} ]"></a-input>
</a-form-item>
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="县分">
<a-select placeholder="请选择" @change="changeSubst()" v-model="modifyForm.subName" >
<a-select-option key="">请选择</a-select-option>
<a-select-option v-for="data in subNameList" :value="data">
{{ data}}
</a-select-option>
</a-select>
</a-form-item>
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="学校名称">
<a-select placeholder="请选择" v-model="modifyForm.schoolId">
<a-select-option key="">请选择</a-select-option>
<a-select-option v-for="data in schoolList" :value="data.id">
{{ data.school_name}}
</a-select-option>
</a-select>
</a-form-item>
</a-form>
</a-modal>
</div>
</div>
</template>
<script>
import STable from '@/components/table';
import {
getList,addAllocation,
deleteAllocation,getSubstList,getSchoolList
} from "@/api/school-center/schoolAllocationAPI"
import {cloneObject} from '@/utils/util'
import treecheck from '@/components/sysmanage/treeCheck'
import treeList from '@/components/sysmanage/treeList'
export default {
name: "schoolAllocation",
components: {
STable,
treeList,
treecheck,
},
data: function () {
return {
emptyText: {emptyText: '暂无数据'},
Formtable: this.$form.createForm(this, {name: 'Formtable'}),
queryParam: {
account: '',
name: '',
substName:'',
schoolName:''
},
titleName: '',
modifyvisible:false,
modifyForm: {
id: '',
account: '',
schoolId: '',
},
autoCompleteResult:[],
subNameList: [],
schoolList:[],
addSubName:'',
columns: [
{dataIndex: 'name', width: 100, title: '姓名 ', align: "center"},
{dataIndex: 'account', width: 100, title: '账号', align: "center"},
{dataIndex: 'substName', width: 100, title: '管辖学校所属县分 ', align: "center"},
{dataIndex: 'schoolName', width: 200, title: '管辖学校 ', align: "center"},
{
dataIndex: 'operation',
width: 100,
title: '操作',
align: "center",
scopedSlots: {customRender: 'operation'},
fixed: "right"
}]
,
rowdata: parameter => {
let params = {
pageNo: parameter.pageNo,
pageSize: parameter.pageSize
}
//表示
let obj = cloneObject(this.queryParam)
this.subNameList = [];
// 获取县分下拉清单
getSubstList(Object.assign(params,obj)).then(res => {
if (res.state == 'success') {
res.data.forEach((key)=>{
this.subNameList.push(key.sub_name)
})
}
})
return getList(Object.assign(params,obj)).then(res => {
let data = {}
if (res.state !== 'success') {
this.$message.error("查询失败！", 5);
this.emptyText.emptyText = '查询失败！'
data = {
data: [],
pageSize: parameter.pageSize,
pageNo: 1,
totalCount: 0
}
} else {
data = {
data: res.data.records,
pageSize: parameter.pageSize,
pageNo: parameter.pageNo,
totalCount: res.data.total
}
}
return data
})
},
keyRecord: '',
recordId: '',
addUser: false,
}
},
methods:{
onLoad(){
let params = [];
params.substName = "";
// 获取县分下拉清单
getSubstList(params).then(res => {
if (res.state == 'success') {
res.data.forEach((key)=>{
this.subNameList.push(key.sub_name)
})
}
})
},
search() {
this.$refs.table.refresh({search: true})
},
openAllocation() {
this.titleName = "添加学校2323分配";
this.modifyvisible = true;
},
//提交表单
createfunctionOk(){
this.Formtable.validateFields(["account"], {force: true}, (err, values)=>{
if (!err){
this.modifyForm.account=values.account
addAllocation(this.modifyForm).then(res=>{
if (res.state=="success") {
this.$message.success(res.data ? res.data : '添加成功！', 5);
this.search();
this.modifyvisible = false;
return null;
}
this.$message.error(res.data ? res.data : '添加失败！', 5);
})
}
})
},
createfunctionCancel(){
this.modifyvisible=false
this.autoCompleteResult=[]
this.Formtable.setFieldsValue({
account: ''
})
this.addForm.subName = '';
},
deleteAllocation(id){
let params = {};
params.id = id;
deleteAllocation(params).then(res=>{
if (res.state=="success") {
this.$message.success(res.data ? res.data : '删除成功！', 5);
this.search();
this.modifyvisible = false;
return null;
}
this.$message.error(res.data ? res.data : '删除失败！', 5);
})
},
changeSubst(){
let schoolParams = {};
schoolParams.substName = this.modifyForm.subName;
this.schoolList = [];
getSchoolList(schoolParams).then(res => {
if (res.state == 'success') {
res.data.forEach((key) => {
this.schoolList.push(key)
})
}
})
},
changeSchool(schoolId){
let schoolParams = {};
schoolParams.substName = this.modifyForm.subName;
this.schoolList = [];
getSchoolList(schoolParams).then(res => {
if (res.state == 'success') {
res.data.forEach((key) => {
this.schoolList.push(key)
})
this.modifyForm.schoolId = schoolId;
}
})
},
}
}
</script>
<style scoped>
</style>
\ No newline at end of file
src/views/school-center/management/schoolAllocation.vue → src/views/school-center/userManager/schoolAllocation.vue
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<a-input placeholder="姓名" v-model="queryParam.name"></a-input> <a-input placeholder="姓名" v-model="queryParam.name"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="12"> <a-col :md="4" :sm="12">
<a-form-item label="县分"> <a-form-item label="县分">
<a-input placeholder="县分" v-model="queryParam.substName"></a-input> <a-input placeholder="县分" v-model="queryParam.substName"></a-input>
...@@ -22,7 +23,7 @@ ...@@ -22,7 +23,7 @@
</a-col> </a-col>
<span class="table-page-search-submitButtons" style="float: left; overflow: hidden;"> <span class="table-page-search-submitButtons" style="float: left; overflow: hidden;">
<a-col :md="6" :sm="24"> <a-col :md="6" :sm="24">
<a-button @click="search()" type="primary">查询</a-button> <a-button @click="search()" type="primary">查询1</a-button>
<a-button @click="openAllocation()" style="margin-left: 8px" icon="plus" type="primary">新增</a-button> <a-button @click="openAllocation()" style="margin-left: 8px" icon="plus" type="primary">新增</a-button>
</a-col> </a-col>
</span> </span>
...@@ -171,9 +172,10 @@ ...@@ -171,9 +172,10 @@
}, },
methods:{ methods:{
onLoad(){ onLoad(){
alert(); let params = [];
params.substName = "";
// 获取县分下拉清单 // 获取县分下拉清单
getSubstList(Object.assign(params,obj)).then(res => { getSubstList(params).then(res => {
if (res.state == 'success') { if (res.state == 'success') {
res.data.forEach((key)=>{ res.data.forEach((key)=>{
this.subNameList.push(key.sub_name) this.subNameList.push(key.sub_name)
...@@ -185,7 +187,7 @@ ...@@ -185,7 +187,7 @@
this.$refs.table.refresh({search: true}) this.$refs.table.refresh({search: true})
}, },
openAllocation() { openAllocation() {
this.titleName = "添加学校分配"; this.titleName = "添加学校2323分配";
this.modifyvisible = true; this.modifyvisible = true;
}, },
//提交表单 //提交表单
...@@ -228,9 +230,9 @@ ...@@ -228,9 +230,9 @@
this.$message.error(res.data ? res.data : '删除失败！', 5); this.$message.error(res.data ? res.data : '删除失败！', 5);
}) })
}, },
changeSubst(type){ changeSubst(){
let schoolParams = {}; let schoolParams = {};
schoolParams.subName = this.modifyForm.subName; schoolParams.substName = this.modifyForm.subName;
this.schoolList = []; this.schoolList = [];
getSchoolList(schoolParams).then(res => { getSchoolList(schoolParams).then(res => {
...@@ -243,7 +245,7 @@ ...@@ -243,7 +245,7 @@
}, },
changeSchool(schoolId){ changeSchool(schoolId){
let schoolParams = {}; let schoolParams = {};
schoolParams.subName = this.modifyForm.subName; schoolParams.substName = this.modifyForm.subName;
this.schoolList = []; this.schoolList = [];
getSchoolList(schoolParams).then(res => { getSchoolList(schoolParams).then(res => {
......
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