From 8ca4dddbb74bb69b517419adef886739aad1b362 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 24 九月 2022 14:50:32 +0800
Subject: [PATCH] 1.递交
---
pages/sbgl/dqby.html | 17 +--
pages/sbgl/rcdj.html | 10 --
pages/sbgl/sbwx.html | 262 +++++++++++++++++++++++++++++++++++++++++++++++++---
3 files changed, 251 insertions(+), 38 deletions(-)
diff --git a/pages/sbgl/dqby.html b/pages/sbgl/dqby.html
index e81d757..647001e 100644
--- a/pages/sbgl/dqby.html
+++ b/pages/sbgl/dqby.html
@@ -409,11 +409,13 @@
},
methods: {
+ // 鏈� 骞撮�夋嫨
onSelectSheet(val) {
dropdownValue = val
this.$forceUpdate()
this.sheetFlag = false
},
+ //鎻愪氦
submit() {
let children = []
centerContent.forEach(item => {
@@ -433,15 +435,11 @@
children: children
}
- console.log(data, 1)
-
const params = {
username: localStorage.getItem('username'),
maintcyc: dropdownValue
}
-
-// vant.Notify(JSON.stringify(params))
-// vant.Toast(JSON.stringify(data))
+
post('AppDeviceManage/AppDeviceRepairSave' + formatParams(params), data)
.then(res => {
if (res.code === '200') {
@@ -470,6 +468,7 @@
vanFieldBlur() {
this.$forceUpdate()
},
+ //鎵弿淇濆吇宸ヤ綅鐐瑰嚮涓嶅悓閫夋嫨椤�
topContentClcik(code) {
radioValue = code
this.$forceUpdate()
@@ -500,16 +499,11 @@
}
})
},
-
+ //淇濆吇缁撴灉鐐瑰嚮
resultClick(val) {
resultValue = val
this.$forceUpdate()
},
-
- selected(id) {
- alert(id)
- },
-
// 鎵弿淇濆吇宸ヤ綅鎵弿
topScanClick() {
createWithoutTitle('../../components/barcode_scan.html', {
@@ -547,7 +541,6 @@
}
});
},
-
// 閮ㄤ綅姝e父 寮傚父鎸夐挳鐐瑰嚮
bwClick(item, val) {
item.isOK = val
diff --git a/pages/sbgl/rcdj.html b/pages/sbgl/rcdj.html
index 1eef026..820edc3 100644
--- a/pages/sbgl/rcdj.html
+++ b/pages/sbgl/rcdj.html
@@ -396,9 +396,6 @@
result: resultValue,
children: children
}
-
- console.log(data, 1)
-
post('AppDeviceManage/AppDeviceCheckSave?username=' + localStorage.getItem('username'), data)
.then(res => {
if (res.code === '200') {
@@ -454,16 +451,10 @@
}
})
},
-
resultClick(val) {
resultValue = val
this.$forceUpdate()
},
-
- selected(id) {
- alert(id)
- },
-
// 鎵弿鐐规宸ヤ綅鎵弿
topScanClick() {
createWithoutTitle('../../components/barcode_scan.html', {
@@ -501,7 +492,6 @@
}
});
},
-
// 閮ㄤ綅姝e父 寮傚父鎸夐挳鐐瑰嚮
bwClick(item, val) {
item.isOK = val
diff --git a/pages/sbgl/sbwx.html b/pages/sbgl/sbwx.html
index 222596e..8999fcc 100644
--- a/pages/sbgl/sbwx.html
+++ b/pages/sbgl/sbwx.html
@@ -6,8 +6,6 @@
<meta name="HandheldFriendly" content="true" />
<meta name="MobileOptimized" content="320" />
<title>鏂板嚡杩埗閫犱簯骞冲彴</title>
- <!-- 寮曞叆鍍忕礌杞崲 px->rpx -->
- <!-- <script src="../../js/rpx4html.js"></script> -->
<!-- 寮曞叆鏍峰紡鏂囦欢 -->
<link rel="stylesheet" href="../../css/vant.css" />
@@ -19,10 +17,75 @@
<script type="text/javascript" src="../../js/axios.min.js"></script>
<script type="text/javascript" src="../../js/http.js"></script>
+ <script type="text/javascript" src="../../js/common.js"></script>
- <link rel="stylesheet" href="../css/global.css" type="text/css" charset="utf-8" />
+ <script type="text/javascript" src="../../js/global.js"></script>
+ <!-- <link rel="stylesheet" href="../../css/global.css" type="text/css" charset="utf-8" /> -->
+
+ <script type="text/javascript">
+ var topContent = [
+
+ // {
+ // code: 'SB003',
+ // name: '榻胯疆绠辩粍',
+ // wksp_code: "CJ002",
+ // wksp_name: '瑁呴厤杞﹂棿',
+ // eqpchkmain_code: "djbz002"
+ // },
+ // {
+ // code: 'SB001',
+ // name: '榻胯疆绠辩粍',
+ // wksp_code: "CJ002",
+ // wksp_name: '瑁呴厤杞﹂棿',
+ // eqpchkmain_code: "djbz002"
+ // },
+ ];
+
+
+
+
+ let radioValue = '' //鍗曢�夋閫変腑鐨勯」
+
+
+ // 鎵弿鐐规宸ヤ綅杩斿洖鏃舵墽琛屾柟娉�
+ function scaned(r) {
+ // let flag = false
+ // topContent.forEach((item, index) => {
+ // if (item.code === r) {
+ // flag = true
+ // }
+ // })
+ // if (flag) {
+ // vant.Notify({
+ // type: 'danger',
+ // message: '姝ゆ潯鐮佸凡鎵弿锛屽凡鍦ㄥ垪琛ㄤ腑锛�'
+ // });
+ // } else {
+ // get('AppDeviceManage/CheckScanDeviceQrCodeData', {
+ // eqpcode: r
+ // }).then(res => {
+ // if (res.code === '200' && res.data[0].eqpchkmain_code !== null) {
+ // topContent.unshift(res.data[0])
+ // topContentClcik(topContent[0].code)
+ // }
+
+ // if (res.code === '200' && res.data[0].eqpchkmain_code === null) {
+ // vant.Notify({
+ // type: 'danger',
+ // message: '褰撳墠璁惧鏈缃偣妫�鏍囧噯缁戝畾鐐规椤圭洰锛�'
+ // });
+ // }
+ // })
+ // }
+ }
+
+ function topContentClcik(code) {
+
+ }
+ </script>
</head>
+ <!-- <body onload="loadNodes()"> -->
<body>
<div id="app">
@@ -30,7 +93,7 @@
<van-nav-bar title="璁惧缁翠慨" @click-right="onClickRight" left-arrow @click-left="onClickleft">
<template #right>
- <van-popover style="" placement="bottom-end" :offset="[13,8]" v-model="showPopover"
+ <van-popover style="" placement="bottom-end" :offset="[13,8]" v-model="showPopover"
trigger="click" :actions="actions" @select="onSelect">
<template #reference>
<van-icon name="bars" size='20' color='#fff' />
@@ -39,8 +102,88 @@
</template>
</van-nav-bar>
- </div>
+ <div class="head">
+ <div class="head_block">
+ <div class="head_left">
+ <div class="head_bar"></div>
+ <div class="head_title">
+ 鎵弿缁翠慨宸ヤ綅
+ </div>
+ </div>
+
+ <div style="margin-right: 10px;">
+ <van-icon name="scan" color='red' size='24' @click='topScanClick()' />
+ </div>
+
+ </div>
+
+ <div class="flex_between" style="">
+ <div id="contentLeft" style="width: 100%;margin-top: 10px;">
+ <div id="topContentID" v-for="item in topContent" :key="item.code"
+ style="margin-bottom: 10px;margin-left: 20px;" @click="topContentClcik(item.code)">
+ <div style="display: flex;align-items: center;">
+ <div>
+ <div>宸ヤ綅缂栫爜锛�</div>
+ <div>宸ヤ綅鍚嶇О锛�</div>
+ <div>鐢熶骇杞﹂棿锛�</div>
+ </div>
+ <div>
+ <div>{{item.code}}</div>
+ <div>{{item.name}}</div>
+ <div>{{item.wksp_name}}</div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <div id="contentRight">
+ <van-radio-group v-model="radioValue" style="padding-right: 12px;">
+ <van-radio checked-color='red' icon-size="18px"
+ style="height: 63px;margin-bottom: 10px;" v-for="item in topContent"
+ :key="item.code" :name="item.code"></van-radio>
+ </van-radio-group>
+ </div>
+ </div>
+ </div>
+
+ <div class="head"
+ :style="{marginTop:topContent.length===0?'100px':'0',minHeight:topContent.length===0?'0':'220px'}"
+ style="margin-bottom: 130px;padding-bottom: 10px;overflow-y: ;"
+ :style="{marginTop:topContent.length===0?'78px':'0'}">
+ <div class="head_block" style="margin-bottom:10px;">
+ <div class="head_left">
+ <div class="head_bar"></div>
+ <div class="head_title">
+ 鏁呴殰鎻忚堪
+ </div>
+ </div>
+ </div>
+
+
+
+ <div style="display:flex;flex-direction: column;width: 96%;margin: auto;">
+ <van-field v-model="messageDescr" rows="2" autosize type="textarea" placeholder="璇疯緭鍏�" />
+ </div>
+ <div style="width: 96%;margin: auto;margin-top: 10px;">
+ <van-uploader v-model="fileList" :after-read="afterRead" multiple :max-count="3" />
+ </div>
+
+ </div>
+
+
+ <div style="">
+ <div class="footer" style="min-height:50px;">
+ <div
+ style="position:fixed;bottom: 0;width: 96%;display: flex;justify-content: center;flex-direction: column;align-items: center">
+ <van-button class="vanButtonInfo" @click="submit" type="info">
+ 纭鎻愪氦</van-button>
+ </div>
+ </div>
+ </div>
+
+
+ </div>
<van-overlay :show="overlayShow" @click="overlayShow=false" />
@@ -48,6 +191,7 @@
</div>
</body>
<script>
+
var app = new Vue({
el: '#app',
data: function() {
@@ -64,40 +208,91 @@
icon: 'revoke',
text: '閫�鍑虹櫥褰�'
}],
-
+ topContent2: topContent,
+ messageDescr: '',
+ fileList: [
+ // {
+ // url: 'https://img01.yzcdn.cn/vant/leaf.jpg'
+ // },
+ // Uploader 鏍规嵁鏂囦欢鍚庣紑鏉ュ垽鏂槸鍚︿负鍥剧墖鏂囦欢
+ // 濡傛灉鍥剧墖 URL 涓笉鍖呭惈绫诲瀷淇℃伅锛屽彲浠ユ坊鍔� isImage 鏍囪鏉ュ0鏄�
+ // {
+ // url: 'https://img01.yzcdn.cn/vant/leaf.jpg'
+ // },
+ ],
}
},
- created() {
+ watch: {
+ 'topContent2.length': {
+ handler(newValue, oldValue) {
+ if (newValue !== oldValue) {
+ // this.topContent2 = topContent
+ // this.$forceUpdate()
+ if (topContent[0] && topContent[0].code) {
+ this.$forceUpdate()
+ this.topContentClcik(topContent[0].code)
+ }
+ }
+ },
+ deep: true,
+ immediate: true,
+ },
},
- mounted() {
-
- },
+ created() {},
+ mounted() {},
methods: {
- onClickleft(){
+ afterRead(file) {
+ // 姝ゆ椂鍙互鑷灏嗘枃浠朵笂浼犺嚦鏈嶅姟鍣�
+ console.log(file);
+
+ //鍒涘缓FormData瀵硅薄銆備笂浼犲浘鐗囬渶瑕佽浆鎹簩杩涘埗锛岃繖閲岃鐢ㄥ埌FormData
+ let forms = new FormData();
+ console.log(file.file);
+ //"file"琛ㄧず缁欏悗鍙颁紶鐨勫睘鎬у悕瀛�
+ forms.append("file", file.file); //鑾峰彇涓婁紶鍥剧墖淇℃伅
+ console.log(forms, 1);
+ },
+ submit() {},
+ // 杈撳叆妗嗗け鐒﹁Е鍙戜簨浠�
+ vanFieldBlur() {
+ this.$forceUpdate()
+ },
+ topContentClcik(code) {
+
+ },
+ onClickleft() {
history.back()
},
onClickRight() {
this.overlayShow = true
},
onSelect(action) {
- vant.Toast(action.text);
+ if (action.text === '鎿嶄綔鎸囧') {
+ topPopoverClick('鎿嶄綔鎸囧')
+ } else if (action.text === '鎴愬搧杩芥函') {
+ topPopoverClick('鎴愬搧杩芥函')
+ } else if (action.text === '閫�鍑虹櫥褰�') {
+ topPopoverClick('閫�鍑虹櫥褰�')
+ }
this.overlayShow = false
},
}
})
</script>
<style type="text/css">
+ @import url('../../css/global.css');
+
body {
background-color: #fff;
}
.body {
- height: 600px;
+ min-height: 600px;
background-color: grey;
margin-top: 0px;
background-color: #fff;
- position: relative;
+ position: relative;
}
.van-nav-bar__content {
@@ -109,8 +304,43 @@
color: #fff;
letter-spacing: 2px;
}
- .van-nav-bar__arrow{
+
+ .van-nav-bar__arrow {
color: #fff !important;
}
+
+ .createElementDiv {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin-bottom: 10px;
+ margin-left: 20px;
+ }
+
+ .vanFieldInput {
+ height: 36px;
+ line-height: 36px;
+ align-items: center;
+ /* width: 200px; */
+
+ padding: 0;
+ padding-left: 10px;
+ /* border-radius: 5px; */
+ margin: 5px 0;
+ /* background-color: #fff; */
+ }
+
+ .buttonSmall {
+ /* border-radius: 5px; */
+ }
+
+ .vanButtonInfo {
+ width: 100%;
+ letter-spacing: 2px;
+ height: 50px;
+ font-size: 18px;
+ /* margin-left: 0; */
+
+ }
</style>
-</html>
\ No newline at end of file
+</html>
--
Gitblit v1.9.3