Skip to content

H
hls-xcmg-vue-app
Commit 8063166c authored by Jennie Shi's avatar Jennie Shi
Browse files
Options

合并代码

parent 1cfe96f0
Show whitespace changes
Inline Side-by-side
Showing with 74 additions and 147 deletions
config/dev.env.js
View file @ 8063166c
......@@ -12,11 +12,6 @@ module.exports = merge(prodEnv, {
rootPath: '"http://180.104.121.66:8088/r/api"',
filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_DEV&apiName=file_view&"',
ocrPath: '"http://180.104.121.66:8088/r/api"',
<<<<<<< HEAD
appId: '"com.xcmg.app"',
currentVersion: '"1.7.6"',
=======
appId: '"com.xcmg.app.dev"',
currentVersion: '"1.7.3"',
>>>>>>> jeshi
currentVersion: '"1.7.7"',
})
config/uat.env.js
View file @ 8063166c
......@@ -11,5 +11,5 @@ module.exports = {
ocrPath:'"http://180.104.121.66:8088/r/api"',
fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
appId: '"com.xcmg.app"',
currentVersion: '"1.2.4"'
currentVersion: '"1.2.6"'
}
src/components/pdf/index.js deleted 100644 → 0
View file @ 1cfe96f0
import PDF from './PDF'
var $vm
export default {
install (Vue, options) {
if (!$vm) {
const PDFPlugin = Vue.extend(PDF)
$vm = new PDFPlugin().$mount()
document.body.appendChild($vm.$el)
}
Vue.prototype.$showPDF = function (url) {
$vm.showPDF(url)
}
},
}
src/components/pdf/pdf.vue deleted 100644 → 0
View file @ 1cfe96f0
<template>
<div id="containers" class="containers">
<!-- <div class='pdf-page'> -->
<canvas id="the-canvas"/>
<div v-if="pdfDoc" class="foot">
<button v-if="pageNum>1" class="left" @click="onPrevPage">上一页</button>
<button v-if="pageNum<pdfDoc.numPages" class="right" @click="onNextPage">下一页</button>
</div>
<!-- </div> -->
</div>
</template>
<script>
import PDFJS from 'pdfjs-dist'
export default {
data () {
return {
pdfDoc: null,
pageNum: 1,
pageRendering: false,
pageNumPending: null,
scale: 0.9,
}
},
methods: {
showPDF (url) {
let _this = this
PDFJS.getDocument(url).then(function (pdf) {
_this.pdfDoc = pdf
_this.renderPage(1)
})
},
renderPage (num) {
this.pageRendering = true
let _this = this
this.pdfDoc.getPage(num).then(function (page) {
var viewport = page.getViewport(_this.scale)
let canvas = document.getElementById('the-canvas')
canvas.height = viewport.height
canvas.width = viewport.width
// Render PDF page into canvas context
var renderContext = {
canvasContext: canvas.getContext('2d'),
viewport: viewport,
}
var renderTask = page.render(renderContext)
// Wait for rendering to finish
renderTask.promise.then(function () {
_this.pageRendering = false
if (_this.pageNumPending !== null) {
// New page rendering is pending
this.renderPage(_this.pageNumPending)
_this.pageNumPending = null
}
})
})
},
queueRenderPage (num) {
if (this.pageRendering) {
this.pageNumPending = num
} else {
this.renderPage(num)
}
},
onPrevPage () {
if (this.pageNum <= 1) {
return
}
this.pageNum--
this.queueRenderPage(this.pageNum)
},
onNextPage () {
if (this.pageNum >= this.pdfDoc.numPages) {
return
}
this.pageNum++
this.queueRenderPage(this.pageNum)
},
},
}
</script>
<style scoped>
#containers.containers {
/* background-color: rgba(0,0,0,0.75); */
position:fixed;
width: 100%;
height: 100%;
top: 0;
left: 0;
text-align: center;
padding: 5px;
}
.pdf-page {
}
.foot {
position: fixed;
transform: translate(-50%,0);
left: 50%;
}
</style>
src/pages/contractCreate/creat-rent-info.vue
View file @ 8063166c
......@@ -169,7 +169,9 @@
</item>
<item>
<div slot="name" class="required">租赁期数</div>
<input slot="content" v-model="saveInfo.lease_times" :readonly="isReadOnly" placeholder="请输入租赁期数">
<input
slot="content" v-model="saveInfo.lease_times" :readonly="isReadOnly" type="number"
placeholder="请输入租赁期数">
</item>
<item>
<div slot="name" class="required">年利率</div>
......
src/pages/contractCreate/create-enclosure-info.vue
View file @ 8063166c
......@@ -78,7 +78,7 @@
<div
v-for="(item, index) in mort_upload_list"
v-if="item.check_id === mortId"
:key="index"
:key="index+'info'"
class="card-upload"
>
<img :src="item.picture" @click="showBigPicture(item.picture)" >
......@@ -87,8 +87,8 @@
</div>
</div>
<!--抵押 下载的图片-->
<div v-for="(pic, index) in dowload_list" :key="index">
<div v-if="pic.check_id==checkId" :key="index" class="card-upload">
<div v-for="(pic, index) in dowload_list" :key="index+'i'">
<div v-if="pic.check_id===mortId" :key="index+'info1'" class="card-upload">
<img :src="pic.url" @click="showBigPicture(pic.url)" >
<div class="close" @click="delete_pic(pic.attachment_id)">
<img src="@/assets/userBind/deleteIcon.png" >
......@@ -105,7 +105,7 @@
<div
v-for="(item, index) in upload_list"
v-if="item.check_id === checkId"
:key="index"
:key="index+'info2'"
class="card-upload"
>
<img :src="item.picture" @click="showBigPicture(item.picture)" >
......@@ -114,8 +114,8 @@
</div>
</div>
<!--从服务器上下载的图片-->
<div v-for="(pic, index) in dowload_list" :key="index">
<div v-if="pic.check_id==checkId" :key="index" class="card-upload">
<div v-for="(pic, index) in dowload_list" :key="index+'info4'">
<div v-if="pic.check_id==checkId" :key="index+'info3'" class="card-upload">
<img :src="pic.url" @click="showBigPicture(pic.url)" >
<div class="close" @click="delete_pic(pic.attachment_id)">
<img src="@/assets/userBind/deleteIcon.png" >
......@@ -190,6 +190,7 @@ export default {
vm.fromPage = window.localStorage.fromPage
vm.loadItemList()
vm.queryCheckId()
vm.queryMortId()
if (vm.fromPage === 'sale') {
vm.isReadOnly = false
} else if (vm.fromPage === 'list') {
......@@ -203,6 +204,47 @@ export default {
})
},
methods: {
// 抵押证书check_id查询
queryMortId () {
let vm = this
let url = process.env.basePath + 'prj_mortgage_query'
let param = {
project_id: window.localStorage.project_id,
}
vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
console.log('抵押证书check_id查询', res)
if (res.result === 'S') {
vm.mortId = res.info.check_id
vm.mortgageQuery()
}
})
},
// 抵押证书查询
mortgageQuery () {
let vm = this
let url =
process.env.basePath + 'attachment_list_query' // 附件查询
let param = {
check_id: vm.mortId,
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
res.lists.forEach(item => {
item['url'] =
process.env.filePath +
'attachment_id=' +
item.attachment_id +
'&access_token=' +
window.localStorage.access_token
})
vm.mort_dowload_list = res.lists
}
})
},
// 特批证书check_id查询
queryCheckId () {
let vm = this
......
src/pages/contractSigning/previewPdf.vue
View file @ 8063166c
......@@ -65,6 +65,7 @@ export default {
console.log('URL ==== ' + url)
PDFJS.getDocument(url).then((pdf) => {
this.pdfDoc = pdf
debugger
console.log('pdf ==== ' + pdf)
this.pages = this.pdfDoc.numPages
this.$nextTick(() => {
......
src/pages/financingTrial/financing-details.vue
View file @ 8063166c
......@@ -81,7 +81,7 @@
</item>
<item>
<div slot="name" class="font-color">租赁期数</div>
<input slot="content" v-model="info.lease_times" placeholder="请输入租赁期数">
<input slot="content" v-model="info.lease_times" placeholder="请输入租赁期数" type="number">
</item>
<item>
<div slot="name" class="font-color">年利率</div>
......
src/pages/pwd-forgotten.vue
View file @ 8063166c
......@@ -141,8 +141,11 @@ export default {
passwordCheck () {
let vm = this
let length = vm.user_password.length
debugger
if (length < 6 || length > 20) {
hlsPopup.showLongCenter('密码长度6～20位之间')
} else if (new RegExp('^[0-9]*$').test(vm.user_password)) {
hlsPopup.showLongCenter('密码不能全为数字')
} else {
vm.passwordFlag = true
}
......@@ -153,7 +156,7 @@ export default {
if (length < 6 || length > 20) {
hlsPopup.showLongCenter('密码长度6～20位之间')
} else if (vm.confirm !== vm.user_password) {
hlsPopup.showLongCenter('两次输入的密码不一致，请从新输入')
hlsPopup.showLongCenter('两次输入的密码不一致，请重新输入')
} else {
vm.confirmPassword = true
}
......
src/pages/regiester2.vue
View file @ 8063166c
......@@ -167,6 +167,8 @@ export default {
let length = vm.user_password.length
if (length < 6 || length > 20) {
hlsPopup.showLongCenter('密码长度6～20位之间')
} else if (new RegExp('^[0-9]*$').test(vm.user_password)) {
hlsPopup.showLongCenter('密码不能全为数字')
} else {
vm.passwordFlag = true
}
......@@ -195,7 +197,7 @@ export default {
} else {
await vm.passwordCheck()
await vm.confirmCheck()
if(vm.passwordFlag && vm.confirmPassword){
if (vm.passwordFlag && vm.confirmPassword) {
let url = process.env.basePath + 'register'
let md5passwprd = CryptoJS.MD5(vm.user_password)
.toString()
......@@ -217,7 +219,6 @@ export default {
}
})
}
}
},
returnLogin () {
......
www/39d5801061722b3e173e.worker.js 0 → 100644
View file @ 8063166c
This source diff could not be displayed because it is too large. You can view the blob instead.
www/39d5801061722b3e173e.worker.js.map 0 → 100644
View file @ 8063166c
This source diff could not be displayed because it is too large. You can view the blob instead.
www/index.html
View file @ 8063166c
<<<<<<< HEAD
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.bf12f36459a8557699346754da6efd18.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.5b23605dc2d9cfefc737.js></script><script type=text/javascript src=./static/js/vendor.64c4110c2ef75634c410.js></script><script type=text/javascript src=./static/js/app.dd5894f1024fda4ea85c.js></script></body></html>
=======
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.52a70966e6418a8b3b97c93ce2dec949.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.75679805cfd6269119a3.js></script><script type=text/javascript src=./static/js/vendor.7278d929ed3c1f5073ab.js></script><script type=text/javascript src=./static/js/app.721099b2f6b67e7c6383.js></script></body></html>
>>>>>>> jeshi
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.09574da6775db7db470394af645f0ad7.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.75679805cfd6269119a3.js></script><script type=text/javascript src=./static/js/vendor.5967fb6c1e3ff49ccff1.js></script><script type=text/javascript src=./static/js/app.7a8eaae9546a92493742.js></script></body></html>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment