diff --git a/config/dev.env.js b/config/dev.env.js index df0ed63..786fb2a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -4,6 +4,9 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee"' + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://192.168.0.212:8083"', + BASE_API: '"http://20.1.11.52:5988"', // BASE_API: '"http://192.168.0.225:8083"', }) diff --git a/config/dev.env.js b/config/dev.env.js index df0ed63..786fb2a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -4,6 +4,9 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee"' + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://192.168.0.212:8083"', + BASE_API: '"http://20.1.11.52:5988"', // BASE_API: '"http://192.168.0.225:8083"', }) diff --git a/config/index.js b/config/index.js index 88422c3..ca24a9c 100644 --- a/config/index.js +++ b/config/index.js @@ -6,14 +6,19 @@ module.exports = { dev: { - // Paths assetsSubDirectory: 'static', assetsPublicPath: '/', - proxyTable: {}, - + proxyTable: { + // '/api': { + // target: 'http://20.1.2.241', //目标接口域名 + // pathRewrite: { + // '^/api': '' //重写接口 + // }, + // changeOrigin: true, //是否跨域 + // }, + }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, diff --git a/config/dev.env.js b/config/dev.env.js index df0ed63..786fb2a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -4,6 +4,9 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee"' + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://192.168.0.212:8083"', + BASE_API: '"http://20.1.11.52:5988"', // BASE_API: '"http://192.168.0.225:8083"', }) diff --git a/config/index.js b/config/index.js index 88422c3..ca24a9c 100644 --- a/config/index.js +++ b/config/index.js @@ -6,14 +6,19 @@ module.exports = { dev: { - // Paths assetsSubDirectory: 'static', assetsPublicPath: '/', - proxyTable: {}, - + proxyTable: { + // '/api': { + // target: 'http://20.1.2.241', //目标接口域名 + // pathRewrite: { + // '^/api': '' //重写接口 + // }, + // changeOrigin: true, //是否跨域 + // }, + }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, diff --git a/config/prod.env.js b/config/prod.env.js index 3327c7d..462c806 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,7 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://119.254.103.80:14536"', - BASE_API: '"http://106.74.146.218:2031"', + BASE_API: '"http://20.1.11.52:5988"', + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://106.74.146.218:2031"', } diff --git a/config/dev.env.js b/config/dev.env.js index df0ed63..786fb2a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -4,6 +4,9 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee"' + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://192.168.0.212:8083"', + BASE_API: '"http://20.1.11.52:5988"', // BASE_API: '"http://192.168.0.225:8083"', }) diff --git a/config/index.js b/config/index.js index 88422c3..ca24a9c 100644 --- a/config/index.js +++ b/config/index.js @@ -6,14 +6,19 @@ module.exports = { dev: { - // Paths assetsSubDirectory: 'static', assetsPublicPath: '/', - proxyTable: {}, - + proxyTable: { + // '/api': { + // target: 'http://20.1.2.241', //目标接口域名 + // pathRewrite: { + // '^/api': '' //重写接口 + // }, + // changeOrigin: true, //是否跨域 + // }, + }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, diff --git a/config/prod.env.js b/config/prod.env.js index 3327c7d..462c806 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,7 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://119.254.103.80:14536"', - BASE_API: '"http://106.74.146.218:2031"', + BASE_API: '"http://20.1.11.52:5988"', + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://106.74.146.218:2031"', } diff --git a/src/api/app.js b/src/api/app.js index d556d7c..ecd110a 100644 --- a/src/api/app.js +++ b/src/api/app.js @@ -2,6 +2,7 @@ * APP的接口 */ import request from '@/utils/request' + // 新版本查询 export function checkVersion() { return request({ diff --git a/config/dev.env.js b/config/dev.env.js index df0ed63..786fb2a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -4,6 +4,9 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee"' + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://192.168.0.212:8083"', + BASE_API: '"http://20.1.11.52:5988"', // BASE_API: '"http://192.168.0.225:8083"', }) diff --git a/config/index.js b/config/index.js index 88422c3..ca24a9c 100644 --- a/config/index.js +++ b/config/index.js @@ -6,14 +6,19 @@ module.exports = { dev: { - // Paths assetsSubDirectory: 'static', assetsPublicPath: '/', - proxyTable: {}, - + proxyTable: { + // '/api': { + // target: 'http://20.1.2.241', //目标接口域名 + // pathRewrite: { + // '^/api': '' //重写接口 + // }, + // changeOrigin: true, //是否跨域 + // }, + }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, diff --git a/config/prod.env.js b/config/prod.env.js index 3327c7d..462c806 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,7 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://119.254.103.80:14536"', - BASE_API: '"http://106.74.146.218:2031"', + BASE_API: '"http://20.1.11.52:5988"', + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://106.74.146.218:2031"', } diff --git a/src/api/app.js b/src/api/app.js index d556d7c..ecd110a 100644 --- a/src/api/app.js +++ b/src/api/app.js @@ -2,6 +2,7 @@ * APP的接口 */ import request from '@/utils/request' + // 新版本查询 export function checkVersion() { return request({ diff --git a/src/api/special.js b/src/api/special.js new file mode 100644 index 0000000..e4574e8 --- /dev/null +++ b/src/api/special.js @@ -0,0 +1,97 @@ + +/** + * APP的接口 + */ +import request from '@/utils/request' +import { getToken } from '@/utils/auth' +import store from '@/store' + + +// 新版本查询 +export function appSpApi(method,params={},type='GET') { + const data = { + 'FWQQ_BWBH':getBWBH(), //报文编号 + 'BWLYIPDZ':getIP(), //12位IP + 'BWLYDKH':'8083', //端口？ + 'FWQQZ_ZCXX':'A00111000026000004818', + 'FWBS':'S00101100002600052004', + 'FFBS':'FUN001', + 'FWQQ_RQSJ':getTime(), + 'FWQQ_NR':{ + method:'appprepositionInvoke', + params:{ + method:method, + type:type, + token: getToken(), + params: params + }}, + 'XXCZRY_XM':store.getters.name, + 'XXCZRY_GMSFHM':store.getters.username, + 'XXCZRY_GAJGJGDM':store.getters.jgdm, + 'FWQQSB_BH':store.getters.imei, + 'FWQQ_SJSJLX':'service_request', + 'YYSBS':store.getters.yys + } + return request({ + url: '/http/GA000Comm', + method: 'post', + data:data + }) +} + +function getBWBH(){ + let head = "SR" + let ip = changeIP(store.getters.ip); + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + let mseconds = mdate.getMilliseconds(); //获取当前毫秒数（0~999） + let end = Math.floor(Math.random()*(9999-1000))+1000;//生成随机4位流水号 + + let result = head+ip + +year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + +formatStr(mseconds,3)+end; + + return result; + +} + +function getIP(){ + let ip = changeIP(store.getters.ip); + return ip; +} + +function getTime(){ + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + + let result = ""+year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + return result +} + +function changeIP(ip){ + const ip_ds = ip.split(".") + let result = "" + for(let item of ip_ds){ + item = "000"+item + result+=item.substr(-3) + } + return result; +} + +function formatStr(str,length){ + str = "000"+str + return str.substr(0-length) +} + diff --git a/config/dev.env.js b/config/dev.env.js index df0ed63..786fb2a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -4,6 +4,9 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee"' + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://192.168.0.212:8083"', + BASE_API: '"http://20.1.11.52:5988"', // BASE_API: '"http://192.168.0.225:8083"', }) diff --git a/config/index.js b/config/index.js index 88422c3..ca24a9c 100644 --- a/config/index.js +++ b/config/index.js @@ -6,14 +6,19 @@ module.exports = { dev: { - // Paths assetsSubDirectory: 'static', assetsPublicPath: '/', - proxyTable: {}, - + proxyTable: { + // '/api': { + // target: 'http://20.1.2.241', //目标接口域名 + // pathRewrite: { + // '^/api': '' //重写接口 + // }, + // changeOrigin: true, //是否跨域 + // }, + }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, diff --git a/config/prod.env.js b/config/prod.env.js index 3327c7d..462c806 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,7 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://119.254.103.80:14536"', - BASE_API: '"http://106.74.146.218:2031"', + BASE_API: '"http://20.1.11.52:5988"', + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://106.74.146.218:2031"', } diff --git a/src/api/app.js b/src/api/app.js index d556d7c..ecd110a 100644 --- a/src/api/app.js +++ b/src/api/app.js @@ -2,6 +2,7 @@ * APP的接口 */ import request from '@/utils/request' + // 新版本查询 export function checkVersion() { return request({ diff --git a/src/api/special.js b/src/api/special.js new file mode 100644 index 0000000..e4574e8 --- /dev/null +++ b/src/api/special.js @@ -0,0 +1,97 @@ + +/** + * APP的接口 + */ +import request from '@/utils/request' +import { getToken } from '@/utils/auth' +import store from '@/store' + + +// 新版本查询 +export function appSpApi(method,params={},type='GET') { + const data = { + 'FWQQ_BWBH':getBWBH(), //报文编号 + 'BWLYIPDZ':getIP(), //12位IP + 'BWLYDKH':'8083', //端口？ + 'FWQQZ_ZCXX':'A00111000026000004818', + 'FWBS':'S00101100002600052004', + 'FFBS':'FUN001', + 'FWQQ_RQSJ':getTime(), + 'FWQQ_NR':{ + method:'appprepositionInvoke', + params:{ + method:method, + type:type, + token: getToken(), + params: params + }}, + 'XXCZRY_XM':store.getters.name, + 'XXCZRY_GMSFHM':store.getters.username, + 'XXCZRY_GAJGJGDM':store.getters.jgdm, + 'FWQQSB_BH':store.getters.imei, + 'FWQQ_SJSJLX':'service_request', + 'YYSBS':store.getters.yys + } + return request({ + url: '/http/GA000Comm', + method: 'post', + data:data + }) +} + +function getBWBH(){ + let head = "SR" + let ip = changeIP(store.getters.ip); + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + let mseconds = mdate.getMilliseconds(); //获取当前毫秒数（0~999） + let end = Math.floor(Math.random()*(9999-1000))+1000;//生成随机4位流水号 + + let result = head+ip + +year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + +formatStr(mseconds,3)+end; + + return result; + +} + +function getIP(){ + let ip = changeIP(store.getters.ip); + return ip; +} + +function getTime(){ + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + + let result = ""+year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + return result +} + +function changeIP(ip){ + const ip_ds = ip.split(".") + let result = "" + for(let item of ip_ds){ + item = "000"+item + result+=item.substr(-3) + } + return result; +} + +function formatStr(str,length){ + str = "000"+str + return str.substr(0-length) +} + diff --git a/src/api/testZongXian.js b/src/api/testZongXian.js new file mode 100644 index 0000000..9081f8f --- /dev/null +++ b/src/api/testZongXian.js @@ -0,0 +1,88 @@ + +var ip = '10.9.39.8' +// 新版本查询 +function generateJson(method,params={},type='GET') { + const data = { + 'FWQQ_BWBH':getBWBH(), //报文编号 + 'BWLYIPDZ':getIP(), //12位IP + 'BWLYDKH':'8083', //端口？ + 'FWQQZ_ZCXX':'A00111000026000004818', + 'FWBS':'S00101100002600052004', + 'FFBS':'FUN001', + 'FWQQ_RQSJ':getTime(), + 'FWQQ_NR':{ + method:'appprepositionInvoke', + params:{ + method:method, + type:type, + token: '', + params: params + }}, + 'XXCZRY_XM':'张森', + 'XXCZRY_GMSFHM':'110226198909261410', + 'XXCZRY_GAJGJGDM':'-', + 'FWQQSB_BH':'-', + 'FWQQ_SJSJLX':'service_request', + 'YYSBS':'lt' + } + console.log(JSON.stringify(data)) +} + +function getBWBH(){ + let head = "SR" + let ip = changeIP('10.9.39.8'); + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + let mseconds = mdate.getMilliseconds(); //获取当前毫秒数（0~999） + let end = Math.floor(Math.random()*(9999-1000))+1000;//生成随机4位流水号 + + let result = head+ip + +year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + +formatStr(mseconds,3)+end; + + return result; + +} + +function getIP(){ + let ip = changeIP('10.9.39.8'); + return ip; +} + +function getTime(){ + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + + let result = ""+year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + return result +} + +function changeIP(ip){ + const ip_ds = ip.split(".") + let result = "" + for(let item of ip_ds){ + item = "000"+item + result+=item.substr(-3) + } + return result; +} + +function formatStr(str,length){ + str = "000"+str + return str.substr(0-length) +} + + +generateJson('app/tokenByCard',{card:'110226198909261410'}) diff --git a/config/dev.env.js b/config/dev.env.js index df0ed63..786fb2a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -4,6 +4,9 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee"' + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://192.168.0.212:8083"', + BASE_API: '"http://20.1.11.52:5988"', // BASE_API: '"http://192.168.0.225:8083"', }) diff --git a/config/index.js b/config/index.js index 88422c3..ca24a9c 100644 --- a/config/index.js +++ b/config/index.js @@ -6,14 +6,19 @@ module.exports = { dev: { - // Paths assetsSubDirectory: 'static', assetsPublicPath: '/', - proxyTable: {}, - + proxyTable: { + // '/api': { + // target: 'http://20.1.2.241', //目标接口域名 + // pathRewrite: { + // '^/api': '' //重写接口 + // }, + // changeOrigin: true, //是否跨域 + // }, + }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, diff --git a/config/prod.env.js b/config/prod.env.js index 3327c7d..462c806 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,7 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://119.254.103.80:14536"', - BASE_API: '"http://106.74.146.218:2031"', + BASE_API: '"http://20.1.11.52:5988"', + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://106.74.146.218:2031"', } diff --git a/src/api/app.js b/src/api/app.js index d556d7c..ecd110a 100644 --- a/src/api/app.js +++ b/src/api/app.js @@ -2,6 +2,7 @@ * APP的接口 */ import request from '@/utils/request' + // 新版本查询 export function checkVersion() { return request({ diff --git a/src/api/special.js b/src/api/special.js new file mode 100644 index 0000000..e4574e8 --- /dev/null +++ b/src/api/special.js @@ -0,0 +1,97 @@ + +/** + * APP的接口 + */ +import request from '@/utils/request' +import { getToken } from '@/utils/auth' +import store from '@/store' + + +// 新版本查询 +export function appSpApi(method,params={},type='GET') { + const data = { + 'FWQQ_BWBH':getBWBH(), //报文编号 + 'BWLYIPDZ':getIP(), //12位IP + 'BWLYDKH':'8083', //端口？ + 'FWQQZ_ZCXX':'A00111000026000004818', + 'FWBS':'S00101100002600052004', + 'FFBS':'FUN001', + 'FWQQ_RQSJ':getTime(), + 'FWQQ_NR':{ + method:'appprepositionInvoke', + params:{ + method:method, + type:type, + token: getToken(), + params: params + }}, + 'XXCZRY_XM':store.getters.name, + 'XXCZRY_GMSFHM':store.getters.username, + 'XXCZRY_GAJGJGDM':store.getters.jgdm, + 'FWQQSB_BH':store.getters.imei, + 'FWQQ_SJSJLX':'service_request', + 'YYSBS':store.getters.yys + } + return request({ + url: '/http/GA000Comm', + method: 'post', + data:data + }) +} + +function getBWBH(){ + let head = "SR" + let ip = changeIP(store.getters.ip); + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + let mseconds = mdate.getMilliseconds(); //获取当前毫秒数（0~999） + let end = Math.floor(Math.random()*(9999-1000))+1000;//生成随机4位流水号 + + let result = head+ip + +year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + +formatStr(mseconds,3)+end; + + return result; + +} + +function getIP(){ + let ip = changeIP(store.getters.ip); + return ip; +} + +function getTime(){ + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + + let result = ""+year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + return result +} + +function changeIP(ip){ + const ip_ds = ip.split(".") + let result = "" + for(let item of ip_ds){ + item = "000"+item + result+=item.substr(-3) + } + return result; +} + +function formatStr(str,length){ + str = "000"+str + return str.substr(0-length) +} + diff --git a/src/api/testZongXian.js b/src/api/testZongXian.js new file mode 100644 index 0000000..9081f8f --- /dev/null +++ b/src/api/testZongXian.js @@ -0,0 +1,88 @@ + +var ip = '10.9.39.8' +// 新版本查询 +function generateJson(method,params={},type='GET') { + const data = { + 'FWQQ_BWBH':getBWBH(), //报文编号 + 'BWLYIPDZ':getIP(), //12位IP + 'BWLYDKH':'8083', //端口？ + 'FWQQZ_ZCXX':'A00111000026000004818', + 'FWBS':'S00101100002600052004', + 'FFBS':'FUN001', + 'FWQQ_RQSJ':getTime(), + 'FWQQ_NR':{ + method:'appprepositionInvoke', + params:{ + method:method, + type:type, + token: '', + params: params + }}, + 'XXCZRY_XM':'张森', + 'XXCZRY_GMSFHM':'110226198909261410', + 'XXCZRY_GAJGJGDM':'-', + 'FWQQSB_BH':'-', + 'FWQQ_SJSJLX':'service_request', + 'YYSBS':'lt' + } + console.log(JSON.stringify(data)) +} + +function getBWBH(){ + let head = "SR" + let ip = changeIP('10.9.39.8'); + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + let mseconds = mdate.getMilliseconds(); //获取当前毫秒数（0~999） + let end = Math.floor(Math.random()*(9999-1000))+1000;//生成随机4位流水号 + + let result = head+ip + +year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + +formatStr(mseconds,3)+end; + + return result; + +} + +function getIP(){ + let ip = changeIP('10.9.39.8'); + return ip; +} + +function getTime(){ + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + + let result = ""+year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + return result +} + +function changeIP(ip){ + const ip_ds = ip.split(".") + let result = "" + for(let item of ip_ds){ + item = "000"+item + result+=item.substr(-3) + } + return result; +} + +function formatStr(str,length){ + str = "000"+str + return str.substr(0-length) +} + + +generateJson('app/tokenByCard',{card:'110226198909261410'}) diff --git a/src/assets/js/storageConst.js b/src/assets/js/storageConst.js index 4cbaec7..33f4dcb 100644 --- a/src/assets/js/storageConst.js +++ b/src/assets/js/storageConst.js @@ -11,3 +11,5 @@ export const DEPT_NAME = '_dept_name_' //部门名称 export const DEPT_ID = '_dept_id_' //部门编号 export const PHONE = '_phone_' //电话号码 +export const ID = '_id_' //用户id +export const RECORD_NUMBER = '_record_number_' //用户id diff --git a/config/dev.env.js b/config/dev.env.js index df0ed63..786fb2a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -4,6 +4,9 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee"' + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://192.168.0.212:8083"', + BASE_API: '"http://20.1.11.52:5988"', // BASE_API: '"http://192.168.0.225:8083"', }) diff --git a/config/index.js b/config/index.js index 88422c3..ca24a9c 100644 --- a/config/index.js +++ b/config/index.js @@ -6,14 +6,19 @@ module.exports = { dev: { - // Paths assetsSubDirectory: 'static', assetsPublicPath: '/', - proxyTable: {}, - + proxyTable: { + // '/api': { + // target: 'http://20.1.2.241', //目标接口域名 + // pathRewrite: { + // '^/api': '' //重写接口 + // }, + // changeOrigin: true, //是否跨域 + // }, + }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, diff --git a/config/prod.env.js b/config/prod.env.js index 3327c7d..462c806 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,7 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://119.254.103.80:14536"', - BASE_API: '"http://106.74.146.218:2031"', + BASE_API: '"http://20.1.11.52:5988"', + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://106.74.146.218:2031"', } diff --git a/src/api/app.js b/src/api/app.js index d556d7c..ecd110a 100644 --- a/src/api/app.js +++ b/src/api/app.js @@ -2,6 +2,7 @@ * APP的接口 */ import request from '@/utils/request' + // 新版本查询 export function checkVersion() { return request({ diff --git a/src/api/special.js b/src/api/special.js new file mode 100644 index 0000000..e4574e8 --- /dev/null +++ b/src/api/special.js @@ -0,0 +1,97 @@ + +/** + * APP的接口 + */ +import request from '@/utils/request' +import { getToken } from '@/utils/auth' +import store from '@/store' + + +// 新版本查询 +export function appSpApi(method,params={},type='GET') { + const data = { + 'FWQQ_BWBH':getBWBH(), //报文编号 + 'BWLYIPDZ':getIP(), //12位IP + 'BWLYDKH':'8083', //端口？ + 'FWQQZ_ZCXX':'A00111000026000004818', + 'FWBS':'S00101100002600052004', + 'FFBS':'FUN001', + 'FWQQ_RQSJ':getTime(), + 'FWQQ_NR':{ + method:'appprepositionInvoke', + params:{ + method:method, + type:type, + token: getToken(), + params: params + }}, + 'XXCZRY_XM':store.getters.name, + 'XXCZRY_GMSFHM':store.getters.username, + 'XXCZRY_GAJGJGDM':store.getters.jgdm, + 'FWQQSB_BH':store.getters.imei, + 'FWQQ_SJSJLX':'service_request', + 'YYSBS':store.getters.yys + } + return request({ + url: '/http/GA000Comm', + method: 'post', + data:data + }) +} + +function getBWBH(){ + let head = "SR" + let ip = changeIP(store.getters.ip); + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + let mseconds = mdate.getMilliseconds(); //获取当前毫秒数（0~999） + let end = Math.floor(Math.random()*(9999-1000))+1000;//生成随机4位流水号 + + let result = head+ip + +year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + +formatStr(mseconds,3)+end; + + return result; + +} + +function getIP(){ + let ip = changeIP(store.getters.ip); + return ip; +} + +function getTime(){ + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + + let result = ""+year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + return result +} + +function changeIP(ip){ + const ip_ds = ip.split(".") + let result = "" + for(let item of ip_ds){ + item = "000"+item + result+=item.substr(-3) + } + return result; +} + +function formatStr(str,length){ + str = "000"+str + return str.substr(0-length) +} + diff --git a/src/api/testZongXian.js b/src/api/testZongXian.js new file mode 100644 index 0000000..9081f8f --- /dev/null +++ b/src/api/testZongXian.js @@ -0,0 +1,88 @@ + +var ip = '10.9.39.8' +// 新版本查询 +function generateJson(method,params={},type='GET') { + const data = { + 'FWQQ_BWBH':getBWBH(), //报文编号 + 'BWLYIPDZ':getIP(), //12位IP + 'BWLYDKH':'8083', //端口？ + 'FWQQZ_ZCXX':'A00111000026000004818', + 'FWBS':'S00101100002600052004', + 'FFBS':'FUN001', + 'FWQQ_RQSJ':getTime(), + 'FWQQ_NR':{ + method:'appprepositionInvoke', + params:{ + method:method, + type:type, + token: '', + params: params + }}, + 'XXCZRY_XM':'张森', + 'XXCZRY_GMSFHM':'110226198909261410', + 'XXCZRY_GAJGJGDM':'-', + 'FWQQSB_BH':'-', + 'FWQQ_SJSJLX':'service_request', + 'YYSBS':'lt' + } + console.log(JSON.stringify(data)) +} + +function getBWBH(){ + let head = "SR" + let ip = changeIP('10.9.39.8'); + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + let mseconds = mdate.getMilliseconds(); //获取当前毫秒数（0~999） + let end = Math.floor(Math.random()*(9999-1000))+1000;//生成随机4位流水号 + + let result = head+ip + +year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + +formatStr(mseconds,3)+end; + + return result; + +} + +function getIP(){ + let ip = changeIP('10.9.39.8'); + return ip; +} + +function getTime(){ + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + + let result = ""+year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + return result +} + +function changeIP(ip){ + const ip_ds = ip.split(".") + let result = "" + for(let item of ip_ds){ + item = "000"+item + result+=item.substr(-3) + } + return result; +} + +function formatStr(str,length){ + str = "000"+str + return str.substr(0-length) +} + + +generateJson('app/tokenByCard',{card:'110226198909261410'}) diff --git a/src/assets/js/storageConst.js b/src/assets/js/storageConst.js index 4cbaec7..33f4dcb 100644 --- a/src/assets/js/storageConst.js +++ b/src/assets/js/storageConst.js @@ -11,3 +11,5 @@ export const DEPT_NAME = '_dept_name_' //部门名称 export const DEPT_ID = '_dept_id_' //部门编号 export const PHONE = '_phone_' //电话号码 +export const ID = '_id_' //用户id +export const RECORD_NUMBER = '_record_number_' //用户id diff --git a/src/page/error/404.vue b/src/page/error/404.vue new file mode 100644 index 0000000..aceb671 --- /dev/null +++ b/src/page/error/404.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/config/dev.env.js b/config/dev.env.js index df0ed63..786fb2a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -4,6 +4,9 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee"' + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://192.168.0.212:8083"', + BASE_API: '"http://20.1.11.52:5988"', // BASE_API: '"http://192.168.0.225:8083"', }) diff --git a/config/index.js b/config/index.js index 88422c3..ca24a9c 100644 --- a/config/index.js +++ b/config/index.js @@ -6,14 +6,19 @@ module.exports = { dev: { - // Paths assetsSubDirectory: 'static', assetsPublicPath: '/', - proxyTable: {}, - + proxyTable: { + // '/api': { + // target: 'http://20.1.2.241', //目标接口域名 + // pathRewrite: { + // '^/api': '' //重写接口 + // }, + // changeOrigin: true, //是否跨域 + // }, + }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, diff --git a/config/prod.env.js b/config/prod.env.js index 3327c7d..462c806 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,7 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://119.254.103.80:14536"', - BASE_API: '"http://106.74.146.218:2031"', + BASE_API: '"http://20.1.11.52:5988"', + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://106.74.146.218:2031"', } diff --git a/src/api/app.js b/src/api/app.js index d556d7c..ecd110a 100644 --- a/src/api/app.js +++ b/src/api/app.js @@ -2,6 +2,7 @@ * APP的接口 */ import request from '@/utils/request' + // 新版本查询 export function checkVersion() { return request({ diff --git a/src/api/special.js b/src/api/special.js new file mode 100644 index 0000000..e4574e8 --- /dev/null +++ b/src/api/special.js @@ -0,0 +1,97 @@ + +/** + * APP的接口 + */ +import request from '@/utils/request' +import { getToken } from '@/utils/auth' +import store from '@/store' + + +// 新版本查询 +export function appSpApi(method,params={},type='GET') { + const data = { + 'FWQQ_BWBH':getBWBH(), //报文编号 + 'BWLYIPDZ':getIP(), //12位IP + 'BWLYDKH':'8083', //端口？ + 'FWQQZ_ZCXX':'A00111000026000004818', + 'FWBS':'S00101100002600052004', + 'FFBS':'FUN001', + 'FWQQ_RQSJ':getTime(), + 'FWQQ_NR':{ + method:'appprepositionInvoke', + params:{ + method:method, + type:type, + token: getToken(), + params: params + }}, + 'XXCZRY_XM':store.getters.name, + 'XXCZRY_GMSFHM':store.getters.username, + 'XXCZRY_GAJGJGDM':store.getters.jgdm, + 'FWQQSB_BH':store.getters.imei, + 'FWQQ_SJSJLX':'service_request', + 'YYSBS':store.getters.yys + } + return request({ + url: '/http/GA000Comm', + method: 'post', + data:data + }) +} + +function getBWBH(){ + let head = "SR" + let ip = changeIP(store.getters.ip); + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + let mseconds = mdate.getMilliseconds(); //获取当前毫秒数（0~999） + let end = Math.floor(Math.random()*(9999-1000))+1000;//生成随机4位流水号 + + let result = head+ip + +year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + +formatStr(mseconds,3)+end; + + return result; + +} + +function getIP(){ + let ip = changeIP(store.getters.ip); + return ip; +} + +function getTime(){ + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + + let result = ""+year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + return result +} + +function changeIP(ip){ + const ip_ds = ip.split(".") + let result = "" + for(let item of ip_ds){ + item = "000"+item + result+=item.substr(-3) + } + return result; +} + +function formatStr(str,length){ + str = "000"+str + return str.substr(0-length) +} + diff --git a/src/api/testZongXian.js b/src/api/testZongXian.js new file mode 100644 index 0000000..9081f8f --- /dev/null +++ b/src/api/testZongXian.js @@ -0,0 +1,88 @@ + +var ip = '10.9.39.8' +// 新版本查询 +function generateJson(method,params={},type='GET') { + const data = { + 'FWQQ_BWBH':getBWBH(), //报文编号 + 'BWLYIPDZ':getIP(), //12位IP + 'BWLYDKH':'8083', //端口？ + 'FWQQZ_ZCXX':'A00111000026000004818', + 'FWBS':'S00101100002600052004', + 'FFBS':'FUN001', + 'FWQQ_RQSJ':getTime(), + 'FWQQ_NR':{ + method:'appprepositionInvoke', + params:{ + method:method, + type:type, + token: '', + params: params + }}, + 'XXCZRY_XM':'张森', + 'XXCZRY_GMSFHM':'110226198909261410', + 'XXCZRY_GAJGJGDM':'-', + 'FWQQSB_BH':'-', + 'FWQQ_SJSJLX':'service_request', + 'YYSBS':'lt' + } + console.log(JSON.stringify(data)) +} + +function getBWBH(){ + let head = "SR" + let ip = changeIP('10.9.39.8'); + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + let mseconds = mdate.getMilliseconds(); //获取当前毫秒数（0~999） + let end = Math.floor(Math.random()*(9999-1000))+1000;//生成随机4位流水号 + + let result = head+ip + +year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + +formatStr(mseconds,3)+end; + + return result; + +} + +function getIP(){ + let ip = changeIP('10.9.39.8'); + return ip; +} + +function getTime(){ + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + + let result = ""+year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + return result +} + +function changeIP(ip){ + const ip_ds = ip.split(".") + let result = "" + for(let item of ip_ds){ + item = "000"+item + result+=item.substr(-3) + } + return result; +} + +function formatStr(str,length){ + str = "000"+str + return str.substr(0-length) +} + + +generateJson('app/tokenByCard',{card:'110226198909261410'}) diff --git a/src/assets/js/storageConst.js b/src/assets/js/storageConst.js index 4cbaec7..33f4dcb 100644 --- a/src/assets/js/storageConst.js +++ b/src/assets/js/storageConst.js @@ -11,3 +11,5 @@ export const DEPT_NAME = '_dept_name_' //部门名称 export const DEPT_ID = '_dept_id_' //部门编号 export const PHONE = '_phone_' //电话号码 +export const ID = '_id_' //用户id +export const RECORD_NUMBER = '_record_number_' //用户id diff --git a/src/page/error/404.vue b/src/page/error/404.vue new file mode 100644 index 0000000..aceb671 --- /dev/null +++ b/src/page/error/404.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/config/dev.env.js b/config/dev.env.js index df0ed63..786fb2a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -4,6 +4,9 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee"' + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://192.168.0.212:8083"', + BASE_API: '"http://20.1.11.52:5988"', // BASE_API: '"http://192.168.0.225:8083"', }) diff --git a/config/index.js b/config/index.js index 88422c3..ca24a9c 100644 --- a/config/index.js +++ b/config/index.js @@ -6,14 +6,19 @@ module.exports = { dev: { - // Paths assetsSubDirectory: 'static', assetsPublicPath: '/', - proxyTable: {}, - + proxyTable: { + // '/api': { + // target: 'http://20.1.2.241', //目标接口域名 + // pathRewrite: { + // '^/api': '' //重写接口 + // }, + // changeOrigin: true, //是否跨域 + // }, + }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, diff --git a/config/prod.env.js b/config/prod.env.js index 3327c7d..462c806 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,7 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://119.254.103.80:14536"', - BASE_API: '"http://106.74.146.218:2031"', + BASE_API: '"http://20.1.11.52:5988"', + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://106.74.146.218:2031"', } diff --git a/src/api/app.js b/src/api/app.js index d556d7c..ecd110a 100644 --- a/src/api/app.js +++ b/src/api/app.js @@ -2,6 +2,7 @@ * APP的接口 */ import request from '@/utils/request' + // 新版本查询 export function checkVersion() { return request({ diff --git a/src/api/special.js b/src/api/special.js new file mode 100644 index 0000000..e4574e8 --- /dev/null +++ b/src/api/special.js @@ -0,0 +1,97 @@ + +/** + * APP的接口 + */ +import request from '@/utils/request' +import { getToken } from '@/utils/auth' +import store from '@/store' + + +// 新版本查询 +export function appSpApi(method,params={},type='GET') { + const data = { + 'FWQQ_BWBH':getBWBH(), //报文编号 + 'BWLYIPDZ':getIP(), //12位IP + 'BWLYDKH':'8083', //端口？ + 'FWQQZ_ZCXX':'A00111000026000004818', + 'FWBS':'S00101100002600052004', + 'FFBS':'FUN001', + 'FWQQ_RQSJ':getTime(), + 'FWQQ_NR':{ + method:'appprepositionInvoke', + params:{ + method:method, + type:type, + token: getToken(), + params: params + }}, + 'XXCZRY_XM':store.getters.name, + 'XXCZRY_GMSFHM':store.getters.username, + 'XXCZRY_GAJGJGDM':store.getters.jgdm, + 'FWQQSB_BH':store.getters.imei, + 'FWQQ_SJSJLX':'service_request', + 'YYSBS':store.getters.yys + } + return request({ + url: '/http/GA000Comm', + method: 'post', + data:data + }) +} + +function getBWBH(){ + let head = "SR" + let ip = changeIP(store.getters.ip); + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + let mseconds = mdate.getMilliseconds(); //获取当前毫秒数（0~999） + let end = Math.floor(Math.random()*(9999-1000))+1000;//生成随机4位流水号 + + let result = head+ip + +year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + +formatStr(mseconds,3)+end; + + return result; + +} + +function getIP(){ + let ip = changeIP(store.getters.ip); + return ip; +} + +function getTime(){ + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + + let result = ""+year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + return result +} + +function changeIP(ip){ + const ip_ds = ip.split(".") + let result = "" + for(let item of ip_ds){ + item = "000"+item + result+=item.substr(-3) + } + return result; +} + +function formatStr(str,length){ + str = "000"+str + return str.substr(0-length) +} + diff --git a/src/api/testZongXian.js b/src/api/testZongXian.js new file mode 100644 index 0000000..9081f8f --- /dev/null +++ b/src/api/testZongXian.js @@ -0,0 +1,88 @@ + +var ip = '10.9.39.8' +// 新版本查询 +function generateJson(method,params={},type='GET') { + const data = { + 'FWQQ_BWBH':getBWBH(), //报文编号 + 'BWLYIPDZ':getIP(), //12位IP + 'BWLYDKH':'8083', //端口？ + 'FWQQZ_ZCXX':'A00111000026000004818', + 'FWBS':'S00101100002600052004', + 'FFBS':'FUN001', + 'FWQQ_RQSJ':getTime(), + 'FWQQ_NR':{ + method:'appprepositionInvoke', + params:{ + method:method, + type:type, + token: '', + params: params + }}, + 'XXCZRY_XM':'张森', + 'XXCZRY_GMSFHM':'110226198909261410', + 'XXCZRY_GAJGJGDM':'-', + 'FWQQSB_BH':'-', + 'FWQQ_SJSJLX':'service_request', + 'YYSBS':'lt' + } + console.log(JSON.stringify(data)) +} + +function getBWBH(){ + let head = "SR" + let ip = changeIP('10.9.39.8'); + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + let mseconds = mdate.getMilliseconds(); //获取当前毫秒数（0~999） + let end = Math.floor(Math.random()*(9999-1000))+1000;//生成随机4位流水号 + + let result = head+ip + +year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + +formatStr(mseconds,3)+end; + + return result; + +} + +function getIP(){ + let ip = changeIP('10.9.39.8'); + return ip; +} + +function getTime(){ + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + + let result = ""+year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + return result +} + +function changeIP(ip){ + const ip_ds = ip.split(".") + let result = "" + for(let item of ip_ds){ + item = "000"+item + result+=item.substr(-3) + } + return result; +} + +function formatStr(str,length){ + str = "000"+str + return str.substr(0-length) +} + + +generateJson('app/tokenByCard',{card:'110226198909261410'}) diff --git a/src/assets/js/storageConst.js b/src/assets/js/storageConst.js index 4cbaec7..33f4dcb 100644 --- a/src/assets/js/storageConst.js +++ b/src/assets/js/storageConst.js @@ -11,3 +11,5 @@ export const DEPT_NAME = '_dept_name_' //部门名称 export const DEPT_ID = '_dept_id_' //部门编号 export const PHONE = '_phone_' //电话号码 +export const ID = '_id_' //用户id +export const RECORD_NUMBER = '_record_number_' //用户id diff --git a/src/page/error/404.vue b/src/page/error/404.vue new file mode 100644 index 0000000..aceb671 --- /dev/null +++ b/src/page/error/404.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/config/dev.env.js b/config/dev.env.js index df0ed63..786fb2a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -4,6 +4,9 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee"' + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://192.168.0.212:8083"', + BASE_API: '"http://20.1.11.52:5988"', // BASE_API: '"http://192.168.0.225:8083"', }) diff --git a/config/index.js b/config/index.js index 88422c3..ca24a9c 100644 --- a/config/index.js +++ b/config/index.js @@ -6,14 +6,19 @@ module.exports = { dev: { - // Paths assetsSubDirectory: 'static', assetsPublicPath: '/', - proxyTable: {}, - + proxyTable: { + // '/api': { + // target: 'http://20.1.2.241', //目标接口域名 + // pathRewrite: { + // '^/api': '' //重写接口 + // }, + // changeOrigin: true, //是否跨域 + // }, + }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, diff --git a/config/prod.env.js b/config/prod.env.js index 3327c7d..462c806 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,7 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://119.254.103.80:14536"', - BASE_API: '"http://106.74.146.218:2031"', + BASE_API: '"http://20.1.11.52:5988"', + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://106.74.146.218:2031"', } diff --git a/src/api/app.js b/src/api/app.js index d556d7c..ecd110a 100644 --- a/src/api/app.js +++ b/src/api/app.js @@ -2,6 +2,7 @@ * APP的接口 */ import request from '@/utils/request' + // 新版本查询 export function checkVersion() { return request({ diff --git a/src/api/special.js b/src/api/special.js new file mode 100644 index 0000000..e4574e8 --- /dev/null +++ b/src/api/special.js @@ -0,0 +1,97 @@ + +/** + * APP的接口 + */ +import request from '@/utils/request' +import { getToken } from '@/utils/auth' +import store from '@/store' + + +// 新版本查询 +export function appSpApi(method,params={},type='GET') { + const data = { + 'FWQQ_BWBH':getBWBH(), //报文编号 + 'BWLYIPDZ':getIP(), //12位IP + 'BWLYDKH':'8083', //端口？ + 'FWQQZ_ZCXX':'A00111000026000004818', + 'FWBS':'S00101100002600052004', + 'FFBS':'FUN001', + 'FWQQ_RQSJ':getTime(), + 'FWQQ_NR':{ + method:'appprepositionInvoke', + params:{ + method:method, + type:type, + token: getToken(), + params: params + }}, + 'XXCZRY_XM':store.getters.name, + 'XXCZRY_GMSFHM':store.getters.username, + 'XXCZRY_GAJGJGDM':store.getters.jgdm, + 'FWQQSB_BH':store.getters.imei, + 'FWQQ_SJSJLX':'service_request', + 'YYSBS':store.getters.yys + } + return request({ + url: '/http/GA000Comm', + method: 'post', + data:data + }) +} + +function getBWBH(){ + let head = "SR" + let ip = changeIP(store.getters.ip); + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + let mseconds = mdate.getMilliseconds(); //获取当前毫秒数（0~999） + let end = Math.floor(Math.random()*(9999-1000))+1000;//生成随机4位流水号 + + let result = head+ip + +year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + +formatStr(mseconds,3)+end; + + return result; + +} + +function getIP(){ + let ip = changeIP(store.getters.ip); + return ip; +} + +function getTime(){ + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + + let result = ""+year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + return result +} + +function changeIP(ip){ + const ip_ds = ip.split(".") + let result = "" + for(let item of ip_ds){ + item = "000"+item + result+=item.substr(-3) + } + return result; +} + +function formatStr(str,length){ + str = "000"+str + return str.substr(0-length) +} + diff --git a/src/api/testZongXian.js b/src/api/testZongXian.js new file mode 100644 index 0000000..9081f8f --- /dev/null +++ b/src/api/testZongXian.js @@ -0,0 +1,88 @@ + +var ip = '10.9.39.8' +// 新版本查询 +function generateJson(method,params={},type='GET') { + const data = { + 'FWQQ_BWBH':getBWBH(), //报文编号 + 'BWLYIPDZ':getIP(), //12位IP + 'BWLYDKH':'8083', //端口？ + 'FWQQZ_ZCXX':'A00111000026000004818', + 'FWBS':'S00101100002600052004', + 'FFBS':'FUN001', + 'FWQQ_RQSJ':getTime(), + 'FWQQ_NR':{ + method:'appprepositionInvoke', + params:{ + method:method, + type:type, + token: '', + params: params + }}, + 'XXCZRY_XM':'张森', + 'XXCZRY_GMSFHM':'110226198909261410', + 'XXCZRY_GAJGJGDM':'-', + 'FWQQSB_BH':'-', + 'FWQQ_SJSJLX':'service_request', + 'YYSBS':'lt' + } + console.log(JSON.stringify(data)) +} + +function getBWBH(){ + let head = "SR" + let ip = changeIP('10.9.39.8'); + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + let mseconds = mdate.getMilliseconds(); //获取当前毫秒数（0~999） + let end = Math.floor(Math.random()*(9999-1000))+1000;//生成随机4位流水号 + + let result = head+ip + +year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + +formatStr(mseconds,3)+end; + + return result; + +} + +function getIP(){ + let ip = changeIP('10.9.39.8'); + return ip; +} + +function getTime(){ + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + + let result = ""+year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + return result +} + +function changeIP(ip){ + const ip_ds = ip.split(".") + let result = "" + for(let item of ip_ds){ + item = "000"+item + result+=item.substr(-3) + } + return result; +} + +function formatStr(str,length){ + str = "000"+str + return str.substr(0-length) +} + + +generateJson('app/tokenByCard',{card:'110226198909261410'}) diff --git a/src/assets/js/storageConst.js b/src/assets/js/storageConst.js index 4cbaec7..33f4dcb 100644 --- a/src/assets/js/storageConst.js +++ b/src/assets/js/storageConst.js @@ -11,3 +11,5 @@ export const DEPT_NAME = '_dept_name_' //部门名称 export const DEPT_ID = '_dept_id_' //部门编号 export const PHONE = '_phone_' //电话号码 +export const ID = '_id_' //用户id +export const RECORD_NUMBER = '_record_number_' //用户id diff --git a/src/page/error/404.vue b/src/page/error/404.vue new file mode 100644 index 0000000..aceb671 --- /dev/null +++ b/src/page/error/404.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/config/dev.env.js b/config/dev.env.js index df0ed63..786fb2a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -4,6 +4,9 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee"' + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://192.168.0.212:8083"', + BASE_API: '"http://20.1.11.52:5988"', // BASE_API: '"http://192.168.0.225:8083"', }) diff --git a/config/index.js b/config/index.js index 88422c3..ca24a9c 100644 --- a/config/index.js +++ b/config/index.js @@ -6,14 +6,19 @@ module.exports = { dev: { - // Paths assetsSubDirectory: 'static', assetsPublicPath: '/', - proxyTable: {}, - + proxyTable: { + // '/api': { + // target: 'http://20.1.2.241', //目标接口域名 + // pathRewrite: { + // '^/api': '' //重写接口 + // }, + // changeOrigin: true, //是否跨域 + // }, + }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, diff --git a/config/prod.env.js b/config/prod.env.js index 3327c7d..462c806 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,7 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://119.254.103.80:14536"', - BASE_API: '"http://106.74.146.218:2031"', + BASE_API: '"http://20.1.11.52:5988"', + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://106.74.146.218:2031"', } diff --git a/src/api/app.js b/src/api/app.js index d556d7c..ecd110a 100644 --- a/src/api/app.js +++ b/src/api/app.js @@ -2,6 +2,7 @@ * APP的接口 */ import request from '@/utils/request' + // 新版本查询 export function checkVersion() { return request({ diff --git a/src/api/special.js b/src/api/special.js new file mode 100644 index 0000000..e4574e8 --- /dev/null +++ b/src/api/special.js @@ -0,0 +1,97 @@ + +/** + * APP的接口 + */ +import request from '@/utils/request' +import { getToken } from '@/utils/auth' +import store from '@/store' + + +// 新版本查询 +export function appSpApi(method,params={},type='GET') { + const data = { + 'FWQQ_BWBH':getBWBH(), //报文编号 + 'BWLYIPDZ':getIP(), //12位IP + 'BWLYDKH':'8083', //端口？ + 'FWQQZ_ZCXX':'A00111000026000004818', + 'FWBS':'S00101100002600052004', + 'FFBS':'FUN001', + 'FWQQ_RQSJ':getTime(), + 'FWQQ_NR':{ + method:'appprepositionInvoke', + params:{ + method:method, + type:type, + token: getToken(), + params: params + }}, + 'XXCZRY_XM':store.getters.name, + 'XXCZRY_GMSFHM':store.getters.username, + 'XXCZRY_GAJGJGDM':store.getters.jgdm, + 'FWQQSB_BH':store.getters.imei, + 'FWQQ_SJSJLX':'service_request', + 'YYSBS':store.getters.yys + } + return request({ + url: '/http/GA000Comm', + method: 'post', + data:data + }) +} + +function getBWBH(){ + let head = "SR" + let ip = changeIP(store.getters.ip); + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + let mseconds = mdate.getMilliseconds(); //获取当前毫秒数（0~999） + let end = Math.floor(Math.random()*(9999-1000))+1000;//生成随机4位流水号 + + let result = head+ip + +year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + +formatStr(mseconds,3)+end; + + return result; + +} + +function getIP(){ + let ip = changeIP(store.getters.ip); + return ip; +} + +function getTime(){ + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + + let result = ""+year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + return result +} + +function changeIP(ip){ + const ip_ds = ip.split(".") + let result = "" + for(let item of ip_ds){ + item = "000"+item + result+=item.substr(-3) + } + return result; +} + +function formatStr(str,length){ + str = "000"+str + return str.substr(0-length) +} + diff --git a/src/api/testZongXian.js b/src/api/testZongXian.js new file mode 100644 index 0000000..9081f8f --- /dev/null +++ b/src/api/testZongXian.js @@ -0,0 +1,88 @@ + +var ip = '10.9.39.8' +// 新版本查询 +function generateJson(method,params={},type='GET') { + const data = { + 'FWQQ_BWBH':getBWBH(), //报文编号 + 'BWLYIPDZ':getIP(), //12位IP + 'BWLYDKH':'8083', //端口？ + 'FWQQZ_ZCXX':'A00111000026000004818', + 'FWBS':'S00101100002600052004', + 'FFBS':'FUN001', + 'FWQQ_RQSJ':getTime(), + 'FWQQ_NR':{ + method:'appprepositionInvoke', + params:{ + method:method, + type:type, + token: '', + params: params + }}, + 'XXCZRY_XM':'张森', + 'XXCZRY_GMSFHM':'110226198909261410', + 'XXCZRY_GAJGJGDM':'-', + 'FWQQSB_BH':'-', + 'FWQQ_SJSJLX':'service_request', + 'YYSBS':'lt' + } + console.log(JSON.stringify(data)) +} + +function getBWBH(){ + let head = "SR" + let ip = changeIP('10.9.39.8'); + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + let mseconds = mdate.getMilliseconds(); //获取当前毫秒数（0~999） + let end = Math.floor(Math.random()*(9999-1000))+1000;//生成随机4位流水号 + + let result = head+ip + +year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + +formatStr(mseconds,3)+end; + + return result; + +} + +function getIP(){ + let ip = changeIP('10.9.39.8'); + return ip; +} + +function getTime(){ + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + + let result = ""+year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + return result +} + +function changeIP(ip){ + const ip_ds = ip.split(".") + let result = "" + for(let item of ip_ds){ + item = "000"+item + result+=item.substr(-3) + } + return result; +} + +function formatStr(str,length){ + str = "000"+str + return str.substr(0-length) +} + + +generateJson('app/tokenByCard',{card:'110226198909261410'}) diff --git a/src/assets/js/storageConst.js b/src/assets/js/storageConst.js index 4cbaec7..33f4dcb 100644 --- a/src/assets/js/storageConst.js +++ b/src/assets/js/storageConst.js @@ -11,3 +11,5 @@ export const DEPT_NAME = '_dept_name_' //部门名称 export const DEPT_ID = '_dept_id_' //部门编号 export const PHONE = '_phone_' //电话号码 +export const ID = '_id_' //用户id +export const RECORD_NUMBER = '_record_number_' //用户id diff --git a/src/page/error/404.vue b/src/page/error/404.vue new file mode 100644 index 0000000..aceb671 --- /dev/null +++ b/src/page/error/404.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 1747fe6..fcc8326 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -92,7 +92,7 @@
- 接单 + 处理 到这里去 转单 提交 @@ -122,6 +122,8 @@ import ChoosePeople from "../ChoosePeople"; import Loading from "../../../components/Loading/index"; import {compareCalendar} from '@/utils/string' + import { appSpApi } from '@/api/special' + export default { name: "JobDetail", components:{ @@ -256,7 +258,7 @@ }, //获取工单详情 fetchData(id){ - getJobInfo(id).then(response=>{ + appSpApi('job/info',{id:id}).then(response =>{ if(response.code==200){ this.jobForm = response.data[0] this.isLoading = false diff --git a/config/dev.env.js b/config/dev.env.js index df0ed63..786fb2a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -4,6 +4,9 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee"' + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://192.168.0.212:8083"', + BASE_API: '"http://20.1.11.52:5988"', // BASE_API: '"http://192.168.0.225:8083"', }) diff --git a/config/index.js b/config/index.js index 88422c3..ca24a9c 100644 --- a/config/index.js +++ b/config/index.js @@ -6,14 +6,19 @@ module.exports = { dev: { - // Paths assetsSubDirectory: 'static', assetsPublicPath: '/', - proxyTable: {}, - + proxyTable: { + // '/api': { + // target: 'http://20.1.2.241', //目标接口域名 + // pathRewrite: { + // '^/api': '' //重写接口 + // }, + // changeOrigin: true, //是否跨域 + // }, + }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, diff --git a/config/prod.env.js b/config/prod.env.js index 3327c7d..462c806 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,7 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://119.254.103.80:14536"', - BASE_API: '"http://106.74.146.218:2031"', + BASE_API: '"http://20.1.11.52:5988"', + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://106.74.146.218:2031"', } diff --git a/src/api/app.js b/src/api/app.js index d556d7c..ecd110a 100644 --- a/src/api/app.js +++ b/src/api/app.js @@ -2,6 +2,7 @@ * APP的接口 */ import request from '@/utils/request' + // 新版本查询 export function checkVersion() { return request({ diff --git a/src/api/special.js b/src/api/special.js new file mode 100644 index 0000000..e4574e8 --- /dev/null +++ b/src/api/special.js @@ -0,0 +1,97 @@ + +/** + * APP的接口 + */ +import request from '@/utils/request' +import { getToken } from '@/utils/auth' +import store from '@/store' + + +// 新版本查询 +export function appSpApi(method,params={},type='GET') { + const data = { + 'FWQQ_BWBH':getBWBH(), //报文编号 + 'BWLYIPDZ':getIP(), //12位IP + 'BWLYDKH':'8083', //端口？ + 'FWQQZ_ZCXX':'A00111000026000004818', + 'FWBS':'S00101100002600052004', + 'FFBS':'FUN001', + 'FWQQ_RQSJ':getTime(), + 'FWQQ_NR':{ + method:'appprepositionInvoke', + params:{ + method:method, + type:type, + token: getToken(), + params: params + }}, + 'XXCZRY_XM':store.getters.name, + 'XXCZRY_GMSFHM':store.getters.username, + 'XXCZRY_GAJGJGDM':store.getters.jgdm, + 'FWQQSB_BH':store.getters.imei, + 'FWQQ_SJSJLX':'service_request', + 'YYSBS':store.getters.yys + } + return request({ + url: '/http/GA000Comm', + method: 'post', + data:data + }) +} + +function getBWBH(){ + let head = "SR" + let ip = changeIP(store.getters.ip); + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + let mseconds = mdate.getMilliseconds(); //获取当前毫秒数（0~999） + let end = Math.floor(Math.random()*(9999-1000))+1000;//生成随机4位流水号 + + let result = head+ip + +year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + +formatStr(mseconds,3)+end; + + return result; + +} + +function getIP(){ + let ip = changeIP(store.getters.ip); + return ip; +} + +function getTime(){ + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + + let result = ""+year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + return result +} + +function changeIP(ip){ + const ip_ds = ip.split(".") + let result = "" + for(let item of ip_ds){ + item = "000"+item + result+=item.substr(-3) + } + return result; +} + +function formatStr(str,length){ + str = "000"+str + return str.substr(0-length) +} + diff --git a/src/api/testZongXian.js b/src/api/testZongXian.js new file mode 100644 index 0000000..9081f8f --- /dev/null +++ b/src/api/testZongXian.js @@ -0,0 +1,88 @@ + +var ip = '10.9.39.8' +// 新版本查询 +function generateJson(method,params={},type='GET') { + const data = { + 'FWQQ_BWBH':getBWBH(), //报文编号 + 'BWLYIPDZ':getIP(), //12位IP + 'BWLYDKH':'8083', //端口？ + 'FWQQZ_ZCXX':'A00111000026000004818', + 'FWBS':'S00101100002600052004', + 'FFBS':'FUN001', + 'FWQQ_RQSJ':getTime(), + 'FWQQ_NR':{ + method:'appprepositionInvoke', + params:{ + method:method, + type:type, + token: '', + params: params + }}, + 'XXCZRY_XM':'张森', + 'XXCZRY_GMSFHM':'110226198909261410', + 'XXCZRY_GAJGJGDM':'-', + 'FWQQSB_BH':'-', + 'FWQQ_SJSJLX':'service_request', + 'YYSBS':'lt' + } + console.log(JSON.stringify(data)) +} + +function getBWBH(){ + let head = "SR" + let ip = changeIP('10.9.39.8'); + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + let mseconds = mdate.getMilliseconds(); //获取当前毫秒数（0~999） + let end = Math.floor(Math.random()*(9999-1000))+1000;//生成随机4位流水号 + + let result = head+ip + +year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + +formatStr(mseconds,3)+end; + + return result; + +} + +function getIP(){ + let ip = changeIP('10.9.39.8'); + return ip; +} + +function getTime(){ + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + + let result = ""+year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + return result +} + +function changeIP(ip){ + const ip_ds = ip.split(".") + let result = "" + for(let item of ip_ds){ + item = "000"+item + result+=item.substr(-3) + } + return result; +} + +function formatStr(str,length){ + str = "000"+str + return str.substr(0-length) +} + + +generateJson('app/tokenByCard',{card:'110226198909261410'}) diff --git a/src/assets/js/storageConst.js b/src/assets/js/storageConst.js index 4cbaec7..33f4dcb 100644 --- a/src/assets/js/storageConst.js +++ b/src/assets/js/storageConst.js @@ -11,3 +11,5 @@ export const DEPT_NAME = '_dept_name_' //部门名称 export const DEPT_ID = '_dept_id_' //部门编号 export const PHONE = '_phone_' //电话号码 +export const ID = '_id_' //用户id +export const RECORD_NUMBER = '_record_number_' //用户id diff --git a/src/page/error/404.vue b/src/page/error/404.vue new file mode 100644 index 0000000..aceb671 --- /dev/null +++ b/src/page/error/404.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 1747fe6..fcc8326 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -92,7 +92,7 @@
- 接单 + 处理 到这里去 转单 提交 @@ -122,6 +122,8 @@ import ChoosePeople from "../ChoosePeople"; import Loading from "../../../components/Loading/index"; import {compareCalendar} from '@/utils/string' + import { appSpApi } from '@/api/special' + export default { name: "JobDetail", components:{ @@ -256,7 +258,7 @@ }, //获取工单详情 fetchData(id){ - getJobInfo(id).then(response=>{ + appSpApi('job/info',{id:id}).then(response =>{ if(response.code==200){ this.jobForm = response.data[0] this.isLoading = false diff --git a/src/page/jobManage/modules/JobDetailSimple.vue b/src/page/jobManage/modules/JobDetailSimple.vue new file mode 100644 index 0000000..be06c86 --- /dev/null +++ b/src/page/jobManage/modules/JobDetailSimple.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/config/dev.env.js b/config/dev.env.js index df0ed63..786fb2a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -4,6 +4,9 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee"' + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://192.168.0.212:8083"', + BASE_API: '"http://20.1.11.52:5988"', // BASE_API: '"http://192.168.0.225:8083"', }) diff --git a/config/index.js b/config/index.js index 88422c3..ca24a9c 100644 --- a/config/index.js +++ b/config/index.js @@ -6,14 +6,19 @@ module.exports = { dev: { - // Paths assetsSubDirectory: 'static', assetsPublicPath: '/', - proxyTable: {}, - + proxyTable: { + // '/api': { + // target: 'http://20.1.2.241', //目标接口域名 + // pathRewrite: { + // '^/api': '' //重写接口 + // }, + // changeOrigin: true, //是否跨域 + // }, + }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, diff --git a/config/prod.env.js b/config/prod.env.js index 3327c7d..462c806 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,7 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://119.254.103.80:14536"', - BASE_API: '"http://106.74.146.218:2031"', + BASE_API: '"http://20.1.11.52:5988"', + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://106.74.146.218:2031"', } diff --git a/src/api/app.js b/src/api/app.js index d556d7c..ecd110a 100644 --- a/src/api/app.js +++ b/src/api/app.js @@ -2,6 +2,7 @@ * APP的接口 */ import request from '@/utils/request' + // 新版本查询 export function checkVersion() { return request({ diff --git a/src/api/special.js b/src/api/special.js new file mode 100644 index 0000000..e4574e8 --- /dev/null +++ b/src/api/special.js @@ -0,0 +1,97 @@ + +/** + * APP的接口 + */ +import request from '@/utils/request' +import { getToken } from '@/utils/auth' +import store from '@/store' + + +// 新版本查询 +export function appSpApi(method,params={},type='GET') { + const data = { + 'FWQQ_BWBH':getBWBH(), //报文编号 + 'BWLYIPDZ':getIP(), //12位IP + 'BWLYDKH':'8083', //端口？ + 'FWQQZ_ZCXX':'A00111000026000004818', + 'FWBS':'S00101100002600052004', + 'FFBS':'FUN001', + 'FWQQ_RQSJ':getTime(), + 'FWQQ_NR':{ + method:'appprepositionInvoke', + params:{ + method:method, + type:type, + token: getToken(), + params: params + }}, + 'XXCZRY_XM':store.getters.name, + 'XXCZRY_GMSFHM':store.getters.username, + 'XXCZRY_GAJGJGDM':store.getters.jgdm, + 'FWQQSB_BH':store.getters.imei, + 'FWQQ_SJSJLX':'service_request', + 'YYSBS':store.getters.yys + } + return request({ + url: '/http/GA000Comm', + method: 'post', + data:data + }) +} + +function getBWBH(){ + let head = "SR" + let ip = changeIP(store.getters.ip); + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + let mseconds = mdate.getMilliseconds(); //获取当前毫秒数（0~999） + let end = Math.floor(Math.random()*(9999-1000))+1000;//生成随机4位流水号 + + let result = head+ip + +year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + +formatStr(mseconds,3)+end; + + return result; + +} + +function getIP(){ + let ip = changeIP(store.getters.ip); + return ip; +} + +function getTime(){ + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + + let result = ""+year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + return result +} + +function changeIP(ip){ + const ip_ds = ip.split(".") + let result = "" + for(let item of ip_ds){ + item = "000"+item + result+=item.substr(-3) + } + return result; +} + +function formatStr(str,length){ + str = "000"+str + return str.substr(0-length) +} + diff --git a/src/api/testZongXian.js b/src/api/testZongXian.js new file mode 100644 index 0000000..9081f8f --- /dev/null +++ b/src/api/testZongXian.js @@ -0,0 +1,88 @@ + +var ip = '10.9.39.8' +// 新版本查询 +function generateJson(method,params={},type='GET') { + const data = { + 'FWQQ_BWBH':getBWBH(), //报文编号 + 'BWLYIPDZ':getIP(), //12位IP + 'BWLYDKH':'8083', //端口？ + 'FWQQZ_ZCXX':'A00111000026000004818', + 'FWBS':'S00101100002600052004', + 'FFBS':'FUN001', + 'FWQQ_RQSJ':getTime(), + 'FWQQ_NR':{ + method:'appprepositionInvoke', + params:{ + method:method, + type:type, + token: '', + params: params + }}, + 'XXCZRY_XM':'张森', + 'XXCZRY_GMSFHM':'110226198909261410', + 'XXCZRY_GAJGJGDM':'-', + 'FWQQSB_BH':'-', + 'FWQQ_SJSJLX':'service_request', + 'YYSBS':'lt' + } + console.log(JSON.stringify(data)) +} + +function getBWBH(){ + let head = "SR" + let ip = changeIP('10.9.39.8'); + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + let mseconds = mdate.getMilliseconds(); //获取当前毫秒数（0~999） + let end = Math.floor(Math.random()*(9999-1000))+1000;//生成随机4位流水号 + + let result = head+ip + +year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + +formatStr(mseconds,3)+end; + + return result; + +} + +function getIP(){ + let ip = changeIP('10.9.39.8'); + return ip; +} + +function getTime(){ + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + + let result = ""+year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + return result +} + +function changeIP(ip){ + const ip_ds = ip.split(".") + let result = "" + for(let item of ip_ds){ + item = "000"+item + result+=item.substr(-3) + } + return result; +} + +function formatStr(str,length){ + str = "000"+str + return str.substr(0-length) +} + + +generateJson('app/tokenByCard',{card:'110226198909261410'}) diff --git a/src/assets/js/storageConst.js b/src/assets/js/storageConst.js index 4cbaec7..33f4dcb 100644 --- a/src/assets/js/storageConst.js +++ b/src/assets/js/storageConst.js @@ -11,3 +11,5 @@ export const DEPT_NAME = '_dept_name_' //部门名称 export const DEPT_ID = '_dept_id_' //部门编号 export const PHONE = '_phone_' //电话号码 +export const ID = '_id_' //用户id +export const RECORD_NUMBER = '_record_number_' //用户id diff --git a/src/page/error/404.vue b/src/page/error/404.vue new file mode 100644 index 0000000..aceb671 --- /dev/null +++ b/src/page/error/404.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 1747fe6..fcc8326 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -92,7 +92,7 @@
- 接单 + 处理 到这里去 转单 提交 @@ -122,6 +122,8 @@ import ChoosePeople from "../ChoosePeople"; import Loading from "../../../components/Loading/index"; import {compareCalendar} from '@/utils/string' + import { appSpApi } from '@/api/special' + export default { name: "JobDetail", components:{ @@ -256,7 +258,7 @@ }, //获取工单详情 fetchData(id){ - getJobInfo(id).then(response=>{ + appSpApi('job/info',{id:id}).then(response =>{ if(response.code==200){ this.jobForm = response.data[0] this.isLoading = false diff --git a/src/page/jobManage/modules/JobDetailSimple.vue b/src/page/jobManage/modules/JobDetailSimple.vue new file mode 100644 index 0000000..be06c86 --- /dev/null +++ b/src/page/jobManage/modules/JobDetailSimple.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..d72abab 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -69,6 +69,7 @@ import {Loadmore, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "OverJob", components:{ @@ -121,7 +122,7 @@ this.$refs.loadmore.onTopLoaded() this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -141,7 +142,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ console.log('getJobList') this.listQuery.offset+=1 for(let item of response.data.rows){ @@ -168,9 +169,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/config/dev.env.js b/config/dev.env.js index df0ed63..786fb2a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -4,6 +4,9 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee"' + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://192.168.0.212:8083"', + BASE_API: '"http://20.1.11.52:5988"', // BASE_API: '"http://192.168.0.225:8083"', }) diff --git a/config/index.js b/config/index.js index 88422c3..ca24a9c 100644 --- a/config/index.js +++ b/config/index.js @@ -6,14 +6,19 @@ module.exports = { dev: { - // Paths assetsSubDirectory: 'static', assetsPublicPath: '/', - proxyTable: {}, - + proxyTable: { + // '/api': { + // target: 'http://20.1.2.241', //目标接口域名 + // pathRewrite: { + // '^/api': '' //重写接口 + // }, + // changeOrigin: true, //是否跨域 + // }, + }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, diff --git a/config/prod.env.js b/config/prod.env.js index 3327c7d..462c806 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,7 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://119.254.103.80:14536"', - BASE_API: '"http://106.74.146.218:2031"', + BASE_API: '"http://20.1.11.52:5988"', + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://106.74.146.218:2031"', } diff --git a/src/api/app.js b/src/api/app.js index d556d7c..ecd110a 100644 --- a/src/api/app.js +++ b/src/api/app.js @@ -2,6 +2,7 @@ * APP的接口 */ import request from '@/utils/request' + // 新版本查询 export function checkVersion() { return request({ diff --git a/src/api/special.js b/src/api/special.js new file mode 100644 index 0000000..e4574e8 --- /dev/null +++ b/src/api/special.js @@ -0,0 +1,97 @@ + +/** + * APP的接口 + */ +import request from '@/utils/request' +import { getToken } from '@/utils/auth' +import store from '@/store' + + +// 新版本查询 +export function appSpApi(method,params={},type='GET') { + const data = { + 'FWQQ_BWBH':getBWBH(), //报文编号 + 'BWLYIPDZ':getIP(), //12位IP + 'BWLYDKH':'8083', //端口？ + 'FWQQZ_ZCXX':'A00111000026000004818', + 'FWBS':'S00101100002600052004', + 'FFBS':'FUN001', + 'FWQQ_RQSJ':getTime(), + 'FWQQ_NR':{ + method:'appprepositionInvoke', + params:{ + method:method, + type:type, + token: getToken(), + params: params + }}, + 'XXCZRY_XM':store.getters.name, + 'XXCZRY_GMSFHM':store.getters.username, + 'XXCZRY_GAJGJGDM':store.getters.jgdm, + 'FWQQSB_BH':store.getters.imei, + 'FWQQ_SJSJLX':'service_request', + 'YYSBS':store.getters.yys + } + return request({ + url: '/http/GA000Comm', + method: 'post', + data:data + }) +} + +function getBWBH(){ + let head = "SR" + let ip = changeIP(store.getters.ip); + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + let mseconds = mdate.getMilliseconds(); //获取当前毫秒数（0~999） + let end = Math.floor(Math.random()*(9999-1000))+1000;//生成随机4位流水号 + + let result = head+ip + +year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + +formatStr(mseconds,3)+end; + + return result; + +} + +function getIP(){ + let ip = changeIP(store.getters.ip); + return ip; +} + +function getTime(){ + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + + let result = ""+year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + return result +} + +function changeIP(ip){ + const ip_ds = ip.split(".") + let result = "" + for(let item of ip_ds){ + item = "000"+item + result+=item.substr(-3) + } + return result; +} + +function formatStr(str,length){ + str = "000"+str + return str.substr(0-length) +} + diff --git a/src/api/testZongXian.js b/src/api/testZongXian.js new file mode 100644 index 0000000..9081f8f --- /dev/null +++ b/src/api/testZongXian.js @@ -0,0 +1,88 @@ + +var ip = '10.9.39.8' +// 新版本查询 +function generateJson(method,params={},type='GET') { + const data = { + 'FWQQ_BWBH':getBWBH(), //报文编号 + 'BWLYIPDZ':getIP(), //12位IP + 'BWLYDKH':'8083', //端口？ + 'FWQQZ_ZCXX':'A00111000026000004818', + 'FWBS':'S00101100002600052004', + 'FFBS':'FUN001', + 'FWQQ_RQSJ':getTime(), + 'FWQQ_NR':{ + method:'appprepositionInvoke', + params:{ + method:method, + type:type, + token: '', + params: params + }}, + 'XXCZRY_XM':'张森', + 'XXCZRY_GMSFHM':'110226198909261410', + 'XXCZRY_GAJGJGDM':'-', + 'FWQQSB_BH':'-', + 'FWQQ_SJSJLX':'service_request', + 'YYSBS':'lt' + } + console.log(JSON.stringify(data)) +} + +function getBWBH(){ + let head = "SR" + let ip = changeIP('10.9.39.8'); + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + let mseconds = mdate.getMilliseconds(); //获取当前毫秒数（0~999） + let end = Math.floor(Math.random()*(9999-1000))+1000;//生成随机4位流水号 + + let result = head+ip + +year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + +formatStr(mseconds,3)+end; + + return result; + +} + +function getIP(){ + let ip = changeIP('10.9.39.8'); + return ip; +} + +function getTime(){ + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + + let result = ""+year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + return result +} + +function changeIP(ip){ + const ip_ds = ip.split(".") + let result = "" + for(let item of ip_ds){ + item = "000"+item + result+=item.substr(-3) + } + return result; +} + +function formatStr(str,length){ + str = "000"+str + return str.substr(0-length) +} + + +generateJson('app/tokenByCard',{card:'110226198909261410'}) diff --git a/src/assets/js/storageConst.js b/src/assets/js/storageConst.js index 4cbaec7..33f4dcb 100644 --- a/src/assets/js/storageConst.js +++ b/src/assets/js/storageConst.js @@ -11,3 +11,5 @@ export const DEPT_NAME = '_dept_name_' //部门名称 export const DEPT_ID = '_dept_id_' //部门编号 export const PHONE = '_phone_' //电话号码 +export const ID = '_id_' //用户id +export const RECORD_NUMBER = '_record_number_' //用户id diff --git a/src/page/error/404.vue b/src/page/error/404.vue new file mode 100644 index 0000000..aceb671 --- /dev/null +++ b/src/page/error/404.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 1747fe6..fcc8326 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -92,7 +92,7 @@
- 接单 + 处理 到这里去 转单 提交 @@ -122,6 +122,8 @@ import ChoosePeople from "../ChoosePeople"; import Loading from "../../../components/Loading/index"; import {compareCalendar} from '@/utils/string' + import { appSpApi } from '@/api/special' + export default { name: "JobDetail", components:{ @@ -256,7 +258,7 @@ }, //获取工单详情 fetchData(id){ - getJobInfo(id).then(response=>{ + appSpApi('job/info',{id:id}).then(response =>{ if(response.code==200){ this.jobForm = response.data[0] this.isLoading = false diff --git a/src/page/jobManage/modules/JobDetailSimple.vue b/src/page/jobManage/modules/JobDetailSimple.vue new file mode 100644 index 0000000..be06c86 --- /dev/null +++ b/src/page/jobManage/modules/JobDetailSimple.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..d72abab 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -69,6 +69,7 @@ import {Loadmore, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "OverJob", components:{ @@ -121,7 +122,7 @@ this.$refs.loadmore.onTopLoaded() this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -141,7 +142,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ console.log('getJobList') this.listQuery.offset+=1 for(let item of response.data.rows){ @@ -168,9 +169,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/config/dev.env.js b/config/dev.env.js index df0ed63..786fb2a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -4,6 +4,9 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee"' + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://192.168.0.212:8083"', + BASE_API: '"http://20.1.11.52:5988"', // BASE_API: '"http://192.168.0.225:8083"', }) diff --git a/config/index.js b/config/index.js index 88422c3..ca24a9c 100644 --- a/config/index.js +++ b/config/index.js @@ -6,14 +6,19 @@ module.exports = { dev: { - // Paths assetsSubDirectory: 'static', assetsPublicPath: '/', - proxyTable: {}, - + proxyTable: { + // '/api': { + // target: 'http://20.1.2.241', //目标接口域名 + // pathRewrite: { + // '^/api': '' //重写接口 + // }, + // changeOrigin: true, //是否跨域 + // }, + }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, diff --git a/config/prod.env.js b/config/prod.env.js index 3327c7d..462c806 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,7 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://119.254.103.80:14536"', - BASE_API: '"http://106.74.146.218:2031"', + BASE_API: '"http://20.1.11.52:5988"', + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://106.74.146.218:2031"', } diff --git a/src/api/app.js b/src/api/app.js index d556d7c..ecd110a 100644 --- a/src/api/app.js +++ b/src/api/app.js @@ -2,6 +2,7 @@ * APP的接口 */ import request from '@/utils/request' + // 新版本查询 export function checkVersion() { return request({ diff --git a/src/api/special.js b/src/api/special.js new file mode 100644 index 0000000..e4574e8 --- /dev/null +++ b/src/api/special.js @@ -0,0 +1,97 @@ + +/** + * APP的接口 + */ +import request from '@/utils/request' +import { getToken } from '@/utils/auth' +import store from '@/store' + + +// 新版本查询 +export function appSpApi(method,params={},type='GET') { + const data = { + 'FWQQ_BWBH':getBWBH(), //报文编号 + 'BWLYIPDZ':getIP(), //12位IP + 'BWLYDKH':'8083', //端口？ + 'FWQQZ_ZCXX':'A00111000026000004818', + 'FWBS':'S00101100002600052004', + 'FFBS':'FUN001', + 'FWQQ_RQSJ':getTime(), + 'FWQQ_NR':{ + method:'appprepositionInvoke', + params:{ + method:method, + type:type, + token: getToken(), + params: params + }}, + 'XXCZRY_XM':store.getters.name, + 'XXCZRY_GMSFHM':store.getters.username, + 'XXCZRY_GAJGJGDM':store.getters.jgdm, + 'FWQQSB_BH':store.getters.imei, + 'FWQQ_SJSJLX':'service_request', + 'YYSBS':store.getters.yys + } + return request({ + url: '/http/GA000Comm', + method: 'post', + data:data + }) +} + +function getBWBH(){ + let head = "SR" + let ip = changeIP(store.getters.ip); + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + let mseconds = mdate.getMilliseconds(); //获取当前毫秒数（0~999） + let end = Math.floor(Math.random()*(9999-1000))+1000;//生成随机4位流水号 + + let result = head+ip + +year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + +formatStr(mseconds,3)+end; + + return result; + +} + +function getIP(){ + let ip = changeIP(store.getters.ip); + return ip; +} + +function getTime(){ + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + + let result = ""+year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + return result +} + +function changeIP(ip){ + const ip_ds = ip.split(".") + let result = "" + for(let item of ip_ds){ + item = "000"+item + result+=item.substr(-3) + } + return result; +} + +function formatStr(str,length){ + str = "000"+str + return str.substr(0-length) +} + diff --git a/src/api/testZongXian.js b/src/api/testZongXian.js new file mode 100644 index 0000000..9081f8f --- /dev/null +++ b/src/api/testZongXian.js @@ -0,0 +1,88 @@ + +var ip = '10.9.39.8' +// 新版本查询 +function generateJson(method,params={},type='GET') { + const data = { + 'FWQQ_BWBH':getBWBH(), //报文编号 + 'BWLYIPDZ':getIP(), //12位IP + 'BWLYDKH':'8083', //端口？ + 'FWQQZ_ZCXX':'A00111000026000004818', + 'FWBS':'S00101100002600052004', + 'FFBS':'FUN001', + 'FWQQ_RQSJ':getTime(), + 'FWQQ_NR':{ + method:'appprepositionInvoke', + params:{ + method:method, + type:type, + token: '', + params: params + }}, + 'XXCZRY_XM':'张森', + 'XXCZRY_GMSFHM':'110226198909261410', + 'XXCZRY_GAJGJGDM':'-', + 'FWQQSB_BH':'-', + 'FWQQ_SJSJLX':'service_request', + 'YYSBS':'lt' + } + console.log(JSON.stringify(data)) +} + +function getBWBH(){ + let head = "SR" + let ip = changeIP('10.9.39.8'); + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + let mseconds = mdate.getMilliseconds(); //获取当前毫秒数（0~999） + let end = Math.floor(Math.random()*(9999-1000))+1000;//生成随机4位流水号 + + let result = head+ip + +year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + +formatStr(mseconds,3)+end; + + return result; + +} + +function getIP(){ + let ip = changeIP('10.9.39.8'); + return ip; +} + +function getTime(){ + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + + let result = ""+year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + return result +} + +function changeIP(ip){ + const ip_ds = ip.split(".") + let result = "" + for(let item of ip_ds){ + item = "000"+item + result+=item.substr(-3) + } + return result; +} + +function formatStr(str,length){ + str = "000"+str + return str.substr(0-length) +} + + +generateJson('app/tokenByCard',{card:'110226198909261410'}) diff --git a/src/assets/js/storageConst.js b/src/assets/js/storageConst.js index 4cbaec7..33f4dcb 100644 --- a/src/assets/js/storageConst.js +++ b/src/assets/js/storageConst.js @@ -11,3 +11,5 @@ export const DEPT_NAME = '_dept_name_' //部门名称 export const DEPT_ID = '_dept_id_' //部门编号 export const PHONE = '_phone_' //电话号码 +export const ID = '_id_' //用户id +export const RECORD_NUMBER = '_record_number_' //用户id diff --git a/src/page/error/404.vue b/src/page/error/404.vue new file mode 100644 index 0000000..aceb671 --- /dev/null +++ b/src/page/error/404.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 1747fe6..fcc8326 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -92,7 +92,7 @@
- 接单 + 处理 到这里去 转单 提交 @@ -122,6 +122,8 @@ import ChoosePeople from "../ChoosePeople"; import Loading from "../../../components/Loading/index"; import {compareCalendar} from '@/utils/string' + import { appSpApi } from '@/api/special' + export default { name: "JobDetail", components:{ @@ -256,7 +258,7 @@ }, //获取工单详情 fetchData(id){ - getJobInfo(id).then(response=>{ + appSpApi('job/info',{id:id}).then(response =>{ if(response.code==200){ this.jobForm = response.data[0] this.isLoading = false diff --git a/src/page/jobManage/modules/JobDetailSimple.vue b/src/page/jobManage/modules/JobDetailSimple.vue new file mode 100644 index 0000000..be06c86 --- /dev/null +++ b/src/page/jobManage/modules/JobDetailSimple.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..d72abab 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -69,6 +69,7 @@ import {Loadmore, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "OverJob", components:{ @@ -121,7 +122,7 @@ this.$refs.loadmore.onTopLoaded() this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -141,7 +142,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ console.log('getJobList') this.listQuery.offset+=1 for(let item of response.data.rows){ @@ -168,9 +169,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..fadc818 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -26,9 +26,9 @@ {{item.position}}
-
- 接单 -
+ + +
@@ -43,6 +43,7 @@ import {MessageBox, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList, getJob } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "WaitGetJob", components: {Loading}, @@ -89,8 +90,7 @@ //页码置1 this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -109,7 +109,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = this.list.concat(response.data.rows) this.total = parseInt(response.data.total) @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/config/dev.env.js b/config/dev.env.js index df0ed63..786fb2a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -4,6 +4,9 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee"' + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://192.168.0.212:8083"', + BASE_API: '"http://20.1.11.52:5988"', // BASE_API: '"http://192.168.0.225:8083"', }) diff --git a/config/index.js b/config/index.js index 88422c3..ca24a9c 100644 --- a/config/index.js +++ b/config/index.js @@ -6,14 +6,19 @@ module.exports = { dev: { - // Paths assetsSubDirectory: 'static', assetsPublicPath: '/', - proxyTable: {}, - + proxyTable: { + // '/api': { + // target: 'http://20.1.2.241', //目标接口域名 + // pathRewrite: { + // '^/api': '' //重写接口 + // }, + // changeOrigin: true, //是否跨域 + // }, + }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, diff --git a/config/prod.env.js b/config/prod.env.js index 3327c7d..462c806 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,7 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://119.254.103.80:14536"', - BASE_API: '"http://106.74.146.218:2031"', + BASE_API: '"http://20.1.11.52:5988"', + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://106.74.146.218:2031"', } diff --git a/src/api/app.js b/src/api/app.js index d556d7c..ecd110a 100644 --- a/src/api/app.js +++ b/src/api/app.js @@ -2,6 +2,7 @@ * APP的接口 */ import request from '@/utils/request' + // 新版本查询 export function checkVersion() { return request({ diff --git a/src/api/special.js b/src/api/special.js new file mode 100644 index 0000000..e4574e8 --- /dev/null +++ b/src/api/special.js @@ -0,0 +1,97 @@ + +/** + * APP的接口 + */ +import request from '@/utils/request' +import { getToken } from '@/utils/auth' +import store from '@/store' + + +// 新版本查询 +export function appSpApi(method,params={},type='GET') { + const data = { + 'FWQQ_BWBH':getBWBH(), //报文编号 + 'BWLYIPDZ':getIP(), //12位IP + 'BWLYDKH':'8083', //端口？ + 'FWQQZ_ZCXX':'A00111000026000004818', + 'FWBS':'S00101100002600052004', + 'FFBS':'FUN001', + 'FWQQ_RQSJ':getTime(), + 'FWQQ_NR':{ + method:'appprepositionInvoke', + params:{ + method:method, + type:type, + token: getToken(), + params: params + }}, + 'XXCZRY_XM':store.getters.name, + 'XXCZRY_GMSFHM':store.getters.username, + 'XXCZRY_GAJGJGDM':store.getters.jgdm, + 'FWQQSB_BH':store.getters.imei, + 'FWQQ_SJSJLX':'service_request', + 'YYSBS':store.getters.yys + } + return request({ + url: '/http/GA000Comm', + method: 'post', + data:data + }) +} + +function getBWBH(){ + let head = "SR" + let ip = changeIP(store.getters.ip); + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + let mseconds = mdate.getMilliseconds(); //获取当前毫秒数（0~999） + let end = Math.floor(Math.random()*(9999-1000))+1000;//生成随机4位流水号 + + let result = head+ip + +year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + +formatStr(mseconds,3)+end; + + return result; + +} + +function getIP(){ + let ip = changeIP(store.getters.ip); + return ip; +} + +function getTime(){ + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + + let result = ""+year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + return result +} + +function changeIP(ip){ + const ip_ds = ip.split(".") + let result = "" + for(let item of ip_ds){ + item = "000"+item + result+=item.substr(-3) + } + return result; +} + +function formatStr(str,length){ + str = "000"+str + return str.substr(0-length) +} + diff --git a/src/api/testZongXian.js b/src/api/testZongXian.js new file mode 100644 index 0000000..9081f8f --- /dev/null +++ b/src/api/testZongXian.js @@ -0,0 +1,88 @@ + +var ip = '10.9.39.8' +// 新版本查询 +function generateJson(method,params={},type='GET') { + const data = { + 'FWQQ_BWBH':getBWBH(), //报文编号 + 'BWLYIPDZ':getIP(), //12位IP + 'BWLYDKH':'8083', //端口？ + 'FWQQZ_ZCXX':'A00111000026000004818', + 'FWBS':'S00101100002600052004', + 'FFBS':'FUN001', + 'FWQQ_RQSJ':getTime(), + 'FWQQ_NR':{ + method:'appprepositionInvoke', + params:{ + method:method, + type:type, + token: '', + params: params + }}, + 'XXCZRY_XM':'张森', + 'XXCZRY_GMSFHM':'110226198909261410', + 'XXCZRY_GAJGJGDM':'-', + 'FWQQSB_BH':'-', + 'FWQQ_SJSJLX':'service_request', + 'YYSBS':'lt' + } + console.log(JSON.stringify(data)) +} + +function getBWBH(){ + let head = "SR" + let ip = changeIP('10.9.39.8'); + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + let mseconds = mdate.getMilliseconds(); //获取当前毫秒数（0~999） + let end = Math.floor(Math.random()*(9999-1000))+1000;//生成随机4位流水号 + + let result = head+ip + +year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + +formatStr(mseconds,3)+end; + + return result; + +} + +function getIP(){ + let ip = changeIP('10.9.39.8'); + return ip; +} + +function getTime(){ + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + + let result = ""+year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + return result +} + +function changeIP(ip){ + const ip_ds = ip.split(".") + let result = "" + for(let item of ip_ds){ + item = "000"+item + result+=item.substr(-3) + } + return result; +} + +function formatStr(str,length){ + str = "000"+str + return str.substr(0-length) +} + + +generateJson('app/tokenByCard',{card:'110226198909261410'}) diff --git a/src/assets/js/storageConst.js b/src/assets/js/storageConst.js index 4cbaec7..33f4dcb 100644 --- a/src/assets/js/storageConst.js +++ b/src/assets/js/storageConst.js @@ -11,3 +11,5 @@ export const DEPT_NAME = '_dept_name_' //部门名称 export const DEPT_ID = '_dept_id_' //部门编号 export const PHONE = '_phone_' //电话号码 +export const ID = '_id_' //用户id +export const RECORD_NUMBER = '_record_number_' //用户id diff --git a/src/page/error/404.vue b/src/page/error/404.vue new file mode 100644 index 0000000..aceb671 --- /dev/null +++ b/src/page/error/404.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 1747fe6..fcc8326 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -92,7 +92,7 @@
- 接单 + 处理 到这里去 转单 提交 @@ -122,6 +122,8 @@ import ChoosePeople from "../ChoosePeople"; import Loading from "../../../components/Loading/index"; import {compareCalendar} from '@/utils/string' + import { appSpApi } from '@/api/special' + export default { name: "JobDetail", components:{ @@ -256,7 +258,7 @@ }, //获取工单详情 fetchData(id){ - getJobInfo(id).then(response=>{ + appSpApi('job/info',{id:id}).then(response =>{ if(response.code==200){ this.jobForm = response.data[0] this.isLoading = false diff --git a/src/page/jobManage/modules/JobDetailSimple.vue b/src/page/jobManage/modules/JobDetailSimple.vue new file mode 100644 index 0000000..be06c86 --- /dev/null +++ b/src/page/jobManage/modules/JobDetailSimple.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..d72abab 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -69,6 +69,7 @@ import {Loadmore, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "OverJob", components:{ @@ -121,7 +122,7 @@ this.$refs.loadmore.onTopLoaded() this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -141,7 +142,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ console.log('getJobList') this.listQuery.offset+=1 for(let item of response.data.rows){ @@ -168,9 +169,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..fadc818 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -26,9 +26,9 @@ {{item.position}}
-
- 接单 -
+ + +
@@ -43,6 +43,7 @@ import {MessageBox, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList, getJob } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "WaitGetJob", components: {Loading}, @@ -89,8 +90,7 @@ //页码置1 this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -109,7 +109,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = this.list.concat(response.data.rows) this.total = parseInt(response.data.total) @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..55178c7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -43,7 +43,7 @@
工    单
-
+
{{item.count}} @@ -65,9 +65,11 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' - import { registerGetui } from '@/api/login' + import { appSpApi } from '@/api/special' + export default { name:'layout', @@ -101,17 +103,12 @@ }, { count:'--', - name:'待确认', - type:'span-count warning' - }, - { - count:'--', - name:'处理中', + name:'已完成', type:'span-count primary' }, { count:'--', - name:'已完成', + name:'全部', type:'span-count success' } ] @@ -120,35 +117,14 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } this.fetchData() }, methods: { - resumeCallback () { - Toast({ - message: '欢迎回来', - position: 'bottom', - duration: 3000 - }) - let login_flag = checkLoginFlag() - if (login_flag) { - this.login() - } else { - MyLocalStorage.Cache.set(LOGIN_FLAG, true, 999999) // 切换回来登陆保持时长无限 - } - }, pauseCallback () { setTimeout(() => { MyLocalStorage.Cache.set(LOGIN_FLAG, true, 6000) // 切换至后台登陆保持10分钟 @@ -157,7 +133,7 @@ //获取数据 fetchData(){ //统计布防撤防井数 - countByBfzt().then(response => { + appSpApi('well/countByBfzt').then(response =>{ this.wellCount = [ { count:response.data.cfWell, @@ -176,7 +152,7 @@ } ] }) - countByJobStatus().then(response => { + appSpApi('job/countByJobStatus').then(response =>{ this.jobCount = [ { count:response.data.beforeGet, @@ -184,18 +160,13 @@ type:'span-count alarm' }, { - count:response.data.beforeConfirm, - name:'待确认', - type:'span-count warning' - }, - { - count:response.data.inHandle, - name:'处理中', + count:response.data.over, + name:'已完成', type:'span-count primary' }, { - count:response.data.over, - name:'已完成', + count:response.data.beforeGet+response.data.over, + name:'全部', type:'span-count success' } ] @@ -224,12 +195,10 @@ clickJobManage(name){ if(name=='待处理'){ this.$router.push({name: 'job', query:{tab:'1'}}) - }else if(name=='待确认'){ - this.$router.push({name: 'job', query:{tab:'2'}}) - }else if(name=='处理中'){ - this.$router.push({name: 'job', query:{tab:'3'}}) }else if(name=='已完成'){ - this.$router.push({name: 'job', query:{tab:'4'}}) + this.$router.push({name: 'job', query:{tab:'2'}}) + }else if(name=='全部'){ + this.$router.push({name: 'job', query:{tab:'3'}}) } } diff --git a/config/dev.env.js b/config/dev.env.js index df0ed63..786fb2a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -4,6 +4,9 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee"' + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://192.168.0.212:8083"', + BASE_API: '"http://20.1.11.52:5988"', // BASE_API: '"http://192.168.0.225:8083"', }) diff --git a/config/index.js b/config/index.js index 88422c3..ca24a9c 100644 --- a/config/index.js +++ b/config/index.js @@ -6,14 +6,19 @@ module.exports = { dev: { - // Paths assetsSubDirectory: 'static', assetsPublicPath: '/', - proxyTable: {}, - + proxyTable: { + // '/api': { + // target: 'http://20.1.2.241', //目标接口域名 + // pathRewrite: { + // '^/api': '' //重写接口 + // }, + // changeOrigin: true, //是否跨域 + // }, + }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, diff --git a/config/prod.env.js b/config/prod.env.js index 3327c7d..462c806 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,7 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://119.254.103.80:14536"', - BASE_API: '"http://106.74.146.218:2031"', + BASE_API: '"http://20.1.11.52:5988"', + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://106.74.146.218:2031"', } diff --git a/src/api/app.js b/src/api/app.js index d556d7c..ecd110a 100644 --- a/src/api/app.js +++ b/src/api/app.js @@ -2,6 +2,7 @@ * APP的接口 */ import request from '@/utils/request' + // 新版本查询 export function checkVersion() { return request({ diff --git a/src/api/special.js b/src/api/special.js new file mode 100644 index 0000000..e4574e8 --- /dev/null +++ b/src/api/special.js @@ -0,0 +1,97 @@ + +/** + * APP的接口 + */ +import request from '@/utils/request' +import { getToken } from '@/utils/auth' +import store from '@/store' + + +// 新版本查询 +export function appSpApi(method,params={},type='GET') { + const data = { + 'FWQQ_BWBH':getBWBH(), //报文编号 + 'BWLYIPDZ':getIP(), //12位IP + 'BWLYDKH':'8083', //端口？ + 'FWQQZ_ZCXX':'A00111000026000004818', + 'FWBS':'S00101100002600052004', + 'FFBS':'FUN001', + 'FWQQ_RQSJ':getTime(), + 'FWQQ_NR':{ + method:'appprepositionInvoke', + params:{ + method:method, + type:type, + token: getToken(), + params: params + }}, + 'XXCZRY_XM':store.getters.name, + 'XXCZRY_GMSFHM':store.getters.username, + 'XXCZRY_GAJGJGDM':store.getters.jgdm, + 'FWQQSB_BH':store.getters.imei, + 'FWQQ_SJSJLX':'service_request', + 'YYSBS':store.getters.yys + } + return request({ + url: '/http/GA000Comm', + method: 'post', + data:data + }) +} + +function getBWBH(){ + let head = "SR" + let ip = changeIP(store.getters.ip); + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + let mseconds = mdate.getMilliseconds(); //获取当前毫秒数（0~999） + let end = Math.floor(Math.random()*(9999-1000))+1000;//生成随机4位流水号 + + let result = head+ip + +year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + +formatStr(mseconds,3)+end; + + return result; + +} + +function getIP(){ + let ip = changeIP(store.getters.ip); + return ip; +} + +function getTime(){ + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + + let result = ""+year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + return result +} + +function changeIP(ip){ + const ip_ds = ip.split(".") + let result = "" + for(let item of ip_ds){ + item = "000"+item + result+=item.substr(-3) + } + return result; +} + +function formatStr(str,length){ + str = "000"+str + return str.substr(0-length) +} + diff --git a/src/api/testZongXian.js b/src/api/testZongXian.js new file mode 100644 index 0000000..9081f8f --- /dev/null +++ b/src/api/testZongXian.js @@ -0,0 +1,88 @@ + +var ip = '10.9.39.8' +// 新版本查询 +function generateJson(method,params={},type='GET') { + const data = { + 'FWQQ_BWBH':getBWBH(), //报文编号 + 'BWLYIPDZ':getIP(), //12位IP + 'BWLYDKH':'8083', //端口？ + 'FWQQZ_ZCXX':'A00111000026000004818', + 'FWBS':'S00101100002600052004', + 'FFBS':'FUN001', + 'FWQQ_RQSJ':getTime(), + 'FWQQ_NR':{ + method:'appprepositionInvoke', + params:{ + method:method, + type:type, + token: '', + params: params + }}, + 'XXCZRY_XM':'张森', + 'XXCZRY_GMSFHM':'110226198909261410', + 'XXCZRY_GAJGJGDM':'-', + 'FWQQSB_BH':'-', + 'FWQQ_SJSJLX':'service_request', + 'YYSBS':'lt' + } + console.log(JSON.stringify(data)) +} + +function getBWBH(){ + let head = "SR" + let ip = changeIP('10.9.39.8'); + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + let mseconds = mdate.getMilliseconds(); //获取当前毫秒数（0~999） + let end = Math.floor(Math.random()*(9999-1000))+1000;//生成随机4位流水号 + + let result = head+ip + +year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + +formatStr(mseconds,3)+end; + + return result; + +} + +function getIP(){ + let ip = changeIP('10.9.39.8'); + return ip; +} + +function getTime(){ + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + + let result = ""+year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + return result +} + +function changeIP(ip){ + const ip_ds = ip.split(".") + let result = "" + for(let item of ip_ds){ + item = "000"+item + result+=item.substr(-3) + } + return result; +} + +function formatStr(str,length){ + str = "000"+str + return str.substr(0-length) +} + + +generateJson('app/tokenByCard',{card:'110226198909261410'}) diff --git a/src/assets/js/storageConst.js b/src/assets/js/storageConst.js index 4cbaec7..33f4dcb 100644 --- a/src/assets/js/storageConst.js +++ b/src/assets/js/storageConst.js @@ -11,3 +11,5 @@ export const DEPT_NAME = '_dept_name_' //部门名称 export const DEPT_ID = '_dept_id_' //部门编号 export const PHONE = '_phone_' //电话号码 +export const ID = '_id_' //用户id +export const RECORD_NUMBER = '_record_number_' //用户id diff --git a/src/page/error/404.vue b/src/page/error/404.vue new file mode 100644 index 0000000..aceb671 --- /dev/null +++ b/src/page/error/404.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 1747fe6..fcc8326 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -92,7 +92,7 @@
- 接单 + 处理 到这里去 转单 提交 @@ -122,6 +122,8 @@ import ChoosePeople from "../ChoosePeople"; import Loading from "../../../components/Loading/index"; import {compareCalendar} from '@/utils/string' + import { appSpApi } from '@/api/special' + export default { name: "JobDetail", components:{ @@ -256,7 +258,7 @@ }, //获取工单详情 fetchData(id){ - getJobInfo(id).then(response=>{ + appSpApi('job/info',{id:id}).then(response =>{ if(response.code==200){ this.jobForm = response.data[0] this.isLoading = false diff --git a/src/page/jobManage/modules/JobDetailSimple.vue b/src/page/jobManage/modules/JobDetailSimple.vue new file mode 100644 index 0000000..be06c86 --- /dev/null +++ b/src/page/jobManage/modules/JobDetailSimple.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..d72abab 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -69,6 +69,7 @@ import {Loadmore, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "OverJob", components:{ @@ -121,7 +122,7 @@ this.$refs.loadmore.onTopLoaded() this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -141,7 +142,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ console.log('getJobList') this.listQuery.offset+=1 for(let item of response.data.rows){ @@ -168,9 +169,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..fadc818 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -26,9 +26,9 @@ {{item.position}}
-
- 接单 -
+ + +
@@ -43,6 +43,7 @@ import {MessageBox, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList, getJob } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "WaitGetJob", components: {Loading}, @@ -89,8 +90,7 @@ //页码置1 this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -109,7 +109,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = this.list.concat(response.data.rows) this.total = parseInt(response.data.total) @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..55178c7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -43,7 +43,7 @@
工    单
-
+
{{item.count}} @@ -65,9 +65,11 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' - import { registerGetui } from '@/api/login' + import { appSpApi } from '@/api/special' + export default { name:'layout', @@ -101,17 +103,12 @@ }, { count:'--', - name:'待确认', - type:'span-count warning' - }, - { - count:'--', - name:'处理中', + name:'已完成', type:'span-count primary' }, { count:'--', - name:'已完成', + name:'全部', type:'span-count success' } ] @@ -120,35 +117,14 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } this.fetchData() }, methods: { - resumeCallback () { - Toast({ - message: '欢迎回来', - position: 'bottom', - duration: 3000 - }) - let login_flag = checkLoginFlag() - if (login_flag) { - this.login() - } else { - MyLocalStorage.Cache.set(LOGIN_FLAG, true, 999999) // 切换回来登陆保持时长无限 - } - }, pauseCallback () { setTimeout(() => { MyLocalStorage.Cache.set(LOGIN_FLAG, true, 6000) // 切换至后台登陆保持10分钟 @@ -157,7 +133,7 @@ //获取数据 fetchData(){ //统计布防撤防井数 - countByBfzt().then(response => { + appSpApi('well/countByBfzt').then(response =>{ this.wellCount = [ { count:response.data.cfWell, @@ -176,7 +152,7 @@ } ] }) - countByJobStatus().then(response => { + appSpApi('job/countByJobStatus').then(response =>{ this.jobCount = [ { count:response.data.beforeGet, @@ -184,18 +160,13 @@ type:'span-count alarm' }, { - count:response.data.beforeConfirm, - name:'待确认', - type:'span-count warning' - }, - { - count:response.data.inHandle, - name:'处理中', + count:response.data.over, + name:'已完成', type:'span-count primary' }, { - count:response.data.over, - name:'已完成', + count:response.data.beforeGet+response.data.over, + name:'全部', type:'span-count success' } ] @@ -224,12 +195,10 @@ clickJobManage(name){ if(name=='待处理'){ this.$router.push({name: 'job', query:{tab:'1'}}) - }else if(name=='待确认'){ - this.$router.push({name: 'job', query:{tab:'2'}}) - }else if(name=='处理中'){ - this.$router.push({name: 'job', query:{tab:'3'}}) }else if(name=='已完成'){ - this.$router.push({name: 'job', query:{tab:'4'}}) + this.$router.push({name: 'job', query:{tab:'2'}}) + }else if(name=='全部'){ + this.$router.push({name: 'job', query:{tab:'3'}}) } } diff --git a/src/page/mine/index.vue b/src/page/mine/index.vue index 81b33ab..1101341 100644 --- a/src/page/mine/index.vue +++ b/src/page/mine/index.vue @@ -8,8 +8,18 @@ - + + + + {{pushOpen=='0'?'关':'开'}} + + +
@@ -18,12 +28,30 @@ + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 1747fe6..fcc8326 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -92,7 +92,7 @@
- 接单 + 处理 到这里去 转单 提交 @@ -122,6 +122,8 @@ import ChoosePeople from "../ChoosePeople"; import Loading from "../../../components/Loading/index"; import {compareCalendar} from '@/utils/string' + import { appSpApi } from '@/api/special' + export default { name: "JobDetail", components:{ @@ -256,7 +258,7 @@ }, //获取工单详情 fetchData(id){ - getJobInfo(id).then(response=>{ + appSpApi('job/info',{id:id}).then(response =>{ if(response.code==200){ this.jobForm = response.data[0] this.isLoading = false diff --git a/src/page/jobManage/modules/JobDetailSimple.vue b/src/page/jobManage/modules/JobDetailSimple.vue new file mode 100644 index 0000000..be06c86 --- /dev/null +++ b/src/page/jobManage/modules/JobDetailSimple.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..d72abab 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -69,6 +69,7 @@ import {Loadmore, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "OverJob", components:{ @@ -121,7 +122,7 @@ this.$refs.loadmore.onTopLoaded() this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -141,7 +142,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ console.log('getJobList') this.listQuery.offset+=1 for(let item of response.data.rows){ @@ -168,9 +169,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..fadc818 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -26,9 +26,9 @@ {{item.position}}
-
- 接单 -
+ + +
@@ -43,6 +43,7 @@ import {MessageBox, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList, getJob } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "WaitGetJob", components: {Loading}, @@ -89,8 +90,7 @@ //页码置1 this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -109,7 +109,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = this.list.concat(response.data.rows) this.total = parseInt(response.data.total) @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..55178c7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -43,7 +43,7 @@
工    单
-
+
{{item.count}} @@ -65,9 +65,11 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' - import { registerGetui } from '@/api/login' + import { appSpApi } from '@/api/special' + export default { name:'layout', @@ -101,17 +103,12 @@ }, { count:'--', - name:'待确认', - type:'span-count warning' - }, - { - count:'--', - name:'处理中', + name:'已完成', type:'span-count primary' }, { count:'--', - name:'已完成', + name:'全部', type:'span-count success' } ] @@ -120,35 +117,14 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } this.fetchData() }, methods: { - resumeCallback () { - Toast({ - message: '欢迎回来', - position: 'bottom', - duration: 3000 - }) - let login_flag = checkLoginFlag() - if (login_flag) { - this.login() - } else { - MyLocalStorage.Cache.set(LOGIN_FLAG, true, 999999) // 切换回来登陆保持时长无限 - } - }, pauseCallback () { setTimeout(() => { MyLocalStorage.Cache.set(LOGIN_FLAG, true, 6000) // 切换至后台登陆保持10分钟 @@ -157,7 +133,7 @@ //获取数据 fetchData(){ //统计布防撤防井数 - countByBfzt().then(response => { + appSpApi('well/countByBfzt').then(response =>{ this.wellCount = [ { count:response.data.cfWell, @@ -176,7 +152,7 @@ } ] }) - countByJobStatus().then(response => { + appSpApi('job/countByJobStatus').then(response =>{ this.jobCount = [ { count:response.data.beforeGet, @@ -184,18 +160,13 @@ type:'span-count alarm' }, { - count:response.data.beforeConfirm, - name:'待确认', - type:'span-count warning' - }, - { - count:response.data.inHandle, - name:'处理中', + count:response.data.over, + name:'已完成', type:'span-count primary' }, { - count:response.data.over, - name:'已完成', + count:response.data.beforeGet+response.data.over, + name:'全部', type:'span-count success' } ] @@ -224,12 +195,10 @@ clickJobManage(name){ if(name=='待处理'){ this.$router.push({name: 'job', query:{tab:'1'}}) - }else if(name=='待确认'){ - this.$router.push({name: 'job', query:{tab:'2'}}) - }else if(name=='处理中'){ - this.$router.push({name: 'job', query:{tab:'3'}}) }else if(name=='已完成'){ - this.$router.push({name: 'job', query:{tab:'4'}}) + this.$router.push({name: 'job', query:{tab:'2'}}) + }else if(name=='全部'){ + this.$router.push({name: 'job', query:{tab:'3'}}) } } diff --git a/src/page/mine/index.vue b/src/page/mine/index.vue index 81b33ab..1101341 100644 --- a/src/page/mine/index.vue +++ b/src/page/mine/index.vue @@ -8,8 +8,18 @@ - + + + + {{pushOpen=='0'?'关':'开'}} + + +
@@ -18,12 +28,30 @@ + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 1747fe6..fcc8326 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -92,7 +92,7 @@
- 接单 + 处理 到这里去 转单 提交 @@ -122,6 +122,8 @@ import ChoosePeople from "../ChoosePeople"; import Loading from "../../../components/Loading/index"; import {compareCalendar} from '@/utils/string' + import { appSpApi } from '@/api/special' + export default { name: "JobDetail", components:{ @@ -256,7 +258,7 @@ }, //获取工单详情 fetchData(id){ - getJobInfo(id).then(response=>{ + appSpApi('job/info',{id:id}).then(response =>{ if(response.code==200){ this.jobForm = response.data[0] this.isLoading = false diff --git a/src/page/jobManage/modules/JobDetailSimple.vue b/src/page/jobManage/modules/JobDetailSimple.vue new file mode 100644 index 0000000..be06c86 --- /dev/null +++ b/src/page/jobManage/modules/JobDetailSimple.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..d72abab 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -69,6 +69,7 @@ import {Loadmore, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "OverJob", components:{ @@ -121,7 +122,7 @@ this.$refs.loadmore.onTopLoaded() this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -141,7 +142,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ console.log('getJobList') this.listQuery.offset+=1 for(let item of response.data.rows){ @@ -168,9 +169,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..fadc818 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -26,9 +26,9 @@ {{item.position}}
-
- 接单 -
+ + +
@@ -43,6 +43,7 @@ import {MessageBox, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList, getJob } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "WaitGetJob", components: {Loading}, @@ -89,8 +90,7 @@ //页码置1 this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -109,7 +109,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = this.list.concat(response.data.rows) this.total = parseInt(response.data.total) @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..55178c7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -43,7 +43,7 @@
工    单
-
+
{{item.count}} @@ -65,9 +65,11 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' - import { registerGetui } from '@/api/login' + import { appSpApi } from '@/api/special' + export default { name:'layout', @@ -101,17 +103,12 @@ }, { count:'--', - name:'待确认', - type:'span-count warning' - }, - { - count:'--', - name:'处理中', + name:'已完成', type:'span-count primary' }, { count:'--', - name:'已完成', + name:'全部', type:'span-count success' } ] @@ -120,35 +117,14 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } this.fetchData() }, methods: { - resumeCallback () { - Toast({ - message: '欢迎回来', - position: 'bottom', - duration: 3000 - }) - let login_flag = checkLoginFlag() - if (login_flag) { - this.login() - } else { - MyLocalStorage.Cache.set(LOGIN_FLAG, true, 999999) // 切换回来登陆保持时长无限 - } - }, pauseCallback () { setTimeout(() => { MyLocalStorage.Cache.set(LOGIN_FLAG, true, 6000) // 切换至后台登陆保持10分钟 @@ -157,7 +133,7 @@ //获取数据 fetchData(){ //统计布防撤防井数 - countByBfzt().then(response => { + appSpApi('well/countByBfzt').then(response =>{ this.wellCount = [ { count:response.data.cfWell, @@ -176,7 +152,7 @@ } ] }) - countByJobStatus().then(response => { + appSpApi('job/countByJobStatus').then(response =>{ this.jobCount = [ { count:response.data.beforeGet, @@ -184,18 +160,13 @@ type:'span-count alarm' }, { - count:response.data.beforeConfirm, - name:'待确认', - type:'span-count warning' - }, - { - count:response.data.inHandle, - name:'处理中', + count:response.data.over, + name:'已完成', type:'span-count primary' }, { - count:response.data.over, - name:'已完成', + count:response.data.beforeGet+response.data.over, + name:'全部', type:'span-count success' } ] @@ -224,12 +195,10 @@ clickJobManage(name){ if(name=='待处理'){ this.$router.push({name: 'job', query:{tab:'1'}}) - }else if(name=='待确认'){ - this.$router.push({name: 'job', query:{tab:'2'}}) - }else if(name=='处理中'){ - this.$router.push({name: 'job', query:{tab:'3'}}) }else if(name=='已完成'){ - this.$router.push({name: 'job', query:{tab:'4'}}) + this.$router.push({name: 'job', query:{tab:'2'}}) + }else if(name=='全部'){ + this.$router.push({name: 'job', query:{tab:'3'}}) } } diff --git a/src/page/mine/index.vue b/src/page/mine/index.vue index 81b33ab..1101341 100644 --- a/src/page/mine/index.vue +++ b/src/page/mine/index.vue @@ -8,8 +8,18 @@ - + + + + {{pushOpen=='0'?'关':'开'}} + + +
@@ -18,12 +28,30 @@ + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 1747fe6..fcc8326 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -92,7 +92,7 @@
- 接单 + 处理 到这里去 转单 提交 @@ -122,6 +122,8 @@ import ChoosePeople from "../ChoosePeople"; import Loading from "../../../components/Loading/index"; import {compareCalendar} from '@/utils/string' + import { appSpApi } from '@/api/special' + export default { name: "JobDetail", components:{ @@ -256,7 +258,7 @@ }, //获取工单详情 fetchData(id){ - getJobInfo(id).then(response=>{ + appSpApi('job/info',{id:id}).then(response =>{ if(response.code==200){ this.jobForm = response.data[0] this.isLoading = false diff --git a/src/page/jobManage/modules/JobDetailSimple.vue b/src/page/jobManage/modules/JobDetailSimple.vue new file mode 100644 index 0000000..be06c86 --- /dev/null +++ b/src/page/jobManage/modules/JobDetailSimple.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..d72abab 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -69,6 +69,7 @@ import {Loadmore, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "OverJob", components:{ @@ -121,7 +122,7 @@ this.$refs.loadmore.onTopLoaded() this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -141,7 +142,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ console.log('getJobList') this.listQuery.offset+=1 for(let item of response.data.rows){ @@ -168,9 +169,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..fadc818 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -26,9 +26,9 @@ {{item.position}}
-
- 接单 -
+ + +
@@ -43,6 +43,7 @@ import {MessageBox, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList, getJob } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "WaitGetJob", components: {Loading}, @@ -89,8 +90,7 @@ //页码置1 this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -109,7 +109,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = this.list.concat(response.data.rows) this.total = parseInt(response.data.total) @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..55178c7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -43,7 +43,7 @@
工    单
-
+
{{item.count}} @@ -65,9 +65,11 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' - import { registerGetui } from '@/api/login' + import { appSpApi } from '@/api/special' + export default { name:'layout', @@ -101,17 +103,12 @@ }, { count:'--', - name:'待确认', - type:'span-count warning' - }, - { - count:'--', - name:'处理中', + name:'已完成', type:'span-count primary' }, { count:'--', - name:'已完成', + name:'全部', type:'span-count success' } ] @@ -120,35 +117,14 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } this.fetchData() }, methods: { - resumeCallback () { - Toast({ - message: '欢迎回来', - position: 'bottom', - duration: 3000 - }) - let login_flag = checkLoginFlag() - if (login_flag) { - this.login() - } else { - MyLocalStorage.Cache.set(LOGIN_FLAG, true, 999999) // 切换回来登陆保持时长无限 - } - }, pauseCallback () { setTimeout(() => { MyLocalStorage.Cache.set(LOGIN_FLAG, true, 6000) // 切换至后台登陆保持10分钟 @@ -157,7 +133,7 @@ //获取数据 fetchData(){ //统计布防撤防井数 - countByBfzt().then(response => { + appSpApi('well/countByBfzt').then(response =>{ this.wellCount = [ { count:response.data.cfWell, @@ -176,7 +152,7 @@ } ] }) - countByJobStatus().then(response => { + appSpApi('job/countByJobStatus').then(response =>{ this.jobCount = [ { count:response.data.beforeGet, @@ -184,18 +160,13 @@ type:'span-count alarm' }, { - count:response.data.beforeConfirm, - name:'待确认', - type:'span-count warning' - }, - { - count:response.data.inHandle, - name:'处理中', + count:response.data.over, + name:'已完成', type:'span-count primary' }, { - count:response.data.over, - name:'已完成', + count:response.data.beforeGet+response.data.over, + name:'全部', type:'span-count success' } ] @@ -224,12 +195,10 @@ clickJobManage(name){ if(name=='待处理'){ this.$router.push({name: 'job', query:{tab:'1'}}) - }else if(name=='待确认'){ - this.$router.push({name: 'job', query:{tab:'2'}}) - }else if(name=='处理中'){ - this.$router.push({name: 'job', query:{tab:'3'}}) }else if(name=='已完成'){ - this.$router.push({name: 'job', query:{tab:'4'}}) + this.$router.push({name: 'job', query:{tab:'2'}}) + }else if(name=='全部'){ + this.$router.push({name: 'job', query:{tab:'3'}}) } } diff --git a/src/page/mine/index.vue b/src/page/mine/index.vue index 81b33ab..1101341 100644 --- a/src/page/mine/index.vue +++ b/src/page/mine/index.vue @@ -8,8 +8,18 @@ - + + + + {{pushOpen=='0'?'关':'开'}} + + +
@@ -18,12 +28,30 @@ + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 1747fe6..fcc8326 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -92,7 +92,7 @@
- 接单 + 处理 到这里去 转单 提交 @@ -122,6 +122,8 @@ import ChoosePeople from "../ChoosePeople"; import Loading from "../../../components/Loading/index"; import {compareCalendar} from '@/utils/string' + import { appSpApi } from '@/api/special' + export default { name: "JobDetail", components:{ @@ -256,7 +258,7 @@ }, //获取工单详情 fetchData(id){ - getJobInfo(id).then(response=>{ + appSpApi('job/info',{id:id}).then(response =>{ if(response.code==200){ this.jobForm = response.data[0] this.isLoading = false diff --git a/src/page/jobManage/modules/JobDetailSimple.vue b/src/page/jobManage/modules/JobDetailSimple.vue new file mode 100644 index 0000000..be06c86 --- /dev/null +++ b/src/page/jobManage/modules/JobDetailSimple.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..d72abab 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -69,6 +69,7 @@ import {Loadmore, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "OverJob", components:{ @@ -121,7 +122,7 @@ this.$refs.loadmore.onTopLoaded() this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -141,7 +142,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ console.log('getJobList') this.listQuery.offset+=1 for(let item of response.data.rows){ @@ -168,9 +169,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..fadc818 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -26,9 +26,9 @@ {{item.position}}
-
- 接单 -
+ + +
@@ -43,6 +43,7 @@ import {MessageBox, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList, getJob } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "WaitGetJob", components: {Loading}, @@ -89,8 +90,7 @@ //页码置1 this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -109,7 +109,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = this.list.concat(response.data.rows) this.total = parseInt(response.data.total) @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..55178c7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -43,7 +43,7 @@
工    单
-
+
{{item.count}} @@ -65,9 +65,11 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' - import { registerGetui } from '@/api/login' + import { appSpApi } from '@/api/special' + export default { name:'layout', @@ -101,17 +103,12 @@ }, { count:'--', - name:'待确认', - type:'span-count warning' - }, - { - count:'--', - name:'处理中', + name:'已完成', type:'span-count primary' }, { count:'--', - name:'已完成', + name:'全部', type:'span-count success' } ] @@ -120,35 +117,14 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } this.fetchData() }, methods: { - resumeCallback () { - Toast({ - message: '欢迎回来', - position: 'bottom', - duration: 3000 - }) - let login_flag = checkLoginFlag() - if (login_flag) { - this.login() - } else { - MyLocalStorage.Cache.set(LOGIN_FLAG, true, 999999) // 切换回来登陆保持时长无限 - } - }, pauseCallback () { setTimeout(() => { MyLocalStorage.Cache.set(LOGIN_FLAG, true, 6000) // 切换至后台登陆保持10分钟 @@ -157,7 +133,7 @@ //获取数据 fetchData(){ //统计布防撤防井数 - countByBfzt().then(response => { + appSpApi('well/countByBfzt').then(response =>{ this.wellCount = [ { count:response.data.cfWell, @@ -176,7 +152,7 @@ } ] }) - countByJobStatus().then(response => { + appSpApi('job/countByJobStatus').then(response =>{ this.jobCount = [ { count:response.data.beforeGet, @@ -184,18 +160,13 @@ type:'span-count alarm' }, { - count:response.data.beforeConfirm, - name:'待确认', - type:'span-count warning' - }, - { - count:response.data.inHandle, - name:'处理中', + count:response.data.over, + name:'已完成', type:'span-count primary' }, { - count:response.data.over, - name:'已完成', + count:response.data.beforeGet+response.data.over, + name:'全部', type:'span-count success' } ] @@ -224,12 +195,10 @@ clickJobManage(name){ if(name=='待处理'){ this.$router.push({name: 'job', query:{tab:'1'}}) - }else if(name=='待确认'){ - this.$router.push({name: 'job', query:{tab:'2'}}) - }else if(name=='处理中'){ - this.$router.push({name: 'job', query:{tab:'3'}}) }else if(name=='已完成'){ - this.$router.push({name: 'job', query:{tab:'4'}}) + this.$router.push({name: 'job', query:{tab:'2'}}) + }else if(name=='全部'){ + this.$router.push({name: 'job', query:{tab:'3'}}) } } diff --git a/src/page/mine/index.vue b/src/page/mine/index.vue index 81b33ab..1101341 100644 --- a/src/page/mine/index.vue +++ b/src/page/mine/index.vue @@ -8,8 +8,18 @@ - + + + + {{pushOpen=='0'?'关':'开'}} + + +
@@ -18,12 +28,30 @@ + + diff --git a/config/dev.env.js b/config/dev.env.js index df0ed63..786fb2a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -4,6 +4,9 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee"' + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://192.168.0.212:8083"', + BASE_API: '"http://20.1.11.52:5988"', // BASE_API: '"http://192.168.0.225:8083"', }) diff --git a/config/index.js b/config/index.js index 88422c3..ca24a9c 100644 --- a/config/index.js +++ b/config/index.js @@ -6,14 +6,19 @@ module.exports = { dev: { - // Paths assetsSubDirectory: 'static', assetsPublicPath: '/', - proxyTable: {}, - + proxyTable: { + // '/api': { + // target: 'http://20.1.2.241', //目标接口域名 + // pathRewrite: { + // '^/api': '' //重写接口 + // }, + // changeOrigin: true, //是否跨域 + // }, + }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, diff --git a/config/prod.env.js b/config/prod.env.js index 3327c7d..462c806 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,7 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://119.254.103.80:14536"', - BASE_API: '"http://106.74.146.218:2031"', + BASE_API: '"http://20.1.11.52:5988"', + // BASE_API: '"http://119.254.103.80:14537"', + // BASE_API: '"http://106.74.146.218:2031"', } diff --git a/src/api/app.js b/src/api/app.js index d556d7c..ecd110a 100644 --- a/src/api/app.js +++ b/src/api/app.js @@ -2,6 +2,7 @@ * APP的接口 */ import request from '@/utils/request' + // 新版本查询 export function checkVersion() { return request({ diff --git a/src/api/special.js b/src/api/special.js new file mode 100644 index 0000000..e4574e8 --- /dev/null +++ b/src/api/special.js @@ -0,0 +1,97 @@ + +/** + * APP的接口 + */ +import request from '@/utils/request' +import { getToken } from '@/utils/auth' +import store from '@/store' + + +// 新版本查询 +export function appSpApi(method,params={},type='GET') { + const data = { + 'FWQQ_BWBH':getBWBH(), //报文编号 + 'BWLYIPDZ':getIP(), //12位IP + 'BWLYDKH':'8083', //端口？ + 'FWQQZ_ZCXX':'A00111000026000004818', + 'FWBS':'S00101100002600052004', + 'FFBS':'FUN001', + 'FWQQ_RQSJ':getTime(), + 'FWQQ_NR':{ + method:'appprepositionInvoke', + params:{ + method:method, + type:type, + token: getToken(), + params: params + }}, + 'XXCZRY_XM':store.getters.name, + 'XXCZRY_GMSFHM':store.getters.username, + 'XXCZRY_GAJGJGDM':store.getters.jgdm, + 'FWQQSB_BH':store.getters.imei, + 'FWQQ_SJSJLX':'service_request', + 'YYSBS':store.getters.yys + } + return request({ + url: '/http/GA000Comm', + method: 'post', + data:data + }) +} + +function getBWBH(){ + let head = "SR" + let ip = changeIP(store.getters.ip); + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + let mseconds = mdate.getMilliseconds(); //获取当前毫秒数（0~999） + let end = Math.floor(Math.random()*(9999-1000))+1000;//生成随机4位流水号 + + let result = head+ip + +year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + +formatStr(mseconds,3)+end; + + return result; + +} + +function getIP(){ + let ip = changeIP(store.getters.ip); + return ip; +} + +function getTime(){ + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + + let result = ""+year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + return result +} + +function changeIP(ip){ + const ip_ds = ip.split(".") + let result = "" + for(let item of ip_ds){ + item = "000"+item + result+=item.substr(-3) + } + return result; +} + +function formatStr(str,length){ + str = "000"+str + return str.substr(0-length) +} + diff --git a/src/api/testZongXian.js b/src/api/testZongXian.js new file mode 100644 index 0000000..9081f8f --- /dev/null +++ b/src/api/testZongXian.js @@ -0,0 +1,88 @@ + +var ip = '10.9.39.8' +// 新版本查询 +function generateJson(method,params={},type='GET') { + const data = { + 'FWQQ_BWBH':getBWBH(), //报文编号 + 'BWLYIPDZ':getIP(), //12位IP + 'BWLYDKH':'8083', //端口？ + 'FWQQZ_ZCXX':'A00111000026000004818', + 'FWBS':'S00101100002600052004', + 'FFBS':'FUN001', + 'FWQQ_RQSJ':getTime(), + 'FWQQ_NR':{ + method:'appprepositionInvoke', + params:{ + method:method, + type:type, + token: '', + params: params + }}, + 'XXCZRY_XM':'张森', + 'XXCZRY_GMSFHM':'110226198909261410', + 'XXCZRY_GAJGJGDM':'-', + 'FWQQSB_BH':'-', + 'FWQQ_SJSJLX':'service_request', + 'YYSBS':'lt' + } + console.log(JSON.stringify(data)) +} + +function getBWBH(){ + let head = "SR" + let ip = changeIP('10.9.39.8'); + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + let mseconds = mdate.getMilliseconds(); //获取当前毫秒数（0~999） + let end = Math.floor(Math.random()*(9999-1000))+1000;//生成随机4位流水号 + + let result = head+ip + +year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + +formatStr(mseconds,3)+end; + + return result; + +} + +function getIP(){ + let ip = changeIP('10.9.39.8'); + return ip; +} + +function getTime(){ + let mdate = new Date(); + let year = mdate.getFullYear(); + let month = mdate.getMonth()+1; + let day = mdate.getDate(); + let hour = mdate.getHours();       //获取当前小时数(0-23) + let minutes = mdate.getMinutes();     //获取当前分钟数(0-59) + let seconds = mdate.getSeconds();     //获取当前秒数(0-59) + + let result = ""+year +formatStr(month,2)+formatStr(day,2) + +formatStr(hour,2)+formatStr(minutes,2)+formatStr(seconds,2) + return result +} + +function changeIP(ip){ + const ip_ds = ip.split(".") + let result = "" + for(let item of ip_ds){ + item = "000"+item + result+=item.substr(-3) + } + return result; +} + +function formatStr(str,length){ + str = "000"+str + return str.substr(0-length) +} + + +generateJson('app/tokenByCard',{card:'110226198909261410'}) diff --git a/src/assets/js/storageConst.js b/src/assets/js/storageConst.js index 4cbaec7..33f4dcb 100644 --- a/src/assets/js/storageConst.js +++ b/src/assets/js/storageConst.js @@ -11,3 +11,5 @@ export const DEPT_NAME = '_dept_name_' //部门名称 export const DEPT_ID = '_dept_id_' //部门编号 export const PHONE = '_phone_' //电话号码 +export const ID = '_id_' //用户id +export const RECORD_NUMBER = '_record_number_' //用户id diff --git a/src/page/error/404.vue b/src/page/error/404.vue new file mode 100644 index 0000000..aceb671 --- /dev/null +++ b/src/page/error/404.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 1747fe6..fcc8326 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -92,7 +92,7 @@
- 接单 + 处理 到这里去 转单 提交 @@ -122,6 +122,8 @@ import ChoosePeople from "../ChoosePeople"; import Loading from "../../../components/Loading/index"; import {compareCalendar} from '@/utils/string' + import { appSpApi } from '@/api/special' + export default { name: "JobDetail", components:{ @@ -256,7 +258,7 @@ }, //获取工单详情 fetchData(id){ - getJobInfo(id).then(response=>{ + appSpApi('job/info',{id:id}).then(response =>{ if(response.code==200){ this.jobForm = response.data[0] this.isLoading = false diff --git a/src/page/jobManage/modules/JobDetailSimple.vue b/src/page/jobManage/modules/JobDetailSimple.vue new file mode 100644 index 0000000..be06c86 --- /dev/null +++ b/src/page/jobManage/modules/JobDetailSimple.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..d72abab 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -69,6 +69,7 @@ import {Loadmore, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "OverJob", components:{ @@ -121,7 +122,7 @@ this.$refs.loadmore.onTopLoaded() this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -141,7 +142,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ console.log('getJobList') this.listQuery.offset+=1 for(let item of response.data.rows){ @@ -168,9 +169,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..fadc818 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -26,9 +26,9 @@ {{item.position}}
-
- 接单 -
+ + +
@@ -43,6 +43,7 @@ import {MessageBox, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList, getJob } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "WaitGetJob", components: {Loading}, @@ -89,8 +90,7 @@ //页码置1 this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -109,7 +109,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = this.list.concat(response.data.rows) this.total = parseInt(response.data.total) @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..55178c7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -43,7 +43,7 @@
工    单
-
+
{{item.count}} @@ -65,9 +65,11 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' - import { registerGetui } from '@/api/login' + import { appSpApi } from '@/api/special' + export default { name:'layout', @@ -101,17 +103,12 @@ }, { count:'--', - name:'待确认', - type:'span-count warning' - }, - { - count:'--', - name:'处理中', + name:'已完成', type:'span-count primary' }, { count:'--', - name:'已完成', + name:'全部', type:'span-count success' } ] @@ -120,35 +117,14 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } this.fetchData() }, methods: { - resumeCallback () { - Toast({ - message: '欢迎回来', - position: 'bottom', - duration: 3000 - }) - let login_flag = checkLoginFlag() - if (login_flag) { - this.login() - } else { - MyLocalStorage.Cache.set(LOGIN_FLAG, true, 999999) // 切换回来登陆保持时长无限 - } - }, pauseCallback () { setTimeout(() => { MyLocalStorage.Cache.set(LOGIN_FLAG, true, 6000) // 切换至后台登陆保持10分钟 @@ -157,7 +133,7 @@ //获取数据 fetchData(){ //统计布防撤防井数 - countByBfzt().then(response => { + appSpApi('well/countByBfzt').then(response =>{ this.wellCount = [ { count:response.data.cfWell, @@ -176,7 +152,7 @@ } ] }) - countByJobStatus().then(response => { + appSpApi('job/countByJobStatus').then(response =>{ this.jobCount = [ { count:response.data.beforeGet, @@ -184,18 +160,13 @@ type:'span-count alarm' }, { - count:response.data.beforeConfirm, - name:'待确认', - type:'span-count warning' - }, - { - count:response.data.inHandle, - name:'处理中', + count:response.data.over, + name:'已完成', type:'span-count primary' }, { - count:response.data.over, - name:'已完成', + count:response.data.beforeGet+response.data.over, + name:'全部', type:'span-count success' } ] @@ -224,12 +195,10 @@ clickJobManage(name){ if(name=='待处理'){ this.$router.push({name: 'job', query:{tab:'1'}}) - }else if(name=='待确认'){ - this.$router.push({name: 'job', query:{tab:'2'}}) - }else if(name=='处理中'){ - this.$router.push({name: 'job', query:{tab:'3'}}) }else if(name=='已完成'){ - this.$router.push({name: 'job', query:{tab:'4'}}) + this.$router.push({name: 'job', query:{tab:'2'}}) + }else if(name=='全部'){ + this.$router.push({name: 'job', query:{tab:'3'}}) } } diff --git a/src/page/mine/index.vue b/src/page/mine/index.vue index 81b33ab..1101341 100644 --- a/src/page/mine/index.vue +++ b/src/page/mine/index.vue @@ -8,8 +8,18 @@ - + + + + {{pushOpen=='0'?'关':'开'}} + + +
@@ -18,12 +28,30 @@ + + diff --git a/src/page/wellManage/WatchData.vue b/src/page/wellManage/WatchData.vue index cb4154c..4d76f78 100644 --- a/src/page/wellManage/WatchData.vue +++ b/src/page/wellManage/WatchData.vue @@ -34,6 +34,7 @@ + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 1747fe6..fcc8326 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -92,7 +92,7 @@
- 接单 + 处理 到这里去 转单 提交 @@ -122,6 +122,8 @@ import ChoosePeople from "../ChoosePeople"; import Loading from "../../../components/Loading/index"; import {compareCalendar} from '@/utils/string' + import { appSpApi } from '@/api/special' + export default { name: "JobDetail", components:{ @@ -256,7 +258,7 @@ }, //获取工单详情 fetchData(id){ - getJobInfo(id).then(response=>{ + appSpApi('job/info',{id:id}).then(response =>{ if(response.code==200){ this.jobForm = response.data[0] this.isLoading = false diff --git a/src/page/jobManage/modules/JobDetailSimple.vue b/src/page/jobManage/modules/JobDetailSimple.vue new file mode 100644 index 0000000..be06c86 --- /dev/null +++ b/src/page/jobManage/modules/JobDetailSimple.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..d72abab 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -69,6 +69,7 @@ import {Loadmore, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "OverJob", components:{ @@ -121,7 +122,7 @@ this.$refs.loadmore.onTopLoaded() this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -141,7 +142,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ console.log('getJobList') this.listQuery.offset+=1 for(let item of response.data.rows){ @@ -168,9 +169,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..fadc818 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -26,9 +26,9 @@ {{item.position}}
-
- 接单 -
+ + +
@@ -43,6 +43,7 @@ import {MessageBox, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList, getJob } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "WaitGetJob", components: {Loading}, @@ -89,8 +90,7 @@ //页码置1 this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -109,7 +109,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = this.list.concat(response.data.rows) this.total = parseInt(response.data.total) @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..55178c7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -43,7 +43,7 @@
工    单
-
+
{{item.count}} @@ -65,9 +65,11 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' - import { registerGetui } from '@/api/login' + import { appSpApi } from '@/api/special' + export default { name:'layout', @@ -101,17 +103,12 @@ }, { count:'--', - name:'待确认', - type:'span-count warning' - }, - { - count:'--', - name:'处理中', + name:'已完成', type:'span-count primary' }, { count:'--', - name:'已完成', + name:'全部', type:'span-count success' } ] @@ -120,35 +117,14 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } this.fetchData() }, methods: { - resumeCallback () { - Toast({ - message: '欢迎回来', - position: 'bottom', - duration: 3000 - }) - let login_flag = checkLoginFlag() - if (login_flag) { - this.login() - } else { - MyLocalStorage.Cache.set(LOGIN_FLAG, true, 999999) // 切换回来登陆保持时长无限 - } - }, pauseCallback () { setTimeout(() => { MyLocalStorage.Cache.set(LOGIN_FLAG, true, 6000) // 切换至后台登陆保持10分钟 @@ -157,7 +133,7 @@ //获取数据 fetchData(){ //统计布防撤防井数 - countByBfzt().then(response => { + appSpApi('well/countByBfzt').then(response =>{ this.wellCount = [ { count:response.data.cfWell, @@ -176,7 +152,7 @@ } ] }) - countByJobStatus().then(response => { + appSpApi('job/countByJobStatus').then(response =>{ this.jobCount = [ { count:response.data.beforeGet, @@ -184,18 +160,13 @@ type:'span-count alarm' }, { - count:response.data.beforeConfirm, - name:'待确认', - type:'span-count warning' - }, - { - count:response.data.inHandle, - name:'处理中', + count:response.data.over, + name:'已完成', type:'span-count primary' }, { - count:response.data.over, - name:'已完成', + count:response.data.beforeGet+response.data.over, + name:'全部', type:'span-count success' } ] @@ -224,12 +195,10 @@ clickJobManage(name){ if(name=='待处理'){ this.$router.push({name: 'job', query:{tab:'1'}}) - }else if(name=='待确认'){ - this.$router.push({name: 'job', query:{tab:'2'}}) - }else if(name=='处理中'){ - this.$router.push({name: 'job', query:{tab:'3'}}) }else if(name=='已完成'){ - this.$router.push({name: 'job', query:{tab:'4'}}) + this.$router.push({name: 'job', query:{tab:'2'}}) + }else if(name=='全部'){ + this.$router.push({name: 'job', query:{tab:'3'}}) } } diff --git a/src/page/mine/index.vue b/src/page/mine/index.vue index 81b33ab..1101341 100644 --- a/src/page/mine/index.vue +++ b/src/page/mine/index.vue @@ -8,8 +8,18 @@ - + + + + {{pushOpen=='0'?'关':'开'}} + + +
@@ -18,12 +28,30 @@ + + diff --git a/src/page/wellManage/WatchData.vue b/src/page/wellManage/WatchData.vue index cb4154c..4d76f78 100644 --- a/src/page/wellManage/WatchData.vue +++ b/src/page/wellManage/WatchData.vue @@ -34,6 +34,7 @@ + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 1747fe6..fcc8326 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -92,7 +92,7 @@
- 接单 + 处理 到这里去 转单 提交 @@ -122,6 +122,8 @@ import ChoosePeople from "../ChoosePeople"; import Loading from "../../../components/Loading/index"; import {compareCalendar} from '@/utils/string' + import { appSpApi } from '@/api/special' + export default { name: "JobDetail", components:{ @@ -256,7 +258,7 @@ }, //获取工单详情 fetchData(id){ - getJobInfo(id).then(response=>{ + appSpApi('job/info',{id:id}).then(response =>{ if(response.code==200){ this.jobForm = response.data[0] this.isLoading = false diff --git a/src/page/jobManage/modules/JobDetailSimple.vue b/src/page/jobManage/modules/JobDetailSimple.vue new file mode 100644 index 0000000..be06c86 --- /dev/null +++ b/src/page/jobManage/modules/JobDetailSimple.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..d72abab 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -69,6 +69,7 @@ import {Loadmore, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "OverJob", components:{ @@ -121,7 +122,7 @@ this.$refs.loadmore.onTopLoaded() this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -141,7 +142,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ console.log('getJobList') this.listQuery.offset+=1 for(let item of response.data.rows){ @@ -168,9 +169,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..fadc818 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -26,9 +26,9 @@ {{item.position}}
-
- 接单 -
+ + +
@@ -43,6 +43,7 @@ import {MessageBox, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList, getJob } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "WaitGetJob", components: {Loading}, @@ -89,8 +90,7 @@ //页码置1 this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -109,7 +109,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = this.list.concat(response.data.rows) this.total = parseInt(response.data.total) @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..55178c7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -43,7 +43,7 @@
工    单
-
+
{{item.count}} @@ -65,9 +65,11 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' - import { registerGetui } from '@/api/login' + import { appSpApi } from '@/api/special' + export default { name:'layout', @@ -101,17 +103,12 @@ }, { count:'--', - name:'待确认', - type:'span-count warning' - }, - { - count:'--', - name:'处理中', + name:'已完成', type:'span-count primary' }, { count:'--', - name:'已完成', + name:'全部', type:'span-count success' } ] @@ -120,35 +117,14 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } this.fetchData() }, methods: { - resumeCallback () { - Toast({ - message: '欢迎回来', - position: 'bottom', - duration: 3000 - }) - let login_flag = checkLoginFlag() - if (login_flag) { - this.login() - } else { - MyLocalStorage.Cache.set(LOGIN_FLAG, true, 999999) // 切换回来登陆保持时长无限 - } - }, pauseCallback () { setTimeout(() => { MyLocalStorage.Cache.set(LOGIN_FLAG, true, 6000) // 切换至后台登陆保持10分钟 @@ -157,7 +133,7 @@ //获取数据 fetchData(){ //统计布防撤防井数 - countByBfzt().then(response => { + appSpApi('well/countByBfzt').then(response =>{ this.wellCount = [ { count:response.data.cfWell, @@ -176,7 +152,7 @@ } ] }) - countByJobStatus().then(response => { + appSpApi('job/countByJobStatus').then(response =>{ this.jobCount = [ { count:response.data.beforeGet, @@ -184,18 +160,13 @@ type:'span-count alarm' }, { - count:response.data.beforeConfirm, - name:'待确认', - type:'span-count warning' - }, - { - count:response.data.inHandle, - name:'处理中', + count:response.data.over, + name:'已完成', type:'span-count primary' }, { - count:response.data.over, - name:'已完成', + count:response.data.beforeGet+response.data.over, + name:'全部', type:'span-count success' } ] @@ -224,12 +195,10 @@ clickJobManage(name){ if(name=='待处理'){ this.$router.push({name: 'job', query:{tab:'1'}}) - }else if(name=='待确认'){ - this.$router.push({name: 'job', query:{tab:'2'}}) - }else if(name=='处理中'){ - this.$router.push({name: 'job', query:{tab:'3'}}) }else if(name=='已完成'){ - this.$router.push({name: 'job', query:{tab:'4'}}) + this.$router.push({name: 'job', query:{tab:'2'}}) + }else if(name=='全部'){ + this.$router.push({name: 'job', query:{tab:'3'}}) } } diff --git a/src/page/mine/index.vue b/src/page/mine/index.vue index 81b33ab..1101341 100644 --- a/src/page/mine/index.vue +++ b/src/page/mine/index.vue @@ -8,8 +8,18 @@ - + + + + {{pushOpen=='0'?'关':'开'}} + + +
@@ -18,12 +28,30 @@ + + diff --git a/src/page/wellManage/WatchData.vue b/src/page/wellManage/WatchData.vue index cb4154c..4d76f78 100644 --- a/src/page/wellManage/WatchData.vue +++ b/src/page/wellManage/WatchData.vue @@ -34,6 +34,7 @@ + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 1747fe6..fcc8326 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -92,7 +92,7 @@
- 接单 + 处理 到这里去 转单 提交 @@ -122,6 +122,8 @@ import ChoosePeople from "../ChoosePeople"; import Loading from "../../../components/Loading/index"; import {compareCalendar} from '@/utils/string' + import { appSpApi } from '@/api/special' + export default { name: "JobDetail", components:{ @@ -256,7 +258,7 @@ }, //获取工单详情 fetchData(id){ - getJobInfo(id).then(response=>{ + appSpApi('job/info',{id:id}).then(response =>{ if(response.code==200){ this.jobForm = response.data[0] this.isLoading = false diff --git a/src/page/jobManage/modules/JobDetailSimple.vue b/src/page/jobManage/modules/JobDetailSimple.vue new file mode 100644 index 0000000..be06c86 --- /dev/null +++ b/src/page/jobManage/modules/JobDetailSimple.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..d72abab 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -69,6 +69,7 @@ import {Loadmore, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "OverJob", components:{ @@ -121,7 +122,7 @@ this.$refs.loadmore.onTopLoaded() this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -141,7 +142,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ console.log('getJobList') this.listQuery.offset+=1 for(let item of response.data.rows){ @@ -168,9 +169,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..fadc818 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -26,9 +26,9 @@ {{item.position}}
-
- 接单 -
+ + +
@@ -43,6 +43,7 @@ import {MessageBox, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList, getJob } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "WaitGetJob", components: {Loading}, @@ -89,8 +90,7 @@ //页码置1 this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -109,7 +109,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = this.list.concat(response.data.rows) this.total = parseInt(response.data.total) @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..55178c7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -43,7 +43,7 @@
工    单
-
+
{{item.count}} @@ -65,9 +65,11 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' - import { registerGetui } from '@/api/login' + import { appSpApi } from '@/api/special' + export default { name:'layout', @@ -101,17 +103,12 @@ }, { count:'--', - name:'待确认', - type:'span-count warning' - }, - { - count:'--', - name:'处理中', + name:'已完成', type:'span-count primary' }, { count:'--', - name:'已完成', + name:'全部', type:'span-count success' } ] @@ -120,35 +117,14 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } this.fetchData() }, methods: { - resumeCallback () { - Toast({ - message: '欢迎回来', - position: 'bottom', - duration: 3000 - }) - let login_flag = checkLoginFlag() - if (login_flag) { - this.login() - } else { - MyLocalStorage.Cache.set(LOGIN_FLAG, true, 999999) // 切换回来登陆保持时长无限 - } - }, pauseCallback () { setTimeout(() => { MyLocalStorage.Cache.set(LOGIN_FLAG, true, 6000) // 切换至后台登陆保持10分钟 @@ -157,7 +133,7 @@ //获取数据 fetchData(){ //统计布防撤防井数 - countByBfzt().then(response => { + appSpApi('well/countByBfzt').then(response =>{ this.wellCount = [ { count:response.data.cfWell, @@ -176,7 +152,7 @@ } ] }) - countByJobStatus().then(response => { + appSpApi('job/countByJobStatus').then(response =>{ this.jobCount = [ { count:response.data.beforeGet, @@ -184,18 +160,13 @@ type:'span-count alarm' }, { - count:response.data.beforeConfirm, - name:'待确认', - type:'span-count warning' - }, - { - count:response.data.inHandle, - name:'处理中', + count:response.data.over, + name:'已完成', type:'span-count primary' }, { - count:response.data.over, - name:'已完成', + count:response.data.beforeGet+response.data.over, + name:'全部', type:'span-count success' } ] @@ -224,12 +195,10 @@ clickJobManage(name){ if(name=='待处理'){ this.$router.push({name: 'job', query:{tab:'1'}}) - }else if(name=='待确认'){ - this.$router.push({name: 'job', query:{tab:'2'}}) - }else if(name=='处理中'){ - this.$router.push({name: 'job', query:{tab:'3'}}) }else if(name=='已完成'){ - this.$router.push({name: 'job', query:{tab:'4'}}) + this.$router.push({name: 'job', query:{tab:'2'}}) + }else if(name=='全部'){ + this.$router.push({name: 'job', query:{tab:'3'}}) } } diff --git a/src/page/mine/index.vue b/src/page/mine/index.vue index 81b33ab..1101341 100644 --- a/src/page/mine/index.vue +++ b/src/page/mine/index.vue @@ -8,8 +8,18 @@ - + + + + {{pushOpen=='0'?'关':'开'}} + + +
@@ -18,12 +28,30 @@ + + diff --git a/src/page/wellManage/WatchData.vue b/src/page/wellManage/WatchData.vue index cb4154c..4d76f78 100644 --- a/src/page/wellManage/WatchData.vue +++ b/src/page/wellManage/WatchData.vue @@ -34,6 +34,7 @@ + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 1747fe6..fcc8326 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -92,7 +92,7 @@
- 接单 + 处理 到这里去 转单 提交 @@ -122,6 +122,8 @@ import ChoosePeople from "../ChoosePeople"; import Loading from "../../../components/Loading/index"; import {compareCalendar} from '@/utils/string' + import { appSpApi } from '@/api/special' + export default { name: "JobDetail", components:{ @@ -256,7 +258,7 @@ }, //获取工单详情 fetchData(id){ - getJobInfo(id).then(response=>{ + appSpApi('job/info',{id:id}).then(response =>{ if(response.code==200){ this.jobForm = response.data[0] this.isLoading = false diff --git a/src/page/jobManage/modules/JobDetailSimple.vue b/src/page/jobManage/modules/JobDetailSimple.vue new file mode 100644 index 0000000..be06c86 --- /dev/null +++ b/src/page/jobManage/modules/JobDetailSimple.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..d72abab 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -69,6 +69,7 @@ import {Loadmore, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "OverJob", components:{ @@ -121,7 +122,7 @@ this.$refs.loadmore.onTopLoaded() this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -141,7 +142,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ console.log('getJobList') this.listQuery.offset+=1 for(let item of response.data.rows){ @@ -168,9 +169,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..fadc818 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -26,9 +26,9 @@ {{item.position}}
-
- 接单 -
+ + +
@@ -43,6 +43,7 @@ import {MessageBox, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList, getJob } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "WaitGetJob", components: {Loading}, @@ -89,8 +90,7 @@ //页码置1 this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -109,7 +109,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = this.list.concat(response.data.rows) this.total = parseInt(response.data.total) @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..55178c7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -43,7 +43,7 @@
工    单
-
+
{{item.count}} @@ -65,9 +65,11 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' - import { registerGetui } from '@/api/login' + import { appSpApi } from '@/api/special' + export default { name:'layout', @@ -101,17 +103,12 @@ }, { count:'--', - name:'待确认', - type:'span-count warning' - }, - { - count:'--', - name:'处理中', + name:'已完成', type:'span-count primary' }, { count:'--', - name:'已完成', + name:'全部', type:'span-count success' } ] @@ -120,35 +117,14 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } this.fetchData() }, methods: { - resumeCallback () { - Toast({ - message: '欢迎回来', - position: 'bottom', - duration: 3000 - }) - let login_flag = checkLoginFlag() - if (login_flag) { - this.login() - } else { - MyLocalStorage.Cache.set(LOGIN_FLAG, true, 999999) // 切换回来登陆保持时长无限 - } - }, pauseCallback () { setTimeout(() => { MyLocalStorage.Cache.set(LOGIN_FLAG, true, 6000) // 切换至后台登陆保持10分钟 @@ -157,7 +133,7 @@ //获取数据 fetchData(){ //统计布防撤防井数 - countByBfzt().then(response => { + appSpApi('well/countByBfzt').then(response =>{ this.wellCount = [ { count:response.data.cfWell, @@ -176,7 +152,7 @@ } ] }) - countByJobStatus().then(response => { + appSpApi('job/countByJobStatus').then(response =>{ this.jobCount = [ { count:response.data.beforeGet, @@ -184,18 +160,13 @@ type:'span-count alarm' }, { - count:response.data.beforeConfirm, - name:'待确认', - type:'span-count warning' - }, - { - count:response.data.inHandle, - name:'处理中', + count:response.data.over, + name:'已完成', type:'span-count primary' }, { - count:response.data.over, - name:'已完成', + count:response.data.beforeGet+response.data.over, + name:'全部', type:'span-count success' } ] @@ -224,12 +195,10 @@ clickJobManage(name){ if(name=='待处理'){ this.$router.push({name: 'job', query:{tab:'1'}}) - }else if(name=='待确认'){ - this.$router.push({name: 'job', query:{tab:'2'}}) - }else if(name=='处理中'){ - this.$router.push({name: 'job', query:{tab:'3'}}) }else if(name=='已完成'){ - this.$router.push({name: 'job', query:{tab:'4'}}) + this.$router.push({name: 'job', query:{tab:'2'}}) + }else if(name=='全部'){ + this.$router.push({name: 'job', query:{tab:'3'}}) } } diff --git a/src/page/mine/index.vue b/src/page/mine/index.vue index 81b33ab..1101341 100644 --- a/src/page/mine/index.vue +++ b/src/page/mine/index.vue @@ -8,8 +8,18 @@ - + + + + {{pushOpen=='0'?'关':'开'}} + + +
@@ -18,12 +28,30 @@ + + diff --git a/src/page/wellManage/WatchData.vue b/src/page/wellManage/WatchData.vue index cb4154c..4d76f78 100644 --- a/src/page/wellManage/WatchData.vue +++ b/src/page/wellManage/WatchData.vue @@ -34,6 +34,7 @@ + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 1747fe6..fcc8326 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -92,7 +92,7 @@
- 接单 + 处理 到这里去 转单 提交 @@ -122,6 +122,8 @@ import ChoosePeople from "../ChoosePeople"; import Loading from "../../../components/Loading/index"; import {compareCalendar} from '@/utils/string' + import { appSpApi } from '@/api/special' + export default { name: "JobDetail", components:{ @@ -256,7 +258,7 @@ }, //获取工单详情 fetchData(id){ - getJobInfo(id).then(response=>{ + appSpApi('job/info',{id:id}).then(response =>{ if(response.code==200){ this.jobForm = response.data[0] this.isLoading = false diff --git a/src/page/jobManage/modules/JobDetailSimple.vue b/src/page/jobManage/modules/JobDetailSimple.vue new file mode 100644 index 0000000..be06c86 --- /dev/null +++ b/src/page/jobManage/modules/JobDetailSimple.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..d72abab 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -69,6 +69,7 @@ import {Loadmore, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "OverJob", components:{ @@ -121,7 +122,7 @@ this.$refs.loadmore.onTopLoaded() this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -141,7 +142,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ console.log('getJobList') this.listQuery.offset+=1 for(let item of response.data.rows){ @@ -168,9 +169,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..fadc818 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -26,9 +26,9 @@ {{item.position}}
-
- 接单 -
+ + +
@@ -43,6 +43,7 @@ import {MessageBox, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList, getJob } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "WaitGetJob", components: {Loading}, @@ -89,8 +90,7 @@ //页码置1 this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -109,7 +109,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = this.list.concat(response.data.rows) this.total = parseInt(response.data.total) @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..55178c7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -43,7 +43,7 @@
工    单
-
+
{{item.count}} @@ -65,9 +65,11 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' - import { registerGetui } from '@/api/login' + import { appSpApi } from '@/api/special' + export default { name:'layout', @@ -101,17 +103,12 @@ }, { count:'--', - name:'待确认', - type:'span-count warning' - }, - { - count:'--', - name:'处理中', + name:'已完成', type:'span-count primary' }, { count:'--', - name:'已完成', + name:'全部', type:'span-count success' } ] @@ -120,35 +117,14 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } this.fetchData() }, methods: { - resumeCallback () { - Toast({ - message: '欢迎回来', - position: 'bottom', - duration: 3000 - }) - let login_flag = checkLoginFlag() - if (login_flag) { - this.login() - } else { - MyLocalStorage.Cache.set(LOGIN_FLAG, true, 999999) // 切换回来登陆保持时长无限 - } - }, pauseCallback () { setTimeout(() => { MyLocalStorage.Cache.set(LOGIN_FLAG, true, 6000) // 切换至后台登陆保持10分钟 @@ -157,7 +133,7 @@ //获取数据 fetchData(){ //统计布防撤防井数 - countByBfzt().then(response => { + appSpApi('well/countByBfzt').then(response =>{ this.wellCount = [ { count:response.data.cfWell, @@ -176,7 +152,7 @@ } ] }) - countByJobStatus().then(response => { + appSpApi('job/countByJobStatus').then(response =>{ this.jobCount = [ { count:response.data.beforeGet, @@ -184,18 +160,13 @@ type:'span-count alarm' }, { - count:response.data.beforeConfirm, - name:'待确认', - type:'span-count warning' - }, - { - count:response.data.inHandle, - name:'处理中', + count:response.data.over, + name:'已完成', type:'span-count primary' }, { - count:response.data.over, - name:'已完成', + count:response.data.beforeGet+response.data.over, + name:'全部', type:'span-count success' } ] @@ -224,12 +195,10 @@ clickJobManage(name){ if(name=='待处理'){ this.$router.push({name: 'job', query:{tab:'1'}}) - }else if(name=='待确认'){ - this.$router.push({name: 'job', query:{tab:'2'}}) - }else if(name=='处理中'){ - this.$router.push({name: 'job', query:{tab:'3'}}) }else if(name=='已完成'){ - this.$router.push({name: 'job', query:{tab:'4'}}) + this.$router.push({name: 'job', query:{tab:'2'}}) + }else if(name=='全部'){ + this.$router.push({name: 'job', query:{tab:'3'}}) } } diff --git a/src/page/mine/index.vue b/src/page/mine/index.vue index 81b33ab..1101341 100644 --- a/src/page/mine/index.vue +++ b/src/page/mine/index.vue @@ -8,8 +8,18 @@ - + + + + {{pushOpen=='0'?'关':'开'}} + + +
@@ -18,12 +28,30 @@ + + diff --git a/src/page/wellManage/WatchData.vue b/src/page/wellManage/WatchData.vue index cb4154c..4d76f78 100644 --- a/src/page/wellManage/WatchData.vue +++ b/src/page/wellManage/WatchData.vue @@ -34,6 +34,7 @@ + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 1747fe6..fcc8326 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -92,7 +92,7 @@
- 接单 + 处理 到这里去 转单 提交 @@ -122,6 +122,8 @@ import ChoosePeople from "../ChoosePeople"; import Loading from "../../../components/Loading/index"; import {compareCalendar} from '@/utils/string' + import { appSpApi } from '@/api/special' + export default { name: "JobDetail", components:{ @@ -256,7 +258,7 @@ }, //获取工单详情 fetchData(id){ - getJobInfo(id).then(response=>{ + appSpApi('job/info',{id:id}).then(response =>{ if(response.code==200){ this.jobForm = response.data[0] this.isLoading = false diff --git a/src/page/jobManage/modules/JobDetailSimple.vue b/src/page/jobManage/modules/JobDetailSimple.vue new file mode 100644 index 0000000..be06c86 --- /dev/null +++ b/src/page/jobManage/modules/JobDetailSimple.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..d72abab 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -69,6 +69,7 @@ import {Loadmore, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "OverJob", components:{ @@ -121,7 +122,7 @@ this.$refs.loadmore.onTopLoaded() this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -141,7 +142,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ console.log('getJobList') this.listQuery.offset+=1 for(let item of response.data.rows){ @@ -168,9 +169,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..fadc818 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -26,9 +26,9 @@ {{item.position}}
-
- 接单 -
+ + +
@@ -43,6 +43,7 @@ import {MessageBox, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList, getJob } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "WaitGetJob", components: {Loading}, @@ -89,8 +90,7 @@ //页码置1 this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -109,7 +109,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = this.list.concat(response.data.rows) this.total = parseInt(response.data.total) @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..55178c7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -43,7 +43,7 @@
工    单
-
+
{{item.count}} @@ -65,9 +65,11 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' - import { registerGetui } from '@/api/login' + import { appSpApi } from '@/api/special' + export default { name:'layout', @@ -101,17 +103,12 @@ }, { count:'--', - name:'待确认', - type:'span-count warning' - }, - { - count:'--', - name:'处理中', + name:'已完成', type:'span-count primary' }, { count:'--', - name:'已完成', + name:'全部', type:'span-count success' } ] @@ -120,35 +117,14 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } this.fetchData() }, methods: { - resumeCallback () { - Toast({ - message: '欢迎回来', - position: 'bottom', - duration: 3000 - }) - let login_flag = checkLoginFlag() - if (login_flag) { - this.login() - } else { - MyLocalStorage.Cache.set(LOGIN_FLAG, true, 999999) // 切换回来登陆保持时长无限 - } - }, pauseCallback () { setTimeout(() => { MyLocalStorage.Cache.set(LOGIN_FLAG, true, 6000) // 切换至后台登陆保持10分钟 @@ -157,7 +133,7 @@ //获取数据 fetchData(){ //统计布防撤防井数 - countByBfzt().then(response => { + appSpApi('well/countByBfzt').then(response =>{ this.wellCount = [ { count:response.data.cfWell, @@ -176,7 +152,7 @@ } ] }) - countByJobStatus().then(response => { + appSpApi('job/countByJobStatus').then(response =>{ this.jobCount = [ { count:response.data.beforeGet, @@ -184,18 +160,13 @@ type:'span-count alarm' }, { - count:response.data.beforeConfirm, - name:'待确认', - type:'span-count warning' - }, - { - count:response.data.inHandle, - name:'处理中', + count:response.data.over, + name:'已完成', type:'span-count primary' }, { - count:response.data.over, - name:'已完成', + count:response.data.beforeGet+response.data.over, + name:'全部', type:'span-count success' } ] @@ -224,12 +195,10 @@ clickJobManage(name){ if(name=='待处理'){ this.$router.push({name: 'job', query:{tab:'1'}}) - }else if(name=='待确认'){ - this.$router.push({name: 'job', query:{tab:'2'}}) - }else if(name=='处理中'){ - this.$router.push({name: 'job', query:{tab:'3'}}) }else if(name=='已完成'){ - this.$router.push({name: 'job', query:{tab:'4'}}) + this.$router.push({name: 'job', query:{tab:'2'}}) + }else if(name=='全部'){ + this.$router.push({name: 'job', query:{tab:'3'}}) } } diff --git a/src/page/mine/index.vue b/src/page/mine/index.vue index 81b33ab..1101341 100644 --- a/src/page/mine/index.vue +++ b/src/page/mine/index.vue @@ -8,8 +8,18 @@ - + + + + {{pushOpen=='0'?'关':'开'}} + + +
@@ -18,12 +28,30 @@ + + diff --git a/src/page/wellManage/WatchData.vue b/src/page/wellManage/WatchData.vue index cb4154c..4d76f78 100644 --- a/src/page/wellManage/WatchData.vue +++ b/src/page/wellManage/WatchData.vue @@ -34,6 +34,7 @@ + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 1747fe6..fcc8326 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -92,7 +92,7 @@
- 接单 + 处理 到这里去 转单 提交 @@ -122,6 +122,8 @@ import ChoosePeople from "../ChoosePeople"; import Loading from "../../../components/Loading/index"; import {compareCalendar} from '@/utils/string' + import { appSpApi } from '@/api/special' + export default { name: "JobDetail", components:{ @@ -256,7 +258,7 @@ }, //获取工单详情 fetchData(id){ - getJobInfo(id).then(response=>{ + appSpApi('job/info',{id:id}).then(response =>{ if(response.code==200){ this.jobForm = response.data[0] this.isLoading = false diff --git a/src/page/jobManage/modules/JobDetailSimple.vue b/src/page/jobManage/modules/JobDetailSimple.vue new file mode 100644 index 0000000..be06c86 --- /dev/null +++ b/src/page/jobManage/modules/JobDetailSimple.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..d72abab 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -69,6 +69,7 @@ import {Loadmore, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "OverJob", components:{ @@ -121,7 +122,7 @@ this.$refs.loadmore.onTopLoaded() this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -141,7 +142,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ console.log('getJobList') this.listQuery.offset+=1 for(let item of response.data.rows){ @@ -168,9 +169,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..fadc818 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -26,9 +26,9 @@ {{item.position}}
-
- 接单 -
+ + +
@@ -43,6 +43,7 @@ import {MessageBox, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList, getJob } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "WaitGetJob", components: {Loading}, @@ -89,8 +90,7 @@ //页码置1 this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -109,7 +109,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = this.list.concat(response.data.rows) this.total = parseInt(response.data.total) @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..55178c7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -43,7 +43,7 @@
工    单
-
+
{{item.count}} @@ -65,9 +65,11 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' - import { registerGetui } from '@/api/login' + import { appSpApi } from '@/api/special' + export default { name:'layout', @@ -101,17 +103,12 @@ }, { count:'--', - name:'待确认', - type:'span-count warning' - }, - { - count:'--', - name:'处理中', + name:'已完成', type:'span-count primary' }, { count:'--', - name:'已完成', + name:'全部', type:'span-count success' } ] @@ -120,35 +117,14 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } this.fetchData() }, methods: { - resumeCallback () { - Toast({ - message: '欢迎回来', - position: 'bottom', - duration: 3000 - }) - let login_flag = checkLoginFlag() - if (login_flag) { - this.login() - } else { - MyLocalStorage.Cache.set(LOGIN_FLAG, true, 999999) // 切换回来登陆保持时长无限 - } - }, pauseCallback () { setTimeout(() => { MyLocalStorage.Cache.set(LOGIN_FLAG, true, 6000) // 切换至后台登陆保持10分钟 @@ -157,7 +133,7 @@ //获取数据 fetchData(){ //统计布防撤防井数 - countByBfzt().then(response => { + appSpApi('well/countByBfzt').then(response =>{ this.wellCount = [ { count:response.data.cfWell, @@ -176,7 +152,7 @@ } ] }) - countByJobStatus().then(response => { + appSpApi('job/countByJobStatus').then(response =>{ this.jobCount = [ { count:response.data.beforeGet, @@ -184,18 +160,13 @@ type:'span-count alarm' }, { - count:response.data.beforeConfirm, - name:'待确认', - type:'span-count warning' - }, - { - count:response.data.inHandle, - name:'处理中', + count:response.data.over, + name:'已完成', type:'span-count primary' }, { - count:response.data.over, - name:'已完成', + count:response.data.beforeGet+response.data.over, + name:'全部', type:'span-count success' } ] @@ -224,12 +195,10 @@ clickJobManage(name){ if(name=='待处理'){ this.$router.push({name: 'job', query:{tab:'1'}}) - }else if(name=='待确认'){ - this.$router.push({name: 'job', query:{tab:'2'}}) - }else if(name=='处理中'){ - this.$router.push({name: 'job', query:{tab:'3'}}) }else if(name=='已完成'){ - this.$router.push({name: 'job', query:{tab:'4'}}) + this.$router.push({name: 'job', query:{tab:'2'}}) + }else if(name=='全部'){ + this.$router.push({name: 'job', query:{tab:'3'}}) } } diff --git a/src/page/mine/index.vue b/src/page/mine/index.vue index 81b33ab..1101341 100644 --- a/src/page/mine/index.vue +++ b/src/page/mine/index.vue @@ -8,8 +8,18 @@ - + + + + {{pushOpen=='0'?'关':'开'}} + + +
@@ -18,12 +28,30 @@ + + diff --git a/src/page/wellManage/WatchData.vue b/src/page/wellManage/WatchData.vue index cb4154c..4d76f78 100644 --- a/src/page/wellManage/WatchData.vue +++ b/src/page/wellManage/WatchData.vue @@ -34,6 +34,7 @@ + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 1747fe6..fcc8326 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -92,7 +92,7 @@
- 接单 + 处理 到这里去 转单 提交 @@ -122,6 +122,8 @@ import ChoosePeople from "../ChoosePeople"; import Loading from "../../../components/Loading/index"; import {compareCalendar} from '@/utils/string' + import { appSpApi } from '@/api/special' + export default { name: "JobDetail", components:{ @@ -256,7 +258,7 @@ }, //获取工单详情 fetchData(id){ - getJobInfo(id).then(response=>{ + appSpApi('job/info',{id:id}).then(response =>{ if(response.code==200){ this.jobForm = response.data[0] this.isLoading = false diff --git a/src/page/jobManage/modules/JobDetailSimple.vue b/src/page/jobManage/modules/JobDetailSimple.vue new file mode 100644 index 0000000..be06c86 --- /dev/null +++ b/src/page/jobManage/modules/JobDetailSimple.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..d72abab 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -69,6 +69,7 @@ import {Loadmore, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "OverJob", components:{ @@ -121,7 +122,7 @@ this.$refs.loadmore.onTopLoaded() this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -141,7 +142,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ console.log('getJobList') this.listQuery.offset+=1 for(let item of response.data.rows){ @@ -168,9 +169,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..fadc818 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -26,9 +26,9 @@ {{item.position}}
-
- 接单 -
+ + +
@@ -43,6 +43,7 @@ import {MessageBox, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList, getJob } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "WaitGetJob", components: {Loading}, @@ -89,8 +90,7 @@ //页码置1 this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -109,7 +109,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = this.list.concat(response.data.rows) this.total = parseInt(response.data.total) @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..55178c7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -43,7 +43,7 @@
工    单
-
+
{{item.count}} @@ -65,9 +65,11 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' - import { registerGetui } from '@/api/login' + import { appSpApi } from '@/api/special' + export default { name:'layout', @@ -101,17 +103,12 @@ }, { count:'--', - name:'待确认', - type:'span-count warning' - }, - { - count:'--', - name:'处理中', + name:'已完成', type:'span-count primary' }, { count:'--', - name:'已完成', + name:'全部', type:'span-count success' } ] @@ -120,35 +117,14 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } this.fetchData() }, methods: { - resumeCallback () { - Toast({ - message: '欢迎回来', - position: 'bottom', - duration: 3000 - }) - let login_flag = checkLoginFlag() - if (login_flag) { - this.login() - } else { - MyLocalStorage.Cache.set(LOGIN_FLAG, true, 999999) // 切换回来登陆保持时长无限 - } - }, pauseCallback () { setTimeout(() => { MyLocalStorage.Cache.set(LOGIN_FLAG, true, 6000) // 切换至后台登陆保持10分钟 @@ -157,7 +133,7 @@ //获取数据 fetchData(){ //统计布防撤防井数 - countByBfzt().then(response => { + appSpApi('well/countByBfzt').then(response =>{ this.wellCount = [ { count:response.data.cfWell, @@ -176,7 +152,7 @@ } ] }) - countByJobStatus().then(response => { + appSpApi('job/countByJobStatus').then(response =>{ this.jobCount = [ { count:response.data.beforeGet, @@ -184,18 +160,13 @@ type:'span-count alarm' }, { - count:response.data.beforeConfirm, - name:'待确认', - type:'span-count warning' - }, - { - count:response.data.inHandle, - name:'处理中', + count:response.data.over, + name:'已完成', type:'span-count primary' }, { - count:response.data.over, - name:'已完成', + count:response.data.beforeGet+response.data.over, + name:'全部', type:'span-count success' } ] @@ -224,12 +195,10 @@ clickJobManage(name){ if(name=='待处理'){ this.$router.push({name: 'job', query:{tab:'1'}}) - }else if(name=='待确认'){ - this.$router.push({name: 'job', query:{tab:'2'}}) - }else if(name=='处理中'){ - this.$router.push({name: 'job', query:{tab:'3'}}) }else if(name=='已完成'){ - this.$router.push({name: 'job', query:{tab:'4'}}) + this.$router.push({name: 'job', query:{tab:'2'}}) + }else if(name=='全部'){ + this.$router.push({name: 'job', query:{tab:'3'}}) } } diff --git a/src/page/mine/index.vue b/src/page/mine/index.vue index 81b33ab..1101341 100644 --- a/src/page/mine/index.vue +++ b/src/page/mine/index.vue @@ -8,8 +8,18 @@ - + + + + {{pushOpen=='0'?'关':'开'}} + + +
@@ -18,12 +28,30 @@ + + diff --git a/src/page/wellManage/WatchData.vue b/src/page/wellManage/WatchData.vue index cb4154c..4d76f78 100644 --- a/src/page/wellManage/WatchData.vue +++ b/src/page/wellManage/WatchData.vue @@ -34,6 +34,7 @@ + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 1747fe6..fcc8326 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -92,7 +92,7 @@
- 接单 + 处理 到这里去 转单 提交 @@ -122,6 +122,8 @@ import ChoosePeople from "../ChoosePeople"; import Loading from "../../../components/Loading/index"; import {compareCalendar} from '@/utils/string' + import { appSpApi } from '@/api/special' + export default { name: "JobDetail", components:{ @@ -256,7 +258,7 @@ }, //获取工单详情 fetchData(id){ - getJobInfo(id).then(response=>{ + appSpApi('job/info',{id:id}).then(response =>{ if(response.code==200){ this.jobForm = response.data[0] this.isLoading = false diff --git a/src/page/jobManage/modules/JobDetailSimple.vue b/src/page/jobManage/modules/JobDetailSimple.vue new file mode 100644 index 0000000..be06c86 --- /dev/null +++ b/src/page/jobManage/modules/JobDetailSimple.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..d72abab 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -69,6 +69,7 @@ import {Loadmore, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "OverJob", components:{ @@ -121,7 +122,7 @@ this.$refs.loadmore.onTopLoaded() this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -141,7 +142,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ console.log('getJobList') this.listQuery.offset+=1 for(let item of response.data.rows){ @@ -168,9 +169,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..fadc818 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -26,9 +26,9 @@ {{item.position}}
-
- 接单 -
+ + +
@@ -43,6 +43,7 @@ import {MessageBox, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList, getJob } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "WaitGetJob", components: {Loading}, @@ -89,8 +90,7 @@ //页码置1 this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -109,7 +109,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = this.list.concat(response.data.rows) this.total = parseInt(response.data.total) @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..55178c7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -43,7 +43,7 @@
工    单
-
+
{{item.count}} @@ -65,9 +65,11 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' - import { registerGetui } from '@/api/login' + import { appSpApi } from '@/api/special' + export default { name:'layout', @@ -101,17 +103,12 @@ }, { count:'--', - name:'待确认', - type:'span-count warning' - }, - { - count:'--', - name:'处理中', + name:'已完成', type:'span-count primary' }, { count:'--', - name:'已完成', + name:'全部', type:'span-count success' } ] @@ -120,35 +117,14 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } this.fetchData() }, methods: { - resumeCallback () { - Toast({ - message: '欢迎回来', - position: 'bottom', - duration: 3000 - }) - let login_flag = checkLoginFlag() - if (login_flag) { - this.login() - } else { - MyLocalStorage.Cache.set(LOGIN_FLAG, true, 999999) // 切换回来登陆保持时长无限 - } - }, pauseCallback () { setTimeout(() => { MyLocalStorage.Cache.set(LOGIN_FLAG, true, 6000) // 切换至后台登陆保持10分钟 @@ -157,7 +133,7 @@ //获取数据 fetchData(){ //统计布防撤防井数 - countByBfzt().then(response => { + appSpApi('well/countByBfzt').then(response =>{ this.wellCount = [ { count:response.data.cfWell, @@ -176,7 +152,7 @@ } ] }) - countByJobStatus().then(response => { + appSpApi('job/countByJobStatus').then(response =>{ this.jobCount = [ { count:response.data.beforeGet, @@ -184,18 +160,13 @@ type:'span-count alarm' }, { - count:response.data.beforeConfirm, - name:'待确认', - type:'span-count warning' - }, - { - count:response.data.inHandle, - name:'处理中', + count:response.data.over, + name:'已完成', type:'span-count primary' }, { - count:response.data.over, - name:'已完成', + count:response.data.beforeGet+response.data.over, + name:'全部', type:'span-count success' } ] @@ -224,12 +195,10 @@ clickJobManage(name){ if(name=='待处理'){ this.$router.push({name: 'job', query:{tab:'1'}}) - }else if(name=='待确认'){ - this.$router.push({name: 'job', query:{tab:'2'}}) - }else if(name=='处理中'){ - this.$router.push({name: 'job', query:{tab:'3'}}) }else if(name=='已完成'){ - this.$router.push({name: 'job', query:{tab:'4'}}) + this.$router.push({name: 'job', query:{tab:'2'}}) + }else if(name=='全部'){ + this.$router.push({name: 'job', query:{tab:'3'}}) } } diff --git a/src/page/mine/index.vue b/src/page/mine/index.vue index 81b33ab..1101341 100644 --- a/src/page/mine/index.vue +++ b/src/page/mine/index.vue @@ -8,8 +8,18 @@ - + + + + {{pushOpen=='0'?'关':'开'}} + + +
@@ -18,12 +28,30 @@ + + diff --git a/src/page/wellManage/WatchData.vue b/src/page/wellManage/WatchData.vue index cb4154c..4d76f78 100644 --- a/src/page/wellManage/WatchData.vue +++ b/src/page/wellManage/WatchData.vue @@ -34,6 +34,7 @@ + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 1747fe6..fcc8326 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -92,7 +92,7 @@
- 接单 + 处理 到这里去 转单 提交 @@ -122,6 +122,8 @@ import ChoosePeople from "../ChoosePeople"; import Loading from "../../../components/Loading/index"; import {compareCalendar} from '@/utils/string' + import { appSpApi } from '@/api/special' + export default { name: "JobDetail", components:{ @@ -256,7 +258,7 @@ }, //获取工单详情 fetchData(id){ - getJobInfo(id).then(response=>{ + appSpApi('job/info',{id:id}).then(response =>{ if(response.code==200){ this.jobForm = response.data[0] this.isLoading = false diff --git a/src/page/jobManage/modules/JobDetailSimple.vue b/src/page/jobManage/modules/JobDetailSimple.vue new file mode 100644 index 0000000..be06c86 --- /dev/null +++ b/src/page/jobManage/modules/JobDetailSimple.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..d72abab 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -69,6 +69,7 @@ import {Loadmore, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "OverJob", components:{ @@ -121,7 +122,7 @@ this.$refs.loadmore.onTopLoaded() this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -141,7 +142,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ console.log('getJobList') this.listQuery.offset+=1 for(let item of response.data.rows){ @@ -168,9 +169,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..fadc818 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -26,9 +26,9 @@ {{item.position}}
-
- 接单 -
+ + +
@@ -43,6 +43,7 @@ import {MessageBox, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList, getJob } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "WaitGetJob", components: {Loading}, @@ -89,8 +90,7 @@ //页码置1 this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -109,7 +109,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = this.list.concat(response.data.rows) this.total = parseInt(response.data.total) @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..55178c7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -43,7 +43,7 @@
工    单
-
+
{{item.count}} @@ -65,9 +65,11 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' - import { registerGetui } from '@/api/login' + import { appSpApi } from '@/api/special' + export default { name:'layout', @@ -101,17 +103,12 @@ }, { count:'--', - name:'待确认', - type:'span-count warning' - }, - { - count:'--', - name:'处理中', + name:'已完成', type:'span-count primary' }, { count:'--', - name:'已完成', + name:'全部', type:'span-count success' } ] @@ -120,35 +117,14 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } this.fetchData() }, methods: { - resumeCallback () { - Toast({ - message: '欢迎回来', - position: 'bottom', - duration: 3000 - }) - let login_flag = checkLoginFlag() - if (login_flag) { - this.login() - } else { - MyLocalStorage.Cache.set(LOGIN_FLAG, true, 999999) // 切换回来登陆保持时长无限 - } - }, pauseCallback () { setTimeout(() => { MyLocalStorage.Cache.set(LOGIN_FLAG, true, 6000) // 切换至后台登陆保持10分钟 @@ -157,7 +133,7 @@ //获取数据 fetchData(){ //统计布防撤防井数 - countByBfzt().then(response => { + appSpApi('well/countByBfzt').then(response =>{ this.wellCount = [ { count:response.data.cfWell, @@ -176,7 +152,7 @@ } ] }) - countByJobStatus().then(response => { + appSpApi('job/countByJobStatus').then(response =>{ this.jobCount = [ { count:response.data.beforeGet, @@ -184,18 +160,13 @@ type:'span-count alarm' }, { - count:response.data.beforeConfirm, - name:'待确认', - type:'span-count warning' - }, - { - count:response.data.inHandle, - name:'处理中', + count:response.data.over, + name:'已完成', type:'span-count primary' }, { - count:response.data.over, - name:'已完成', + count:response.data.beforeGet+response.data.over, + name:'全部', type:'span-count success' } ] @@ -224,12 +195,10 @@ clickJobManage(name){ if(name=='待处理'){ this.$router.push({name: 'job', query:{tab:'1'}}) - }else if(name=='待确认'){ - this.$router.push({name: 'job', query:{tab:'2'}}) - }else if(name=='处理中'){ - this.$router.push({name: 'job', query:{tab:'3'}}) }else if(name=='已完成'){ - this.$router.push({name: 'job', query:{tab:'4'}}) + this.$router.push({name: 'job', query:{tab:'2'}}) + }else if(name=='全部'){ + this.$router.push({name: 'job', query:{tab:'3'}}) } } diff --git a/src/page/mine/index.vue b/src/page/mine/index.vue index 81b33ab..1101341 100644 --- a/src/page/mine/index.vue +++ b/src/page/mine/index.vue @@ -8,8 +8,18 @@ - + + + + {{pushOpen=='0'?'关':'开'}} + + +
@@ -18,12 +28,30 @@ + + diff --git a/src/page/wellManage/WatchData.vue b/src/page/wellManage/WatchData.vue index cb4154c..4d76f78 100644 --- a/src/page/wellManage/WatchData.vue +++ b/src/page/wellManage/WatchData.vue @@ -34,6 +34,7 @@ + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 1747fe6..fcc8326 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -92,7 +92,7 @@
- 接单 + 处理 到这里去 转单 提交 @@ -122,6 +122,8 @@ import ChoosePeople from "../ChoosePeople"; import Loading from "../../../components/Loading/index"; import {compareCalendar} from '@/utils/string' + import { appSpApi } from '@/api/special' + export default { name: "JobDetail", components:{ @@ -256,7 +258,7 @@ }, //获取工单详情 fetchData(id){ - getJobInfo(id).then(response=>{ + appSpApi('job/info',{id:id}).then(response =>{ if(response.code==200){ this.jobForm = response.data[0] this.isLoading = false diff --git a/src/page/jobManage/modules/JobDetailSimple.vue b/src/page/jobManage/modules/JobDetailSimple.vue new file mode 100644 index 0000000..be06c86 --- /dev/null +++ b/src/page/jobManage/modules/JobDetailSimple.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..d72abab 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -69,6 +69,7 @@ import {Loadmore, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "OverJob", components:{ @@ -121,7 +122,7 @@ this.$refs.loadmore.onTopLoaded() this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -141,7 +142,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ console.log('getJobList') this.listQuery.offset+=1 for(let item of response.data.rows){ @@ -168,9 +169,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..fadc818 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -26,9 +26,9 @@ {{item.position}}
-
- 接单 -
+ + +
@@ -43,6 +43,7 @@ import {MessageBox, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList, getJob } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "WaitGetJob", components: {Loading}, @@ -89,8 +90,7 @@ //页码置1 this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -109,7 +109,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = this.list.concat(response.data.rows) this.total = parseInt(response.data.total) @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..55178c7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -43,7 +43,7 @@
工    单
-
+
{{item.count}} @@ -65,9 +65,11 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' - import { registerGetui } from '@/api/login' + import { appSpApi } from '@/api/special' + export default { name:'layout', @@ -101,17 +103,12 @@ }, { count:'--', - name:'待确认', - type:'span-count warning' - }, - { - count:'--', - name:'处理中', + name:'已完成', type:'span-count primary' }, { count:'--', - name:'已完成', + name:'全部', type:'span-count success' } ] @@ -120,35 +117,14 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } this.fetchData() }, methods: { - resumeCallback () { - Toast({ - message: '欢迎回来', - position: 'bottom', - duration: 3000 - }) - let login_flag = checkLoginFlag() - if (login_flag) { - this.login() - } else { - MyLocalStorage.Cache.set(LOGIN_FLAG, true, 999999) // 切换回来登陆保持时长无限 - } - }, pauseCallback () { setTimeout(() => { MyLocalStorage.Cache.set(LOGIN_FLAG, true, 6000) // 切换至后台登陆保持10分钟 @@ -157,7 +133,7 @@ //获取数据 fetchData(){ //统计布防撤防井数 - countByBfzt().then(response => { + appSpApi('well/countByBfzt').then(response =>{ this.wellCount = [ { count:response.data.cfWell, @@ -176,7 +152,7 @@ } ] }) - countByJobStatus().then(response => { + appSpApi('job/countByJobStatus').then(response =>{ this.jobCount = [ { count:response.data.beforeGet, @@ -184,18 +160,13 @@ type:'span-count alarm' }, { - count:response.data.beforeConfirm, - name:'待确认', - type:'span-count warning' - }, - { - count:response.data.inHandle, - name:'处理中', + count:response.data.over, + name:'已完成', type:'span-count primary' }, { - count:response.data.over, - name:'已完成', + count:response.data.beforeGet+response.data.over, + name:'全部', type:'span-count success' } ] @@ -224,12 +195,10 @@ clickJobManage(name){ if(name=='待处理'){ this.$router.push({name: 'job', query:{tab:'1'}}) - }else if(name=='待确认'){ - this.$router.push({name: 'job', query:{tab:'2'}}) - }else if(name=='处理中'){ - this.$router.push({name: 'job', query:{tab:'3'}}) }else if(name=='已完成'){ - this.$router.push({name: 'job', query:{tab:'4'}}) + this.$router.push({name: 'job', query:{tab:'2'}}) + }else if(name=='全部'){ + this.$router.push({name: 'job', query:{tab:'3'}}) } } diff --git a/src/page/mine/index.vue b/src/page/mine/index.vue index 81b33ab..1101341 100644 --- a/src/page/mine/index.vue +++ b/src/page/mine/index.vue @@ -8,8 +8,18 @@ - + + + + {{pushOpen=='0'?'关':'开'}} + + +
@@ -18,12 +28,30 @@ + + diff --git a/src/page/wellManage/WatchData.vue b/src/page/wellManage/WatchData.vue index cb4154c..4d76f78 100644 --- a/src/page/wellManage/WatchData.vue +++ b/src/page/wellManage/WatchData.vue @@ -34,6 +34,7 @@ + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 1747fe6..fcc8326 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -92,7 +92,7 @@
- 接单 + 处理 到这里去 转单 提交 @@ -122,6 +122,8 @@ import ChoosePeople from "../ChoosePeople"; import Loading from "../../../components/Loading/index"; import {compareCalendar} from '@/utils/string' + import { appSpApi } from '@/api/special' + export default { name: "JobDetail", components:{ @@ -256,7 +258,7 @@ }, //获取工单详情 fetchData(id){ - getJobInfo(id).then(response=>{ + appSpApi('job/info',{id:id}).then(response =>{ if(response.code==200){ this.jobForm = response.data[0] this.isLoading = false diff --git a/src/page/jobManage/modules/JobDetailSimple.vue b/src/page/jobManage/modules/JobDetailSimple.vue new file mode 100644 index 0000000..be06c86 --- /dev/null +++ b/src/page/jobManage/modules/JobDetailSimple.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..d72abab 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -69,6 +69,7 @@ import {Loadmore, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "OverJob", components:{ @@ -121,7 +122,7 @@ this.$refs.loadmore.onTopLoaded() this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -141,7 +142,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ console.log('getJobList') this.listQuery.offset+=1 for(let item of response.data.rows){ @@ -168,9 +169,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..fadc818 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -26,9 +26,9 @@ {{item.position}}
-
- 接单 -
+ + +
@@ -43,6 +43,7 @@ import {MessageBox, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList, getJob } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "WaitGetJob", components: {Loading}, @@ -89,8 +90,7 @@ //页码置1 this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -109,7 +109,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = this.list.concat(response.data.rows) this.total = parseInt(response.data.total) @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..55178c7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -43,7 +43,7 @@
工    单
-
+
{{item.count}} @@ -65,9 +65,11 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' - import { registerGetui } from '@/api/login' + import { appSpApi } from '@/api/special' + export default { name:'layout', @@ -101,17 +103,12 @@ }, { count:'--', - name:'待确认', - type:'span-count warning' - }, - { - count:'--', - name:'处理中', + name:'已完成', type:'span-count primary' }, { count:'--', - name:'已完成', + name:'全部', type:'span-count success' } ] @@ -120,35 +117,14 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } this.fetchData() }, methods: { - resumeCallback () { - Toast({ - message: '欢迎回来', - position: 'bottom', - duration: 3000 - }) - let login_flag = checkLoginFlag() - if (login_flag) { - this.login() - } else { - MyLocalStorage.Cache.set(LOGIN_FLAG, true, 999999) // 切换回来登陆保持时长无限 - } - }, pauseCallback () { setTimeout(() => { MyLocalStorage.Cache.set(LOGIN_FLAG, true, 6000) // 切换至后台登陆保持10分钟 @@ -157,7 +133,7 @@ //获取数据 fetchData(){ //统计布防撤防井数 - countByBfzt().then(response => { + appSpApi('well/countByBfzt').then(response =>{ this.wellCount = [ { count:response.data.cfWell, @@ -176,7 +152,7 @@ } ] }) - countByJobStatus().then(response => { + appSpApi('job/countByJobStatus').then(response =>{ this.jobCount = [ { count:response.data.beforeGet, @@ -184,18 +160,13 @@ type:'span-count alarm' }, { - count:response.data.beforeConfirm, - name:'待确认', - type:'span-count warning' - }, - { - count:response.data.inHandle, - name:'处理中', + count:response.data.over, + name:'已完成', type:'span-count primary' }, { - count:response.data.over, - name:'已完成', + count:response.data.beforeGet+response.data.over, + name:'全部', type:'span-count success' } ] @@ -224,12 +195,10 @@ clickJobManage(name){ if(name=='待处理'){ this.$router.push({name: 'job', query:{tab:'1'}}) - }else if(name=='待确认'){ - this.$router.push({name: 'job', query:{tab:'2'}}) - }else if(name=='处理中'){ - this.$router.push({name: 'job', query:{tab:'3'}}) }else if(name=='已完成'){ - this.$router.push({name: 'job', query:{tab:'4'}}) + this.$router.push({name: 'job', query:{tab:'2'}}) + }else if(name=='全部'){ + this.$router.push({name: 'job', query:{tab:'3'}}) } } diff --git a/src/page/mine/index.vue b/src/page/mine/index.vue index 81b33ab..1101341 100644 --- a/src/page/mine/index.vue +++ b/src/page/mine/index.vue @@ -8,8 +8,18 @@ - + + + + {{pushOpen=='0'?'关':'开'}} + + +
@@ -18,12 +28,30 @@ + + diff --git a/src/page/wellManage/WatchData.vue b/src/page/wellManage/WatchData.vue index cb4154c..4d76f78 100644 --- a/src/page/wellManage/WatchData.vue +++ b/src/page/wellManage/WatchData.vue @@ -34,6 +34,7 @@ + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 1747fe6..fcc8326 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -92,7 +92,7 @@
- 接单 + 处理 到这里去 转单 提交 @@ -122,6 +122,8 @@ import ChoosePeople from "../ChoosePeople"; import Loading from "../../../components/Loading/index"; import {compareCalendar} from '@/utils/string' + import { appSpApi } from '@/api/special' + export default { name: "JobDetail", components:{ @@ -256,7 +258,7 @@ }, //获取工单详情 fetchData(id){ - getJobInfo(id).then(response=>{ + appSpApi('job/info',{id:id}).then(response =>{ if(response.code==200){ this.jobForm = response.data[0] this.isLoading = false diff --git a/src/page/jobManage/modules/JobDetailSimple.vue b/src/page/jobManage/modules/JobDetailSimple.vue new file mode 100644 index 0000000..be06c86 --- /dev/null +++ b/src/page/jobManage/modules/JobDetailSimple.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..d72abab 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -69,6 +69,7 @@ import {Loadmore, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "OverJob", components:{ @@ -121,7 +122,7 @@ this.$refs.loadmore.onTopLoaded() this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -141,7 +142,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ console.log('getJobList') this.listQuery.offset+=1 for(let item of response.data.rows){ @@ -168,9 +169,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..fadc818 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -26,9 +26,9 @@ {{item.position}}
-
- 接单 -
+ + +
@@ -43,6 +43,7 @@ import {MessageBox, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList, getJob } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "WaitGetJob", components: {Loading}, @@ -89,8 +90,7 @@ //页码置1 this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -109,7 +109,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = this.list.concat(response.data.rows) this.total = parseInt(response.data.total) @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..55178c7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -43,7 +43,7 @@
工    单
-
+
{{item.count}} @@ -65,9 +65,11 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' - import { registerGetui } from '@/api/login' + import { appSpApi } from '@/api/special' + export default { name:'layout', @@ -101,17 +103,12 @@ }, { count:'--', - name:'待确认', - type:'span-count warning' - }, - { - count:'--', - name:'处理中', + name:'已完成', type:'span-count primary' }, { count:'--', - name:'已完成', + name:'全部', type:'span-count success' } ] @@ -120,35 +117,14 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } this.fetchData() }, methods: { - resumeCallback () { - Toast({ - message: '欢迎回来', - position: 'bottom', - duration: 3000 - }) - let login_flag = checkLoginFlag() - if (login_flag) { - this.login() - } else { - MyLocalStorage.Cache.set(LOGIN_FLAG, true, 999999) // 切换回来登陆保持时长无限 - } - }, pauseCallback () { setTimeout(() => { MyLocalStorage.Cache.set(LOGIN_FLAG, true, 6000) // 切换至后台登陆保持10分钟 @@ -157,7 +133,7 @@ //获取数据 fetchData(){ //统计布防撤防井数 - countByBfzt().then(response => { + appSpApi('well/countByBfzt').then(response =>{ this.wellCount = [ { count:response.data.cfWell, @@ -176,7 +152,7 @@ } ] }) - countByJobStatus().then(response => { + appSpApi('job/countByJobStatus').then(response =>{ this.jobCount = [ { count:response.data.beforeGet, @@ -184,18 +160,13 @@ type:'span-count alarm' }, { - count:response.data.beforeConfirm, - name:'待确认', - type:'span-count warning' - }, - { - count:response.data.inHandle, - name:'处理中', + count:response.data.over, + name:'已完成', type:'span-count primary' }, { - count:response.data.over, - name:'已完成', + count:response.data.beforeGet+response.data.over, + name:'全部', type:'span-count success' } ] @@ -224,12 +195,10 @@ clickJobManage(name){ if(name=='待处理'){ this.$router.push({name: 'job', query:{tab:'1'}}) - }else if(name=='待确认'){ - this.$router.push({name: 'job', query:{tab:'2'}}) - }else if(name=='处理中'){ - this.$router.push({name: 'job', query:{tab:'3'}}) }else if(name=='已完成'){ - this.$router.push({name: 'job', query:{tab:'4'}}) + this.$router.push({name: 'job', query:{tab:'2'}}) + }else if(name=='全部'){ + this.$router.push({name: 'job', query:{tab:'3'}}) } } diff --git a/src/page/mine/index.vue b/src/page/mine/index.vue index 81b33ab..1101341 100644 --- a/src/page/mine/index.vue +++ b/src/page/mine/index.vue @@ -8,8 +8,18 @@ - + + + + {{pushOpen=='0'?'关':'开'}} + + +
@@ -18,12 +28,30 @@ + + diff --git a/src/page/wellManage/WatchData.vue b/src/page/wellManage/WatchData.vue index cb4154c..4d76f78 100644 --- a/src/page/wellManage/WatchData.vue +++ b/src/page/wellManage/WatchData.vue @@ -34,6 +34,7 @@ + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 1747fe6..fcc8326 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -92,7 +92,7 @@
- 接单 + 处理 到这里去 转单 提交 @@ -122,6 +122,8 @@ import ChoosePeople from "../ChoosePeople"; import Loading from "../../../components/Loading/index"; import {compareCalendar} from '@/utils/string' + import { appSpApi } from '@/api/special' + export default { name: "JobDetail", components:{ @@ -256,7 +258,7 @@ }, //获取工单详情 fetchData(id){ - getJobInfo(id).then(response=>{ + appSpApi('job/info',{id:id}).then(response =>{ if(response.code==200){ this.jobForm = response.data[0] this.isLoading = false diff --git a/src/page/jobManage/modules/JobDetailSimple.vue b/src/page/jobManage/modules/JobDetailSimple.vue new file mode 100644 index 0000000..be06c86 --- /dev/null +++ b/src/page/jobManage/modules/JobDetailSimple.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..d72abab 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -69,6 +69,7 @@ import {Loadmore, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "OverJob", components:{ @@ -121,7 +122,7 @@ this.$refs.loadmore.onTopLoaded() this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -141,7 +142,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ console.log('getJobList') this.listQuery.offset+=1 for(let item of response.data.rows){ @@ -168,9 +169,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..fadc818 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -26,9 +26,9 @@ {{item.position}}
-
- 接单 -
+ + +
@@ -43,6 +43,7 @@ import {MessageBox, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList, getJob } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "WaitGetJob", components: {Loading}, @@ -89,8 +90,7 @@ //页码置1 this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -109,7 +109,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = this.list.concat(response.data.rows) this.total = parseInt(response.data.total) @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..55178c7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -43,7 +43,7 @@
工    单
-
+
{{item.count}} @@ -65,9 +65,11 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' - import { registerGetui } from '@/api/login' + import { appSpApi } from '@/api/special' + export default { name:'layout', @@ -101,17 +103,12 @@ }, { count:'--', - name:'待确认', - type:'span-count warning' - }, - { - count:'--', - name:'处理中', + name:'已完成', type:'span-count primary' }, { count:'--', - name:'已完成', + name:'全部', type:'span-count success' } ] @@ -120,35 +117,14 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } this.fetchData() }, methods: { - resumeCallback () { - Toast({ - message: '欢迎回来', - position: 'bottom', - duration: 3000 - }) - let login_flag = checkLoginFlag() - if (login_flag) { - this.login() - } else { - MyLocalStorage.Cache.set(LOGIN_FLAG, true, 999999) // 切换回来登陆保持时长无限 - } - }, pauseCallback () { setTimeout(() => { MyLocalStorage.Cache.set(LOGIN_FLAG, true, 6000) // 切换至后台登陆保持10分钟 @@ -157,7 +133,7 @@ //获取数据 fetchData(){ //统计布防撤防井数 - countByBfzt().then(response => { + appSpApi('well/countByBfzt').then(response =>{ this.wellCount = [ { count:response.data.cfWell, @@ -176,7 +152,7 @@ } ] }) - countByJobStatus().then(response => { + appSpApi('job/countByJobStatus').then(response =>{ this.jobCount = [ { count:response.data.beforeGet, @@ -184,18 +160,13 @@ type:'span-count alarm' }, { - count:response.data.beforeConfirm, - name:'待确认', - type:'span-count warning' - }, - { - count:response.data.inHandle, - name:'处理中', + count:response.data.over, + name:'已完成', type:'span-count primary' }, { - count:response.data.over, - name:'已完成', + count:response.data.beforeGet+response.data.over, + name:'全部', type:'span-count success' } ] @@ -224,12 +195,10 @@ clickJobManage(name){ if(name=='待处理'){ this.$router.push({name: 'job', query:{tab:'1'}}) - }else if(name=='待确认'){ - this.$router.push({name: 'job', query:{tab:'2'}}) - }else if(name=='处理中'){ - this.$router.push({name: 'job', query:{tab:'3'}}) }else if(name=='已完成'){ - this.$router.push({name: 'job', query:{tab:'4'}}) + this.$router.push({name: 'job', query:{tab:'2'}}) + }else if(name=='全部'){ + this.$router.push({name: 'job', query:{tab:'3'}}) } } diff --git a/src/page/mine/index.vue b/src/page/mine/index.vue index 81b33ab..1101341 100644 --- a/src/page/mine/index.vue +++ b/src/page/mine/index.vue @@ -8,8 +8,18 @@ - + + + + {{pushOpen=='0'?'关':'开'}} + + +
@@ -18,12 +28,30 @@ + + diff --git a/src/page/wellManage/WatchData.vue b/src/page/wellManage/WatchData.vue index cb4154c..4d76f78 100644 --- a/src/page/wellManage/WatchData.vue +++ b/src/page/wellManage/WatchData.vue @@ -34,6 +34,7 @@ + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 1747fe6..fcc8326 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -92,7 +92,7 @@
- 接单 + 处理 到这里去 转单 提交 @@ -122,6 +122,8 @@ import ChoosePeople from "../ChoosePeople"; import Loading from "../../../components/Loading/index"; import {compareCalendar} from '@/utils/string' + import { appSpApi } from '@/api/special' + export default { name: "JobDetail", components:{ @@ -256,7 +258,7 @@ }, //获取工单详情 fetchData(id){ - getJobInfo(id).then(response=>{ + appSpApi('job/info',{id:id}).then(response =>{ if(response.code==200){ this.jobForm = response.data[0] this.isLoading = false diff --git a/src/page/jobManage/modules/JobDetailSimple.vue b/src/page/jobManage/modules/JobDetailSimple.vue new file mode 100644 index 0000000..be06c86 --- /dev/null +++ b/src/page/jobManage/modules/JobDetailSimple.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..d72abab 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -69,6 +69,7 @@ import {Loadmore, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "OverJob", components:{ @@ -121,7 +122,7 @@ this.$refs.loadmore.onTopLoaded() this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -141,7 +142,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ console.log('getJobList') this.listQuery.offset+=1 for(let item of response.data.rows){ @@ -168,9 +169,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..fadc818 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -26,9 +26,9 @@ {{item.position}}
-
- 接单 -
+ + +
@@ -43,6 +43,7 @@ import {MessageBox, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList, getJob } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "WaitGetJob", components: {Loading}, @@ -89,8 +90,7 @@ //页码置1 this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -109,7 +109,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = this.list.concat(response.data.rows) this.total = parseInt(response.data.total) @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..55178c7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -43,7 +43,7 @@
工    单
-
+
{{item.count}} @@ -65,9 +65,11 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' - import { registerGetui } from '@/api/login' + import { appSpApi } from '@/api/special' + export default { name:'layout', @@ -101,17 +103,12 @@ }, { count:'--', - name:'待确认', - type:'span-count warning' - }, - { - count:'--', - name:'处理中', + name:'已完成', type:'span-count primary' }, { count:'--', - name:'已完成', + name:'全部', type:'span-count success' } ] @@ -120,35 +117,14 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } this.fetchData() }, methods: { - resumeCallback () { - Toast({ - message: '欢迎回来', - position: 'bottom', - duration: 3000 - }) - let login_flag = checkLoginFlag() - if (login_flag) { - this.login() - } else { - MyLocalStorage.Cache.set(LOGIN_FLAG, true, 999999) // 切换回来登陆保持时长无限 - } - }, pauseCallback () { setTimeout(() => { MyLocalStorage.Cache.set(LOGIN_FLAG, true, 6000) // 切换至后台登陆保持10分钟 @@ -157,7 +133,7 @@ //获取数据 fetchData(){ //统计布防撤防井数 - countByBfzt().then(response => { + appSpApi('well/countByBfzt').then(response =>{ this.wellCount = [ { count:response.data.cfWell, @@ -176,7 +152,7 @@ } ] }) - countByJobStatus().then(response => { + appSpApi('job/countByJobStatus').then(response =>{ this.jobCount = [ { count:response.data.beforeGet, @@ -184,18 +160,13 @@ type:'span-count alarm' }, { - count:response.data.beforeConfirm, - name:'待确认', - type:'span-count warning' - }, - { - count:response.data.inHandle, - name:'处理中', + count:response.data.over, + name:'已完成', type:'span-count primary' }, { - count:response.data.over, - name:'已完成', + count:response.data.beforeGet+response.data.over, + name:'全部', type:'span-count success' } ] @@ -224,12 +195,10 @@ clickJobManage(name){ if(name=='待处理'){ this.$router.push({name: 'job', query:{tab:'1'}}) - }else if(name=='待确认'){ - this.$router.push({name: 'job', query:{tab:'2'}}) - }else if(name=='处理中'){ - this.$router.push({name: 'job', query:{tab:'3'}}) }else if(name=='已完成'){ - this.$router.push({name: 'job', query:{tab:'4'}}) + this.$router.push({name: 'job', query:{tab:'2'}}) + }else if(name=='全部'){ + this.$router.push({name: 'job', query:{tab:'3'}}) } } diff --git a/src/page/mine/index.vue b/src/page/mine/index.vue index 81b33ab..1101341 100644 --- a/src/page/mine/index.vue +++ b/src/page/mine/index.vue @@ -8,8 +8,18 @@ - + + + + {{pushOpen=='0'?'关':'开'}} + + +
@@ -18,12 +28,30 @@ + + diff --git a/src/page/wellManage/WatchData.vue b/src/page/wellManage/WatchData.vue index cb4154c..4d76f78 100644 --- a/src/page/wellManage/WatchData.vue +++ b/src/page/wellManage/WatchData.vue @@ -34,6 +34,7 @@ + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 1747fe6..fcc8326 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -92,7 +92,7 @@
- 接单 + 处理 到这里去 转单 提交 @@ -122,6 +122,8 @@ import ChoosePeople from "../ChoosePeople"; import Loading from "../../../components/Loading/index"; import {compareCalendar} from '@/utils/string' + import { appSpApi } from '@/api/special' + export default { name: "JobDetail", components:{ @@ -256,7 +258,7 @@ }, //获取工单详情 fetchData(id){ - getJobInfo(id).then(response=>{ + appSpApi('job/info',{id:id}).then(response =>{ if(response.code==200){ this.jobForm = response.data[0] this.isLoading = false diff --git a/src/page/jobManage/modules/JobDetailSimple.vue b/src/page/jobManage/modules/JobDetailSimple.vue new file mode 100644 index 0000000..be06c86 --- /dev/null +++ b/src/page/jobManage/modules/JobDetailSimple.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..d72abab 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -69,6 +69,7 @@ import {Loadmore, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "OverJob", components:{ @@ -121,7 +122,7 @@ this.$refs.loadmore.onTopLoaded() this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -141,7 +142,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ console.log('getJobList') this.listQuery.offset+=1 for(let item of response.data.rows){ @@ -168,9 +169,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..fadc818 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -26,9 +26,9 @@ {{item.position}}
-
- 接单 -
+ + +
@@ -43,6 +43,7 @@ import {MessageBox, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList, getJob } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "WaitGetJob", components: {Loading}, @@ -89,8 +90,7 @@ //页码置1 this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -109,7 +109,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = this.list.concat(response.data.rows) this.total = parseInt(response.data.total) @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..55178c7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -43,7 +43,7 @@
工    单
-
+
{{item.count}} @@ -65,9 +65,11 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' - import { registerGetui } from '@/api/login' + import { appSpApi } from '@/api/special' + export default { name:'layout', @@ -101,17 +103,12 @@ }, { count:'--', - name:'待确认', - type:'span-count warning' - }, - { - count:'--', - name:'处理中', + name:'已完成', type:'span-count primary' }, { count:'--', - name:'已完成', + name:'全部', type:'span-count success' } ] @@ -120,35 +117,14 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } this.fetchData() }, methods: { - resumeCallback () { - Toast({ - message: '欢迎回来', - position: 'bottom', - duration: 3000 - }) - let login_flag = checkLoginFlag() - if (login_flag) { - this.login() - } else { - MyLocalStorage.Cache.set(LOGIN_FLAG, true, 999999) // 切换回来登陆保持时长无限 - } - }, pauseCallback () { setTimeout(() => { MyLocalStorage.Cache.set(LOGIN_FLAG, true, 6000) // 切换至后台登陆保持10分钟 @@ -157,7 +133,7 @@ //获取数据 fetchData(){ //统计布防撤防井数 - countByBfzt().then(response => { + appSpApi('well/countByBfzt').then(response =>{ this.wellCount = [ { count:response.data.cfWell, @@ -176,7 +152,7 @@ } ] }) - countByJobStatus().then(response => { + appSpApi('job/countByJobStatus').then(response =>{ this.jobCount = [ { count:response.data.beforeGet, @@ -184,18 +160,13 @@ type:'span-count alarm' }, { - count:response.data.beforeConfirm, - name:'待确认', - type:'span-count warning' - }, - { - count:response.data.inHandle, - name:'处理中', + count:response.data.over, + name:'已完成', type:'span-count primary' }, { - count:response.data.over, - name:'已完成', + count:response.data.beforeGet+response.data.over, + name:'全部', type:'span-count success' } ] @@ -224,12 +195,10 @@ clickJobManage(name){ if(name=='待处理'){ this.$router.push({name: 'job', query:{tab:'1'}}) - }else if(name=='待确认'){ - this.$router.push({name: 'job', query:{tab:'2'}}) - }else if(name=='处理中'){ - this.$router.push({name: 'job', query:{tab:'3'}}) }else if(name=='已完成'){ - this.$router.push({name: 'job', query:{tab:'4'}}) + this.$router.push({name: 'job', query:{tab:'2'}}) + }else if(name=='全部'){ + this.$router.push({name: 'job', query:{tab:'3'}}) } } diff --git a/src/page/mine/index.vue b/src/page/mine/index.vue index 81b33ab..1101341 100644 --- a/src/page/mine/index.vue +++ b/src/page/mine/index.vue @@ -8,8 +8,18 @@ - + + + + {{pushOpen=='0'?'关':'开'}} + + +
@@ -18,12 +28,30 @@ + + diff --git a/src/page/wellManage/WatchData.vue b/src/page/wellManage/WatchData.vue index cb4154c..4d76f78 100644 --- a/src/page/wellManage/WatchData.vue +++ b/src/page/wellManage/WatchData.vue @@ -34,6 +34,7 @@ + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 1747fe6..fcc8326 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -92,7 +92,7 @@
- 接单 + 处理 到这里去 转单 提交 @@ -122,6 +122,8 @@ import ChoosePeople from "../ChoosePeople"; import Loading from "../../../components/Loading/index"; import {compareCalendar} from '@/utils/string' + import { appSpApi } from '@/api/special' + export default { name: "JobDetail", components:{ @@ -256,7 +258,7 @@ }, //获取工单详情 fetchData(id){ - getJobInfo(id).then(response=>{ + appSpApi('job/info',{id:id}).then(response =>{ if(response.code==200){ this.jobForm = response.data[0] this.isLoading = false diff --git a/src/page/jobManage/modules/JobDetailSimple.vue b/src/page/jobManage/modules/JobDetailSimple.vue new file mode 100644 index 0000000..be06c86 --- /dev/null +++ b/src/page/jobManage/modules/JobDetailSimple.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..d72abab 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -69,6 +69,7 @@ import {Loadmore, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "OverJob", components:{ @@ -121,7 +122,7 @@ this.$refs.loadmore.onTopLoaded() this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -141,7 +142,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ console.log('getJobList') this.listQuery.offset+=1 for(let item of response.data.rows){ @@ -168,9 +169,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..fadc818 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -26,9 +26,9 @@ {{item.position}}
-
- 接单 -
+ + +
@@ -43,6 +43,7 @@ import {MessageBox, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList, getJob } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "WaitGetJob", components: {Loading}, @@ -89,8 +90,7 @@ //页码置1 this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -109,7 +109,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = this.list.concat(response.data.rows) this.total = parseInt(response.data.total) @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..55178c7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -43,7 +43,7 @@
工    单
-
+
{{item.count}} @@ -65,9 +65,11 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' - import { registerGetui } from '@/api/login' + import { appSpApi } from '@/api/special' + export default { name:'layout', @@ -101,17 +103,12 @@ }, { count:'--', - name:'待确认', - type:'span-count warning' - }, - { - count:'--', - name:'处理中', + name:'已完成', type:'span-count primary' }, { count:'--', - name:'已完成', + name:'全部', type:'span-count success' } ] @@ -120,35 +117,14 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } this.fetchData() }, methods: { - resumeCallback () { - Toast({ - message: '欢迎回来', - position: 'bottom', - duration: 3000 - }) - let login_flag = checkLoginFlag() - if (login_flag) { - this.login() - } else { - MyLocalStorage.Cache.set(LOGIN_FLAG, true, 999999) // 切换回来登陆保持时长无限 - } - }, pauseCallback () { setTimeout(() => { MyLocalStorage.Cache.set(LOGIN_FLAG, true, 6000) // 切换至后台登陆保持10分钟 @@ -157,7 +133,7 @@ //获取数据 fetchData(){ //统计布防撤防井数 - countByBfzt().then(response => { + appSpApi('well/countByBfzt').then(response =>{ this.wellCount = [ { count:response.data.cfWell, @@ -176,7 +152,7 @@ } ] }) - countByJobStatus().then(response => { + appSpApi('job/countByJobStatus').then(response =>{ this.jobCount = [ { count:response.data.beforeGet, @@ -184,18 +160,13 @@ type:'span-count alarm' }, { - count:response.data.beforeConfirm, - name:'待确认', - type:'span-count warning' - }, - { - count:response.data.inHandle, - name:'处理中', + count:response.data.over, + name:'已完成', type:'span-count primary' }, { - count:response.data.over, - name:'已完成', + count:response.data.beforeGet+response.data.over, + name:'全部', type:'span-count success' } ] @@ -224,12 +195,10 @@ clickJobManage(name){ if(name=='待处理'){ this.$router.push({name: 'job', query:{tab:'1'}}) - }else if(name=='待确认'){ - this.$router.push({name: 'job', query:{tab:'2'}}) - }else if(name=='处理中'){ - this.$router.push({name: 'job', query:{tab:'3'}}) }else if(name=='已完成'){ - this.$router.push({name: 'job', query:{tab:'4'}}) + this.$router.push({name: 'job', query:{tab:'2'}}) + }else if(name=='全部'){ + this.$router.push({name: 'job', query:{tab:'3'}}) } } diff --git a/src/page/mine/index.vue b/src/page/mine/index.vue index 81b33ab..1101341 100644 --- a/src/page/mine/index.vue +++ b/src/page/mine/index.vue @@ -8,8 +8,18 @@ - + + + + {{pushOpen=='0'?'关':'开'}} + + +
@@ -18,12 +28,30 @@ + + diff --git a/src/page/wellManage/WatchData.vue b/src/page/wellManage/WatchData.vue index cb4154c..4d76f78 100644 --- a/src/page/wellManage/WatchData.vue +++ b/src/page/wellManage/WatchData.vue @@ -34,6 +34,7 @@ + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 1747fe6..fcc8326 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -92,7 +92,7 @@
- 接单 + 处理 到这里去 转单 提交 @@ -122,6 +122,8 @@ import ChoosePeople from "../ChoosePeople"; import Loading from "../../../components/Loading/index"; import {compareCalendar} from '@/utils/string' + import { appSpApi } from '@/api/special' + export default { name: "JobDetail", components:{ @@ -256,7 +258,7 @@ }, //获取工单详情 fetchData(id){ - getJobInfo(id).then(response=>{ + appSpApi('job/info',{id:id}).then(response =>{ if(response.code==200){ this.jobForm = response.data[0] this.isLoading = false diff --git a/src/page/jobManage/modules/JobDetailSimple.vue b/src/page/jobManage/modules/JobDetailSimple.vue new file mode 100644 index 0000000..be06c86 --- /dev/null +++ b/src/page/jobManage/modules/JobDetailSimple.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..d72abab 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -69,6 +69,7 @@ import {Loadmore, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "OverJob", components:{ @@ -121,7 +122,7 @@ this.$refs.loadmore.onTopLoaded() this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -141,7 +142,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ console.log('getJobList') this.listQuery.offset+=1 for(let item of response.data.rows){ @@ -168,9 +169,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..fadc818 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -26,9 +26,9 @@ {{item.position}}
-
- 接单 -
+ + +
@@ -43,6 +43,7 @@ import {MessageBox, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList, getJob } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "WaitGetJob", components: {Loading}, @@ -89,8 +90,7 @@ //页码置1 this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -109,7 +109,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = this.list.concat(response.data.rows) this.total = parseInt(response.data.total) @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..55178c7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -43,7 +43,7 @@
工    单
-
+
{{item.count}} @@ -65,9 +65,11 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' - import { registerGetui } from '@/api/login' + import { appSpApi } from '@/api/special' + export default { name:'layout', @@ -101,17 +103,12 @@ }, { count:'--', - name:'待确认', - type:'span-count warning' - }, - { - count:'--', - name:'处理中', + name:'已完成', type:'span-count primary' }, { count:'--', - name:'已完成', + name:'全部', type:'span-count success' } ] @@ -120,35 +117,14 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } this.fetchData() }, methods: { - resumeCallback () { - Toast({ - message: '欢迎回来', - position: 'bottom', - duration: 3000 - }) - let login_flag = checkLoginFlag() - if (login_flag) { - this.login() - } else { - MyLocalStorage.Cache.set(LOGIN_FLAG, true, 999999) // 切换回来登陆保持时长无限 - } - }, pauseCallback () { setTimeout(() => { MyLocalStorage.Cache.set(LOGIN_FLAG, true, 6000) // 切换至后台登陆保持10分钟 @@ -157,7 +133,7 @@ //获取数据 fetchData(){ //统计布防撤防井数 - countByBfzt().then(response => { + appSpApi('well/countByBfzt').then(response =>{ this.wellCount = [ { count:response.data.cfWell, @@ -176,7 +152,7 @@ } ] }) - countByJobStatus().then(response => { + appSpApi('job/countByJobStatus').then(response =>{ this.jobCount = [ { count:response.data.beforeGet, @@ -184,18 +160,13 @@ type:'span-count alarm' }, { - count:response.data.beforeConfirm, - name:'待确认', - type:'span-count warning' - }, - { - count:response.data.inHandle, - name:'处理中', + count:response.data.over, + name:'已完成', type:'span-count primary' }, { - count:response.data.over, - name:'已完成', + count:response.data.beforeGet+response.data.over, + name:'全部', type:'span-count success' } ] @@ -224,12 +195,10 @@ clickJobManage(name){ if(name=='待处理'){ this.$router.push({name: 'job', query:{tab:'1'}}) - }else if(name=='待确认'){ - this.$router.push({name: 'job', query:{tab:'2'}}) - }else if(name=='处理中'){ - this.$router.push({name: 'job', query:{tab:'3'}}) }else if(name=='已完成'){ - this.$router.push({name: 'job', query:{tab:'4'}}) + this.$router.push({name: 'job', query:{tab:'2'}}) + }else if(name=='全部'){ + this.$router.push({name: 'job', query:{tab:'3'}}) } } diff --git a/src/page/mine/index.vue b/src/page/mine/index.vue index 81b33ab..1101341 100644 --- a/src/page/mine/index.vue +++ b/src/page/mine/index.vue @@ -8,8 +8,18 @@ - + + + + {{pushOpen=='0'?'关':'开'}} + + +
@@ -18,12 +28,30 @@ + + diff --git a/src/page/wellManage/WatchData.vue b/src/page/wellManage/WatchData.vue index cb4154c..4d76f78 100644 --- a/src/page/wellManage/WatchData.vue +++ b/src/page/wellManage/WatchData.vue @@ -34,6 +34,7 @@ + + diff --git a/src/page/error/other.vue b/src/page/error/other.vue new file mode 100644 index 0000000..a10d3ca --- /dev/null +++ b/src/page/error/other.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue index fce5367..5e3d73b 100644 --- a/src/page/jobManage/JobManage.vue +++ b/src/page/jobManage/JobManage.vue @@ -8,23 +8,19 @@
待处理 - 待确认 - 处理中 - 已完成 + 已完成 + 全部 - + - + - - - - +
@@ -35,16 +31,15 @@ + + diff --git a/src/page/jobManage/modules/InHandleJob.vue b/src/page/jobManage/modules/InHandleJob.vue index 1a1f05e..2cf4fd2 100644 --- a/src/page/jobManage/modules/InHandleJob.vue +++ b/src/page/jobManage/modules/InHandleJob.vue @@ -165,8 +165,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 1747fe6..fcc8326 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -92,7 +92,7 @@
- 接单 + 处理 到这里去 转单 提交 @@ -122,6 +122,8 @@ import ChoosePeople from "../ChoosePeople"; import Loading from "../../../components/Loading/index"; import {compareCalendar} from '@/utils/string' + import { appSpApi } from '@/api/special' + export default { name: "JobDetail", components:{ @@ -256,7 +258,7 @@ }, //获取工单详情 fetchData(id){ - getJobInfo(id).then(response=>{ + appSpApi('job/info',{id:id}).then(response =>{ if(response.code==200){ this.jobForm = response.data[0] this.isLoading = false diff --git a/src/page/jobManage/modules/JobDetailSimple.vue b/src/page/jobManage/modules/JobDetailSimple.vue new file mode 100644 index 0000000..be06c86 --- /dev/null +++ b/src/page/jobManage/modules/JobDetailSimple.vue @@ -0,0 +1,346 @@ + + + + + diff --git a/src/page/jobManage/modules/OverJob.vue b/src/page/jobManage/modules/OverJob.vue index a211802..d72abab 100644 --- a/src/page/jobManage/modules/OverJob.vue +++ b/src/page/jobManage/modules/OverJob.vue @@ -69,6 +69,7 @@ import {Loadmore, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "OverJob", components:{ @@ -121,7 +122,7 @@ this.$refs.loadmore.onTopLoaded() this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -141,7 +142,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ console.log('getJobList') this.listQuery.offset+=1 for(let item of response.data.rows){ @@ -168,9 +169,14 @@ .joblist { margin-top 50px padding 0px 2vw - overflow: scroll; - height: calc( 100vh - 135px ); + overflow: scroll + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitConfirmJob.vue b/src/page/jobManage/modules/WaitConfirmJob.vue index 15cda87..e34a5d8 100644 --- a/src/page/jobManage/modules/WaitConfirmJob.vue +++ b/src/page/jobManage/modules/WaitConfirmJob.vue @@ -161,8 +161,13 @@ margin-top 50px padding 0px 2vw overflow: scroll; - height: calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} + .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/jobManage/modules/WaitGetJob.vue b/src/page/jobManage/modules/WaitGetJob.vue index 53c8032..fadc818 100644 --- a/src/page/jobManage/modules/WaitGetJob.vue +++ b/src/page/jobManage/modules/WaitGetJob.vue @@ -26,9 +26,9 @@ {{item.position}}
-
- 接单 -
+ + +
@@ -43,6 +43,7 @@ import {MessageBox, Indicator, Toast} from 'mint-ui' import Loading from '@/components/Loading' import { getJobList, getJob } from '@/api/job' + import { appSpApi } from '@/api/special' export default { name: "WaitGetJob", components: {Loading}, @@ -89,8 +90,7 @@ //页码置1 this.listQuery.offset=1 this.loadConf.loadBottomConf.isFinish = false - - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = [] this.isLoading = false @@ -109,7 +109,7 @@ this.loadConf.loadBottomConf.isFinish = true this.$refs.loadmore.onBottomLoaded(); } else { - getJobList(this.listQuery).then(response => { + appSpApi('job/list',this.listQuery).then(response =>{ this.listQuery.offset+=1 this.list = this.list.concat(response.data.rows) this.total = parseInt(response.data.total) @@ -147,8 +147,12 @@ margin-top 50px padding 0px 2vw overflow scroll; - height calc( 100vh - 135px ); + height: 95vh + height:-moz-calc( 100vh - 135px ) + height:-webkit-calc( 100vh - 135px ) + height: calc( 100vh - 135px ) } + .joblist::-webkit-scrollbar {display:none} .list-li { margin-top 1vw; border 1px solid #f0f0f0 diff --git a/src/page/layout/index.vue b/src/page/layout/index.vue index d67e69e..55178c7 100644 --- a/src/page/layout/index.vue +++ b/src/page/layout/index.vue @@ -43,7 +43,7 @@
工    单
-
+
{{item.count}} @@ -65,9 +65,11 @@ import { plusReady } from 'assets/js/plusReady' import { MyLocalStorage, checkADFlag, checkLoginFlag } from 'assets/js/utils' import { LOGIN_FLAG, AD_FLAG, INDEX_ACTIVETAB } from 'assets/js/storageConst' + import { getAccount } from '@/utils/auth' import { countByBfzt } from '@/api/well' import { countByJobStatus } from '@/api/job' - import { registerGetui } from '@/api/login' + import { appSpApi } from '@/api/special' + export default { name:'layout', @@ -101,17 +103,12 @@ }, { count:'--', - name:'待确认', - type:'span-count warning' - }, - { - count:'--', - name:'处理中', + name:'已完成', type:'span-count primary' }, { count:'--', - name:'已完成', + name:'全部', type:'span-count success' } ] @@ -120,35 +117,14 @@ created () { console.log("created") plusReady(this.plusReady) + // this.setLocalStorage() // 储存本地存储 this.fetchData() }, activated(){ - const cid = this.$store.getters.cid - console.log('cid:'+cid) - if(cid && cid!=''){ - registerGetui(cid).then(res=>{ - if(res.code==200){ - console.log('registerGetui success!') - } - }) - } this.fetchData() }, methods: { - resumeCallback () { - Toast({ - message: '欢迎回来', - position: 'bottom', - duration: 3000 - }) - let login_flag = checkLoginFlag() - if (login_flag) { - this.login() - } else { - MyLocalStorage.Cache.set(LOGIN_FLAG, true, 999999) // 切换回来登陆保持时长无限 - } - }, pauseCallback () { setTimeout(() => { MyLocalStorage.Cache.set(LOGIN_FLAG, true, 6000) // 切换至后台登陆保持10分钟 @@ -157,7 +133,7 @@ //获取数据 fetchData(){ //统计布防撤防井数 - countByBfzt().then(response => { + appSpApi('well/countByBfzt').then(response =>{ this.wellCount = [ { count:response.data.cfWell, @@ -176,7 +152,7 @@ } ] }) - countByJobStatus().then(response => { + appSpApi('job/countByJobStatus').then(response =>{ this.jobCount = [ { count:response.data.beforeGet, @@ -184,18 +160,13 @@ type:'span-count alarm' }, { - count:response.data.beforeConfirm, - name:'待确认', - type:'span-count warning' - }, - { - count:response.data.inHandle, - name:'处理中', + count:response.data.over, + name:'已完成', type:'span-count primary' }, { - count:response.data.over, - name:'已完成', + count:response.data.beforeGet+response.data.over, + name:'全部', type:'span-count success' } ] @@ -224,12 +195,10 @@ clickJobManage(name){ if(name=='待处理'){ this.$router.push({name: 'job', query:{tab:'1'}}) - }else if(name=='待确认'){ - this.$router.push({name: 'job', query:{tab:'2'}}) - }else if(name=='处理中'){ - this.$router.push({name: 'job', query:{tab:'3'}}) }else if(name=='已完成'){ - this.$router.push({name: 'job', query:{tab:'4'}}) + this.$router.push({name: 'job', query:{tab:'2'}}) + }else if(name=='全部'){ + this.$router.push({name: 'job', query:{tab:'3'}}) } } diff --git a/src/page/mine/index.vue b/src/page/mine/index.vue index 81b33ab..1101341 100644 --- a/src/page/mine/index.vue +++ b/src/page/mine/index.vue @@ -8,8 +8,18 @@ - + + + + {{pushOpen=='0'?'关':'开'}} + + +
@@ -18,12 +28,30 @@ + + diff --git a/src/page/wellManage/WatchData.vue b/src/page/wellManage/WatchData.vue index cb4154c..4d76f78 100644 --- a/src/page/wellManage/WatchData.vue +++ b/src/page/wellManage/WatchData.vue @@ -34,6 +34,7 @@