diff --git a/components/lm-combox/lm-combox.vue b/components/lm-combox/lm-combox.vue new file mode 100644 index 0000000..0f8509d --- /dev/null +++ b/components/lm-combox/lm-combox.vue @@ -0,0 +1,241 @@ + + + + + \ No newline at end of file diff --git a/config/index.js b/config/index.js index d2c90c8..4c21d77 100644 --- a/config/index.js +++ b/config/index.js @@ -15,8 +15,8 @@ export default { /** * @description api请求基础路径 */ - // local: "http://192.168.0.103:8891", - local: "http://61.184.202.72:8891", + // local: "http://192.168.61.133/tos", + local: "http://192.168.61.133/tos", imgSrc: "http://116.205.142.169/HtRtosResource/assets/", mapkey: "FUFBZ-KBIWW-P63RR-RR4W3-BNV4H-T6BGX" -} +} \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index 9f8c8bd..6911e18 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -9,6 +9,7 @@ + @@ -85,6 +86,7 @@ id: '6', name: '...' }] + } }, onLoad() { @@ -100,12 +102,6 @@ url: '/pages/index/instruct' }) }, - input_json(e) { - console.log(e) // 选项一 - }, - select_json(e) { - console.log(e) // {id: '1',name: '选项一'} - } } }; diff --git a/pages/shipWork/index.vue b/pages/shipWork/index.vue index 725d44c..269f862 100644 --- a/pages/shipWork/index.vue +++ b/pages/shipWork/index.vue @@ -6,50 +6,55 @@ - + - - - + + + + 搜索 - 海王星领袖 + {{item.spmName}} - - 进口航次: 735546 + 进口航次: {{item.inVvyName}} - 贸易类型: 内贸 + 进口贸易类型: {{item.inTradeTypeName}} - 出口航次: 555546 + 出口航次: {{item.outVvyName}} - 贸易类型: 外贸 + 出口贸易类型: {{item.outTradeTypeName}} - 计划泊位: 一泊位 + 计划泊位: {{item.planBerthageName}} - 实际泊位: 一泊位 + 实际泊位: {{item.actualBerthageName}} - + + {{item.uploadStatusDesc}} + {{item.uploadTime}} + + - + 下载 - + 上传 - @@ -88,22 +92,13 @@ export default { data() { return { - value: 0, - value1: '', - range: [{ - value: 0, - text: "一号港" - }, - { - value: 1, - text: "二号港" - }, - { - value: 2, - text: "不冻港" - }, - ], - ltemList: [1, 2, 1, 1, 2, 1, 1, 1, 1], + // 港口 + pamValue: "", + pamList: [], + // 船名航次 + shipValue: '', + shipList: [], + ltemList: [], } }, onLoad() { @@ -111,12 +106,101 @@ }, components: { SideBar, - HeadInfo + HeadInfo, + }, + mounted() { + this.getPam(); + this.getShip(); }, methods: { - change(e) { - console.log("e:", e); + // 获取船的数据 + initData() { + uni.request({ + url: this.$local + '/api/shipOperate/select?pamId=' + this.pamValue + "&vvyId=" + this + .shipValue, + header: { + 'Content-Type': 'application/json' //自定义请求头信息 + }, + method: 'GET', //请求方式，必须为大写 + success: (res) => { + console.log('接口返回------', res); + if (res.statusCode === 200) { + this.ltemList = res.data.data.records + } + } + }) }, + // 获取港区下拉数据 + getPam() { + uni.request({ + url: this.$local + '/api/shipOperate/queryPortArea', + header: { + 'Content-Type': 'application/json' //自定义请求头信息 + }, + method: 'GET', //请求方式，必须为大写 + success: (res) => { + console.log('接口返回------', res); + if (res.statusCode === 200) { + let arr = res.data.data; + arr.forEach((v, index) => { + this.pamList.push({ + text: v.pamName, + value: v.pamId + }) + }) + } + } + }) + }, + // 获取船名航次下拉数据 + getShip() { + uni.request({ + url: this.$local + '/api/shipOperate/queryShipmentVoyageData?key=阳', + header: { + 'Content-Type': 'application/json' //自定义请求头信息 + }, + method: 'GET', //请求方式，必须为大写 + success: (res) => { + console.log('接口返回------', res); + if (res.statusCode === 200) { + // this.shipList = res.data.data + let arr = res.data.data; + arr.forEach((v, index) => { + this.shipList.push({ + text: v.spmName, + value: v.vvyId + }) + }) + } + } + }) + }, + // 港区下拉 + pamChange(event) {}, + // 船名航次下拉 + shipChange(e) {}, + // 点击搜索 + search() { + this.initData() + }, + // 点击下载 + download(item) { + let ids = [item.outVvyName, item.inVvyName] + console.log(ids) + uni.request({ + url: this.$local + '/api/shipOperate/download?vvyIds=' + ids, + header: { + 'Content-Type': 'application/json' //自定义请求头信息 + }, + method: 'GET', //请求方式，必须为大写 + success: (res) => { + console.log('接口返回------', res); + if (res.statusCode === 200) {} + } + }) + }, + // 点击上传 + upload() {}, toGo() { uni.navigateTo({ url: `/pages/shipWork/documentList` @@ -126,20 +210,23 @@ }; - +======= + } + for (let i in styles) { + classles += `${i}:${styles[i]};` + } + return classles + }, + setStyleIconText(item) { + let styles = {} + let classles = '' + if (this.selectedColor) { + let selectedColor = this.selectedColor?this.selectedColor:'#2979ff' + if (this.mode === 'tag') { + styles.color = item.selected?(this.selectedTextColor?this.selectedTextColor:'#fff'):'#666' + } else { + styles.color = item.selected?(this.selectedTextColor?this.selectedTextColor:selectedColor):'#666' + } + if(!item.selected && item.disabled){ + styles.color = '#999' + } + } + for (let i in styles) { + classles += `${i}:${styles[i]};` + } + return classles + }, + setStyleRightIcon(item) { + let styles = {} + let classles = '' + if (this.mode === 'list') { + styles['border-color'] = item.selected?this.styles.selectedColor:'#DCDFE6' + } + for (let i in styles) { + classles += `${i}:${styles[i]};` + } + + return classles + } + } + } + + + +>>>>>>> cf4cde6399c3c847ec80ef42bece70d7d39de0b1