康意修改

zhangwencui

8 天以前 e8dfe17e4afe9c065b25e2f8e5025b37cee5c4e1

康意修改

 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) });
}


 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];

 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 智造协同"
    }
}
}

 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>

 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>