Commit 0ff98e92 authored by 528360026@qq.com's avatar 528360026@qq.com

修复横屏样式错乱问题

parent 1706f442
...@@ -23,6 +23,7 @@ const config = { ...@@ -23,6 +23,7 @@ const config = {
// 设置后台接口服务的基础地址 // 设置后台接口服务的基础地址
//config.baseUrl = 'http://localhost:8080'; //config.baseUrl = 'http://localhost:8080';
//config.baseUrl = "http://101.43.244.58:8080/"; //config.baseUrl = "http://101.43.244.58:8080/";
config.baseUrl = "/api"; //config.baseUrl = "/api";
config.baseUrl = "http://101.200.162.168:8080";
export default config; export default config;
\ No newline at end of file
import Vue from 'vue' import Vue from 'vue'
import { mergeRecursive } from "@/utils/ruoyi"; import {
mergeRecursive
} from "@/utils/ruoyi";
import DictMeta from './DictMeta' import DictMeta from './DictMeta'
import DictData from './DictData' import DictData from './DictData'
...@@ -22,7 +24,9 @@ export default class Dict { ...@@ -22,7 +24,9 @@ export default class Dict {
init(options) { init(options) {
if (options instanceof Array) { if (options instanceof Array) {
options = { types: options } options = {
types: options
}
} }
const opts = mergeRecursive(DEFAULT_DICT_OPTIONS, options) const opts = mergeRecursive(DEFAULT_DICT_OPTIONS, options)
if (opts.types === undefined) { if (opts.types === undefined) {
...@@ -66,10 +70,13 @@ function loadDict(dict, dictMeta) { ...@@ -66,10 +70,13 @@ function loadDict(dict, dictMeta) {
.then(response => { .then(response => {
const type = dictMeta.type const type = dictMeta.type
let dicts = dictMeta.responseConverter(response, dictMeta) let dicts = dictMeta.responseConverter(response, dictMeta)
// #ifdef H5
if (!(dicts instanceof Array)) { if (!(dicts instanceof Array)) {
console.error('the return of responseConverter must be Array.<DictData>') console.error('the return of responseConverter must be Array.<DictData>')
dicts = [] dicts = []
} else if (dicts.filter(d => d instanceof DictData).length !== dicts.length) { } else
// #endif
if (dicts.filter(d => d instanceof DictData).length !== dicts.length) {
console.error('the type of elements in dicts must be DictData') console.error('the type of elements in dicts must be DictData')
dicts = [] dicts = []
} }
......
import { mergeRecursive } from "@/utils/ruoyi"; import {
mergeRecursive
} from "@/utils/ruoyi";
import DictOptions from './DictOptions' import DictOptions from './DictOptions'
/** /**
...@@ -25,7 +27,7 @@ export default class DictMeta { ...@@ -25,7 +27,7 @@ export default class DictMeta {
* @param {Object} options * @param {Object} options
* @returns {DictMeta} * @returns {DictMeta}
*/ */
DictMeta.parse= function(options) { DictMeta.parse = function(options) {
let opts = null let opts = null
if (typeof options === 'string') { if (typeof options === 'string') {
opts = DictOptions.metas[options] || {} opts = DictOptions.metas[options] || {}
......
{ {
"name" : "ktg-mes-pad", "name" : "ktg-mes-pad",
"appid" : "__UNI__86F3F47", "appid" : "__UNI__5750C3E",
"description" : "MES-PAD", "description" : "MES-PAD",
"versionName" : "1.0.0", "versionName" : "1.0.0",
"versionCode" : "100", "versionCode" : "100",
......
<template> <template>
<view class="common-container"> <view class="common-container">
<view class="header"> <view class="header">
<image mode="widthFix" class="header-logo" src="@/static/logo.png"></image> <image mode="widthFix" class="header-logo" style="width: 110px;margin: 10px auto;display: block;" src="/static/logo.png"></image>
<TabHeader></TabHeader> <TabHeader></TabHeader>
<view class="setting-body" <view class="setting-body"
@click="handleUserTaped"> @click="handleUserTaped">
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<QcContent v-else-if="tabIndex ==='QC'"></QcContent> <QcContent v-else-if="tabIndex ==='QC'"></QcContent>
<ProContent v-if="tabIndex === 'DV'"></ProContent> <ProContent v-if="tabIndex === 'DV'"></ProContent>
</view> </view>
<u-modal width="1680rpx" v-model="showWorkstationFlag" :showConfirmButton="false" :showCancelButton="true" <u-modal width="90%" v-model="showWorkstationFlag" :showConfirmButton="false" :showCancelButton="true"
title="请选择工作站" content="操作内容"> title="请选择工作站" content="操作内容">
<!-- <u-tabs :list="processList" :is-scroll="true" :current="currentFlag" name="processName" <!-- <u-tabs :list="processList" :is-scroll="true" :current="currentFlag" name="processName"
@change="getWorkstationList"> @change="getWorkstationList">
...@@ -200,7 +200,8 @@ export default { ...@@ -200,7 +200,8 @@ export default {
height: inherit; height: inherit;
.header-logo { .header-logo {
width: 90%; width: 200rpx;
height: auto;
margin: 40rpx auto; margin: 40rpx auto;
display: block; display: block;
} }
......
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
<view class="button-bar"> <view class="button-bar">
<view class="button-frame" @click="addQC('QCMSG')"> <view class="button-frame" @click="addQC('QCMSG')">
<view class="shortcut-icon icon-color01"> <view class="shortcut-icon icon-color01">
<img class="icon-button" :src="require('@/static/icons/png/pro.png')" alt=""> <image class="icon-button" src="/static/icons/png/pro.png"/>
</view> </view>
<view class="grid-text">检查通知</view> <view class="grid-text">检查通知</view>
</view> </view>
<view class="button-frame" v-for="qcType in dict.type.mes_ipqc_type" @click="addQC(qcType.value )"> <view class="button-frame" v-for="qcType in dict.type.mes_ipqc_type" @click="addQC(qcType.value )">
<view class="shortcut-icon icon-color01"> <view class="shortcut-icon icon-color01">
<img class="icon-button" :src="require('@/static/icons/png/pro.png')" alt=""> <image class="icon-button" src="/static/icons/png/pro.png" />
</view> </view>
<view class="grid-text">{{ qcType.label }}</view> <view class="grid-text">{{ qcType.label }}</view>
</view> </view>
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</view> </view>
</view> </view>
<u-modal width="1800rpx" v-model="qcModalFlag" :showConfirmButton=true :showCancelButton="true" <u-modal width="90%" v-model="qcModalFlag" :showConfirmButton=true :showCancelButton="true"
title="请填写检验单" title="请填写检验单"
content="操作内容"> content="操作内容">
<u-form ref="qcForm" label-width="70px"> <u-form ref="qcForm" label-width="70px">
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
</scroll-view> </scroll-view>
</u-modal> </u-modal>
<u-modal width="760px" v-model="qcMsgVisible" :showConfirmButton=false :showCancelButton="true" <u-modal width="80%" v-model="qcMsgVisible" :showConfirmButton=false :showCancelButton="true"
title="检验通知" content="操作内容"> title="检验通知" content="操作内容">
<uni-table class="line-table" border stripe :loading="loading" emptyText="未查询到数据"> <uni-table class="line-table" border stripe :loading="loading" emptyText="未查询到数据">
<uni-tr> <uni-tr>
...@@ -216,7 +216,7 @@ ...@@ -216,7 +216,7 @@
</u-form> </u-form>
</u-modal> </u-modal>
<u-modal width="600px" v-model="deffectModalFlag" @confirm="subQcdeffect" @cancel="getTemplateLineList" <u-modal width="80%" v-model="deffectModalFlag" @confirm="subQcdeffect" @cancel="getTemplateLineList"
confirm-text="提交" confirm-text="提交"
:showConfirmButton=true :showCancelButton=true :showConfirmButton=true :showCancelButton=true
title="缺陷登记"> title="缺陷登记">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment