From ac42a9af5a94e2625a519a21c54518ec9142f7b5 Mon Sep 17 00:00:00 2001 From: mo-bai <1873032855@qq.com> Date: Wed, 30 Mar 2022 17:00:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=B9=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 38 +- apis/deviceApi.js | 81 ++ apis/factoryApi.js | 11 + components/qn-easyinput/qn-easyinput.vue | 2 +- components/qn-select/qn-select.vue | 104 ++- enums/index.js | 38 +- pages.json | 31 + pages/complete-info/EnterpriseForm.vue | 92 ++- pages/complete-info/index.vue | 30 +- pages/device-info/index.vue | 177 +++++ pages/device-operation/index.vue | 409 ++++++++++ pages/device-production-detail/index.vue | 471 ++++++++++++ pages/digital-workshops/EmptyData.vue | 70 ++ pages/digital-workshops/index.vue | 712 +++++++++++++++++- pages/page-view/index.vue | 77 ++ pages/promotion/Banner.vue | 128 ++++ pages/promotion/index.vue | 407 ++++++++++ static/imgs/.DS_Store | Bin 6148 -> 6148 bytes static/imgs/digital-workshops/add-icon.png | Bin 0 -> 2179 bytes static/imgs/digital-workshops/clock.png | Bin 0 -> 10063 bytes .../digital-workshops/device-detail-bg.png | Bin 0 -> 5109 bytes .../digital-workshops/down-arrow-icon.png | Bin 0 -> 575 bytes static/imgs/digital-workshops/gear.png | Bin 0 -> 9560 bytes static/imgs/digital-workshops/no-camera.png | Bin 0 -> 11077 bytes static/imgs/digital-workshops/toggle-icon.png | Bin 0 -> 1271 bytes static/imgs/general/camera-bg.png | Bin 0 -> 6669 bytes static/imgs/general/line-share-icon.png | Bin 0 -> 4272 bytes static/imgs/general/select-icon.png | Bin 0 -> 2146 bytes static/imgs/general/selected-icon.png | Bin 0 -> 1900 bytes static/imgs/general/session-share-icon.png | Bin 0 -> 9278 bytes static/imgs/promotion/video-close.png | Bin 0 -> 1932 bytes utils/hook.js | 16 +- 32 files changed, 2816 insertions(+), 78 deletions(-) create mode 100644 apis/deviceApi.js create mode 100644 pages/device-info/index.vue create mode 100644 pages/device-operation/index.vue create mode 100644 pages/device-production-detail/index.vue create mode 100644 pages/digital-workshops/EmptyData.vue create mode 100644 pages/page-view/index.vue create mode 100644 pages/promotion/Banner.vue create mode 100644 static/imgs/digital-workshops/add-icon.png create mode 100644 static/imgs/digital-workshops/clock.png create mode 100644 static/imgs/digital-workshops/device-detail-bg.png create mode 100644 static/imgs/digital-workshops/down-arrow-icon.png create mode 100644 static/imgs/digital-workshops/gear.png create mode 100644 static/imgs/digital-workshops/no-camera.png create mode 100644 static/imgs/digital-workshops/toggle-icon.png create mode 100644 static/imgs/general/camera-bg.png create mode 100644 static/imgs/general/line-share-icon.png create mode 100644 static/imgs/general/select-icon.png create mode 100644 static/imgs/general/selected-icon.png create mode 100644 static/imgs/general/session-share-icon.png create mode 100644 static/imgs/promotion/video-close.png diff --git a/App.vue b/App.vue index 53daebe..3d74661 100644 --- a/App.vue +++ b/App.vue @@ -17,25 +17,25 @@ export default { //#ifdef APP-PLUS checkUpdate().then((version) => { let curVersion = plus.runtime.version - if (version != curVersion) { - let client = uni.getSystemInfoSync().platform - if (client === 'ios') { - uni.showModal({ - title: '更新提示', - content: '有新的版本更新,请前往App Store更新' - }) - } else { - uni.showModal({ - title: '更新提示', - content: '有新版本,请前往更新', - success: (res) => { - if (res.confirm) { - // plus.runtime.openURL(`https://www.pgyer.com/ST8i`) - } - } - }) - } - } + // if (version != curVersion) { + // let client = uni.getSystemInfoSync().platform + // if (client === 'ios') { + // uni.showModal({ + // title: '更新提示', + // content: '有新的版本更新,请前往App Store更新' + // }) + // } else { + // uni.showModal({ + // title: '更新提示', + // content: '有新版本,请前往更新', + // success: (res) => { + // if (res.confirm) { + // // plus.runtime.openURL(`https://www.pgyer.com/ST8i`) + // } + // } + // }) + // } + // } }) //#endif }, diff --git a/apis/deviceApi.js b/apis/deviceApi.js new file mode 100644 index 0000000..20a3bca --- /dev/null +++ b/apis/deviceApi.js @@ -0,0 +1,81 @@ +import http from '../utils/http/index.js' + +/** + * 获取设备类型 + */ +export function getDeviceTypeList(data = {}) { + return http.get({ + url: '/base-paper-trading/get/mechanical-equipment/type', + data + }) +} + +/** + * 获取生产工艺列表 + */ +export function getTechnicsList(data = {}) { + return http.get({ + url: '/base-paper-trading/get/technics/type', + data + }) +} + +/** + * 添加或修改设备 + */ +export function changeDevice(data = {}) { + return http.post({ + url: '/base-paper-trading/save/mechanical-equipment', + data + }) +} + +/** + * 获取设备列表 + */ +export function getDeviceList(data = {}) { + return http.get({ + url: '/base-paper-trading/get/mechanical-equipment/list', + data + }) +} + +/** + * 印包客监控台获取设备类型统计数据 + */ +export function getEquipmentStatistics(data = {}) { + return http.get({ + url: '/base-paper-trading/get/mechanical-equipment/type-statistics/list', + data + }) +} + +/** + * 设备生产详情分享 + */ +export function makeDeviceShare(data = {}) { + return http.post({ + url: '/base-paper-trading/create/mechanical-equipment/share', + data + }) +} + +/** + * 推广界面获取设备列表 + */ +export function getEquipmentList(data = {}) { + return http.get({ + url: '/base-paper-trading/get/mechanical-equipment/list', + data + }) +} + +/** + * 获取设备信息 + */ +export function getEquipmentInfo(data = {}) { + return http.get({ + url: `/base-paper-trading/get/mechanical-equipment/${data.id}`, + data + }) +} diff --git a/apis/factoryApi.js b/apis/factoryApi.js index d62e7e6..854962d 100644 --- a/apis/factoryApi.js +++ b/apis/factoryApi.js @@ -21,3 +21,14 @@ export function savePersonalInfo(data = {}) { data }) } + +/** + * 查询工厂信息 + * + */ +export function getFactoryInfo(data = {}) { + return http.get({ + url: `/yyt-uec/get/factory/information/${data.id}`, + data + }) +} diff --git a/components/qn-easyinput/qn-easyinput.vue b/components/qn-easyinput/qn-easyinput.vue index f2aa47a..984486c 100644 --- a/components/qn-easyinput/qn-easyinput.vue +++ b/components/qn-easyinput/qn-easyinput.vue @@ -376,7 +376,7 @@ $uni-border-1: #dcdfe6 !default; width: 100%; display: flex; box-sizing: border-box; - // min-height: 36px; + min-height: 21px; height: 100%; /* #endif */ flex-direction: row; diff --git a/components/qn-select/qn-select.vue b/components/qn-select/qn-select.vue index 04d4695..41b45bf 100644 --- a/components/qn-select/qn-select.vue +++ b/components/qn-select/qn-select.vue @@ -1,14 +1,14 @@