From e8dfe17e4afe9c065b25e2f8e5025b37cee5c4e1 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期六, 31 十月 2026 11:42:49 +0800
Subject: [PATCH] 康意修改
---
src/config/company.ts | 4
src/api/equipment.ts | 4
src/pages/mes/dv/machinery/index.vue | 2
src/manifest.json | 164 ++++++++++++++++++++--------------------
src/pages/mes/dv/machinery/form.vue | 10 ++
5 files changed, 100 insertions(+), 84 deletions(-)
diff --git a/src/api/equipment.ts b/src/api/equipment.ts
index 0b2a0e7..cd91181 100644
--- a/src/api/equipment.ts
+++ b/src/api/equipment.ts
@@ -29,6 +29,8 @@
machineryTypeName?: string;
workshopId?: number;
workshopName?: string;
+ collectDeviceCode?: string;
+ collectEnabled?: boolean;
status?: number;
lastMaintenTime?: string;
lastCheckTime?: string;
@@ -347,7 +349,7 @@
return request<Workshop[]>('/mes/md-workshop/simple-list', { header: authHeader(accessToken) });
}
-export function getMachineryPage(accessToken: string, params: { pageNo: number; pageSize: number; code?: string; name?: string; workshopId?: number; status?: number; machineryTypeId?: number }) {
+export function getMachineryPage(accessToken: string, params: { pageNo: number; pageSize: number; code?: string; name?: string; workshopId?: number; status?: number; machineryTypeId?: number; collectDeviceCode?: string; collectEnabled?: boolean }) {
return request<PageResult<Machinery>>(`/mes/dv/machinery/page${toQuery(params)}`, { header: authHeader(accessToken) });
}
diff --git a/src/config/company.ts b/src/config/company.ts
index 579960e..a7d9d69 100644
--- a/src/config/company.ts
+++ b/src/config/company.ts
@@ -49,7 +49,7 @@
key: "kangyi",
name: "搴锋剰鏅鸿兘",
homeVariant: "kangyi-intelligent",
- apiBaseUrl: "http://101.245.92.159:9006/admin-api",
+ apiBaseUrl: "http://101.245.92.159:9008/admin-api",
webBaseUrl: "http://101.245.92.159:9008",
},
lanyu: {
@@ -83,6 +83,6 @@
};
/** 鈽� 鎵撳寘寮�鍏筹細鍙敼杩欎竴琛� */
-export const ACTIVE_COMPANY: CompanyCode = "changhui";
+export const ACTIVE_COMPANY: CompanyCode = "kangyi";
export const APP_COMPANY: AppCompanyConfig = COMPANY_PROFILES[ACTIVE_COMPANY];
diff --git a/src/manifest.json b/src/manifest.json
index 025e50f..ec2fcf7 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,36 +1,36 @@
{
- "name" : "鏂扮枂闀胯緣鐢靛姏",
- "appid" : "__UNI__59EDE0D",
- "description" : "鏂扮枂闀胯緣鐢靛姏",
- "versionName" : "1.0.0",
- "versionCode" : 100,
- "transformPx" : false,
- "app-plus" : {
- "compatible" : {
- "usingComponents" : true,
- "ignoreVersion" : true
+ "name": "搴锋剰鏅鸿兘",
+ "appid": "__UNI__2CEB659",
+ "description": "搴锋剰鏅鸿兘",
+ "versionName": "1.0.0",
+ "versionCode": 100,
+ "transformPx": false,
+ "app-plus": {
+ "compatible": {
+ "usingComponents": true,
+ "ignoreVersion": true
},
- "usingComponents" : true,
- "nvueStyleCompiler" : "uni-app",
- "compilerVersion" : 3,
- "modules" : {
- "Camera" : {},
- "Barcode" : {},
- "Geolocation" : {}
+ "usingComponents": true,
+ "nvueStyleCompiler": "uni-app",
+ "compilerVersion": 3,
+ "modules": {
+ "Camera": {},
+ "Barcode": {},
+ "Geolocation": {}
},
- "splashscreen" : {
- "alwaysShowBeforeRender" : true,
- "waiting" : true,
- "autoclose" : true,
- "delay" : 0
+ "splashscreen": {
+ "alwaysShowBeforeRender": true,
+ "waiting": true,
+ "autoclose": true,
+ "delay": 0
},
- "distribute" : {
- "android" : {
- "usesCleartextTraffic" : true,
- "permissionPhoneState" : {
- "request" : "none"
+ "distribute": {
+ "android": {
+ "usesCleartextTraffic": true,
+ "permissionPhoneState": {
+ "request": "none"
},
- "permissions" : [
+ "permissions": [
"<uses-permission android:name=\"android.permission.INTERNET\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
@@ -49,74 +49,76 @@
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
]
},
- "icons" : {
- "android" : {
- "hdpi" : "unpackage/res/icons/72x72.png",
- "xhdpi" : "unpackage/res/icons/96x96.png",
- "xxhdpi" : "unpackage/res/icons/144x144.png",
- "xxxhdpi" : "unpackage/res/icons/192x192.png"
+ "icons": {
+ "android": {
+ "hdpi": "unpackage/res/icons/72x72.png",
+ "xhdpi": "unpackage/res/icons/96x96.png",
+ "xxhdpi": "unpackage/res/icons/144x144.png",
+ "xxxhdpi": "unpackage/res/icons/192x192.png"
},
- "ios" : {
- "appstore" : "unpackage/res/icons/1024x1024.png",
- "ipad" : {
- "app" : "unpackage/res/icons/76x76.png",
- "app@2x" : "unpackage/res/icons/152x152.png",
- "notification" : "unpackage/res/icons/20x20.png",
- "notification@2x" : "unpackage/res/icons/40x40.png",
- "proapp@2x" : "unpackage/res/icons/167x167.png",
- "settings" : "unpackage/res/icons/29x29.png",
- "settings@2x" : "unpackage/res/icons/58x58.png",
- "spotlight" : "unpackage/res/icons/40x40.png",
- "spotlight@2x" : "unpackage/res/icons/80x80.png"
+ "ios": {
+ "appstore": "unpackage/res/icons/1024x1024.png",
+ "ipad": {
+ "app": "unpackage/res/icons/76x76.png",
+ "app@2x": "unpackage/res/icons/152x152.png",
+ "notification": "unpackage/res/icons/20x20.png",
+ "notification@2x": "unpackage/res/icons/40x40.png",
+ "proapp@2x": "unpackage/res/icons/167x167.png",
+ "settings": "unpackage/res/icons/29x29.png",
+ "settings@2x": "unpackage/res/icons/58x58.png",
+ "spotlight": "unpackage/res/icons/40x40.png",
+ "spotlight@2x": "unpackage/res/icons/80x80.png"
},
- "iphone" : {
- "app@2x" : "unpackage/res/icons/120x120.png",
- "app@3x" : "unpackage/res/icons/180x180.png",
- "notification@2x" : "unpackage/res/icons/40x40.png",
- "notification@3x" : "unpackage/res/icons/60x60.png",
- "settings@2x" : "unpackage/res/icons/58x58.png",
- "settings@3x" : "unpackage/res/icons/87x87.png",
- "spotlight@2x" : "unpackage/res/icons/80x80.png",
- "spotlight@3x" : "unpackage/res/icons/120x120.png"
+ "iphone": {
+ "app@2x": "unpackage/res/icons/120x120.png",
+ "app@3x": "unpackage/res/icons/180x180.png",
+ "notification@2x": "unpackage/res/icons/40x40.png",
+ "notification@3x": "unpackage/res/icons/60x60.png",
+ "settings@2x": "unpackage/res/icons/58x58.png",
+ "settings@3x": "unpackage/res/icons/87x87.png",
+ "spotlight@2x": "unpackage/res/icons/80x80.png",
+ "spotlight@3x": "unpackage/res/icons/120x120.png"
}
}
},
- "ios" : {
- "dSYMs" : false,
- "privacyDescription" : {
- "NSLocationWhenInUseUsageDescription" : "鐢ㄤ簬鑰冨嫟鎵撳崱鏃剁‘璁ゆ偍鏄惁浣嶄簬瑙勫畾鐨勬墦鍗¤寖鍥村唴"
+ "ios": {
+ "dSYMs": false,
+ "privacyDescription": {
+ "NSLocationWhenInUseUsageDescription": "鐢ㄤ簬鑰冨嫟鎵撳崱鏃剁‘璁ゆ偍鏄惁浣嶄簬瑙勫畾鐨勬墦鍗¤寖鍥村唴"
}
}
}
},
- "quickapp" : {},
- "mp-weixin" : {
- "appid" : "wx0faf8fbc5a763dc5",
- "permission" : {
- "scope.userLocation" : {
- "desc" : "鎮ㄧ殑浣嶇疆淇℃伅灏嗙敤浜庤�冨嫟鎵撳崱鑼冨洿鏍￠獙"
+ "quickapp": {},
+ "mp-weixin": {
+ "appid": "wx0faf8fbc5a763dc5",
+ "permission": {
+ "scope.userLocation": {
+ "desc": "鎮ㄧ殑浣嶇疆淇℃伅灏嗙敤浜庤�冨嫟鎵撳崱鑼冨洿鏍￠獙"
}
},
- "requiredPrivateInfos" : [ "getLocation" ],
- "setting" : {
- "urlCheck" : false
+ "requiredPrivateInfos": [
+ "getLocation"
+ ],
+ "setting": {
+ "urlCheck": false
},
- "usingComponents" : true
+ "usingComponents": true
},
- "mp-alipay" : {
- "usingComponents" : true
+ "mp-alipay": {
+ "usingComponents": true
},
- "mp-baidu" : {
- "usingComponents" : true
+ "mp-baidu": {
+ "usingComponents": true
},
- "mp-toutiao" : {
- "usingComponents" : true
+ "mp-toutiao": {
+ "usingComponents": true
},
- "uniStatistics" : {
- "enable" : false
+ "uniStatistics": {
+ "enable": false
},
- "vueVersion" : "3",
- "h5" : {
- "title" : "MOM 鏅洪�犲崗鍚�"
+ "vueVersion": "3",
+ "h5": {
+ "title": "MOM 鏅洪�犲崗鍚�"
}
-}
+}
\ No newline at end of file
diff --git a/src/pages/mes/dv/machinery/form.vue b/src/pages/mes/dv/machinery/form.vue
index 68d8061..869d1ea 100644
--- a/src/pages/mes/dv/machinery/form.vue
+++ b/src/pages/mes/dv/machinery/form.vue
@@ -51,6 +51,8 @@
brand: "",
machineryTypeId: undefined,
workshopId: undefined,
+ collectDeviceCode: "",
+ collectEnabled: false,
status: 1,
productionEfficiency: undefined,
conveyorBelt: undefined,
@@ -163,6 +165,8 @@
brand: form.brand?.trim(),
specification: form.specification?.trim(),
machineryTypeId: numberValue(form.machineryTypeId),
+ collectDeviceCode: form.collectDeviceCode?.trim() || undefined,
+ collectEnabled: form.collectEnabled === true,
workshopId: numberValue(form.workshopId),
status: Number(form.status || 1),
productionEfficiency: numberValue(form.productionEfficiency),
@@ -230,6 +234,12 @@
</picker>
<text v-else class="value">{{ statusText() }}</text>
</view>
+ <view class="field"><text>鏁伴噰璁惧缂栧彿</text><input v-model="form.collectDeviceCode" :disabled="readonly" placeholder="璇疯緭鍏ョ紪鍙凤紝濡� C01" /></view>
+ <view class="field">
+ <text>鍚敤鏁伴噰</text>
+ <switch v-if="!readonly" :checked="form.collectEnabled === true" color="#1677ff" @change="form.collectEnabled = $event.detail.value" />
+ <text v-else class="value">{{ form.collectEnabled ? '鏄�' : '鍚�' }}</text>
+ </view>
<view class="field"><text>鐢熶骇鏁堢巼</text><input v-model="form.productionEfficiency" :disabled="readonly" type="digit" placeholder="璇疯緭鍏ョ敓浜ф晥鐜�(姣忓皬鏃�)" /></view>
<view class="field"><text>浼犻�佸饱甯�</text><input v-model="form.conveyorBelt" :disabled="readonly" type="number" placeholder="璇疯緭鍏ヤ紶閫佸饱甯︽暟閲�" /></view>
<view class="field"><text>瑙勬牸鍨嬪彿</text><input v-model="form.specification" :disabled="readonly" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" /></view>
diff --git a/src/pages/mes/dv/machinery/index.vue b/src/pages/mes/dv/machinery/index.vue
index fe3ecf3..a4ad468 100644
--- a/src/pages/mes/dv/machinery/index.vue
+++ b/src/pages/mes/dv/machinery/index.vue
@@ -160,6 +160,8 @@
<view class="grid">
<text>鍝佺墝锛歿{ item.brand || '鈥�' }}</text>
<text>瑙勬牸鍨嬪彿锛歿{ item.specification || '鈥�' }}</text>
+ <text>鏁伴噰璁惧缂栧彿锛歿{ item.collectDeviceCode || '鈥�' }}</text>
+ <text>鍚敤鏁伴噰锛歿{ item.collectEnabled ? '鏄�' : '鍚�' }}</text>
<text>鎵�灞炶溅闂达細{{ item.workshopName || '鈥�' }}</text>
<text>鐢熶骇鏁堢巼(/h)锛歿{ numberText(item.productionEfficiency) }}</text>
<text>浼犻�佸饱甯︼細{{ numberText(item.conveyorBelt) }}</text>
--
Gitblit v1.9.3