master
parent
9691598913
commit
e1160cacda
|
|
@ -13,7 +13,9 @@ axios.defaults.baseURL='https://a99zg89a.xiaomy.net'
|
|||
axios.interceptors.request.use(config => {
|
||||
|
||||
config.headers.Authorization = "Basic c2FiZXI6c2FiZXJfc2VjcmV0"
|
||||
console.log(config.headers)
|
||||
|
||||
config.headers.common['Blade-Auth'] =localStorage.token
|
||||
|
||||
return config
|
||||
})
|
||||
let app=createApp(App)
|
||||
|
|
|
|||
|
|
@ -45,12 +45,8 @@ export default {
|
|||
this.axios
|
||||
.post("/hysc/auth/token", param)
|
||||
.then(function (response) {
|
||||
console.log(response.data,"登录");
|
||||
if (response.data.code == 200) {
|
||||
|
||||
that.axios.defaults.headers.common['Blade-Auth'] ="bearer "+response.data.data.accessToken
|
||||
console.log( that.axios.defaults.headers);
|
||||
console.log();
|
||||
localStorage.token="bearer "+response.data.data.accessToken
|
||||
that.$router.push("/index");
|
||||
}else{
|
||||
that.$alert(response.data.msg,"登录失败", {
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
</div>
|
||||
<div class="searchInput">
|
||||
<el-date-picker
|
||||
v-model="value2"
|
||||
v-model="projectDate"
|
||||
type="daterange"
|
||||
align="right"
|
||||
unlink-panels
|
||||
|
|
@ -27,26 +27,30 @@
|
|||
<button type="button" @click="queryProject()" class="queryProject">
|
||||
<img src="" alt="" /> 查询
|
||||
</button>
|
||||
<button type="button" class="addProject">
|
||||
<button type="primary" @click="addProject()" class="addProject">
|
||||
<img src="" alt="" /> 新建
|
||||
</button>
|
||||
</div>
|
||||
<div class="projectTable">
|
||||
<el-table :data="tableData" style="width: 100%" max-height="500">
|
||||
<el-table-column fixed prop="date" label="Date" width="150" />
|
||||
<el-table-column prop="name" label="Name" width="120" />
|
||||
<el-table-column prop="state" label="State" width="120" />
|
||||
<el-table-column prop="city" label="City" width="120" />
|
||||
<el-table-column prop="address" label="Address" width="600" />
|
||||
<el-table-column prop="zip" label="Zip" width="120" />
|
||||
<el-table-column fixed="right" label="Operations" width="120">
|
||||
<el-table-column
|
||||
align="center"
|
||||
fixed
|
||||
prop="companyName"
|
||||
label="创建部门"
|
||||
/>
|
||||
<el-table-column align="center" prop="createTime" label="创建时间" />
|
||||
<el-table-column align="center" prop="name" label="项目" />
|
||||
<el-table-column align="center" prop="note" label="备注" />
|
||||
<el-table-column align="center" prop="testCount" label="数量" />
|
||||
<el-table-column align="center" fixed="right" label="操作">
|
||||
<template #default="scope">
|
||||
<el-button
|
||||
type="text"
|
||||
size="small"
|
||||
@click.prevent="deleteRow(scope.$index)"
|
||||
>
|
||||
Remove
|
||||
删除
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
@ -54,15 +58,52 @@
|
|||
<div class="pagination">
|
||||
<el-pagination
|
||||
background
|
||||
v-model:currentPage="currentPage4"
|
||||
layout=" prev, pager, next, jumper"
|
||||
@size-change="handleSizeChange"
|
||||
@current-change="handleCurrentChange"
|
||||
:current-page="currentPage4"
|
||||
layout="prev, pager, next, jumper"
|
||||
:total="400"
|
||||
>
|
||||
</el-pagination>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<el-drawer
|
||||
v-model="drawer"
|
||||
title="新建项目"
|
||||
:direction="direction"
|
||||
:before-close="handleClose"
|
||||
>
|
||||
<div class="elementUl">
|
||||
<el-form
|
||||
:label-position="labelPosition"
|
||||
label-width="100px"
|
||||
:model="addProjectData"
|
||||
style="max-width: 460px"
|
||||
>
|
||||
<el-form-item label="项目名称">
|
||||
<el-input v-model="addProjectData.projectName"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="项目单位">
|
||||
<el-input v-model="addProjectData.projectUnit"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="项目描述" prop="type">
|
||||
<el-input v-model="addProjectData.projectNote" type="textarea" :autosize="{ minRows:9, maxRows: 9 }"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="addProjectManagement()"
|
||||
>新建项目</el-button
|
||||
>
|
||||
<el-button @click="resetForm(ruleFormRef)">取消新建</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
|
||||
</el-drawer>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
@ -78,8 +119,16 @@ export default {
|
|||
},
|
||||
data() {
|
||||
return {
|
||||
addProjectData:{
|
||||
projectName:"",
|
||||
projectUnit:"",
|
||||
projectNote:""
|
||||
},
|
||||
drawer: false,
|
||||
direction: "rtl",
|
||||
projectName: "",
|
||||
projectDate: "",
|
||||
|
||||
projectData: {
|
||||
current: 1,
|
||||
endTime: "",
|
||||
|
|
@ -87,98 +136,108 @@ export default {
|
|||
size: "",
|
||||
startTime: "",
|
||||
},
|
||||
tableData: [
|
||||
{
|
||||
date: "2016-05-03",
|
||||
name: "王小虎",
|
||||
province: "上海",
|
||||
city: "普陀区",
|
||||
address: "上海市普陀区金沙江路 1518 弄",
|
||||
zip: 200333,
|
||||
},
|
||||
{
|
||||
date: "2016-05-02",
|
||||
name: "王小虎",
|
||||
province: "上海",
|
||||
city: "普陀区",
|
||||
address: "上海市普陀区金沙江路 1518 弄",
|
||||
zip: 200333,
|
||||
},
|
||||
{
|
||||
date: "2016-05-04",
|
||||
name: "王小虎",
|
||||
province: "上海",
|
||||
city: "普陀区",
|
||||
address: "上海市普陀区金沙江路 1518 弄",
|
||||
zip: 200333,
|
||||
},
|
||||
{
|
||||
date: "2016-05-01",
|
||||
name: "王小虎",
|
||||
province: "上海",
|
||||
city: "普陀区",
|
||||
address: "上海市普陀区金沙江路 1518 弄",
|
||||
zip: 200333,
|
||||
},
|
||||
{
|
||||
date: "2016-05-08",
|
||||
name: "王小虎",
|
||||
province: "上海",
|
||||
city: "普陀区",
|
||||
address: "上海市普陀区金沙江路 1518 弄",
|
||||
zip: 200333,
|
||||
},
|
||||
{
|
||||
date: "2016-05-06",
|
||||
name: "王小虎",
|
||||
province: "上海",
|
||||
city: "普陀区",
|
||||
address: "上海市普陀区金沙江路 1518 弄",
|
||||
zip: 200333,
|
||||
},
|
||||
{
|
||||
date: "2016-05-07",
|
||||
name: "王小虎",
|
||||
province: "上海",
|
||||
city: "普陀区",
|
||||
address: "上海市普陀区金沙江路 1518 弄",
|
||||
zip: 200333,
|
||||
},
|
||||
{
|
||||
date: "2016-05-07",
|
||||
name: "王小虎",
|
||||
province: "上海",
|
||||
city: "普陀区",
|
||||
address: "上海市普陀区金沙江路 1518 弄",
|
||||
zip: 200333,
|
||||
},
|
||||
],
|
||||
tableData: [],
|
||||
pickerOptions: {
|
||||
shortcuts: [
|
||||
{
|
||||
text: "本月",
|
||||
onClick(picker) {
|
||||
picker.$emit("pick", [new Date(), new Date()]);
|
||||
},
|
||||
},
|
||||
{
|
||||
text: "今年至今",
|
||||
onClick(picker) {
|
||||
const end = new Date();
|
||||
const start = new Date(new Date().getFullYear(), 0);
|
||||
picker.$emit("pick", [start, end]);
|
||||
},
|
||||
},
|
||||
{
|
||||
text: "最近六个月",
|
||||
onClick(picker) {
|
||||
const end = new Date();
|
||||
const start = new Date();
|
||||
start.setMonth(start.getMonth() - 6);
|
||||
picker.$emit("pick", [start, end]);
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
// 初始化获取数据
|
||||
this.getProject();
|
||||
},
|
||||
methods: {
|
||||
handleClose() {
|
||||
|
||||
this.drawer=false
|
||||
},
|
||||
deleteRow(index) {
|
||||
console.log(index);
|
||||
this.tableData.splice(index, 1);
|
||||
},
|
||||
queryProject() {
|
||||
this.getProject();
|
||||
},
|
||||
getProject() {
|
||||
let param = new URLSearchParams();
|
||||
// 时间格式转换
|
||||
newDate(data) {
|
||||
let yy = new Date(data).getFullYear();
|
||||
let mm = new Date(data).getMonth() + 1;
|
||||
let dd = new Date(data).getDate();
|
||||
// let hh = new Date(data).getHours();
|
||||
// let mf = new Date(data).getMinutes();
|
||||
// let ss = new Date(data).getSeconds();
|
||||
|
||||
return yy + "-" + mm + "-" + "-" + dd;
|
||||
},
|
||||
// 打开弹窗
|
||||
addProject(){
|
||||
this.drawer=true
|
||||
console.log( this.drawer);
|
||||
},
|
||||
addProjectManagement(){
|
||||
let param = new URLSearchParams();
|
||||
|
||||
param.append("current", this.projectData.current);
|
||||
param.append("endTime", this.projectData.endTime);
|
||||
param.append("name", this.projectData.name);
|
||||
param.append("size", this.projectData.size);
|
||||
param.append("startTime", this.projectData.startTime);
|
||||
|
||||
let that = this;
|
||||
this.axios
|
||||
.get("/hysc/project/getProjectPage", param)
|
||||
.then(function (response) {
|
||||
console.log(response);
|
||||
console.log(response.data);
|
||||
|
||||
that.tableData = response.data.data.records;
|
||||
})
|
||||
.catch(function (error) {
|
||||
console.log(error);
|
||||
});
|
||||
|
||||
},
|
||||
// 查询
|
||||
queryProject() {
|
||||
this.projectData.startTime = this.newDate(this.projectDate[0]);
|
||||
this.projectData.endTime = this.newDate(this.projectDate[1]);
|
||||
this.projectData.name = this.projectName;
|
||||
this.getProject();
|
||||
},
|
||||
// 获取列表数据
|
||||
getProject() {
|
||||
let param = new URLSearchParams();
|
||||
param.append("current", this.projectData.current);
|
||||
param.append("endTime", this.projectData.endTime);
|
||||
param.append("name", this.projectData.name);
|
||||
param.append("size", this.projectData.size);
|
||||
param.append("startTime", this.projectData.startTime);
|
||||
let that = this;
|
||||
this.axios
|
||||
.get("/hysc/project/getProjectPage", param)
|
||||
.then(function (response) {
|
||||
console.log(response.data);
|
||||
|
||||
that.tableData = response.data.data.records;
|
||||
})
|
||||
.catch(function (error) {
|
||||
console.log(error);
|
||||
|
|
@ -222,6 +281,9 @@ export default {
|
|||
.searchInput .el-input__inner {
|
||||
height: 40px;
|
||||
}
|
||||
.elementUl .el-input__inner {
|
||||
height: 40px;
|
||||
}
|
||||
.searchInput {
|
||||
margin-right: 10px;
|
||||
width: 340px;
|
||||
|
|
|
|||
Loading…
Reference in New Issue