From 0ad220d7a97ff885f8f709580eec39ff24c84df9 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期三, 19 三月 2025 10:25:26 +0800
Subject: [PATCH] 1.IQC平板检验初步样式确认
---
Images/Style.css | 27 +++-
H5/Js/LLJ/Add.js | 6
Mst.master | 2
H5/LLJ/Add.aspx | 283 ++++++++++++++++++++++++++++++++++++++++++-----
4 files changed, 276 insertions(+), 42 deletions(-)
diff --git a/H5/Js/LLJ/Add.js b/H5/Js/LLJ/Add.js
index ca52f28..559a127 100644
--- a/H5/Js/LLJ/Add.js
+++ b/H5/Js/LLJ/Add.js
@@ -31,7 +31,9 @@
ttrre: false,
show: false,
tableMxData: [],
- tabActive:0
+ tabActive: 0,
+ inputValue: '',//鐗瑰緛鍊艰緭鍏�
+ resultValue: '',//妫�楠岀粨鏋滃綍鍏�
}
},
mounted() {
@@ -60,7 +62,7 @@
guid : mxguid ,
}, true, 1).then(function (res1) {
if (res1.rtnCode == 1) {
-
+ that.tableMxData = res1.rtnData;
} else {
that.$toast.fail(res1.rtnMsg);
}
diff --git a/H5/LLJ/Add.aspx b/H5/LLJ/Add.aspx
index 27d6478..aae56a4 100644
--- a/H5/LLJ/Add.aspx
+++ b/H5/LLJ/Add.aspx
@@ -13,7 +13,7 @@
.van-popup__close-icon--top-right {
top: .25rem;
- right: -.01rem;
+ right: -.00rem;
}
.content-wrapper-jymx {
@@ -24,6 +24,152 @@
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
}
+ .van-cell__value--alone {
+ color: #323233;
+ text-align: center;
+ }
+
+
+
+ .si-container {
+ padding: 0.16rem;
+ }
+
+ /* 鐘舵�佹樉绀虹粍 */
+ .si-status-group {
+ display: flex;
+ gap: 0.08rem;
+ margin-bottom: 0.16rem;
+ }
+
+ .si-status-box {
+ flex: 1;
+ height: 0.6rem;
+ border-radius: 0.08rem;
+ display: flex;
+ overflow: hidden;
+ }
+
+ /* 宸︿晶鐘舵�佹爣绛� */
+ .si-status__left {
+ width: 1.2rem;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ position: relative;
+ }
+
+ .si-status__left::after {
+ content: '';
+ position: absolute;
+ right: -0.13rem;
+ width: 0.27rem;
+ height: 100%;
+ transform: skewX(-10deg);
+ z-index: 1;
+ }
+
+ /* 鍙充晶鏁板�兼樉绀� */
+ .si-status__right {
+ flex: 1;
+ display: flex;
+ align-items: center;
+ padding-left: 0.16rem;
+ background: #fff;
+ font-weight: bold;
+ }
+
+ /* 鐘舵�佺被鍨嬩慨楗扮 */
+ .si-status--ok .si-status__left {
+ background: #07c160;
+ }
+
+ .si-status--ok .si-status__left::after {
+ background: #07c160;
+ }
+
+ .si-status--error .si-status__left {
+ background: #ee0a24;
+ }
+
+ .si-status--error .si-status__left::after {
+ background: #ee0a24;
+ }
+
+ /* 杈撳叆妗嗘牱寮� */
+ .si-input-box {
+ height: 0.6rem;
+ border-radius: 0.08rem;
+ display: flex;
+ overflow: hidden;
+ background: #fff;
+ box-shadow: 0 0.02rem 0.04rem rgba(0,0,0,0.05);
+ }
+
+ .si-input__left {
+ width: 1.2rem;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background: #e6f7ff;
+ position: relative;
+ }
+
+ .si-input__left::after {
+ content: '';
+ position: absolute;
+ right: 0;
+ top: 50%;
+ transform: translateY(-50%);
+ width: 0.01rem;
+ height: 50%;
+ background: #d9d9d9;
+ }
+
+ /* 缁熶竴鏂囧瓧鏍峰紡 */
+ .si-status__label,
+ .si-input__label,
+ .si-status__right {
+ font-size: 0.20rem;
+ line-height: 0.23rem;
+ }
+
+ .si-input__label {
+ color: #1890ff;
+ }
+
+ /* Vant杈撳叆妗嗘繁搴﹀畾鍒� */
+ :deep(.si-input-field .van-field__control) {
+ height: 0.6rem !important;
+ font-size: 0.20rem !important;
+ line-height: 0.23rem !important;
+ color: #333;
+ }
+
+/* .van-dropdown-menu__bar {
+ position: relative;
+ display: -webkit-box;
+ display: -webkit-flex;
+ display: flex;
+ height: 0.23rem;
+ background-color: #fff;
+ box-shadow: 0 .0533rem .32rem rgba(100, 101, 102, .12);
+ }
+
+ .van-dropdown-menu__title {
+ position: relative;
+ box-sizing: border-box;
+ max-width: 100%;
+ padding: 0 .2133rem;
+ color: #323233;
+ font-size: .20rem;
+ line-height: .23rem;
+ }
+*/
+
+ .van-icon-popup {
+ font-size: 0.5rem;
+ }
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
@@ -34,7 +180,7 @@
@click-left="GetBack1()"
></van-nav-bar>
<div class="content-wrapper">
- <van-cell-group>
+ <van-cell-group >
<van-field label="妫�楠屽崟鍙�" colon="true" v-model="formData.releaseNo" readonly ></van-field>
<van-field label="鍒拌揣鍗曞彿" colon="true" v-model="formData.lotNo" readonly ></van-field>
@@ -57,36 +203,41 @@
<van-field label="妫�娴嬬粨鏋�" colon="true" v-model="formData.fcheckResu" readonly ></van-field>
</van-cell-group>
</div>
- <van-button :loading="ttrre" type="info" loading-text="鍔犺浇涓�..." v-if="!isShowTable && formData.fsubmit == 0" @click="submit">妫�楠屾彁浜�</van-button>
- <van-button type="danger" v-if="!isShowTable && formData.fsubmit == 0" @click="removeXJ">閲嶆柊鍔犺浇椤圭洰</van-button>
+<%-- <van-button :loading="ttrre" type="info" loading-text="鍔犺浇涓�..." v-if="!isShowTable && formData.fsubmit == 0" @click="submit">妫�楠屾彁浜�</van-button>
+ <van-button type="danger" v-if="!isShowTable && formData.fsubmit == 0" @click="removeXJ">閲嶆柊鍔犺浇椤圭洰</van-button>--%>
+ <van-button :loading="ttrre" type="info" loading-text="鍔犺浇涓�..." @click="submit">妫�楠屾彁浜�</van-button>
+ <van-button type="danger" @click="removeXJ">閲嶆柊鍔犺浇椤圭洰</van-button>
<van-tabs color="#000" title-active-color="#0283EF" style="padding-bottom: 120px;">
<van-tab title="妫�楠岄」鐩�" class="mySolid font">
<van-row type="flex" justify="center">
- <van-col span="10">妫�楠岄」鐩�</van-col>
- <van-col span="6">鏄惁鍚堟牸</van-col>
- <van-col span="8">璁板綍(鐐瑰嚮)</van-col>
+ <van-col span="10" center class="text-left padding-left">妫�楠岄」鐩�</van-col>
+ <van-col span="6">妫�楠岀粨鏋�</van-col>
+ <van-col span="8">宸叉/寰呮</van-col>
</van-row>
- <van-row v-for="(item,index) in tableData" :key="index" type="flex" justify="center">
+ <van-row v-for="(item,index) in tableData" :key="index" type="flex" justify="left">
<van-col span="10" center class="text-left padding-left" >
<van-cell center
center :title="item.fcheckItem" @click="togglePopup(index)"></van-cell>
</van-col>
- <van-col center span="6">
+ <van-col center span="6" >
<van-cell center
- center :title="item.fcheckResu"></van-cell>
- </van-col>
- <van-col span="8">
- <van-cell center :url="'detail.aspx?id='+ item.guid + '&gid=' + formData.guid+'&fsubmit='+formData.fsubmit"
- v-if="item.fenterQty >=item.checkQyt"
- center :title="item.checkQyt + '/' + item.fenterQty"></van-cell>
- <van-cell v-else center is-link :url="'detail.aspx?id='+ item.guid + '&gid=' + formData.guid+'&fsubmit='+formData.fsubmit">
- <!-- 浣跨敤 title 鎻掓Ы鏉ヨ嚜瀹氫箟鏍囬 -->
- <template #title>
- <span class="custom-title">{{item.checkQyt + '/' + item.fenterQty}}</span>
- <van-tag type="danger" style="font-size:15px">鏈畬鎴�</van-tag>
- </template>
+ center v-if="item.fcheckResu === '鍚堟牸'">
+ <van-tag type="success" style="font-size:15px">鍚堟牸</van-tag>
</van-cell>
+ <van-cell center
+ center v-else-if="item.fcheckResu === '涓嶅悎鏍�'">
+ <van-tag type="danger" style="font-size:15px">涓嶅悎鏍�</van-tag>
+ </van-cell>
+ <van-cell center
+ center v-else >
+ <van-tag type="warning" style="font-size:15px">鏈畬鎴�</van-tag>
+ </van-cell>
+
+ </van-col>
+ <van-col span="8" >
+ <van-cell center
+ center :title="item.checkQyt + '/' + item.fenterQty"></van-cell>
</van-col>
</van-row>
</van-tab>
@@ -98,6 +249,7 @@
overlay ="true"
round
close-icon="close"
+ class="van-icon-popup"
position="right"
:style="{ width: '100%',
height: '100%' ,
@@ -113,25 +265,94 @@
<van-cell-group>
<van-field label="椤圭洰鍚嶇О" colon="true" v-model="jymxData.fcheckItem" readonly ></van-field>
<van-field label="瑙勬牸瑕佹眰" colon="true" v-model="jymxData.fspecRequ" readonly ></van-field>
- <van-field label="妫�楠屾柟娉�" colon="true" v-model="jymxData.inspectionMethod" readonly ></van-field>
<van-field label="妫�楠屽伐鍏�" colon="true" v-model="jymxData.fcheckTool" readonly ></van-field>
<van-field label="妫�楠屾暟" colon="true" v-model="jymxData.checkQyt" readonly ></van-field>
- <van-field label="妫�楠屾爣鍑嗙紪鐮�" colon="true" v-model="jymxData.sampleSizeNo" readonly ></van-field>
- <van-field label="妫�楠屾按骞�" colon="true" v-model="jymxData.fcheckLevel" readonly ></van-field>
- <van-field label="鎺ユ敹姘村钩" colon="true" v-model="jymxData.facLevel" readonly ></van-field>
<van-field label="涓嬮檺" colon="true" v-model="jymxData.fdownAllow" readonly ></van-field>
<van-field label="鏍囧噯鍊�" colon="true" v-model="jymxData.fstand" readonly ></van-field>
<van-field label="涓婇檺" colon="true" v-model="jymxData.fupAllow" readonly ></van-field>
<van-field label="AC鏁�" colon="true" v-model="jymxData.facQty" readonly ></van-field>
<van-field label="RE鏁�" colon="true" v-model="jymxData.freQty" readonly ></van-field>
- <van-field label="涓嶅悎鏍兼暟" colon="true" v-model="jymxData.fngQty" readonly ></van-field>
- <van-field label="棰勮缁撴灉" colon="true" v-model="jymxData.result" readonly ></van-field>
- <van-field label="涓嶅悎鏍兼弿杩�" colon="true" v-model="jymxData.remarks" readonly ></van-field>
- <van-field label="妫�娴嬬粨鏋�" colon="true" v-model="jymxData.fcheckResu" placeholder="娌℃湁鏈�澶у�煎拰鏈�灏忓�兼椂濉啓0锛堟湭閫氳繃妫�楠岋級鎴�1锛堥�氳繃妫�楠岋級" ></van-field
+ <%--<van-field label="棰勮缁撴灉" colon="true" v-model="jymxData.result" readonly ></van-field>--%>
+ <van-field label="缁撴灉褰曞叆" colon="true" v-model="resultValue" placeholder="璇疯緭鍏K-鏁板瓧鎴朜G-鏁板瓧"></van-field>
+ <van-field label="妫�娴嬬粨鏋�" colon="true" readonly >
+ <template #input>
+ <van-tag v-if="jymxData.fcheckResu === '鍚堟牸'" type="success">鍚堟牸</van-tag>
+ <van-tag v-else-if="jymxData.fcheckResu === '涓嶅悎鏍�'" type="danger">涓嶅悎鏍�</van-tag>
+ <van-tag v-else type="warning">鏈畬鎴�</van-tag>
+ </template>
+ </van-field>
</van-cell-group>
</template>
+ <!-- StatsInput.vue -->
+ <template>
+ <div class="si-container">
+ <!-- 鐘舵�佹樉绀鸿 -->
+ <div class="si-status-group">
+ <div class="si-status-box si-status--ok">
+ <div class="si-status__left">
+ <span class="si-status__label">鍚堟牸鏁�</span>
+ </div>
+ <div class="si-status__right">256</div>
+ </div>
+
+ <div class="si-status-box si-status--error">
+ <div class="si-status__left">
+ <span class="si-status__label">涓嶅悎鏍兼暟</span>
+ </div>
+ <div class="si-status__right">32</div>
+ </div>
+ </div>
+ </template>
+ <template>
+ <!-- 杈撳叆妗� -->
+ <div class="si-input-box">
+ <div class="si-input__left">
+ <span class="si-input__label">鐗瑰緛鍊艰緭鍏�</span>
+ </div>
+ <div class="si-status__right">
+ <van-field
+ v-model="inputValue"
+ placeholder="璇疯緭鍏�"
+ :border="false"
+ class="si-input-field"
+ />
+ </div>
+ </div>
+ </div>
+ </template>
+ <van-row type="flex" justify="center">
+ <van-col span="10" center class="text-left padding-left">妫�楠岄」鐩�</van-col>
+ <van-col span="6">鏍锋湰鍊�</van-col>
+ <van-col span="8">鍒ゅ畾鏍囧織</van-col>
+ </van-row>
+ <van-row v-for="(item,index) in tableMxData.list2" :key="index" type="flex" justify="left">
+
+ <van-col span="10" center class="text-left padding-left" >
+ <van-cell center
+ center :title="item.fcheckItemd5" @click="togglePopup(index)"></van-cell>
+ </van-col>
+ <van-col span="6" >
+ <van-cell center
+ center :title="item.fcheckResu"></van-cell>
+ </van-col>
+ <van-col center span="8" >
+ <van-cell center
+ center v-if="item.fstand === '鈭�'">
+ <van-tag type="success" style="font-size:15px">鍚堟牸</van-tag>
+ </van-cell>
+ <van-cell center
+ center v-else-if="item.fstand === '脳'">
+ <van-tag type="danger" style="font-size:15px">涓嶅悎鏍�</van-tag>
+ </van-cell>
+ <van-cell center
+ center v-else >
+ <van-tag type="warning" style="font-size:15px">鏈畬鎴�</van-tag>
+ </van-cell>
+ </van-col>
+ </van-row>
+
</van-tab>
- </van-tabs
+ </van-tabs>
</div>
</van-popup>
</asp:Content>
@@ -140,5 +361,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="../Js/LLJ/Add.js?<%=116 %>"></script>
+ <script src="../Js/LLJ/Add.js?<%=118 %>"></script>
</asp:Content>
diff --git a/Images/Style.css b/Images/Style.css
index 16d3c2d..ef35fd2 100644
--- a/Images/Style.css
+++ b/Images/Style.css
@@ -359,7 +359,7 @@
}
/* 褰撳睆骞曞搴﹀皬浜庢垨绛変簬600px鏃跺簲鐢ㄧ殑鏍峰紡 */
-@media (max-width: 600px) {
+@media (max-width: 300px) {
.van-cell {
font-size: .33rem; /* 鏇村皬鐨勫瓧浣撳ぇ灏� */
line-height: .50rem;
@@ -368,10 +368,10 @@
}
/* 褰撳睆骞曞搴﹀ぇ浜�600px涓斿皬浜庢垨绛変簬1024px鏃跺簲鐢ㄧ殑鏍峰紡 */
-@media (min-width: 601px) and (max-width: 1600px) {
+@media (min-width: 300px) and (max-width: 1600px) {
.van-cell {
- font-size: .25rem; /* 涓瓑瀛椾綋澶у皬 */
- line-height: .45rem;
+ font-size: .20rem; /* 涓瓑瀛椾綋澶у皬 */
+ line-height: .23rem;
padding: .025rem .0900rem; /* 涓瓑鍐呰竟璺� */
}
@@ -385,7 +385,7 @@
/* 澧炲姞鍙充晶杈撳叆鍖哄煙鐨勫瓧浣撳ぇ灏忓苟鍔犳繁棰滆壊 */
.van-cell__value {
color: #333; /* 娣辫壊 */
- font-size: .30rem; /* 瀛椾綋澶у皬澧炲ぇ */
+ font-size: .25rem; /* 瀛椾綋澶у皬澧炲ぇ */
}
.van-cell--clickable {
@@ -456,7 +456,7 @@
}
.van-checkbox__icon--checked .van-icon {
- color: blue !important; /* 鍕鹃�夋鐨勯鑹茶缃负钃濊壊 */
+ color: #1989fa !important; /* 鍕鹃�夋鐨勯鑹茶缃负钃濊壊 */
}
/* 淇濇寔瀛椾綋棰滆壊涓嶅彉 */
@@ -467,9 +467,13 @@
/* 纭繚绂佺敤鐘舵�佷笅鍕鹃�夋浠嶇劧鏄剧ず涓鸿摑鑹� */
.van-checkbox--disabled .van-checkbox__icon .van-icon {
background-color: transparent !important; /* 绉婚櫎绂佺敤鐘舵�佷笅鐨勭伆鑹茶儗鏅� */
- border-color: blue !important; /* 璁剧疆绂佺敤鐘舵�佷笅鐨勮竟妗嗛鑹蹭负钃濊壊 */
+ border-color: #1989fa !important; /* 璁剧疆绂佺敤鐘舵�佷笅鐨勮竟妗嗛鑹蹭负钃濊壊 */
+
}
+.van-icon {
+ font-size: 0.8em;
+}
.van-tabs--line .van-tabs__wrap {
height: 0.8rem;
}
@@ -528,4 +532,11 @@
border-radius: 8px;
padding: 3px;
box-shadow: 0 2px 4px rgba(0,0,0,0.05);
-}
\ No newline at end of file
+}
+
+
+
+/* 妫�楠屾槑缁嗛〉杈撳叆妗嗙晫闈㈡牱寮� */
+
+
+/* 妫�楠屾槑缁嗛〉杈撳叆妗嗙晫闈㈡牱寮� */
diff --git a/Mst.master b/Mst.master
index 7d0a0b8..3a8bd65 100644
--- a/Mst.master
+++ b/Mst.master
@@ -14,7 +14,7 @@
<script src="/scripts/config.js?<%=1234 %>"></script>
<link href="/scripts/vant/vant.css" rel="stylesheet" />
<script src="/scripts/vant/vant.js"></script>
- <link href="/Images/Style.css?<%=168 %>" rel="stylesheet" />
+ <link href="/Images/Style.css?<%=1694 %>" rel="stylesheet" />
<script src="/Scripts/uni.webview.1.5.2.js"></script>
<asp:ContentPlaceHolder ID="head" runat="server">
</asp:ContentPlaceHolder>
--
Gitblit v1.9.3