Skip to content

T
TOSTUMI
Commit 2bdfc4cc authored by MrShi's avatar MrShi
Browse files
Options

dev分支，小区模块，小区公告等模块

parent dc9cf569
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2926 additions and 18 deletions
config/config.ts
View file @ 2bdfc4cc
......@@ -188,13 +188,22 @@ export default defineConfig({
{path: './ReportOnline/Edit',component:'./CommercialService/Detail'},
]
},
{
/* {
path: '/OrderManagement',
name: 'ordermanagement',
icon: 'ContainerOutlined',
routes: [
{ path: './', component: './OrderManagement/Order' },
]
},*/
{
path: '/OrderManagement',
name: 'ordermanagement',
icon: 'ContainerOutlined',
routes: [
{ path: './', component: './OrderManagement/OrderManagement' },
{ path: './Detail', component: './OrderManagement/OrderManagementDetail' },
]
},
{
path: '/ContractManagement',
......@@ -228,22 +237,21 @@ export default defineConfig({
},
{
/* {
path: './CommunityAnnouncement',
name: 'communityannouncement',
component:'./runTest/Template'
},
/*{
},*/
{
path: './CommunityAnnouncement',
name: 'communityannouncement',
routes: [
{ path: './', component: './CommunityAnnouncement/communityNotice/CommunityNotice' },
{ path: './Create', component: './CommunityAnnouncement/communityNotice/CommunityNoticeCreate' },
{ path: './Edit', component: './CommunityAnnouncement/communityNotice/CommunityNoticeEdit' },
{ path: './Detail', component: './CommunityAnnouncement/communityNotice/CommunityNoticeDetail' },
{ path: './', component: './CommunityManagement/communityNotice/CommunityNotice' },
{ path: './Create', component: './CommunityManagement/communityNotice/CommunityNoticeCreate' },
{ path: './Edit', component: './CommunityManagement/communityNotice/CommunityNoticeEdit' },
{ path: './Detail', component: './CommunityManagement/communityNotice/CommunityNoticeDetail' },
]
},*/
},
{
......@@ -259,11 +267,18 @@ export default defineConfig({
{ path: "./FacilityApply",component:'./CommunityManagement/FacilityBookings/Bookings'}
]
},
{
/*{
path: './VisitorRecord',
name: 'visitorrecord',
component:'./runTest/Template'
},*/
{
path: './VisitorRecord',
name: 'visitorrecord',
component: './CommunityManagement/visitorRecord/VisitorRecord'
},
]
},
{
......
src/models/orderManagement.ts 0 → 100644
View file @ 2bdfc4cc
import { getAdvertisement,delAdvertisement,saveAdvertisement,quitAndUserAd,uploadApk,checkVideo } from '@/services/orderManagement';
export default{
namespace: 'orderManagementModel',
state: {
data: [],
},
effects: {
*getAdvertisement({callback,payload},{ call, put }) {
const response = yield call(getAdvertisement,payload);
yield put({
type: "getAd",
});
if(callback) callback(response);
},
*delAdvertisement({callback,payload},{ call, put }) {
const response = yield call(delAdvertisement,payload);
yield put({
type: "del",
});
if(callback) callback(response);
},
*saveAdvertisement({callback,payload},{ call, put }) {
const response = yield call(saveAdvertisement,payload);
yield put({
type: "save",
});
if(callback) callback(response);
},
*quitAndUserAd({callback,payload},{ call, put }) {
const response = yield call(quitAndUserAd,payload);
yield put({
type: "quit",
});
if(callback) callback(response);
},
*uploadApk({callback,payload},{ call, put }) {
const response = yield call(uploadApk,payload);
yield put({
type: "apk",
});
if(callback) callback(response);
},
*checkVideo({callback,payload},{ call, put }) {
const response = yield call(checkVideo,payload);
yield put({
type: "check",
});
if(callback) callback(response);
},
},
reducers: {
getAd(state, action) {
return {
...state,
data:action.payload || {},
};
},
del(state, action) {
return {
...state,
data:action.payload || {},
};
},
save(state, action) {
return {
...state,
data:action.payload || {},
};
},
quit(state, action) {
return {
...state,
data:action.payload || {},
};
},
apk(state, action) {
return {
...state,
data:action.payload || {},
};
},
check(state, action) {
return {
...state,
data:action.payload || {},
};
},
},
};
src/models/visitorRecord.ts 0 → 100644
View file @ 2bdfc4cc
import { getAdvertisement,delAdvertisement,saveAdvertisement,quitAndUserAd,uploadApk,checkVideo } from '@/services/visitorRecord';
export default{
namespace: 'visitorRecordModel',
state: {
data: [],
},
effects: {
*getAdvertisement({callback,payload},{ call, put }) {
const response = yield call(getAdvertisement,payload);
yield put({
type: "getAd",
});
if(callback) callback(response);
},
*delAdvertisement({callback,payload},{ call, put }) {
const response = yield call(delAdvertisement,payload);
yield put({
type: "del",
});
if(callback) callback(response);
},
*saveAdvertisement({callback,payload},{ call, put }) {
const response = yield call(saveAdvertisement,payload);
yield put({
type: "save",
});
if(callback) callback(response);
},
*quitAndUserAd({callback,payload},{ call, put }) {
const response = yield call(quitAndUserAd,payload);
yield put({
type: "quit",
});
if(callback) callback(response);
},
*uploadApk({callback,payload},{ call, put }) {
const response = yield call(uploadApk,payload);
yield put({
type: "apk",
});
if(callback) callback(response);
},
*checkVideo({callback,payload},{ call, put }) {
const response = yield call(checkVideo,payload);
yield put({
type: "check",
});
if(callback) callback(response);
},
},
reducers: {
getAd(state, action) {
return {
...state,
data:action.payload || {},
};
},
del(state, action) {
return {
...state,
data:action.payload || {},
};
},
save(state, action) {
return {
...state,
data:action.payload || {},
};
},
quit(state, action) {
return {
...state,
data:action.payload || {},
};
},
apk(state, action) {
return {
...state,
data:action.payload || {},
};
},
check(state, action) {
return {
...state,
data:action.payload || {},
};
},
},
};
src/pages/CommunityManagement/communityNotice/CommunityNotice.tsx
View file @ 2bdfc4cc
......@@ -3,7 +3,7 @@ import {connect, routerRedux} from 'dva';
import {Table, Button, Input, Select, Modal, Tooltip, Upload, Icon, Checkbox, Row, Radio, Tag} from "antd";
import styles from './style.less';
import {ConnectState} from "@/models/connect";
import XLSX from "@/pages/account/xlsx.core.min";
// import XLSX from "@/pages/account/xlsx.core.min";
import {router} from "umi";
import 'moment/locale/zh-cn';
......@@ -260,7 +260,7 @@ class CommunityNotice extends React.Component {
if(nowUser.permission[i]=="3"){
flag = 1;
this.props.dispatch(routerRedux.push({
pathname: '/communityNotice/Create',
pathname: '/CommunityManagement/CommunityAnnouncement/Create',
query: params,
}))
}
......@@ -270,7 +270,7 @@ class CommunityNotice extends React.Component {
if(nowUser.permission[i]=="2"){
flag = 1;
this.props.dispatch(routerRedux.push({
pathname: '/communityNotice/Edit',
pathname: '/CommunityManagement/CommunityAnnouncement/Edit',
query: params,
}))
}
......@@ -331,7 +331,7 @@ class CommunityNotice extends React.Component {
//跳转到详情页面
details = (params) => {
this.props.dispatch(routerRedux.push({
pathname: '/communityNotice/Detail',
pathname: '/CommunityManagement/CommunityAnnouncement/Detail',
query: params,
}))
};
......
src/pages/CommunityManagement/communityNotice/CommunityNoticeCreate.tsx
View file @ 2bdfc4cc
......@@ -7,7 +7,7 @@ import TextArea from 'antd/lib/input/TextArea';
import { PlusOutlined } from '@ant-design/icons';
import SelectOptions from '../../components/SelectOptions/index';
import SelectOptions from '../../../components/SelectOptions/index';
const printContent = (comment: any)=>{
console.log(comment)
}
......
src/pages/CommunityManagement/communityNotice/CommunityNoticeDetail.tsx
View file @ 2bdfc4cc
......@@ -7,7 +7,7 @@ import TextArea from 'antd/lib/input/TextArea';
import { PlusOutlined } from '@ant-design/icons';
import SelectOptions from '../../components/SelectOptions/index';
import SelectOptions from '../../../components/SelectOptions/index';
const printContent = (comment: any)=>{
console.log(comment)
}
......
src/pages/CommunityManagement/communityNotice/CommunityNoticeEdit.tsx
View file @ 2bdfc4cc
......@@ -7,7 +7,7 @@ import TextArea from 'antd/lib/input/TextArea';
import { PlusOutlined } from '@ant-design/icons';
import SelectOptions from '../../components/SelectOptions/index';
import SelectOptions from '../../../components/SelectOptions/index';
const printContent = (comment: any)=>{
console.log(comment)
}
......
src/pages/CommunityManagement/visitorRecord/VisitorRecord.tsx 0 → 100644
View file @ 2bdfc4cc
This diff is collapsed.
src/pages/CommunityManagement/visitorRecord/style.less 0 → 100644
View file @ 2bdfc4cc
@import '~antd/lib/style/themes/default.less';
.pre {
margin: 12px 0;
padding: 12px 20px;
background: @input-bg;
box-shadow: @card-shadow;
}
.input {
width:200px;
height:34px;
border:1px solid rgba(229, 229, 229, 1);
border-radius:5px;
margin: 0px 10px;
}
.input1 {
width:200px;
height:34px;
border:1px solid rgba(229, 229, 229, 1);
border-radius:5px;
margin: 0px 120px 10px;
}
.body {
background:rgba(255,255,255,1);
border:1px solid rgba(229, 229, 229, 1);
}
.inputBox {
width:1250px;
height:50px;
padding-top: 10px;
}
.downIcon {
position: relative;
left: 80px;
}
.downButton {
width:120px;
height:34px;
border:1px solid rgba(229, 229, 229, 1);
border-radius:5px;
margin: 0px 10px;
text-align: left;
}
.button11 {
width:82px;
height:34px;
background:rgba(234,244,255,1);
border:1px solid rgba(178, 215, 255, 1);
font-size:14px;
font-family:PingFang SC;
font-weight:400;
color:rgba(66,159,255,1);
line-height:34px;
margin:20px 20px 7px 10px;
float: left;
}
.button1 {
width:150px;
height:34px;
background:rgba(234,244,255,1);
border:1px solid rgba(178, 215, 255, 1);
font-size:14px;
font-family:PingFang SC;
font-weight:400;
color:rgba(66,159,255,1);
line-height:34px;
margin: 7px 10px;
float: left;
}
.button2 {
width:150px;
height:34px;
background:rgba(24,144,255,1);
border-radius:4px;
font-size:14px;
font-family:PingFang SC;
font-weight:400;
color:rgba(255,255,255,1);
line-height:34px;
margin: 7px 10px;
float: left;
}
.button3 {
position: relative;
bottom: 52px;
width:72px;
height:32px;
background:rgba(255,255,255,1);
border:1px solid rgba(229, 229, 229, 1);
border-radius:4px;
margin: 10px 10px;
}
.table {
margin-right: 10px;
}
.detailsTitle {
display: inline-block;
font-size:18px;
font-family:PingFang SC;
font-weight:400;
color:rgba(73,73,73,1);
margin: 0px 30px;
}
.detailsContent {
display: inline-block;
font-size:15px;
width: 100px;
font-family:PingFang SC;
font-weight:400;
color:rgba(153,153,153,1);
margin: 10px 10px;
}
.detailsContent2 {
display: inline-block;
font-size:18px;
width: 200px;
font-family:PingFang SC;
font-weight:400;
color:rgba(51,51,51,1);
}
.detailsBox {
border-top: 1px solid rgba(229, 229, 229, 1);
margin: 10px 30px;
}
.font1 {
.detailsContent {
font-family:PingFang SC;
font-weight:400;
color:rgba(153,153,153,1);
margin: 5px 10px;
}
.backBox{
border: 1px solid rgb(0, 12, 23);
font-size: 2em;
margin: 50px ;
background: #1153ff;
}
.allCheckbox{
}
.subCheckbox{
}
}
src/pages/OrderManagement/OrderManagement.tsx 0 → 100644
View file @ 2bdfc4cc
This diff is collapsed.
src/pages/OrderManagement/OrderManagementDetail.tsx 0 → 100644
View file @ 2bdfc4cc
This diff is collapsed.
src/pages/OrderManagement/style.less 0 → 100644
View file @ 2bdfc4cc
@import '~antd/lib/style/themes/default.less';
.pre {
margin: 12px 0;
padding: 12px 20px;
background: @input-bg;
box-shadow: @card-shadow;
}
.input {
width:200px;
height:34px;
border:1px solid rgba(229, 229, 229, 1);
border-radius:5px;
margin: 0px 10px;
}
.input1 {
width:400px;
height:100px;
border:1px solid rgba(229, 229, 229, 1);
border-radius:5px;
margin: 0px 10px;
}
.body {
background:rgba(255,255,255,1);
border:1px solid rgba(229, 229, 229, 1);
}
.inputBox {
width:1250px;
//height:50px;
padding-top: 10px;
margin-bottom: 10px;
}
.downIcon {
position: relative;
left: 80px;
}
.downButton {
width:120px;
height:34px;
border:1px solid rgba(229, 229, 229, 1);
border-radius:5px;
margin: 0px 10px;
text-align: left;
}
.button1 {
width:82px;
height:34px;
background:rgba(234,244,255,1);
border:1px solid rgba(178, 215, 255, 1);
font-size:14px;
font-family:PingFang SC;
font-weight:400;
color:rgba(66,159,255,1);
line-height:34px;
margin: 10px 10px;
}
.button2 {
width:82px;
height:34px;
background:rgba(24,144,255,1);
border-radius:4px;
font-size:14px;
font-family:PingFang SC;
font-weight:400;
color:rgba(255,255,255,1);
line-height:34px;
margin: 7px 10px;
}
.button22 {
width:82px;
height:34px;
background:rgba(24,144,255,1);
border-radius:4px;
font-size:14px;
font-family:PingFang SC;
font-weight:400;
color:rgba(255,255,255,1);
line-height:34px;
margin: 7px 10px;
margin-bottom: 100px;
}
.button3 {
position: relative;
bottom: 52px;
width:72px;
height:32px;
background:rgba(255,255,255,1);
border:1px solid rgba(229, 229, 229, 1);
border-radius:4px;
margin: 10px 10px;
}
.table {
margin-right: 10px;
}
.detailsTitle {
display: inline-block;
font-size:18px;
font-family:PingFang SC;
font-weight:400;
color:rgba(73,73,73,1);
margin: 0px 30px;
}
.detailsContent {
display: inline-block;
font-size:18px;
width: 500px;
font-family:PingFang SC;
font-weight:400;
color:rgba(153,153,153,1);
margin: 10px 10px;
}
.detailsContent1 {
display: inline-block;
font-size:18px;
width: 200px;
font-family:PingFang SC;
font-weight:400;
color:rgba(153,153,153,1);
margin: 10px 10px;
}
.detailsContent11 {
display: flex;
//font-size:18px;
//width: 200px;
//font-family:PingFang SC;
//font-weight:400;
//color:rgba(153,153,153,1);
margin-top: 20px ;
}
.detailsContent2 {
display: inline-block;
font-size:18px;
width: 200px;
font-family:PingFang SC;
font-weight:400;
color:rgba(51,51,51,1);
}
.detailsBox {
border-top: 1px solid rgba(229, 229, 229, 1);
margin: 10px 10px 10px 30px;
}
.font1 {
.detailsContent {
font-family:PingFang SC;
font-weight:400;
color: rgb(153, 153, 153);
margin: 5px 10px;
}
}
src/services/orderManagement.ts 0 → 100644
View file @ 2bdfc4cc
import request from '@/utils/request';
export async function getAdvertisement(params) {
return request('/api/ad/get', {
method: 'POST',
data: params,
});
}
export async function delAdvertisement(params) {
return request('/api/ad/del', {
method: 'POST',
data: params,
});
}
export async function saveAdvertisement(params) {
return request('/api/ad/save', {
method: 'POST',
data: params,
});
}
export async function quitAndUserAd(params) {
return request('/api/ad/quitAndUserAd', {
method: 'POST',
data: params,
});
}
export async function uploadApk(params) {
return request('/api/uploadApk/apk', {
method: 'POST',
data: params,
});
}
export async function checkVideo(params) {
return request('/api/uploadApk/prview', {
method: 'POST',
data: params,
});
}
src/services/visitorRecord.ts 0 → 100644
View file @ 2bdfc4cc
import request from '@/utils/request';
export async function getAdvertisement(params) {
return request('/api/ad/get', {
method: 'POST',
data: params,
});
}
export async function delAdvertisement(params) {
return request('/api/ad/del', {
method: 'POST',
data: params,
});
}
export async function saveAdvertisement(params) {
return request('/api/ad/save', {
method: 'POST',
data: params,
});
}
export async function quitAndUserAd(params) {
return request('/api/ad/quitAndUserAd', {
method: 'POST',
data: params,
});
}
export async function uploadApk(params) {
return request('/api/uploadApk/apk', {
method: 'POST',
data: params,
});
}
export async function checkVideo(params) {
return request('/api/uploadApk/prview', {
method: 'POST',
data: params,
});
}
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