提交 ca8d5039 编写于 作者: 刘英杰's avatar 刘英杰

v20240130 保存

上级 f32d84d3
流水线 #23929 已通过 ,包含阶段
in 46 second
......@@ -8,7 +8,7 @@ stages:
build:
stage: publish
script:
- remove-item -Force -Recurse D:\ASC_web\A00051\placeManagement\pc*
- xcopy "dist" "D:\ASC_web\A00051\placeManagement\pc\" /s/e/y/
- remove-item -Force -Recurse D:\ASC_web\A00051\teacherGo2Corporation\pc*
- xcopy "dist" "D:\ASC_web\A00051\teacherGo2Corporation\pc\" /s/e/y/
only:
- pc
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
.ivu-form-item[data-v-2a65a7bf]{padding-right:15px}.fileRow[data-v-2a65a7bf]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-2a65a7bf]{color:#ed4014}.fileRow .delIcon[data-v-2a65a7bf]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-7f239dd6]{margin-bottom:12px}.searchDiv .buttonCol[data-v-7f239dd6]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-7f239dd6]{margin-left:8px}
\ No newline at end of file
.demo-drawer-footer{width:100%;position:absolute;bottom:0;left:0;border-top:1px solid #e8e8e8;padding:12px 16px;text-align:right;background:#fff}
\ No newline at end of file
此差异已折叠。
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="shortcut icon" href=favicon.ico><title>党建管理系统</title><link href=css/app.f8f860e0.css rel=stylesheet></head><body><script src=/a/manager/identify/identify.js></script><noscript><strong>请开启 JavaScript 功能来使用 党建管理系统。</strong></noscript><div id=app></div><script src=js/chunk-vendors.c0d93cbb.js></script><script src=js/app.84ce5778.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="shortcut icon" href=favicon.ico><title>党建管理系统</title><link href=css/chunk-vendors.2ae0b606.css rel=stylesheet><link href=css/app.dd21080a.css rel=stylesheet></head><body><noscript><strong>请开启 JavaScript 功能来使用 党建管理系统。</strong></noscript><div id=app></div><script src=js/chunk-vendors.5a0372f7.js></script><script src=js/app.dce86c51.js></script></body></html>
\ No newline at end of file
此差异已折叠。
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-fb0e666a"],{"137a":function(t,e,a){},"15fd":function(t,e,a){"use strict";function s(t,e){if(null==t)return{};var a,s,i={},n=Object.keys(t);for(s=0;s<n.length;s++)a=n[s],e.indexOf(a)>=0||(i[a]=t[a]);return i}function i(t,e){if(null==t)return{};var a,i,n=s(t,e);if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(t);for(i=0;i<l.length;i++)a=l[i],e.indexOf(a)>=0||Object.prototype.propertyIsEnumerable.call(t,a)&&(n[a]=t[a])}return n}a.d(e,"a",(function(){return i}))},"356b":function(t,e,a){"use strict";a.r(e);var s=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",[a("Card",{ref:"card"},[a("TableFrom"),a("Button",{staticClass:"ivu-ml-8",attrs:{type:"primary"},on:{click:t.add}},[a("Icon",{attrs:{type:"md-add"}}),t._v("新增")],1),a("Table",{staticClass:"ivu-mt",attrs:{columns:t.columns,data:t.tableData,loading:t.loading,size:t.tableSize},scopedSlots:t._u([{key:"status",fn:function(e){var s=e.row;return[a("i-switch",{attrs:{size:"large","true-value":1,"false-value":0},on:{"on-change":function(e){return t.switchChange(s)}},model:{value:s.status,callback:function(e){t.$set(s,"status",e)},expression:"row.status"}},[a("span",{attrs:{slot:"open",type:"md-checkmark"},slot:"open"},[t._v("启用")]),a("span",{attrs:{slot:"close",type:"md-close"},slot:"close"},[t._v("停用")])])]}},{key:"action",fn:function(e){var s=e.row;return[a("Button",{attrs:{type:"info"},on:{click:function(e){return t.edit(s)}}},[t._v("编辑")]),a("Poptip",{attrs:{confirm:"",transfer:"",title:"你确定删除吗?"},on:{"on-ok":function(e){return t.del(s)},"on-cancel":t.cancel}},[a("Button",{staticStyle:{"margin-left":"20px"},attrs:{type:"error"}},[t._v("删除")])],1)]}}])}),a("div",{staticClass:"ivu-text-center ivu-mt"},[a("Page",{attrs:{total:t.total,current:t.params.pageIndex,"show-total":"","show-sizer":"","page-size":t.params.pageSize},on:{"update:current":function(e){return t.$set(t.params,"pageIndex",e)},"on-change":t.handleChangePage,"on-page-size-change":t.handleChangePageSize}})],1),a("AddEditDrawer",{ref:"addEdit",on:{getData:t.getData}})],1)],1)},i=[],n=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",[a("Modal",{attrs:{title:"add"==t.addOrEdit?"新增":"修改",width:"40%"},model:{value:t.visibleShow,callback:function(e){t.visibleShow=e},expression:"visibleShow"}},[a("Form",{ref:"formData",attrs:{model:t.formData,"label-width":100,rules:t.rules}},[a("Row",{attrs:{gutter:32}},[a("Col",{attrs:{span:"12"}},[a("FormItem",{attrs:{label:"ddd",prop:"a"}},[a("Input",{model:{value:t.formData.a,callback:function(e){t.$set(t.formData,"a",e)},expression:"formData.a"}})],1)],1)],1)],1),"add"==t.addOrEdit?a("div",{staticClass:"demo-drawer-footer"},[a("Button",{staticStyle:{"margin-right":"8px"},on:{click:function(e){t.visibleShow=!1}}},[t._v("取消")]),a("Button",{attrs:{type:"primary"},on:{click:t.addSubmit}},[t._v("确认新增")])],1):t._e(),"edit"==t.addOrEdit?a("div",{staticClass:"demo-drawer-footer"},[a("Button",{staticStyle:{"margin-right":"8px"},on:{click:function(e){t.visibleShow=!1}}},[t._v("取消")]),a("Button",{attrs:{type:"primary"},on:{click:t.editSubmit}},[t._v("确认修改")])],1):t._e()],1)],1)},l=[],r=(a("456d"),a("ac6a"),a("15fd")),o=["status"],c={data:function(){return{visibleShow:!1,rules:{class_code:[{required:!0,message:"不能为空",trigger:"blur"}],class_name:[{required:!0,message:"不能为空",trigger:"blur"}],college_id:[{required:!0,message:"不能为空",trigger:"change"}],grade:[{required:!0,message:"不能为空",trigger:"change"}],training_id:[{required:!0,message:"不能为空",trigger:"change"}]},formData:{a:""},formList:[],addOrEdit:""}},mounted:function(){this.getData()},methods:{getData:function(){},addSubmit:function(){var t=this;this.$refs.formData.validate((function(e){e&&(t.$Message.success(res),t.visibleShow=!1,t.$emit("getData"))}))},editSubmit:function(){var t=this.formData;t.status,Object(r["a"])(t,o);this.$refs.formData.validate((function(t){}))},add:function(){var t=this;this.addOrEdit="add",this.visibleShow=!0,Object.keys(this.formData).forEach((function(e){return t.formData[e]=""}))},edit:function(t){this.addOrEdit="edit",this.visibleShow=!0,this.formData=Object.assign({},t)}}},d=c,u=(a("72c3"),a("2877")),m=Object(u["a"])(d,n,l,!1,null,null,null),p=m.exports,h=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("Form",{attrs:{"label-width":120}},[a("Row",{attrs:{gutter:32}},[t._l(t.formList,(function(e,s){return[~[0,1].indexOf(s)?a("Col",t._b({key:e.code},"Col",t.grid,!1),[a("FormItem",{attrs:{label:e.label+":"}},[e.option_list?a("Select",{attrs:{clearable:"",placeholder:"请选择"},on:{"on-clear":t.getData},model:{value:t.params[e.code],callback:function(a){t.$set(t.params,e.code,a)},expression:"params[item.code]"}},t._l(e.option_list,(function(e){return a("Option",{key:e.label,attrs:{value:e.value}},[t._v(t._s(e.label))])})),1):t._e(),e.option_list?t._e():a("Input",{attrs:{clearable:"",placeholder:"请输入"},on:{"on-clear":t.getData},model:{value:t.params[e.code],callback:function(a){t.$set(t.params,e.code,a)},expression:"params[item.code]"}})],1)],1):t._e(),t.collapse?[s>=2?a("Col",t._b({key:e.code},"Col",t.grid,!1),[a("FormItem",{attrs:{label:e.label+":"}},[e.option_list?a("Select",{attrs:{clearable:"",placeholder:"请选择"},on:{"on-clear":t.getData},model:{value:t.params[e.code],callback:function(a){t.$set(t.params,e.code,a)},expression:"params[item.code]"}},t._l(e.option_list,(function(e){return a("Option",{key:e.label,attrs:{value:e.value}},[t._v(t._s(e.label))])})),1):t._e(),e.option_list?t._e():a("Input",{attrs:{clearable:"",placeholder:"请输入"},on:{"on-clear":t.getData},model:{value:t.params[e.code],callback:function(a){t.$set(t.params,e.code,a)},expression:"params[item.code]"}})],1)],1):t._e()]:t._e()]})),0!==t.formList.length?a("Col",t._b({staticClass:"ivu-text-right"},"Col",t.grid,!1),[a("FormItem",{attrs:{type:"flex",justify:"end"}},[a("Button",{attrs:{type:"primary"},on:{click:t.getData}},[t._v("查询")]),a("a",{directives:[{name:"font",rawName:"v-font",value:14,expression:"14"}],staticClass:"ivu-ml-8",on:{click:function(e){t.collapse=!t.collapse}}},[t.collapse?[t._v("\n 收起 "),a("Icon",{attrs:{type:"ios-arrow-up"}})]:[t._v("\n 展开 "),a("Icon",{attrs:{type:"ios-arrow-down"}})]],2)],1)],1):t._e()],2)],1)},g=[],f={data:function(){return{grid:{xl:8,lg:12,md:24,sm:24,xs:24},formList:[{label:"所属院系",code:"college_id",search_type:"select",is_must:0,option_list:[{value:"117c96a1-5c8f-4c71-8574-d45ec049db3b",label:"电气工程系"}]},{label:"状态1",code:"status",search_type:"select",is_must:0,option_list:[{value:"0",label:"停用"}]},{label:"状态2",code:"status2",search_type:"select",is_must:0,option_list:[{value:"0",label:"停用"}]},{label:"状态3",code:"status3",search_type:"select",is_must:0,option_list:[{value:"0",label:"停用"}]}],collapse:!1,params:{pageIndex:1,pageSize:10,college_id:"",status:"",status2:"",status3:""}}},mounted:function(){},methods:{getData:function(){console.log("搜索条件查询")}}},_=f,b=Object(u["a"])(_,h,g,!1,null,null,null),v=b.exports,w={name:"list",components:{AddEditDrawer:p,TableFrom:v},data:function(){return{grid:{xl:8,lg:12,md:24,sm:24,xs:24},columns:[{title:"序号",type:"index",align:"center",show:!0,width:80},{title:"班级编号",key:"class_code",align:"center",show:!0,minWidth:100},{title:"班级名称",key:"class_name",align:"center",show:!0,minWidth:150},{title:"年级",key:"grade",align:"center",show:!0,minWidth:100},{title:"培养层次",key:"training",align:"center",show:!0,minWidth:120},{title:"辅导员工号",key:"counselor_card",align:"center",show:!0,minWidth:150},{title:"辅导员姓名",key:"counselor_name",align:"center",show:!0,minWidth:120},{title:"班主任工号",key:"head_teacher_card",align:"center",show:!0,minWidth:150},{title:"班主任姓名",key:"head_teacher_name",align:"center",show:!0,minWidth:120},{title:"院系名称",key:"college_name",align:"center",show:!0,minWidth:200},{title:"状态",key:"status",align:"center",slot:"status",show:!0,minWidth:130},{title:"操作",align:"center",minWidth:180,fixed:"right",show:!0,slot:"action"}],loading:!1,tableData:[{}],tableSize:"default",tableFullscreen:!1,total:0,collapse:!1,params:{pageIndex:1,pageSize:10,college_id:"",grade:"",classId_Name:"",status:""}}},created:function(){},mounted:function(){this.getData()},methods:{getData:function(){this.params.college_id=void 0==this.params.college_id?"":this.params.college_id,this.params.grade=void 0==this.params.grade?"":this.params.grade,this.params.classId_Name=void 0==this.params.classId_Name?"":this.params.classId_Name,this.params.status=void 0==this.params.status?"":this.params.status,this.params.pageIndex=1},add:function(){this.$refs.addEdit.add()},edit:function(t){this.$refs.addEdit.edit(t)},del:function(t){console.log("删除"),this.$Message.info("删除成功")},cancel:function(){this.$Message.info("You click cancel")},handleChangePage:function(t){this.params.pageIndex=t,this.getData()},handleChangePageSize:function(t){this.current=1,this.params.pageSize=t,this.getData()}}},y=w,k=Object(u["a"])(y,s,i,!1,null,null,null);e["default"]=k.exports},"72c3":function(t,e,a){"use strict";a("137a")}}]);
\ No newline at end of file
此差异已折叠。
......@@ -8,7 +8,7 @@
<title><%= VUE_APP_TITLE %></title>
</head>
<body>
<script type="text/javascript" src="/a/manager/identify/identify.js"></script>
<!--<script type="text/javascript" src="/a/manager/identify/identify.js"></script>-->
<noscript>
<strong>
请开启 JavaScript 功能来使用 <%= VUE_APP_TITLE %>。
......
......@@ -10,16 +10,7 @@ export declare function getApiGetTokenInfo(): import("axios").AxiosPromise<{
response: {
cardNumber: string;
name: string;
type: any;
roleAndPower: {
role_name: string;
role_id: string;
powers: string[];
menus: {
menuid: string;
menu_name: string;
menu_path: string;
}[];
}[];
openId: string;
phone: string;
};
}>;
/**
* PC单点
* PC单点登陆
* /api/sso/pc
*/
export declare function getApiSsoPc(params: GetApiSsoPcParams): import("axios").AxiosPromise<{
......
import request from "@/plugins/request";
/**
* PC单点
* PC单点登陆
* /api/sso/pc
*/
export function getApiSsoPc(params) {
......
/**
* 测试用获取token
* /api/Login/CheckLoginTest
* 测试用
* /api/sso/test
*/
export declare function getApiLoginCheckLoginTest(params: GetApiLoginCheckLoginTestParams): import("axios").AxiosPromise<{
export declare function getApiSsoTest(params: GetApiSsoTestParams): import("axios").AxiosPromise<{
code: number;
status: string;
msg: string;
......@@ -18,7 +18,7 @@ export declare function getApiLoginCheckLoginTest(params: GetApiLoginCheckLoginT
};
};
}>;
interface GetApiLoginCheckLoginTestParams {
interface GetApiSsoTestParams {
card: string;
}
export {};
import request from "@/plugins/request";
/**
* 测试用获取token
* /api/Login/CheckLoginTest
* 测试用
* /api/sso/test
*/
export function getApiLoginCheckLoginTest(params) {
export function getApiSsoTest(params) {
const paramsInput = {
card: params.card,
};
return request.get(`/api/Login/CheckLoginTest`, {
return request.get(`/api/sso/test`, {
params: paramsInput,
});
}
import { type UserType } from "../../interface";
/**
* WX单点
* /api/sso/wx
*/
export declare function getApiSsoWx(params: GetApiSsoWxParams): import("axios").AxiosPromise<{
code: number;
status: string;
msg: string;
msg_detail: string;
response: {
accessToken: {
tokenContent: string;
expires: string;
};
refreshToken: {
tokenContent: string;
expires: string;
};
};
}>;
interface GetApiSsoWxParams {
userType: UserType;
code: string;
sign: string;
timestamp: string;
}
export {};
import request from "@/plugins/request";
/**
* WX单点
* /api/sso/wx
*/
export function getApiSsoWx(params) {
const paramsInput = {
...params.userType,
code: params.code,
sign: params.sign,
timestamp: params.timestamp,
};
return request.get(`/api/sso/wx`, {
params: paramsInput,
});
}
export * from "./getApiLoginCheckLoginTest";
export * from "./getApiSsoTest";
export * from "./getApiSsoPc";
export * from "./getApiSsoWx";
export * from "./getApiGetTokenInfo";
export * from "./getApiRefreshToken";
export * from "./getApiLoginCheckLoginTest";
export * from "./getApiSsoTest";
export * from "./getApiSsoPc";
export * from "./getApiSsoWx";
export * from "./getApiGetTokenInfo";
export * from "./getApiRefreshToken";
export interface MenuPathViewModel {
menuid?: string;
menu_name?: string;
menu_path?: string;
}
import { type MenuPathViewModel } from "../../interface";
export interface RoleAndPowerViewModel {
role_name?: string;
role_id?: string;
powers?: string[];
menus?: MenuPathViewModel[];
}
import { type UserType, type RoleAndPowerViewModel } from "../../interface";
export interface UserJwtViewModel {
cardNumber?: string;
name?: string;
type?: UserType;
roleAndPower?: RoleAndPowerViewModel[];
openId?: string;
phone?: string;
}
export * from "./apiTypes/TokenViewModel";
export * from "./apiTypes/ComplexTokenViewModel";
export * from "./apiTypes/ComplexTokenViewModelMessageModel";
export * from "./apiTypes/UserType";
export * from "./apiTypes/MenuPathViewModel";
export * from "./apiTypes/RoleAndPowerViewModel";
export * from "./apiTypes/UserJwtViewModel";
export * from "./apiTypes/UserJwtViewModelMessageModel";
export * from "./apiTypes/TokenViewModelMessageModel";
......
export * from "./apiTypes/TokenViewModel";
export * from "./apiTypes/ComplexTokenViewModel";
export * from "./apiTypes/ComplexTokenViewModelMessageModel";
export * from "./apiTypes/UserType";
export * from "./apiTypes/MenuPathViewModel";
export * from "./apiTypes/RoleAndPowerViewModel";
export * from "./apiTypes/UserJwtViewModel";
export * from "./apiTypes/UserJwtViewModelMessageModel";
export * from "./apiTypes/TokenViewModelMessageModel";
{
"docsUrl": "https://asc.hnasct.cn/placemanage/swagger/Dormitoryscore/swagger.json",
"docsUrl": "https://asc.hnasct.cn/enterpriseclock/swagger/Dormitoryscore/swagger.json",
"axiosInstanceUrl": "@/plugins/request"
}
此差异已折叠。
<template>
<!-- 通用Table -->
<div>
<Table
class="ivu-mt"
:columns="tableColumns"
:data="tableData"
:loading="tableLoading"
:size="tableSize"
:span-method="handleSpan"
>
<template slot-scope="{ row, index }" slot="generalSwitch">
<Switch
v-model="row.is_enable"
size="large"
:true-value="1"
:false-value="0"
@on-change="(val) => switchChange(val, row, index)">
<span type="md-checkmark" slot="open" >启用</span>
<span type="md-close" slot="close">停用</span>
</Switch>
</template>
<template slot-scope="{ row }" slot="action">
<Button type="info" size="small" @click="edit(row)">编辑</Button>
<Poptip confirm transfer title="是否确认删除?" @on-ok="del(row)">
<Button type="error" size="small" style="margin-left: 8px">删除</Button>
</Poptip>
</template>
<template slot-scope="{ row }" slot="actionAndDetails">
<a @click="details(row)">详情</a>
<Button type="info" size="small" @click="edit(row)" style="margin-left: 8px">编辑</Button>
<Poptip confirm transfer title="是否确认删除?" @on-ok="del(row)">
<Button type="error" size="small" style="margin-left: 8px">删除</Button>
</Poptip>
</template>
<!-- 自定义插槽 -->
<template v-for="(_, slot) in $scopedSlots" v-slot:[slot]="scope">
<slot :name="slot" v-bind="scope"> </slot>
</template>
</Table>
<div class="ivu-text-center ivu-mt">
<Page
:total="dataCount"
:current="pageIndex"
:page-size="pageSize"
:page-size-opts="pageSizeOpts"
show-total
show-sizer
@on-change="handleChangePage"
@on-page-size-change="handleChangePageSize"
/>
</div>
</div>
</template>
<script>
export default {
props: {
tableColumns: { type: Array, require: true },
tableData: { type: Array, require: true },
tableLoading: { type: Boolean, default: false },
tableSize: { type: String, default: 'default' },
dataCount: { type: Number, require: true },
pageIndex: { type: Number, require: true },
pageSize: { type: Number, require: true },
pageSizeOpts: { type: Array, default: () => [10, 20, 50, 100] },
},
data() {
return {}
},
computed: {},
created() {},
mounted() {},
methods: {
// 改变开关
switchChange(val, row, index) {
this.$emit('switchChange', val, row, index)
},
// 详情
details(row) {
this.$emit('rowDetails', row)
},
// 编辑行
edit(row) {
this.$emit('rowEdit', row)
},
// 删除行
del(row) {
this.$emit('rowDelete', row)
},
// 翻页
handleChangePage(val) {
this.$emit('onPageChange', val)
},
// 更改每页长度
handleChangePageSize(val) {
this.$emit('onPageSizeChange', val)
},
},
}
</script>
<style scoped lang="less">
</style>
<template>
<!-- 通用搜索表单 -->
<div>
<Form
class="searchDiv"
:model="searchCondObj"
:label-width="labelWidth"
:label-colon="labelColon">
<Row>
<Col v-bind="grid" v-for="item in searchCondList.filter(a => a.show)" :key="item.id">
<FormItem :label="item.name">
<Input
v-if="item.type == 'input'"
style="width: 100%;"
v-model="searchCondObj[item.id]"
clearable
:placeholder="'请输入'+item.name"></Input>
<Select
v-else-if="item.type == 'select'"
style="width: 100%;"
v-model="searchCondObj[item.id]"
clearable
:placeholder="'请选择'+item.name"
>
<Option
v-for="it in item.optList"
:key="it.value"
:value="it.value">{{ it.label }}</Option>
</Select>
<DatePicker
v-else-if="item.type == 'datetime'"
v-model="searchCondObj[item['id']]"
type="datetime"
format="yyyy-MM-dd HH:mm"
:placeholder="'请选择'+item.name"
@on-change="(val1, val2) => datetimeChange(val1, val2, item.id)"/>
</FormItem>
</Col>
<Col v-bind="grid" class="buttonCol">
<Button type="primary" @click="searchBt">查询</Button>
<Button @click="resetBt">重置</Button>
</Col>
</Row>
</Form>
</div>
</template>
<script>
export default {
props: {
// 搜索项列表
searchCondList: { type: Array, require: true },
// label宽度
labelWidth: { type: Number, default: 100 },
// label冒号
labelColon: { type: Boolean, default: true },
},
data() {
return {
// 搜索条件布局
grid: {
sm: 12,
md: 12,
lg: 8,
xl: 6,
},
// 搜索数据
searchCondObj: {},
}
},
computed: {},
created() {},
mounted() {},
methods: {
// 搜索
searchBt() {
this.$emit('onSubmit', this.searchCondObj)
},
// 重置
resetBt() {
// console.log('重置按钮')
this.searchCondObj = {}
this.$emit('onReset')
},
// 日期时间改变选择
datetimeChange(val1, val2, id) {
// console.log('日期时间改变选择', val1, val2, id)
this.searchCondObj[id] = val1
},
},
}
</script>
<style scoped lang="less">
.searchDiv{
.ivu-form-item{
margin-bottom: 12px;
}
.buttonCol{
margin-left: auto;
text-align: right;
.ivu-btn{
margin-left: 8px;
}
}
}
</style>
......@@ -6,7 +6,7 @@
<!-- <img src="@/assets/images/logo-small.png" v-if="menuCollapse">
<img src="@/assets/images/logo.png" v-else-if="siderTheme === 'light'">
<img src="@/assets/images/logo-dark.png" v-else> -->
<h1>党建管理系统</h1>
<h1>教师下企业</h1>
</i-link>
</transition>
</div>
......
// Vue
import './style.css'
import Vue from 'vue';
import App from './App';
import Vant from 'vant';
import 'vant/lib/index.css';
Vue.use(Vant);
// 配置
import Setting from './setting';
......
export default {
path: '/activityManagement',
title: '活动管理',
title: '考勤汇总',
header: 'home',
}
......@@ -32,13 +32,13 @@ export default [
custom: 'i-icon-demo i-icon-demo-i18n',
},
activityManagement,
siteManagement,
siteTypeManagement,
materialsManagement,
keyManagement,
authorityManagement,
systemConfiguration,
blacklistManagement,
// siteManagement,
// siteTypeManagement,
// materialsManagement,
// keyManagement,
// authorityManagement,
// systemConfiguration,
// blacklistManagement,
// notice,
// trainingEffect,
......
<template>
<div>
<Modal
:title="addOrEdit == 'add' ? '新增' : '修改'"
v-model="visibleShow"
width="40%"
>
<Form :model="formData" :label-width="100" ref="formData" :rules="rules">
<Row :gutter="32">
<Col span="12">
<FormItem label="ddd" prop="a">
<Input v-model="formData.a"/>
</FormItem>
</Col>
</Row>
</Form>
<div class="demo-drawer-footer" v-if="addOrEdit == 'add'">
<Button style="margin-right: 8px" @click="visibleShow = false">取消</Button>
<Button type="primary" @click="addSubmit">确认新增</Button>
</div>
<div class="demo-drawer-footer" v-if="addOrEdit == 'edit'">
<Button style="margin-right: 8px" @click="visibleShow = false">取消</Button>
<Button type="primary" @click="editSubmit">确认修改</Button>
</div>
</Modal>
</div>
</template>
<script>
export default {
data () {
return {
visibleShow: false,
rules: {
class_code: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
class_name: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
college_id: [
{ required: true, message: '不能为空', trigger: 'change' }
],
grade: [
{ required: true, message: '不能为空', trigger: 'change' }
],
training_id: [
{ required: true, message: '不能为空', trigger: 'change' }
],
},
formData: {
a: ''
},
formList:[],
addOrEdit: ''
}
},
mounted() {
this.getData()
},
methods: {
// 初始化
getData(){
},
// 确认新增
addSubmit() {
this.$refs.formData.validate((valid) => {
if(valid) {
this.$Message.success(res)
this.visibleShow = false
this.$emit('getData')
}
})
},
// 确认修改
editSubmit() {
const {status, ...params} = this.formData //从对象中删除status
this.$refs.formData.validate((valid) => {
if(valid) {
}
})
},
// 点击新增
add() {
this.addOrEdit = "add"
this.visibleShow = true
Object.keys(this.formData).forEach(key => this.formData[key] = '') //es6清空对象属性
},
// 点击修改
edit(row) {
this.addOrEdit = "edit"
this.visibleShow = true
this.formData = Object.assign({},row) //es6深拷贝
}
}
}
</script>
<style>
.demo-drawer-footer{
width: 100%;
position: absolute;
bottom: 0;
left: 0;
border-top: 1px solid #e8e8e8;
padding: 12px 16px;
text-align: right;
background: #fff;
}
</style>
\ No newline at end of file
<template>
<Form :label-width="120">
<Row :gutter="32">
<template v-for="(item, index) in formList">
<Col v-bind="grid" :key="item.code" v-if="!!~[0,1].indexOf(index)">
<FormItem :label="`${item.label}:`" >
<Select v-if="item.option_list" clearable @on-clear="getData" placeholder="请选择" v-model="params[item.code]">
<Option :value="items.value" v-for="items in item.option_list" :key="items.label">{{items.label}}</Option>
</Select>
<Input clearable @on-clear="getData" v-if="!item.option_list" placeholder="请输入" v-model="params[item.code]"></Input>
</FormItem>
</Col>
<template v-if="collapse">
<Col v-bind="grid" :key="item.code" v-if="index>=2">
<FormItem :label="`${item.label}:`">
<Select v-if="item.option_list" clearable @on-clear="getData" placeholder="请选择" v-model="params[item.code]">
<Option :value="items.value" v-for="items in item.option_list" :key="items.label">{{items.label}}</Option>
</Select>
<Input clearable @on-clear="getData" v-if="!item.option_list" placeholder="请输入" v-model="params[item.code]"></Input>
</FormItem>
</Col>
</template>
</template>
<Col v-bind="grid" class="ivu-text-right" v-if="formList.length === 0 ? false : true">
<FormItem type="flex" justify="end">
<Button type="primary" @click="getData">查询</Button>
<a v-font="14" class="ivu-ml-8" @click="collapse = !collapse">
<template v-if="!collapse">
展开 <Icon type="ios-arrow-down"/>
</template>
<template v-else>
收起 <Icon type="ios-arrow-up"/>
</template>
</a>
</FormItem>
</Col>
</Row>
</Form>
</template>
<script>
export default {
data () {
return {
grid: {
xl: 8,
lg: 12,
md: 24,
sm: 24,
xs: 24
},
formList:[
{
label: "所属院系",
code: "college_id",
search_type: "select",
is_must: 0,
option_list: [
{
value: "117c96a1-5c8f-4c71-8574-d45ec049db3b",
label: "电气工程系"
}
]
},
{
label: "状态1",
code: "status",
search_type: "select",
is_must: 0,
option_list: [
{
value: "0",
label: "停用"
}
]
},
{
label: "状态2",
code: "status2",
search_type: "select",
is_must: 0,
option_list: [
{
value: "0",
label: "停用"
}
]
},
{
label: "状态3",
code: "status3",
search_type: "select",
is_must: 0,
option_list: [
{
value: "0",
label: "停用"
}
]
}
],
collapse: false,
params:{
pageIndex: 1,
pageSize: 10,
college_id: '',
status: '',
status2: '',
status3: '',
}
}
},
mounted() {
},
methods: {
getData() {
console.log('搜索条件查询');
}
}
}
</script>
\ No newline at end of file
......@@ -3,7 +3,7 @@ import axios from 'axios';
import util from '@/libs/util';
import Setting from '@/setting';
import dayjs from "dayjs";
import * as api from '@/api/controller/index'
import {Message, Notice} from 'view-design';
import router from "@/router";
......@@ -54,12 +54,12 @@ const refreshToken = async () => {
if (flag === 1) {
flag = 2
let currentTime = dayjs(dayjs().valueOf())
let refreshTime = dayjs(dayjs(util.cookies.get('site-management-refreshTime')).valueOf())
let refreshTime = dayjs(dayjs(util.cookies.get('teacher-go2-corporation-refreshTime')).valueOf())
if (refreshTime.diff(currentTime) <= 2 * 60 * 60) {
try {
const res = await api.RefreshToken()
util.cookies.set('site-management-token', res.response.token_content)
util.cookies.set('site-management-refreshTime', res.response.expires)
const res = await api.getApiRefreshToken()
util.cookies.set('teacher-go2-corporation-token', res.response.token_content)
util.cookies.set('teacher-go2-corporation-refreshTime', res.response.expires)
} catch (e) {
console.error('1')
} finally {
......@@ -73,7 +73,7 @@ service.interceptors.request.use(
config => {
// 在请求发送之前做一些处理
// const token = util.cookies.get('token');
let token = util.cookies.get('site-management-token')
let token = util.cookies.get('teacher-go2-corporation-token')
// 让每个请求携带token-- ['X-Token']为自定义key 请根据实际情况自行修改
config.headers['Authorization'] = 'Bearer ' + token;
config.headers['X-Token'] = token;
......@@ -129,8 +129,8 @@ service.interceptors.response.use(
break;
case 401:
// error.message = '未授权,请登录';
util.cookies.remove('site-management-token');
util.cookies.remove('site-management-userinfo');
util.cookies.remove('teacher-go2-corporation-token');
util.cookies.remove('teacher-go2-corporation-userinfo');
router.replace({name: '403'})
break;
case 403:
......
......@@ -34,13 +34,11 @@ const router = new VueRouter({
*/
router.beforeEach(async (to, from, next) => {
if (Setting.showProgressBar) iView.LoadingBar.start();
// 判断是否需要登录才可以进入
if (to.matched.some(_ => _.meta.auth)) {
next();
// 这里依据 token 判断是否登录,可视情况修改
const token = util.cookies.get('site-management-token');
const token = util.cookies.get('teacher-go2-corporation-token');
const urlKey = getUrlKey('token');
if (urlKey) {
await store.dispatch('admin/account/ascLogin', {
......
......@@ -16,7 +16,7 @@ export default {
name: `activityManagement`,
meta: {
...meta,
title: '活动管理',
title: '考勤汇总',
closable: false
},
component: () => import('@/pages/activityManagement/index')
......
......@@ -9,7 +9,7 @@ const Setting = {
* 基础配置
* */
// 网页标题的后缀
titleSuffix: '场地管理',
titleSuffix: '教师下企业',
// 路由模式,可选值为 history 或 hash
routerMode: 'hash',
// 应用的基路径
......@@ -17,7 +17,7 @@ const Setting = {
// 页面切换时,是否显示模拟的进度条
showProgressBar: true,
// 接口请求地址
apiBaseURL: env === 'development' ? '/placemanage' : '/placemanage',
apiBaseURL: env === 'development' ? '/enterpriseclock' : '/enterpriseclock',
// 接口请求返回错误时,弹窗的持续时间,单位:秒
modalDuration: 5,
// 接口请求返回错误时,弹窗的类型,可选值为 Message 或 Notice
......
......@@ -6,7 +6,7 @@ import router from '@/router';
import Setting from '@/setting';
import Vue from "vue";
import { AccountLogin, AccountRegister } from '@api/account';
import * as api from '@/api/controller/index'
import { Modal } from 'view-design';
import {getApiSsoPc} from "@api/controller/Login/getApiSsoPc";
import {getApiGetTokenInfo} from "@api/controller/Login/getApiGetTokenInfo";
......@@ -26,7 +26,7 @@ export default {
token
} = {}) {
return new Promise(async (resolve, reject) => {
await that.asc.getApiSsoPc({
await api.getApiSsoPc({
token: token
})
.then(async res => {
......@@ -35,11 +35,11 @@ export default {
name: '403',
})
} else if (res.response.access_token.token_content) {
util.cookies.set('site-management-token', res.response.access_token.token_content); // 这个util的cookie会自带admin前缀
util.cookies.set('site-management-refreshTime', res.response.access_token.expires);
await that.asc.getApiGetTokenInfo().then(async res => {
util.cookies.set('teacher-go2-corporation-token', res.response.access_token.token_content); // 这个util的cookie会自带admin前缀
util.cookies.set('teacher-go2-corporation-refreshTime', res.response.access_token.expires);
await api.getApiGetTokenInfo().then(async res => {
// 这个接口是解析单点返回的token(admin_token) 获取到用户信息 且每次请求都会带上此token(admin_token) 在请求拦截中配置
util.cookies.set('site-management-userinfo', res.response);
util.cookies.set('teacher-go2-corporation-userinfo', res.response);
// 获取动态菜单
if (Setting.dynamicMenu) await dispatch('admin/menu/getMenuList', false, {root: true});
// 设置 vuex 用户信息
......@@ -52,7 +52,6 @@ export default {
}
})
.catch(err => {
reject(err);
})
// util.cookies.set('uuid', 'asc666');
......
@tailwind base;
@tailwind components;
@tailwind utilities;
/** @type {import('tailwindcss').Config} */
module.exports = {
content:[
"./index.html",
"./src/**/*.{vue,js,ts,jsx,tsx}",
],
theme: {
extend: {},
},
plugins: [],
}
......@@ -17,7 +17,7 @@ module.exports = {
devServer: {
publicPath: Setting.publicPath,
proxy: {
'/placemanage': {
'/enterpriseclock': {
target: 'https://asc.hnasct.cn/',
changeOrigin:true,
ws: true,
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或