From ae3855638dba0c927236c1a1b1a85d5b048c40e2 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期五, 18 四月 2025 10:31:08 +0800
Subject: [PATCH] 提交
---
pages/device/device.vue | 278 ++++++++++++-------------------------------------------
1 files changed, 62 insertions(+), 216 deletions(-)
diff --git a/pages/device/device.vue b/pages/device/device.vue
index 0aebad7..e76021f 100644
--- a/pages/device/device.vue
+++ b/pages/device/device.vue
@@ -15,61 +15,49 @@
<uni-card margin="10px" spacing="1px" v-for="(item,index) in msgList" :key="index"
@click="onClickProductionTask(item)">
<view class="flex">
+ <view class="flex-sub text-light bg-white padding-xs margin-xs radius">璁惧缂栧彿:</view>
+ <view
+ class="flex-sub bg-white padding-xs margin-xs text-bold text-blue radius text-right">
+ {{item.equipmentCode}}
+ </view>
+ </view>
+ <view class="flex">
<view class="flex-sub text-light bg-white padding-xs margin-xs radius">璁惧鍚嶇О:</view>
- <view class="flex-sub bg-white padding-xs margin-xs text-bold radius text-right">
- {{item.partName}}
- </view>
- </view>
- <view class="flex">
- <view class="flex-sub text-light bg-white padding-xs margin-xs radius">璁惧绫诲瀷:</view>
<view class="flex-sub bg-white padding-xs margin-xs radius text-right">
- {{item.partType}}
+ {{item.equipmentName}}
</view>
</view>
<view class="flex">
- <view class="flex-sub text-light bg-white padding-xs margin-xs radius">浣嶇疆::</view>
- <view class="flex-sub bg-white padding-xs margin-xs text-blue radius text-right">
- {{item.location}}
+ <view class="flex-sub text-light bg-white padding-xs margin-xs radius">缁翠慨鐘舵��::</view>
+ <view class="flex-sub bg-white padding-xs margin-xs text-orange radius text-right">
+ {{item.assetStatus_dictText}}
</view>
</view>
- <view class="flex">
- <view class="flex-sub text-light bg-white padding-xs margin-xs radius">鍒堕�犲晢::</view>
- <view class="flex-sub bg-white padding-xs margin-xs text-blue radius text-right">
- {{item.manufacturer}}
+ <!-- <view class="flex">
+ <view class="flex-sub text-light bg-white padding-xs margin-xs radius">淇濆吇鐘舵��::</view>
+ <view class="flex-sub bg-white padding-xs margin-xs text-orange radius text-right">
+ {{item.maintenanceStatus_dictText}}
</view>
</view>
<view class="flex">
- <view class="flex-sub text-light bg-white padding-xs margin-xs radius">鍨嬪彿:</view>
+ <view class="flex-sub text-light bg-white padding-xs margin-xs radius">浣跨敤杞﹂棿:</view>
<view class="flex-sub bg-white padding-xs margin-xs radius text-right">
- {{item.model}}
+ {{item.orgId_dictText}}
</view>
</view>
<view class="flex">
- <view class="flex-sub text-light bg-white padding-xs margin-xs radius">璐熻矗浜�:</view>
+ <view class="flex-sub text-light bg-white padding-xs margin-xs radius">璁惧绠＄悊鍛�:</view>
<view class="flex-sub bg-white padding-xs margin-xs radius text-right">
- {{item.assignee}}
+ {{item.equipmentManager_dictText}}
</view>
</view>
<view class="flex">
- <view class="flex-sub text-light bg-white padding-xs margin-xs radius">澶囨敞:</view>
- <view class="flex-sub bg-white padding-xs margin-xs radius text-right">
- {{item.remark}}
+ <view class="flex-sub text-light bg-white padding-xs margin-xs radius">璁惧鍒嗙被:</view>
+ <view class="flex-sub bg-white padding-xs margin-xs text-bold radius text-right">
+ {{item.equipmentCategory_dictText}}
</view>
- </view>
- <view class="flex">
- <view class="flex-sub text-light bg-white padding-xs margin-xs radius">鐘舵��:</view>
- <view
- class="flex-sub bg-white padding-xs margin-xs text-bold text-green radius text-right"
- v-if="item.status == '1'">
- 寰呭鐞�
- </view>
- <view
- class="flex-sub bg-white padding-xs margin-xs text-bold text-green radius text-right"
- v-if="item.status == '3'">
- 宸插畬鎴�
- </view>
- </view>
+ </view> -->
</uni-card>
</view>
@@ -93,7 +81,7 @@
NavBarColor: this.NavBarColor,
url: {
- stallList: "/mom/partTakeRollingDetail/list"
+ stallList: "/eam/equipment/list"
},
upOption: {
@@ -114,16 +102,7 @@
color: '#2979FF',
borderColor: '#2979FF'
},
- msgList: [{
- partName: "璁惧A",
- partType: "鏈嶅姟鍣�",
- location: "鏈烘埧",
- manufacturer: "鐏电",
- model: "ModelX",
- assignee: "寮犱笁",
- remark: "婕旂ず",
- status: 1
- }], //鍒楄〃鏁版嵁
+ msgList: [], //鍒楄〃鏁版嵁
announcement1: [],
msg1Count: 0,
msg2Count: 0,
@@ -163,101 +142,51 @@
* @param {Object} item
* 璇︽儏椤甸潰
*/
- // onClickProductionTask(item) {
- // let keyword = this.TabCur
- // uni.navigateTo({
- // url: '/pages/mes/om/workSheetOpToolingBorrowDeils/workSheetOpToolingBorrowDeils?keyword=' + keyword
- // })
+
+ onClickProductionTask(item) {
+ uni.navigateTo({
+ url: '/pages/device/deviceDeils/deviceDeils?item=' + encodeURIComponent(JSON.stringify(item))
+ })
+ },
+ upCallback(page) {
+ this.$http.get(this.url.stallList, {
+ params: {
+ pageNo: page.num,
+ pageSize: page.size,
+ order: 'asc',
+ column: 'createTime',
- // },
+ },
+ }).then(res => {
+ this.announcement1 = res.data.result.records
+ this.mescroll.endSuccess(this.announcement1.length);
+ console.log("url", res)
+ //璁剧疆鍒楄〃鏁版嵁
+ if (res.data.success) {
+ console.log("res", res.data)
+ this.msg1Count = res.data.result.total
+ this.msg1Title = "閫氱煡(" + res.data.result.total + ")";
+ for (let annItem of this.announcement1) {
+ this.msgList.push(annItem)
+ }
+ }
+ if (page.num == 1) {
+ this.msgList = []; //濡傛灉鏄涓�椤甸渶鎵嬪姩鍒剁┖鍒楄〃
+ this.msgList = this.msgList.concat(this.announcement1); //杩藉姞鏂版暟鎹�
+ }
-
-
-
-
- // upCallback(page) {
- // let keyword = this.TabCur
- // if (keyword == 0) {
-
- // this.$http.get(this.url.stallList, {
- // params: {
- // pageNo: page.num,
- // pageSize: page.size,
- // order: 'asc',
- // column: 'createTime',
- // status: 1
- // },
-
- // }).then(res => {
- // this.announcement1 = res.data.result.records
- // this.mescroll.endSuccess(this.announcement1.length);
- // console.log("url", res)
- // //璁剧疆鍒楄〃鏁版嵁
- // if (res.data.success) {
- // console.log("res", res.data)
- // this.msg1Count = res.data.result.total
- // this.msg1Title = "閫氱煡(" + res.data.result.total + ")";
- // for (let annItem of this.announcement1) {
- // this.msgList.push(annItem)
- // }
- // }
- // if (page.num == 1) {
- // this.msgList = []; //濡傛灉鏄涓�椤甸渶鎵嬪姩鍒剁┖鍒楄〃
- // this.msgList = this.msgList.concat(this.announcement1); //杩藉姞鏂版暟鎹�
- // }
-
- // }).catch(() => {
- // //鑱旂綉澶辫触, 缁撴潫鍔犺浇
- // this.mescroll.endErr();
- // })
- // } else if (keyword == 1) {
-
- // this.$http.get(this.url.stallList, {
- // params: {
- // pageNo: page.num,
- // pageSize: page.size,
- // order: 'desc',
- // status: 3,
- // column: 'createTime'
- // },
-
- // }).then(res => {
- // this.announcement1 = res.data.result.records
- // this.mescroll.endSuccess(this.announcement1.length);
- // console.log("url", res)
- // //璁剧疆鍒楄〃鏁版嵁
- // if (res.data.success) {
- // console.log("res", res.data)
- // this.msg2Count = res.data.result.total
- // this.msg1Title = "閫氱煡(" + res.data.result.total + ")";
- // for (let annItem of this.announcement1) {
- // this.msgList.push(annItem)
- // }
- // }
- // if (page.num == 1) {
- // this.msgList = []; //濡傛灉鏄涓�椤甸渶鎵嬪姩鍒剁┖鍒楄〃
- // this.msgList = this.msgList.concat(this.announcement1); //杩藉姞鏂版暟鎹�
- // }
-
- // }).catch(() => {
- // //鑱旂綉澶辫触, 缁撴潫鍔犺浇
- // this.mescroll.endErr();
- // })
-
- // }
-
-
- // },
+ }).catch(() => {
+ //鑱旂綉澶辫触, 缁撴潫鍔犺浇
+ this.mescroll.endErr();
+ })
+ },
/* 妫�绱� */
getSera(res) {
- this.$refs.popup.close();
- let keyword = this.TabCur
this.msgList = [];
-
if (keyword == 0) {
this.$http.get(this.url.stallList, {
params: {
@@ -265,9 +194,7 @@
pageSize: 999,
order: "desc",
column: "createTime",
- num: '*' + this.formData.num + '*',
- partNumNameModel: '*' + this.formData.partNumNameModel + '*',
- status: 'published'
+ equipmentCode: res
}
}).then(res => {
//鑱旂綉鎴愬姛鐨勫洖璋�,闅愯棌涓嬫媺鍒锋柊鍜屼笂鎷夊姞杞界殑鐘舵��;
@@ -293,89 +220,8 @@
//鑱旂綉澶辫触, 缁撴潫鍔犺浇
this.mescroll.endErr();
})
-
- } else if (keyword == 1) {
- this.$http.get(this.url.stallList, {
- params: {
- pageNo: 1,
- pageSize: 999,
- order: "desc",
- column: "createTime",
- status: 'training',
- num: '*' + this.formData.num + '*',
- partNumNameModel: '*' + this.formData.partNumNameModel + '*'
-
- }
- }).then(res => {
- //鑱旂綉鎴愬姛鐨勫洖璋�,闅愯棌涓嬫媺鍒锋柊鍜屼笂鎷夊姞杞界殑鐘舵��;
-
- this.announcement1 = res.data.result.records
- this.mescroll.endSuccess(this.announcement1.length);
- console.log("url", res)
- //璁剧疆鍒楄〃鏁版嵁
- if (res.data.success) {
- console.log("res", res.data)
- this.msg1Count = res.data.result.total
- this.msg2Title = "閫氱煡(" + res.data.result.total + ")";
- for (let annItem of this.announcement1) {
- this.msgList.push(annItem)
- }
- }
- if (page.num == 1) {
- this.msgList = []; //濡傛灉鏄涓�椤甸渶鎵嬪姩鍒剁┖鍒楄〃
- this.msgList = this.msgList.concat(this.announcement1); //杩藉姞鏂版暟鎹�
- }
-
- }).catch(() => {
- //鑱旂綉澶辫触, 缁撴潫鍔犺浇
- this.mescroll.endErr();
- })
-
- } else if (keyword == 2) {
- this.$http.get(this.url.stallList, {
- params: {
- pageNo: 1,
- pageSize: 999,
- order: "desc",
- column: "createTime",
- status: 'completed',
- num: '*' + this.formData.num + '*',
- partNumNameModel: '*' + this.formData.partNumNameModel + '*'
-
- }
- }).then(res => {
- //鑱旂綉鎴愬姛鐨勫洖璋�,闅愯棌涓嬫媺鍒锋柊鍜屼笂鎷夊姞杞界殑鐘舵��;
-
- this.announcement1 = res.data.result.records
- this.mescroll.endSuccess(this.announcement1.length);
- console.log("url", res)
- //璁剧疆鍒楄〃鏁版嵁
- if (res.data.success) {
- console.log("res", res.data)
- this.msg3Count = res.data.result.total
- this.msg1Title = "閫氱煡(" + res.data.result.total + ")";
- for (let annItem of this.announcement1) {
- this.msgList.push(annItem)
- }
- }
- if (page.num == 1) {
- this.msgList = []; //濡傛灉鏄涓�椤甸渶鎵嬪姩鍒剁┖鍒楄〃
- this.msgList = this.msgList.concat(this.announcement1); //杩藉姞鏂版暟鎹�
- }
-
- }).catch(() => {
- //鑱旂綉澶辫触, 缁撴潫鍔犺浇
- this.mescroll.endErr();
- })
-
}
-
-
-
-
-
},
-
mescrollInit(mescroll) {
console.log('mescrollInit')
--
Gitblit v1.9.3