Skip to content

Q
qsh-wc
Commit 0a022266 authored by honghuiliu's avatar honghuiliu 💬
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 46eb31dc 4a311364
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 248 additions and 235 deletions
pc/src/api/getData.js
View file @ 0a022266
......@@ -69,11 +69,11 @@ function checkCode(res,url) {
}
export default {
post(url,data, config = { 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' }){
post(url,data, config = { 'Content-Type': 'application/json; charset=UTF-8' }){
let record = id;
if(list.indexOf(url)==-1){
let token = myPublic.getStorage('token');
config['token'] = token;
let token = myPublic.getStorage('qsh-wc-token');
url = url+'?access_token='+token;
}
console.log(`request`,record,url+' ',data);
console.time(`request ${record}`);
......@@ -82,7 +82,7 @@ export default {
method: 'post',
baseURL: API_HOST,
url,
data: qs.stringify(data),
data: JSON.stringify(data),
headers: config
}).then(response =>{
return checkStatus(response,url,record);
......
pc/src/api/methods/index.js
View file @ 0a022266
......@@ -14,6 +14,10 @@ export default {
},
//工单列表
getPatrolList(params) {
return http.post('web/toilet/getPatrolList', params)
return http.post('web/patrol/getPatrolList', params)
},
//工单详情
getPatrolDetail(params) {
return http.post('web/patrol/getPatrolDetail', params)
}
}
pc/src/views/home.vue
View file @ 0a022266
......@@ -47,41 +47,41 @@
site_id:'',
time:myPublic.dateFormat.format(Date.now(), 'HH:mm:ss YYYY年MM月DD日'),
list:[
{
longitude:119.779647,
latitude:30.24369,
name:'青山湖国家森林公园',
address:'浙江省杭州市临安区老圣园路北',
type:1
},
{
longitude:119.821796,
latitude:30.254114,
name:'青山湖街道',
address:'浙江省杭州市临安区',
type:1
},
{
longitude:119.790127,
latitude:30.255317,
name:'灵山',
address:'浙江省杭州市临安区',
type:2
},
{
longitude:119.852565,
latitude:30.2528,
name:'青山湖互通',
address:'浙江省杭州市临安区',
type:1
},
{
longitude:119.823904,
latitude:30.24808,
name:'青山中学',
address:'浙江省杭州市临安区',
type:1
},
// {
// longitude:119.779647,
// latitude:30.24369,
// name:'青山湖国家森林公园',
// address:'浙江省杭州市临安区老圣园路北',
// type:1
// },
// {
// longitude:119.821796,
// latitude:30.254114,
// name:'青山湖街道',
// address:'浙江省杭州市临安区',
// type:1
// },
// {
// longitude:119.790127,
// latitude:30.255317,
// name:'灵山',
// address:'浙江省杭州市临安区',
// type:2
// },
// {
// longitude:119.852565,
// latitude:30.2528,
// name:'青山湖互通',
// address:'浙江省杭州市临安区',
// type:1
// },
// {
// longitude:119.823904,
// latitude:30.24808,
// name:'青山中学',
// address:'浙江省杭州市临安区',
// type:1
// },
]
});
const user = computed(()=>{
......@@ -98,12 +98,23 @@
getList();
}
function getList() {
for (let item of state.list) {
const marker = new BMapGL.Point(item.longitude, item.latitude);
mapShow(marker, item, function (i) {
let p = {
page:1,
page_size:99
};
api.toiletList(p).then((res)=>{
if(res.code==0){
if(Array.isArray(res.data.list)){
state.list = [...res.data.list];
for (let item of state.list) {
const marker = new BMapGL.Point(item.lng, item.lat);
mapShow(marker, item, function (i) {
});
}
});
}
}
}
});
}
function mapShow(coordinate, item, callBack) {
const now = Date.now();
......@@ -172,8 +183,8 @@
}
}
function seeDetail(item){
state.site_id = item.ID;
state.show = true;
state.site_id = item.site_id||'12';
}
onMounted(()=>{
nextTick(()=>{
......
pc/src/views/login.vue
View file @ 0a022266
......@@ -11,7 +11,7 @@
</div>
<div class="row">
<span class="icon icon-17"></span>
<input class="input" type="password" v-model="password" placeholder="请输入密码" />
<input class="input" type="password" v-model="password" placeholder="请输入密码" @keyup.enter="submit"/>
</div>
<div class="opt">
<span class="btn" @click="submit">登录</span>
......@@ -57,7 +57,6 @@
if(res.data){
myPublic.setStorage("qsh-wc-token",res.data);
await router.replace({path:"/home"});
window.reload();
}
}
})
......
pc/src/views/order-detail.vue
View file @ 0a022266
......@@ -11,7 +11,7 @@
</div>
<div class="row-one">
<span class="row-name">巡检公厕单位</span>
<span class="row-content">{{detail.name}}</span>
<span class="row-content">{{detail.toiletId}}</span>
</div>
<div class="row-one">
<span class="row-name">巡检类型</span>
......@@ -19,7 +19,7 @@
</div>
<div class="row-one baseline">
<span class="row-name">巡检内容</span>
<div class="row-content">
<div class="row-content" v-if="detail.content">
<template v-for="item in detail.content">
<div class="check-one">
<el-checkbox v-model="item.check" :label="item.title" size="large" :disabled="true"/>
......@@ -28,7 +28,7 @@
</div>
</div>
<div class="row-one">
<span class="row-name">附件</span>
<span class="row-name">巡检图片</span>
<div class="row-content">
<photo-provider>
<photo-consumer v-for="(url,index) in fileList" :key="url" :src="url">
......@@ -44,11 +44,11 @@
</div>
<div class="row-one">
<span class="row-name">站点巡检人</span>
<span class="row-content">{{detail.staff}}</span>
<span class="row-content">{{detail.partolName}}</span>
</div>
<div class="row-one">
<span class="row-name">提交时间</span>
<span class="row-content">{{detail.create_time}}</span>
<span class="row-content">{{detail.CreatedAt}}</span>
</div>
</div>
</div>
......@@ -60,6 +60,7 @@
import {ElMessage} from "element-plus"
import {Close} from "@element-plus/icons-vue"
import api from "@/api/methods/index"
import myPublic from "@/utils/public"
export default {
name: 'order-detail',
emits: ['update:modelValue'],
......@@ -76,10 +77,10 @@
setup(props, {emit}) {
const state = reactive({
detail: {
title:'2022年6月22日公厕巡检工作',
title:'',
type:1,
name:'三号路公共厕所【GC-004】',
staff:'罗小飞',
name:'',
partolName:'',
content:[
{
title:'检查格栅井',
......@@ -148,7 +149,7 @@
],
description:'泵站清淤很多、泵站清淤很多、泵站清淤很多、泵站清淤很多、泵站清淤很多、泵站清淤很多、\n' +
'泵站清淤很多。',
create_time:'2022-06-22 10:00'
CreatedAt:'2022-06-22 10:00'
},
typeList:[
{
......@@ -233,7 +234,12 @@
}
}
function getDetail(){
api.getPatrolDetail({id:props.order_id}).then((res)=>{
if(res.code==0){
res.data.CreatedAt = myPublic.dateFormat.format(res.data.CreatedAt)
Object.assign(state.detail,{...res.data});
}
});
}
function closeBox(){
emit('update:modelValue',false)
......
pc/src/views/site-detail.vue
View file @ 0a022266
This diff is collapsed.
pc/vue.config.js
View file @ 0a022266
......@@ -62,7 +62,7 @@ module.exports = {
port:80,
proxy: {
'/api': {
target: 'http://qsh-wc-test.linanquan.com/api',
target: 'http://127.0.0.1:9801',
changeOrigin: true,
pathRewrite: {
// '^/apis': ''表示把/apis替换为‘’(空字符串)，这样既能使用代理，
......
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