zmj
/
cultivationApp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

页面完善

This commit is contained in:
zmj 2023-10-30 19:09:40 +08:00
parent 6cd676bf3b
commit 3b2c00b839
28 changed files with 616 additions and 682 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
App.vue
View File

@ -9,12 +9,12 @@
onLaunch: function() { onLaunch: function() {
const userInfo = userInfoStore() const userInfo = userInfoStore()
userInfoAPI({ userInfoAPI({
user_id: 307 user_id: 307,
user_type: 3
}).then(res => { }).then(res => {
userInfo.saveUserInfo(res.data) userInfo.saveUserInfo(res.data)
}) })
uni.setStorageSync("SY_TOKEN", "dfdf4564557445df4df") uni.setStorageSync("SY_TOKEN", "dfdf4564557445df4df")
}, },
onShow: function() { onShow: function() {
console.log('App Show') console.log('App Show')
@ -23,6 +23,7 @@
console.log('App Hide') console.log('App Hide')
} }
} }
// ngrok http 5173
</script> </script>
<style lang="scss"> <style lang="scss">

2
api/plant.js
View File

@ -14,7 +14,7 @@ export const addLandCropPicAPI = (data) => syhttp.post('/LandPlant/addLandCropPi
// 实时监测记录 // 实时监测记录
export const landEnvDataCurrAPI = (data) => syhttp.get('/LandPlant/landEnvDataCurr', data) export const landEnvDataCurrAPI = (data) => syhttp.get('/LandPlant/landEnvDataCurr', data)
// 标记为成熟 // 标记为成熟
export const setLandCropRipeAPI = (data) => syhttp.get('/LandPlant/setLandCropRipe', data) export const setLandCropRipeAPI = (data) => syhttp.post('/LandPlant/setLandCropRipe', data)
// 种植图片列表 // 种植图片列表
export const landCropPicListAPI = (data) => syhttp.get('/LandPlant/landCropPicList', data) export const landCropPicListAPI = (data) => syhttp.get('/LandPlant/landCropPicList', data)
// 种植操作列表 // 种植操作列表

1
components/animal/farmersCard.vue
View File

@ -37,7 +37,6 @@
</view> </view>
<view class="card-li"> <view class="card-li">
<view class=""> <view class="">
地址: {{userInfo.area_name}}{{userInfo.street_name}}{{userInfo.village_name}}{{userInfo.brigade_name}} 地址: {{userInfo.area_name}}{{userInfo.street_name}}{{userInfo.village_name}}{{userInfo.brigade_name}}
</view> </view>
</view> </view>

25
components/aquatic/pondCard.vue
View File

@ -2,7 +2,7 @@
<view class="card"> <view class="card">
<view class="tit"> <view class="tit">
<view class=""> <view class="">
农户名称: ??? 农户名称: {{userInfo.userInfo.name}}
</view> </view>
<view class=""> <view class="">
<!-- {{headData}} --> <!-- {{headData}} -->
@ -18,22 +18,23 @@
养殖数量: {{headData.total_num}} 养殖数量: {{headData.total_num}}
</view> </view>
</view> </view>
<view class="card-li"> <view class="card-li" v-if="headData.kind">
<view class=""> <view class="">
土地面积: 20亩 土地面积: 20亩
</view> </view>
<view class="">
草鱼鱼苗: 的划分等级
</view>
</view>
<view class="card-li" v-if="headData.kind">
<view class=""> <view class="">
养殖种类: {{headData.kind[0]}},{{headData.kind[1]}},{{headData.kind[2]}} 养殖种类: {{headData.kind[0]}},{{headData.kind[1]}},{{headData.kind[2]}}
</view> </view>
<!-- <view class="">
草鱼鱼苗: 的划分等级
</view> -->
</view>
<!-- <view class="card-li" v-if="headData.kind">
<view class=""> <view class="">
鲫鱼鱼苗: 的划分等级 鲫鱼鱼苗: 的划分等级
</view> </view>
</view> </view> -->
<view class="card-li" v-if="headData.breed"> <view class="card-li" v-if="headData.breed">
<view class=""> <view class="">
<!-- {{}} --> <!-- {{}} -->
@ -54,8 +55,12 @@
} from "vue" } from "vue"
import { import {
pondInfoAPI, pondInfoAPI,
} from "@/api/aquatic.js" } from "@/api/aquatic.js"
import {
userInfoStore
} from '@/store/userInfo'
const userInfo = userInfoStore()
const props = defineProps({ const props = defineProps({
id: String, id: String,
showBtn: Boolean showBtn: Boolean
@ -68,6 +73,7 @@
user_id: 307, user_id: 307,
pond_id: props.id pond_id: props.id
}).then(res => { }).then(res => {
// console.log(4557545)
for (let key in res.data) { for (let key in res.data) {
headData[key] = (res.data)[key] headData[key] = (res.data)[key]
} }
@ -76,6 +82,7 @@
}, { }, {
immediate: true immediate: true
}) })
const navgo = (url) => { const navgo = (url) => {
uni.navigateTo({ uni.navigateTo({
url url

45
components/index/chick.vue
View File

@ -1,42 +1,5 @@
<template> <template>
<view class="content"> <view class="content">
<!-- <view class="card">
<view class="tit">
<view class="">
农户名称: {{userInfo.name}}
</view>
</view>
<view class="card-li">
<view class="">
种养殖类型: 养殖户
</view>
<view class="">
养殖头数: {{userInfo.poultry_detail.total_count}}头
</view>
</view>
<view class="card-li">
<view class="">
土地面积:{{userInfo.total_land_area}}亩
</view>
<view class="">
公: {{userInfo.poultry_detail.male_count}}头
</view>
</view>
<view class="card-li">
<view class="">
养殖种类: {{userInfo.poultry_detail.kind[0]}},{{userInfo.poultry_detail.kind[1]}}
</view>
<view class="">
母: {{userInfo.poultry_detail.maternal_count}}头
</view>
</view>
<view class="card-li">
<view class="">
具体种类: {{userInfo.poultry_detail.breed[0]}}
</view>
</view>
</view> -->
<farmersCard></farmersCard> <farmersCard></farmersCard>
<view class="circumstance"> <view class="circumstance">
<view class="card-tit"> <view class="card-tit">
@ -65,7 +28,7 @@
</view> </view>
<view class="card-li"> <view class="card-li">
<view class=""> <view class="">
养殖类型: {{item.kind}} 养殖类型: {{item.gender==1?"公":"母"}}
</view> </view>
<view class=""> <view class="">
年龄: {{item.age}}年 年龄: {{item.age}}年
@ -91,11 +54,12 @@
<view class=""> <view class="">
{{index}} {{index}}
</view> </view>
<view class="updata-btn" @click="navgo('/pages/growRecord/chick?type=2')"> <view class="updata-btn" @click="navgo(`/pages/growRecord/chick?type=2&title=${index}`)">
更新{{index.slice(0,-2)}} 更新{{index.slice(0,-2)}}
</view> </view>
</view> </view>
<myTable :tit='`查看${index.slice(0,-2)}`' :dataList="item.action_record" route='/pages/poultry/allRecording'> <myTable :tit='`查看${index.slice(0,-2)}`' :dataList="item.action_record"
:route='`/pages/poultry/allRecording?index=${index}`'>
</myTable> </myTable>
</view> </view>
<!-- <view class="circumstance"> <!-- <view class="circumstance">
@ -235,6 +199,7 @@
animalList.push(item) animalList.push(item)
}) })
// console.log(animalList) // console.log(animalList)
}) })
animalEnvDataAPI({ animalEnvDataAPI({
user_id: 307 user_id: 307

6
components/index/cultivation.vue
View File

@ -65,7 +65,7 @@
</view> </view>
<view class="card-li"> <view class="card-li">
<view class=""> <view class="">
养殖类型: {{item.animal_kind}} 养殖类型: {{item.animal_gender==1?'公':"母"}}
</view> </view>
<view class=""> <view class="">
年龄: {{item.animal_age}}年 年龄: {{item.animal_age}}年
@ -88,12 +88,12 @@
<view class=""> <view class="">
{{index}} {{index}}
</view> </view>
<view class="updata-btn" @click="navgo('/pages/growRecord/feedIng?type=3')"> <view class="updata-btn" @click="navgo(`/pages/growRecord/feedIng?type=3&title=${index}`)">
更新{{index.slice(0,-2)}} 更新{{index.slice(0,-2)}}
</view> </view>
</view> </view>
<myTable :tit='`查看${index.slice(0,-2)}`' :dataList="item.action_record" <myTable :tit='`查看${index.slice(0,-2)}`' :dataList="item.action_record"
route='/pages/feedIng/allRecordTable'>> :route='`/pages/feedIng/allRecordTable?index=${index}`'>
</myTable> </myTable>
</view> </view>

5
components/myTable/index.vue
View File

@ -10,7 +10,7 @@
<!-- 表格数据行 --> <!-- 表格数据行 -->
<uni-tr v-for="(item,index) in props.dataList" :key="index"> <uni-tr v-for="(item,index) in props.dataList" :key="index">
<!-- <uni-td>{(item.create_time).slice(5,11)}}</uni-td> --> <!-- <uni-td>{(item.create_time).slice(5,11)}}</uni-td> -->
<uni-td>5,11</uni-td> <uni-td>{{item.create_time.substring(5, 10)}}</uni-td>
<uni-td style="text-align: center;">{{item.action_name}}</uni-td> <uni-td style="text-align: center;">{{item.action_name}}</uni-td>
<!-- <uni-td v-else> {{objFn()}}</uni-td> --> <!-- <uni-td v-else> {{objFn()}}</uni-td> -->
@ -18,7 +18,8 @@
<!-- <view class="" v-for="item in objFn(item.action_content)"> <!-- <view class="" v-for="item in objFn(item.action_content)">
{{item[0]}}:{{item[1]}} {{item[0]}}:{{item[1]}}
</view> --> </view> -->
<view class="" v-for="(items,indexs) in objFn(item.action_content)" :key="indexs"> <view class="" v-for="(items,indexs) in objFn(item.action_content)" v-show="items.tit"
:key="indexs">
<view class="" v-if="indexs=='pic'"> <view class="" v-if="indexs=='pic'">
{{items.tit}}: <u--image :src="items.value" width="100%" height="210.28rpx" {{items.tit}}: <u--image :src="items.value" width="100%" height="210.28rpx"
alt=""></u--image> alt=""></u--image>

35
index.html
View File

@ -1,20 +1,21 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<script> <!-- <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> -->
var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || <script>
CSS.supports('top: constant(a)')) var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
document.write( CSS.supports('top: constant(a)'))
'<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + document.write(
(coverSupport ? ', viewport-fit=cover' : '') + '" />') '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
</script> (coverSupport ? ', viewport-fit=cover' : '') + '" />')
<title></title> </script>
<!--preload-links--> <title></title>
<!--app-context--> <!--preload-links-->
</head> <!--app-context-->
<body> </head>
<div id="app"><!--app-html--></div> <body>
<script type="module" src="/main.js"></script> <div id="app"><!--app-html--></div>
</body> <script type="module" src="/main.js"></script>
</body>
</html> </html>

6
node_modules/.vite/deps/_metadata.json generated vendored
View File

@ -1,11 +1,11 @@
{ {
"hash": "615a5b64", "hash": "25035236",
"browserHash": "bf60a751", "browserHash": "1466e902",
"optimized": { "optimized": {
"uview-plus": { "uview-plus": {
"src": "../../uview-plus/index.js", "src": "../../uview-plus/index.js",
"file": "uview-plus.js", "file": "uview-plus.js",
"fileHash": "6e866713", "fileHash": "a0f19e5d",
"needsInterop": false "needsInterop": false
} }
}, },

234
node_modules/.vite/deps/uview-plus.js generated vendored
View File

@ -1,4 +1,4 @@
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/mixin/mixin.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/mixin/mixin.js
var mixin_default = { var mixin_default = {
// 定义每个组件都可能需要用到的外部样式以及类名 // 定义每个组件都可能需要用到的外部样式以及类名
props: { props: {
@ -129,10 +129,10 @@ var mixin_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/mixin/mpMixin.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/mixin/mpMixin.js
var mpMixin_default = {}; var mpMixin_default = {};
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/utils.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/utils.js
var { toString } = Object.prototype; var { toString } = Object.prototype;
function isArray(val) { function isArray(val) {
return toString.call(val) === "[object Array]"; return toString.call(val) === "[object Array]";
@ -188,7 +188,7 @@ function isUndefined(val) {
return typeof val === "undefined"; return typeof val === "undefined";
} }
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/helpers/buildURL.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/helpers/buildURL.js
function encode(val) { function encode(val) {
return encodeURIComponent(val).replace(/%40/gi, "@").replace(/%3A/gi, ":").replace(/%24/g, "$").replace(/%2C/gi, ",").replace(/%20/g, "+").replace(/%5B/gi, "[").replace(/%5D/gi, "]"); return encodeURIComponent(val).replace(/%40/gi, "@").replace(/%3A/gi, ":").replace(/%24/g, "$").replace(/%2C/gi, ",").replace(/%20/g, "+").replace(/%5B/gi, "[").replace(/%5D/gi, "]");
} }
@ -231,17 +231,17 @@ function buildURL(url2, params) {
return url2; return url2;
} }
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/helpers/isAbsoluteURL.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/helpers/isAbsoluteURL.js
function isAbsoluteURL(url2) { function isAbsoluteURL(url2) {
return /^([a-z][a-z\d+\-.]*:)?\/\//i.test(url2); return /^([a-z][a-z\d+\-.]*:)?\/\//i.test(url2);
} }
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/helpers/combineURLs.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/helpers/combineURLs.js
function combineURLs(baseURL, relativeURL) { function combineURLs(baseURL, relativeURL) {
return relativeURL ? `${baseURL.replace(/\/+$/, "")}/${relativeURL.replace(/^\/+/, "")}` : baseURL; return relativeURL ? `${baseURL.replace(/\/+$/, "")}/${relativeURL.replace(/^\/+/, "")}` : baseURL;
} }
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/buildFullPath.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/buildFullPath.js
function buildFullPath(baseURL, requestedURL) { function buildFullPath(baseURL, requestedURL) {
if (baseURL && !isAbsoluteURL(requestedURL)) { if (baseURL && !isAbsoluteURL(requestedURL)) {
return combineURLs(baseURL, requestedURL); return combineURLs(baseURL, requestedURL);
@ -249,7 +249,7 @@ function buildFullPath(baseURL, requestedURL) {
return requestedURL; return requestedURL;
} }
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/settle.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/settle.js
function settle(resolve, reject, response) { function settle(resolve, reject, response) {
const { validateStatus: validateStatus2 } = response.config; const { validateStatus: validateStatus2 } = response.config;
const status = response.statusCode; const status = response.statusCode;
@ -260,7 +260,7 @@ function settle(resolve, reject, response) {
} }
} }
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/adapters/index.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/adapters/index.js
var mergeKeys = (keys, config2) => { var mergeKeys = (keys, config2) => {
const config = {}; const config = {};
keys.forEach((prop) => { keys.forEach((prop) => {
@ -323,10 +323,10 @@ var adapters_default = (config) => new Promise((resolve, reject) => {
} }
}); });
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/dispatchRequest.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/dispatchRequest.js
var dispatchRequest_default = (config) => adapters_default(config); var dispatchRequest_default = (config) => adapters_default(config);
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/InterceptorManager.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/InterceptorManager.js
function InterceptorManager() { function InterceptorManager() {
this.handlers = []; this.handlers = [];
} }
@ -351,7 +351,7 @@ InterceptorManager.prototype.forEach = function forEach2(fn) {
}; };
var InterceptorManager_default = InterceptorManager; var InterceptorManager_default = InterceptorManager;
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/mergeConfig.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/mergeConfig.js
var mergeKeys2 = (keys, globalsConfig, config2) => { var mergeKeys2 = (keys, globalsConfig, config2) => {
const config = {}; const config = {};
keys.forEach((prop) => { keys.forEach((prop) => {
@ -413,7 +413,7 @@ var mergeConfig_default = (globalsConfig, config2 = {}) => {
return config; return config;
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/defaults.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/defaults.js
var defaults_default = { var defaults_default = {
baseURL: "", baseURL: "",
header: {}, header: {},
@ -428,7 +428,7 @@ var defaults_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/utils/clone.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/utils/clone.js
var clone = function() { var clone = function() {
"use strict"; "use strict";
function _instanceof(obj, type) { function _instanceof(obj, type) {
@ -625,7 +625,7 @@ var clone = function() {
}(); }();
var clone_default = clone; var clone_default = clone;
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/Request.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/Request.js
var Request = class { var Request = class {
/** /**
* @param {Object} arg - 全局配置 * @param {Object} arg - 全局配置
@ -763,10 +763,10 @@ var Request = class {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/index.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/index.js
var luch_request_default = Request; var luch_request_default = Request;
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/util/route.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/util/route.js
var Router = class { var Router = class {
constructor() { constructor() {
this.config = { this.config = {
@ -866,7 +866,7 @@ var Router = class {
}; };
var route_default = new Router().route; var route_default = new Router().route;
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/function/colorGradient.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/function/colorGradient.js
function colorGradient(startColor = "rgb(0, 0, 0)", endColor = "rgb(255, 255, 255)", step = 10) { function colorGradient(startColor = "rgb(0, 0, 0)", endColor = "rgb(255, 255, 255)", step = 10) {
const startRGB = hexToRgb(startColor, false); const startRGB = hexToRgb(startColor, false);
const startR = startRGB[0]; const startR = startRGB[0];
@ -978,7 +978,7 @@ var colorGradient_default = {
colorToRgba colorToRgba
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/function/test.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/function/test.js
function email(value) { function email(value) {
return /^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/.test(value); return /^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/.test(value);
} }
@ -1152,7 +1152,7 @@ var test_default = {
string string
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/function/debounce.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/function/debounce.js
var timeout = null; var timeout = null;
function debounce(func2, wait = 500, immediate = false) { function debounce(func2, wait = 500, immediate = false) {
if (timeout !== null) if (timeout !== null)
@ -1172,7 +1172,7 @@ function debounce(func2, wait = 500, immediate = false) {
} }
var debounce_default = debounce; var debounce_default = debounce;
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/function/throttle.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/function/throttle.js
var timer; var timer;
var flag; var flag;
function throttle(func2, wait = 500, immediate = true) { function throttle(func2, wait = 500, immediate = true) {
@ -1194,7 +1194,7 @@ function throttle(func2, wait = 500, immediate = true) {
} }
var throttle_default = throttle; var throttle_default = throttle;
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/function/digit.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/function/digit.js
var _boundaryCheckingState = true; var _boundaryCheckingState = true;
function strip(num, precision = 15) { function strip(num, precision = 15) {
return +parseFloat(Number(num).toPrecision(precision)); return +parseFloat(Number(num).toPrecision(precision));
@ -1258,7 +1258,7 @@ function round(num, ratio) {
return result; return result;
} }
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/function/index.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/function/index.js
function range2(min = 0, max = 0, value = 0) { function range2(min = 0, max = 0, value = 0) {
return Math.max(min, Math.min(max, Number(value))); return Math.max(min, Math.min(max, Number(value)));
} }
@ -1732,7 +1732,7 @@ var function_default = {
setConfig setConfig
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/config.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/config.js
var version = "3"; var version = "3";
if (true) { if (true) {
console.log(` console.log(`
@ -1767,7 +1767,7 @@ var config_default = {
unit: "px" unit: "px"
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/actionSheet.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/actionSheet.js
var actionSheet_default = { var actionSheet_default = {
// action-sheet组件 // action-sheet组件
actionSheet: { actionSheet: {
@ -1785,7 +1785,7 @@ var actionSheet_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/album.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/album.js
var album_default = { var album_default = {
// album 组件 // album 组件
album: { album: {
@ -1803,7 +1803,7 @@ var album_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/alert.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/alert.js
var alert_default = { var alert_default = {
// alert警告组件 // alert警告组件
alert: { alert: {
@ -1818,7 +1818,7 @@ var alert_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/avatar.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/avatar.js
var avatar_default = { var avatar_default = {
// avatar 组件 // avatar 组件
avatar: { avatar: {
@ -1839,7 +1839,7 @@ var avatar_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/avatarGroup.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/avatarGroup.js
var avatarGroup_default = { var avatarGroup_default = {
// avatarGroup 组件 // avatarGroup 组件
avatarGroup: { avatarGroup: {
@ -1855,7 +1855,7 @@ var avatarGroup_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/backtop.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/backtop.js
var backtop_default = { var backtop_default = {
// backtop组件 // backtop组件
backtop: { backtop: {
@ -1875,7 +1875,7 @@ var backtop_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/badge.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/badge.js
var badge_default = { var badge_default = {
// 徽标数组件 // 徽标数组件
badge: { badge: {
@ -1895,7 +1895,7 @@ var badge_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/button.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/button.js
var button_default = { var button_default = {
// button组件 // button组件
button: { button: {
@ -1930,7 +1930,7 @@ var button_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/calendar.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/calendar.js
var calendar_default = { var calendar_default = {
// calendar 组件 // calendar 组件
calendar: { calendar: {
@ -1967,7 +1967,7 @@ var calendar_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/carKeyboard.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/carKeyboard.js
var carKeyboard_default = { var carKeyboard_default = {
// 车牌号键盘 // 车牌号键盘
carKeyboard: { carKeyboard: {
@ -1975,7 +1975,7 @@ var carKeyboard_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/cell.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/cell.js
var cell_default = { var cell_default = {
// cell组件的props // cell组件的props
cell: { cell: {
@ -2003,7 +2003,7 @@ var cell_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/cellGroup.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/cellGroup.js
var cellGroup_default = { var cellGroup_default = {
// cell-group组件的props // cell-group组件的props
cellGroup: { cellGroup: {
@ -2013,7 +2013,7 @@ var cellGroup_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/checkbox.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/checkbox.js
var checkbox_default = { var checkbox_default = {
// checkbox组件 // checkbox组件
checkbox: { checkbox: {
@ -2033,7 +2033,7 @@ var checkbox_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/checkboxGroup.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/checkboxGroup.js
var checkboxGroup_default = { var checkboxGroup_default = {
// checkbox-group组件 // checkbox-group组件
checkboxGroup: { checkboxGroup: {
@ -2055,7 +2055,7 @@ var checkboxGroup_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/circleProgress.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/circleProgress.js
var circleProgress_default = { var circleProgress_default = {
// circleProgress 组件 // circleProgress 组件
circleProgress: { circleProgress: {
@ -2063,7 +2063,7 @@ var circleProgress_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/code.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/code.js
var code_default = { var code_default = {
// code 组件 // code 组件
code: { code: {
@ -2076,7 +2076,7 @@ var code_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/codeInput.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/codeInput.js
var codeInput_default = { var codeInput_default = {
// codeInput 组件 // codeInput 组件
codeInput: { codeInput: {
@ -2098,7 +2098,7 @@ var codeInput_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/col.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/col.js
var col_default = { var col_default = {
// col 组件 // col 组件
col: { col: {
@ -2110,7 +2110,7 @@ var col_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/collapse.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/collapse.js
var collapse_default = { var collapse_default = {
// collapse 组件 // collapse 组件
collapse: { collapse: {
@ -2120,7 +2120,7 @@ var collapse_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/collapseItem.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/collapseItem.js
var collapseItem_default = { var collapseItem_default = {
// collapseItem 组件 // collapseItem 组件
collapseItem: { collapseItem: {
@ -2138,7 +2138,7 @@ var collapseItem_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/columnNotice.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/columnNotice.js
var columnNotice_default = { var columnNotice_default = {
// columnNotice 组件 // columnNotice 组件
columnNotice: { columnNotice: {
@ -2155,7 +2155,7 @@ var columnNotice_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/countDown.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/countDown.js
var countDown_default = { var countDown_default = {
// u-count-down 计时器组件 // u-count-down 计时器组件
countDown: { countDown: {
@ -2166,7 +2166,7 @@ var countDown_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/countTo.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/countTo.js
var countTo_default = { var countTo_default = {
// countTo 组件 // countTo 组件
countTo: { countTo: {
@ -2184,7 +2184,7 @@ var countTo_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/datetimePicker.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/datetimePicker.js
var datetimePicker_default = { var datetimePicker_default = {
// datetimePicker 组件 // datetimePicker 组件
datetimePicker: { datetimePicker: {
@ -2213,7 +2213,7 @@ var datetimePicker_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/divider.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/divider.js
var divider_default = { var divider_default = {
// divider组件 // divider组件
divider: { divider: {
@ -2228,7 +2228,7 @@ var divider_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/empty.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/empty.js
var empty_default = { var empty_default = {
// empty组件 // empty组件
empty: { empty: {
@ -2246,7 +2246,7 @@ var empty_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/form.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/form.js
var form_default = { var form_default = {
// form 组件 // form 组件
form: { form: {
@ -2261,7 +2261,7 @@ var form_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/formItem.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/formItem.js
var formItem_default = { var formItem_default = {
// formItem 组件 // formItem 组件
formItem: { formItem: {
@ -2276,7 +2276,7 @@ var formItem_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/gap.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/gap.js
var gap_default = { var gap_default = {
// gap组件 // gap组件
gap: { gap: {
@ -2288,7 +2288,7 @@ var gap_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/grid.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/grid.js
var grid_default = { var grid_default = {
// grid组件 // grid组件
grid: { grid: {
@ -2298,7 +2298,7 @@ var grid_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/gridItem.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/gridItem.js
var gridItem_default = { var gridItem_default = {
// grid-item组件 // grid-item组件
gridItem: { gridItem: {
@ -2307,7 +2307,7 @@ var gridItem_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/icon.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/icon.js
var { var {
color color
} = config_default; } = config_default;
@ -2334,7 +2334,7 @@ var icon_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/image.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/image.js
var image_default = { var image_default = {
// image组件 // image组件
image: { image: {
@ -2357,7 +2357,7 @@ var image_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/indexAnchor.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/indexAnchor.js
var indexAnchor_default = { var indexAnchor_default = {
// indexAnchor 组件 // indexAnchor 组件
indexAnchor: { indexAnchor: {
@ -2369,7 +2369,7 @@ var indexAnchor_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/indexList.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/indexList.js
var indexList_default = { var indexList_default = {
// indexList 组件 // indexList 组件
indexList: { indexList: {
@ -2381,7 +2381,7 @@ var indexList_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/input.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/input.js
var input_default = { var input_default = {
// index 组件 // index 组件
input: { input: {
@ -2422,7 +2422,7 @@ var input_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/keyboard.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/keyboard.js
var keyboard_default = { var keyboard_default = {
// 键盘组件 // 键盘组件
keyboard: { keyboard: {
@ -2445,7 +2445,7 @@ var keyboard_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/line.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/line.js
var line_default = { var line_default = {
// line组件 // line组件
line: { line: {
@ -2458,7 +2458,7 @@ var line_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/lineProgress.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/lineProgress.js
var lineProgress_default = { var lineProgress_default = {
// lineProgress 组件 // lineProgress 组件
lineProgress: { lineProgress: {
@ -2470,7 +2470,7 @@ var lineProgress_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/link.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/link.js
var { var {
color: color2 color: color2
} = config_default; } = config_default;
@ -2487,7 +2487,7 @@ var link_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/list.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/list.js
var list_default = { var list_default = {
// list 组件 // list 组件
list: { list: {
@ -2508,7 +2508,7 @@ var list_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/listItem.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/listItem.js
var listItem_default = { var listItem_default = {
// listItem 组件 // listItem 组件
listItem: { listItem: {
@ -2516,7 +2516,7 @@ var listItem_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/loadingIcon.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/loadingIcon.js
var { var {
color: color3 color: color3
} = config_default; } = config_default;
@ -2537,7 +2537,7 @@ var loadingIcon_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/loadingPage.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/loadingPage.js
var loadingPage_default = { var loadingPage_default = {
// loading-page组件 // loading-page组件
loadingPage: { loadingPage: {
@ -2553,7 +2553,7 @@ var loadingPage_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/loadmore.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/loadmore.js
var loadmore_default = { var loadmore_default = {
// loadmore 组件 // loadmore 组件
loadmore: { loadmore: {
@ -2578,7 +2578,7 @@ var loadmore_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/modal.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/modal.js
var modal_default = { var modal_default = {
// modal 组件 // modal 组件
modal: { modal: {
@ -2601,7 +2601,7 @@ var modal_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/color.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/color.js
var color4 = { var color4 = {
primary: "#3c9cff", primary: "#3c9cff",
info: "#909399", info: "#909399",
@ -2617,7 +2617,7 @@ var color4 = {
}; };
var color_default = color4; var color_default = color4;
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/navbar.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/navbar.js
var navbar_default = { var navbar_default = {
// navbar 组件 // navbar 组件
navbar: { navbar: {
@ -2640,7 +2640,7 @@ var navbar_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/noNetwork.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/noNetwork.js
var noNetwork_default = { var noNetwork_default = {
// noNetwork // noNetwork
noNetwork: { noNetwork: {
@ -2650,7 +2650,7 @@ var noNetwork_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/noticeBar.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/noticeBar.js
var noticeBar_default = { var noticeBar_default = {
// noticeBar // noticeBar
noticeBar: { noticeBar: {
@ -2670,7 +2670,7 @@ var noticeBar_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/notify.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/notify.js
var notify_default = { var notify_default = {
// notify组件 // notify组件
notify: { notify: {
@ -2685,7 +2685,7 @@ var notify_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/numberBox.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/numberBox.js
var numberBox_default = { var numberBox_default = {
// 步进器组件 // 步进器组件
numberBox: { numberBox: {
@ -2713,7 +2713,7 @@ var numberBox_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/numberKeyboard.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/numberKeyboard.js
var numberKeyboard_default = { var numberKeyboard_default = {
// 数字键盘 // 数字键盘
numberKeyboard: { numberKeyboard: {
@ -2723,7 +2723,7 @@ var numberKeyboard_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/overlay.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/overlay.js
var overlay_default = { var overlay_default = {
// overlay组件 // overlay组件
overlay: { overlay: {
@ -2734,7 +2734,7 @@ var overlay_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/parse.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/parse.js
var parse_default = { var parse_default = {
// parse // parse
parse: { parse: {
@ -2749,7 +2749,7 @@ var parse_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/picker.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/picker.js
var picker_default = { var picker_default = {
// picker // picker
picker: { picker: {
@ -2771,7 +2771,7 @@ var picker_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/popup.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/popup.js
var popup_default = { var popup_default = {
// popup组件 // popup组件
popup: { popup: {
@ -2794,7 +2794,7 @@ var popup_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/radio.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/radio.js
var radio_default = { var radio_default = {
// radio组件 // radio组件
radio: { radio: {
@ -2814,7 +2814,7 @@ var radio_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/radioGroup.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/radioGroup.js
var radioGroup_default = { var radioGroup_default = {
// radio-group组件 // radio-group组件
radioGroup: { radioGroup: {
@ -2837,7 +2837,7 @@ var radioGroup_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/rate.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/rate.js
var rate_default = { var rate_default = {
// rate组件 // rate组件
rate: { rate: {
@ -2856,7 +2856,7 @@ var rate_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/readMore.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/readMore.js
var readMore_default = { var readMore_default = {
// readMore // readMore
readMore: { readMore: {
@ -2871,7 +2871,7 @@ var readMore_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/row.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/row.js
var row_default = { var row_default = {
// row // row
row: { row: {
@ -2881,7 +2881,7 @@ var row_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/rowNotice.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/rowNotice.js
var rowNotice_default = { var rowNotice_default = {
// rowNotice // rowNotice
rowNotice: { rowNotice: {
@ -2895,7 +2895,7 @@ var rowNotice_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/scrollList.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/scrollList.js
var scrollList_default = { var scrollList_default = {
// scrollList // scrollList
scrollList: { scrollList: {
@ -2908,7 +2908,7 @@ var scrollList_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/search.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/search.js
var search_default = { var search_default = {
// search // search
search: { search: {
@ -2938,7 +2938,7 @@ var search_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/section.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/section.js
var section_default = { var section_default = {
// u-section组件 // u-section组件
section: { section: {
@ -2955,7 +2955,7 @@ var section_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/skeleton.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/skeleton.js
var skeleton_default = { var skeleton_default = {
// skeleton // skeleton
skeleton: { skeleton: {
@ -2973,7 +2973,7 @@ var skeleton_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/slider.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/slider.js
var slider_default = { var slider_default = {
// slider组件 // slider组件
slider: { slider: {
@ -2992,7 +2992,7 @@ var slider_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/statusBar.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/statusBar.js
var statusBar_default = { var statusBar_default = {
// statusBar // statusBar
statusBar: { statusBar: {
@ -3000,7 +3000,7 @@ var statusBar_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/steps.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/steps.js
var steps_default = { var steps_default = {
// steps组件 // steps组件
steps: { steps: {
@ -3014,7 +3014,7 @@ var steps_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/stepsItem.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/stepsItem.js
var stepsItem_default = { var stepsItem_default = {
// steps-item组件 // steps-item组件
stepsItem: { stepsItem: {
@ -3025,7 +3025,7 @@ var stepsItem_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/sticky.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/sticky.js
var sticky_default = { var sticky_default = {
// sticky组件 // sticky组件
sticky: { sticky: {
@ -3038,7 +3038,7 @@ var sticky_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/subsection.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/subsection.js
var subsection_default = { var subsection_default = {
// subsection组件 // subsection组件
subsection: { subsection: {
@ -3054,7 +3054,7 @@ var subsection_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swipeAction.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swipeAction.js
var swipeAction_default = { var swipeAction_default = {
// swipe-action组件 // swipe-action组件
swipeAction: { swipeAction: {
@ -3062,7 +3062,7 @@ var swipeAction_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swipeActionItem.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swipeActionItem.js
var swipeActionItem_default = { var swipeActionItem_default = {
// swipeActionItem 组件 // swipeActionItem 组件
swipeActionItem: { swipeActionItem: {
@ -3076,7 +3076,7 @@ var swipeActionItem_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swiper.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swiper.js
var swiper_default = { var swiper_default = {
// swiper 组件 // swiper 组件
swiper: { swiper: {
@ -3107,7 +3107,7 @@ var swiper_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swipterIndicator.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swipterIndicator.js
var swipterIndicator_default = { var swipterIndicator_default = {
// swiperIndicator 组件 // swiperIndicator 组件
swiperIndicator: { swiperIndicator: {
@ -3119,7 +3119,7 @@ var swipterIndicator_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/switch.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/switch.js
var switch_default = { var switch_default = {
// switch // switch
switch: { switch: {
@ -3136,7 +3136,7 @@ var switch_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tabbar.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tabbar.js
var tabbar_default = { var tabbar_default = {
// tabbar // tabbar
tabbar: { tabbar: {
@ -3151,7 +3151,7 @@ var tabbar_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tabbarItem.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tabbarItem.js
var tabbarItem_default = { var tabbarItem_default = {
// //
tabbarItem: { tabbarItem: {
@ -3164,7 +3164,7 @@ var tabbarItem_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tabs.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tabs.js
var tabs_default = { var tabs_default = {
// //
tabs: { tabs: {
@ -3189,7 +3189,7 @@ var tabs_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tag.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tag.js
var tag_default = { var tag_default = {
// tag 组件 // tag 组件
tag: { tag: {
@ -3211,7 +3211,7 @@ var tag_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/text.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/text.js
var text_default = { var text_default = {
// text 组件 // text 组件
text: { text: {
@ -3241,7 +3241,7 @@ var text_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/textarea.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/textarea.js
var textarea_default = { var textarea_default = {
// textarea 组件 // textarea 组件
textarea: { textarea: {
@ -3270,7 +3270,7 @@ var textarea_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/toast.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/toast.js
var toast_default = { var toast_default = {
// toast组件 // toast组件
toast: { toast: {
@ -3293,7 +3293,7 @@ var toast_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/toolbar.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/toolbar.js
var toolbar_default = { var toolbar_default = {
// toolbar 组件 // toolbar 组件
toolbar: { toolbar: {
@ -3306,7 +3306,7 @@ var toolbar_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tooltip.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tooltip.js
var tooltip_default = { var tooltip_default = {
// tooltip 组件 // tooltip 组件
tooltip: { tooltip: {
@ -3324,7 +3324,7 @@ var tooltip_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/transition.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/transition.js
var transition_default = { var transition_default = {
// transition动画组件的props // transition动画组件的props
transition: { transition: {
@ -3335,7 +3335,7 @@ var transition_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/upload.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/upload.js
var upload_default = { var upload_default = {
// upload组件 // upload组件
upload: { upload: {
@ -3364,7 +3364,7 @@ var upload_default = {
} }
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props.js
var { var {
color: color5 color: color5
} = config_default; } = config_default;
@ -3459,7 +3459,7 @@ var props_default = {
...upload_default ...upload_default
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/zIndex.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/zIndex.js
var zIndex_default = { var zIndex_default = {
toast: 10090, toast: 10090,
noNetwork: 10080, noNetwork: 10080,
@ -3472,13 +3472,13 @@ var zIndex_default = {
indexListSticky: 965 indexListSticky: 965
}; };
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/function/platform.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/function/platform.js
var platform = "none"; var platform = "none";
platform = "vue3"; platform = "vue3";
platform = "h5"; platform = "h5";
var platform_default = platform; var platform_default = platform;
// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/index.js // ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/index.js
var pleaseSetTranspileDependencies = {}; var pleaseSetTranspileDependencies = {};
var babelTest = pleaseSetTranspileDependencies == null ? void 0 : pleaseSetTranspileDependencies.test; var babelTest = pleaseSetTranspileDependencies == null ? void 0 : pleaseSetTranspileDependencies.test;
var $u = { var $u = {

2
node_modules/.vite/deps/uview-plus.js.map generated vendored
View File

File diff suppressed because one or more lines are too long

8
pages.json
View File

@ -275,6 +275,14 @@
"navigationBarBackgroundColor": "#F4F4F4", "navigationBarBackgroundColor": "#F4F4F4",
"navigationBarTextStyle": "black" "navigationBarTextStyle": "black"
} }
}, {
"path": "pages/aquatic/allRecordTable",
"style": {
"navigationBarTitleText": "详情",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#F4F4F4",
"navigationBarTextStyle": "black"
}
}, { }, {
"path": "pages/aquatic/imgList", "path": "pages/aquatic/imgList",
"style": { "style": {

26
pages/aquatic/addPond.vue
View File

@ -28,10 +28,11 @@
</view> </view>
<view class="card-li"> <view class="card-li">
<view class="card-li-tit"> <view class="card-li-tit">
鱼苗购入点 鱼苗购入时间
</view> </view>
<view class=""> <view class="">
<up-input placeholder="请输入品种" border="surround" v-model="formData.buy_info"></up-input> <up-input placeholder="点击选择时间" @focus="choseDateFn" border="surround"
v-model="formData.buy_info"></up-input>
</view> </view>
</view> </view>
@ -62,8 +63,7 @@
+上传播种图片 +上传播种图片
</view> --> </view> -->
<view class="confirm"> <view class="confirm">
<view class="confirm-btn" style="color: white;background-color: #0AA565;" <view class="confirm-btn" style="color: white;background-color: #0AA565;" @click="addFn">
@click="navgo('/pages/index/index')">
完成添加 完成添加
</view> </view>
<view class="confirm-btn" style="color: #0AA565;" @click="nextFn"> <view class="confirm-btn" style="color: #0AA565;" @click="nextFn">
@ -75,7 +75,7 @@
</view> --> </view> -->
<!-- 组件 --> <!-- 组件 -->
<uni-calendar :insert="false" ref="calendar" :lunar="true" @confirm="confirm" />
</view> </view>
</template> </template>
@ -96,9 +96,10 @@
userInfoStore userInfoStore
} from '@/store/userInfo' } from '@/store/userInfo'
const userInfo = userInfoStore() const userInfo = userInfoStore()
// console.log()
const formData = reactive({}) const formData = reactive({})
const baseData = reactive({ const baseData = reactive({
user_id: userInfo.user_id, user_id: userInfo.userInfo.id,
pond_id: "", pond_id: "",
kind: "", kind: "",
breed: "", breed: "",
@ -116,6 +117,12 @@
url url
}) })
} }
const addFn = () => {
if (formData.kind) {
nextFn()
}
navgo('/pages/index/index')
}
const nextFn = async () => { const nextFn = async () => {
let res = await addFishAPI({ let res = await addFishAPI({
...formData ...formData
@ -134,6 +141,13 @@
baseData.pond_id = options.pond_id baseData.pond_id = options.pond_id
objFn(baseData, formData) objFn(baseData, formData)
}) })
const calendar = ref()
const choseDateFn = () => {
calendar.value.open()
}
const confirm = (e) => {
formData.buy_info = e.fulldate
}
</script> </script>
<style lang='scss' scoped> <style lang='scss' scoped>

87
pages/aquatic/allRecordTable.vue Normal file
View File

@ -0,0 +1,87 @@
<template>
<view class="content">
<pondCard :id='pond_id'></pondCard>
<view class="histroy">
<view class="tit" style="margin-bottom: 40rpx;">
历史操作记录
</view>
<myTable :dataList='dataList'></myTable>
</view>
</view>
</template>
<script setup>
import pondCard from "@/components/aquatic/pondCard.vue"
import {
ref,
reactive
} from "vue"
import myTable from "@/components/myTable/index.vue"
import {
actionsAPI
} from "@/api/animal.js"
import {
onLoad
} from "@dcloudio/uni-app"
const dataList = reactive({})
const pond_id = ref('')
onLoad((option) => {
pond_id.value = option.pond_id
actionsAPI({
type: 4,
pond_id: pond_id.value
}).then(res => {
for (let key in res.data[option.index].action_record) {
dataList[key] = res.data[option.index].action_record[key]
}
})
})
const navgo = (url) => {
uni.navigateTo({
url
})
}
</script>
<style lang="scss" scoped>
.circumstance {
width: 693.93rpx;
margin: 0 auto;
margin-bottom: 43rpx;
.card-tit {
display: flex;
justify-content: space-between;
margin-bottom: 28rpx;
}
.updata-btn {
font-size: 26.29rpx;
// width: 192.76rpx;
padding: 0 30rpx;
height: 57.83rpx;
border: 1px solid #00A15E;
color: #00A15E;
display: flex;
justify-content: center;
align-items: center;
border-radius: 31.54rpx 31.54rpx 31.54rpx 31.54rpx;
}
.check {
font-size: 29.79rpx;
text-align: center;
display: flex;
justify-content: center;
align-items: center;
}
.tab {
height: 500rpx;
background-color: red;
}
}
</style>

76
pages/aquatic/detail.vue
View File

@ -1,5 +1,6 @@
<template> <template>
<view class="content"> <view class="content">
{{actionsList}}
<imgCard :imgUrl='headData?.pic_detail?.pic'></imgCard> <imgCard :imgUrl='headData?.pic_detail?.pic'></imgCard>
<view class="bad-info"> <view class="bad-info">
<view class="" style="display: flex;align-items: center;"> <view class="" style="display: flex;align-items: center;">
@ -15,43 +16,21 @@
上传新的种植情况 上传新的种植情况
</view> </view>
<pondCard :id='pond_id' :showBtn="true"></pondCard> <pondCard :id='pond_id' :showBtn="true"></pondCard>
<view class="circumstance" v-for="(item,index) in actionList" :key="index"> <view class="circumstance" v-for="(item,index) in actionList" :key="index">
<view class="card-tit"> <view class="card-tit">
<view class=""> <view class="">
{{index}} {{index}}
</view> </view>
<view class="updata-btn" @click="navgo(`/pages/growRecord/fish?type=4&pond_id=${pond_id}`)"> <view class="updata-btn"
@click="navgo(`/pages/growRecord/fish?type=4&pond_id=${pond_id}&title=${index}`)">
更新{{index.slice(0,-2)}} 更新{{index.slice(0,-2)}}
</view> </view>
</view> </view>
<myTable :tit='`查看${index.slice(0,-2)}`' :dataList="item.action_record" route='/pages/feedIng/allRecording'> <myTable :tit='`查看${index.slice(0,-2)}`' :dataList="item.action_record"
:route='`/pages/aquatic/allRecordTable?pond_id=${pond_id}&index=${index}`'>
</myTable> </myTable>
</view> </view>
<!-- <view class="circumstance">
<view class="card-tit">
<view class="">
生长密度记录
</view>
<view class="updata-btn" @click="navgo('/pages/aquatic/updateGrow')">
更新生长记录
</view>
</view>
<myTable tit='查看历史清点记录' route='/pages/feedIng/allRecording'></myTable>
</view>
<view class="circumstance">
<view class="card-tit">
<view class="">
饲养记录
</view>
<view class="updata-btn" style="width: 300rpx;" @click="navgo('/pages/growRecord/index')">
更新饲养记录
</view>
</view>
<myTable tit='查看历史消毒记录' route='/pages/feedIng/allRecording'></myTable>
</view> -->
<view class="data"> <view class="data">
<view class="tit"> <view class="tit">
<view class="" style="display: flex;justify-content: space-between;font-size: 29.79rpx;"> <view class="" style="display: flex;justify-content: space-between;font-size: 29.79rpx;">
@ -64,7 +43,6 @@
<text>刷新时间: {{dateFn()}}</text> <text>刷新时间: {{dateFn()}}</text>
</view> </view>
</view> </view>
<!-- 你这不是 -->
<view class="data-cont"> <view class="data-cont">
<view class="data-cont-li center" v-for="(item,index) in data " :key="index"> <view class="data-cont-li center" v-for="(item,index) in data " :key="index">
@ -91,6 +69,7 @@
</view> </view>
</view> </view>
</view> </view>
</template> </template>
<script setup> <script setup>
@ -182,6 +161,7 @@
}) })
} }
const pond_id = ref(0) const pond_id = ref(0)
const actionList = reactive({})
const headData = reactive({}) const headData = reactive({})
onShow(() => { onShow(() => {
pondInfoAPI({ pondInfoAPI({
@ -193,31 +173,33 @@
} }
}) })
}) })
onLoad((option) => { onLoad(async (option) => {
pondEnvDataAPI({
user_id: 307
}).then(res => {
for (let key in res.data) {
baseData[key] = (res.data)[key]
}
})
pond_id.value = option.pond_id pond_id.value = option.pond_id
pondInfoAPI({ actionsAPI({
type: 4,
pond_id: option.pond_id
}).then(res2 => {
for (let key in res2.data) {
actionList[key] = (res2.data)[key]
}
console.log(actionList)
})
let res1 = await pondEnvDataAPI({
user_id: 307
})
for (let key in res1.data) {
baseData[key] = (res1.data)[key]
}
let res = await pondInfoAPI({
user_id: 307, user_id: 307,
pond_id: pond_id.value pond_id: pond_id.value
}).then(res => {
for (let key in res.data) {
headData[key] = (res.data)[key]
}
}) })
})
const actionList = reactive({})
actionsAPI({
type: 4
}).then(res => {
for (let key in res.data) { for (let key in res.data) {
actionList[key] = (res.data)[key] headData[key] = (res.data)[key]
} }
}) })
</script> </script>

41
pages/detail/plant.vue
View File

@ -17,20 +17,6 @@
<!-- {{crop_id}} --> <!-- {{crop_id}} -->
</view> </view>
<landInfo :land_id='landDeatil.land_id' @getcropid='getcropidFn'></landInfo> <landInfo :land_id='landDeatil.land_id' @getcropid='getcropidFn'></landInfo>
<!-- 生长记录 -->
<!-- <view class="grow-record-tit">
<view class="">
生长记录操作
</view>
<view class="updata-btn" @tap="navgo(`/pages/growRecord/index?land_id=${landDeatil.land_id}&type=1`)">
更新生长记录
</view>
</view>
<myTable tit='查看历史记录' :dataList="tableDate" :route='`/pages/records/index?land_id=${landDeatil.land_id}`'>
</myTable> -->
<!-- dsfdsf
{{tableDate}} -->
<view class="circumstance" v-for="(item,index) in tableDate" :key="index"> <view class="circumstance" v-for="(item,index) in tableDate" :key="index">
<!-- {{index}} --> <!-- {{index}} -->
<!-- {{tableDate}} <!-- {{tableDate}}
@ -40,12 +26,13 @@
{{index}} {{index}}
</view> </view>
<view class="updata-btn" <view class="updata-btn"
@click="navgo(`/pages/growRecord/index?type=1&crop_id=${crop_id}&land_id=${landDeatil.land_id}`)"> @click="navgo(`/pages/growRecord/index?type=1&crop_id=${crop_id}&land_id=${landDeatil.land_id}&title=${index}`)">
更新{{index.slice(0,-2)}} 更新{{index.slice(0,-2)}}
</view> </view>
</view> </view>
<!-- {{item.action_record}} -->
<myTable :tit='`查看${index.slice(0,-2)}`' :dataList="item.action_record" <myTable :tit='`查看${index.slice(0,-2)}`' :dataList="item.action_record"
:route='`/pages/records/index?land_id=${landDeatil.land_id}&crop_id=${crop_id}`'> :route='`/pages/records/index?land_id=${landDeatil.land_id}&crop_id=${crop_id}&index=${index}`'>
</myTable> </myTable>
</view> </view>
@ -97,7 +84,7 @@
<view class="ripe-btn" @click="showPop=true"> <view class="ripe-btn" @click="showPop=true">
标记为成熟 标记为成熟
</view> </view>
<view class="ripe-btn" v-if="false" @click="navgo('/pages/index/index')"> <view class="ripe-btn" v-if="false" @click="navgo(allripeFn)">
标记为全部收获 标记为全部收获
</view> </view>
<!-- 组件 --> <!-- 组件 -->
@ -244,7 +231,9 @@
// crop_id: landDeatil.crop_id // crop_id: landDeatil.crop_id
// }) // })
let res2 = await actionsAPI({ let res2 = await actionsAPI({
type: 1 type: 1,
crop_id: landDeatil.crop_id
}) })
objFn(res2.data, tableDate) objFn(res2.data, tableDate)
let res3 = await landEnvDataCurrAPI({ let res3 = await landEnvDataCurrAPI({
@ -296,15 +285,13 @@
const img = (w, h, m) => { const img = (w, h, m) => {
return `width:${w}rpx;height:${h};margin:0 ${m}rpx ` return `width:${w}rpx;height:${h};margin:0 ${m}rpx `
} }
const navto = () => {
uni.navigateTo({
url: '/pages/index2/index'
})
}
const markFn = () => { const markFn = () => {
setLandCropRipeAPI({ setLandCropRipeAPI({
crop_id: landDeatil.crop_id, crop_id: landDeatil.crop_id,
crop_yield: Number(crop_yield.value) crop_yield: Number(crop_yield.value)
}).then(res => {
showPop.value = false
}) })
} }
@ -314,6 +301,14 @@
} }
} }
const allripeFn = () => {
return
uni.navigateTo({
url: '/pages/index/index'
})
}
// actionsAPI({ // actionsAPI({
// type: 1 // type: 1
// }).then(res => { // }).then(res => {

34
pages/feedIng/allRecordTable.vue
View File

@ -1,17 +1,11 @@
<template> <template>
<view class="content"> <view class="content">
<farmersCard></farmersCard> <farmersCard></farmersCard>
<view class="circumstance" v-for="(item,index) in actionList" :key="index"> <view class="histroy">
<view class="card-tit"> <view class="tit" style="margin-bottom: 40rpx;">
<view class=""> 历史操作记录
{{index}}
</view>
<view class="updata-btn" @click="navgo('/pages/growRecord/index')">
更新{{index.slice(0,-2)}}
</view>
</view> </view>
<myTable :dataList="item.action_record">> <myTable :dataList='dataList'></myTable>
</myTable>
</view> </view>
</view> </view>
</template> </template>
@ -27,14 +21,20 @@
actionsAPI actionsAPI
} from "@/api/animal.js" } from "@/api/animal.js"
const actionList = reactive({}) import {
actionsAPI({ onLoad
type: 3 } from "@dcloudio/uni-app"
}).then(res => { const dataList = reactive({})
for (let key in res.data) { onLoad((option) => {
actionList[key] = (res.data)[key] actionsAPI({
} type: 3
}).then(res => {
for (let key in res.data[option.index].action_record) {
dataList[key] = res.data[option.index].action_record[key]
}
})
}) })
const navgo = (url) => { const navgo = (url) => {
uni.navigateTo({ uni.navigateTo({
url url

11
pages/feedIng/feedDetail.vue
View File

@ -58,10 +58,17 @@
</view> </view>
<view class="card"> <view class="card">
<view class="card-li"> <view class="card-li">
<view class="" @click.capture="selectFoucsFn"> <view class="" @click.capture="selectFoucsFn">
养殖类型: {{baseData.animal_kind}} 养殖品种: {{baseData.animal_kind}}
</view>
<view class="" style="display: flex;align-items: center;">
具体种类: {{baseData.animal_breed}}
</view>
</view>
<view class="card-li">
<view class="" @click.capture="selectFoucsFn">
养殖类型: {{baseData.animal_gender==1?'公':"母"}}
</view> </view>
<view class="" style="display: flex;align-items: center;"> <view class="" style="display: flex;align-items: center;">
体重: <up-input style="height: 49.07rpx;width: 215.54rpx;margin-left: 20rpx;" placeholder="请输入内容" 体重: <up-input style="height: 49.07rpx;width: 215.54rpx;margin-left: 20rpx;" placeholder="请输入内容"

32
pages/growRecord/chick.vue
View File

@ -34,9 +34,10 @@
</view> </view>
</view> --> </view> -->
<landInfo :land_id='land_id'></landInfo> <!-- <landInfo :land_id='land_id'></landInfo> -->
<farmersCard></farmersCard>
<view class="operate" v-for="(item,index) in actionData" :key="index"> <view class="operate" v-for="(item,index) in actionData" :key="index" v-show="title==index">
<view class="tit"> <view class="tit">
{{index}} {{index}}
</view> </view>
@ -104,7 +105,7 @@
</view> </view>
</view> </view>
<view class="ripe-btn"> <view class="ripe-btn" @click="finshFn">
完成今日操作 完成今日操作
</view> </view>
<!-- 组件 --> <!-- 组件 -->
@ -214,7 +215,7 @@
</view> </view>
<!-- 组件 --> <!-- 组件 -->
<u-picker :show="showPicker" :columns="columns" @confirm="confirmFn" @close="showPicker=false" <u-picker :show="showPicker" :columns="columns" @confirm="confirmFn" @close="showPicker=false"
@cancel="showModal=false"></u-picker> @cancel="showPicker=false"></u-picker>
<u-modal :show="showModal" :showCancelButton='true' :closeOnClickOverlay="true" @close="showModal=false" <u-modal :show="showModal" :showCancelButton='true' :closeOnClickOverlay="true" @close="showModal=false"
content='确认删除吗?' @confirm="delFn" @cancel="showModal=false"></u-modal> content='确认删除吗?' @confirm="delFn" @cancel="showModal=false"></u-modal>
</view> </view>
@ -226,7 +227,7 @@
ref, ref,
reactive reactive
} from "vue" } from "vue"
import landInfo from "@/components/plant/landInfo.vue" import farmersCard from "@/components/poultry/farmersCard.vue"
import { import {
actionsListAPI, actionsListAPI,
actionsDetailAPI, actionsDetailAPI,
@ -256,17 +257,19 @@
showPicker.value = false showPicker.value = false
formData.select.value = e.value[0] formData.select.value = e.value[0]
} }
const land_id = ref(0) // const land_id = ref(0)
const pond_id = ref(0) // const pond_id = ref(0)
const crop_id = ref(0) // const crop_id = ref(0)
const type = ref(0) const type = ref(0)
const title = ref("")
const actionData = reactive({}) const actionData = reactive({})
const delIndex = ref(0) const delIndex = ref(0)
onLoad((options) => { onLoad((options) => {
type.value = options.type type.value = options.type
land_id.value = options.land_id title.value = options.title
pond_id.value = options.pond_id // land_id.value = options.land_id
crop_id.value = options.crop_id // pond_id.value = options.pond_id
// crop_id.value = options.crop_id
getAcyionListFn(options.type) getAcyionListFn(options.type)
}) })
@ -367,7 +370,7 @@
}) })
} }
const editFn = (item) => { const editFn = (item) => {
console.log(item)
delIndex.value = item.id delIndex.value = item.id
showPopFn(item.action_id) showPopFn(item.action_id)
formData = deepCopy(item.action_content) formData = deepCopy(item.action_content)
@ -491,6 +494,11 @@
serchList.splice(e, 1); serchList.splice(e, 1);
formData.serch.list.splice(e, 1) formData.serch.list.splice(e, 1)
} }
const finshFn = () => {
uni.navigateTo({
url: "/pages/index/index?index=3"
})
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

25
pages/growRecord/feedIng.vue
View File

@ -1,8 +1,9 @@
<template> <template>
<view :class="{popupShow:showPop}"> <view :class="{popupShow:showPop}">
<view class="cont"> <view class="cont">
<landInfo :land_id='land_id'></landInfo> <!-- <landInfo :land_id='land_id'></landInfo> -->
<view class="operate" v-for="(item,index) in actionData" :key="index"> <farmersCard></farmersCard>
<view class="operate" v-for="(item,index) in actionData" :key="index" v-show="title==index">
<view class="tit"> <view class="tit">
{{index}} {{index}}
</view> </view>
@ -51,7 +52,7 @@
</view> </view>
</view> </view>
<view class="ripe-btn"> <view class="ripe-btn" @tap="finishFn">
完成今日操作 完成今日操作
</view> </view>
<!-- 组件 --> <!-- 组件 -->
@ -173,7 +174,8 @@
ref, ref,
reactive reactive
} from "vue" } from "vue"
import landInfo from "@/components/plant/landInfo.vue" // import landInfo from "@/components/plant/landInfo.vue"
import farmersCard from "@/components/animal/farmersCard.vue"
import { import {
actionsListAPI, actionsListAPI,
actionsDetailAPI, actionsDetailAPI,
@ -203,17 +205,12 @@
showPicker.value = false showPicker.value = false
formData.select.value = e.value[0] formData.select.value = e.value[0]
} }
const land_id = ref(0) const title = ref('')
const pond_id = ref(0)
const crop_id = ref(0)
const type = ref(0) const type = ref(0)
const actionData = reactive({}) const actionData = reactive({})
const delIndex = ref(0) const delIndex = ref(0)
onLoad((options) => { onLoad((options) => {
type.value = options.type title.value = options.title
land_id.value = options.land_id
pond_id.value = options.pond_id
crop_id.value = options.crop_id
getAcyionListFn(options.type) getAcyionListFn(options.type)
}) })
@ -317,7 +314,6 @@
delIndex.value = item.id delIndex.value = item.id
showPopFn(item.action_id) showPopFn(item.action_id)
formData = deepCopy(item.action_content) formData = deepCopy(item.action_content)
if (item.action_content.serch.list.length) { if (item.action_content.serch.list.length) {
item.action_content.serch.list.forEach(item => { item.action_content.serch.list.forEach(item => {
animalSearchByCodeAPI({ animalSearchByCodeAPI({
@ -437,6 +433,11 @@
serchList.splice(e, 1); serchList.splice(e, 1);
formData.serch.list.splice(e, 1) formData.serch.list.splice(e, 1)
} }
const finishFn = () => {
uni.navigateTo({
url: '/pages/index/index?index=2'
})
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

250
pages/growRecord/fish.vue
View File

@ -1,42 +1,8 @@
<template> <template>
<view :class="{popupShow:showPop}"> <view :class="{popupShow:showPop}">
<view class="cont"> <view class="cont">
<pondCard :id='pond_id'></pondCard>
<!-- <view class="card"> <view class="operate" v-for="(item,index) in actionData" :key="index" v-show="title==index">
<view class="tit">
<view class="">
1号土地
</view>
<view class="">
溯源码: 12302
</view>
</view>
<view class="card-li">
<view class="">
当前种植: 土豆
</view>
<view class="">
种植品牌: 的划分等级
</view>
</view>
<view class="card-li">
<view class="">
土地面积: 20亩
</view>
<view class="">
种子品牌: 的划分等级
</view>
</view>
<view class="card-li">
<view class="">
播种时间: 2020.12.01
</view>
</view>
</view> -->
<landInfo :land_id='land_id'></landInfo>
<view class="operate" v-for="(item,index) in actionData" :key="index">
<view class="tit"> <view class="tit">
{{index}} {{index}}
</view> </view>
@ -45,25 +11,6 @@
v-for="items,indexs in item.actions" :key='indexs'> v-for="items,indexs in item.actions" :key='indexs'>
{{items.name}} {{items.name}}
</view> </view>
<!-- <view class="operate-li" @tap="navgo('')">
喂食
</view>
<view class="operate-li" @tap="navgo('/pages/feedIng/vaccineInfo')">
注射疫苗
</view>
<view class="operate-li">
胶水dassdd
</view>
<view class="operate-li">
胶水
</view>
<view class="operate-li">
胶水
</view> -->
</view>
<view class="">
</view> </view>
</view> </view>
<view class="fertilize" v-for="(item,index) in actionList" :key="index"> <view class="fertilize" v-for="(item,index) in actionList" :key="index">
@ -80,36 +27,35 @@
编辑 编辑
</view> </view>
</view> </view>
</view> </view>
<view class="fertilize-li"> <view class="fertilize-li">
<view class="fertilize-li-a" v-for="(items,indexs) in item.action_content" v-show="items.tit" <view class="fertilize-li-a" v-for="(items,indexs) in item.action_content" v-show="items.value"
:key="indexs"> :key="indexs">
<view class="" v-if="indexs=='pic'"> <view class="" v-if="indexs=='pic'">
{{items.tit}}: <text style="color: #3274F9;" {{items.tit}}: <text style="color: #3274F9;"
@click="previewImage(items.value)">图片</text> @click="previewImage(items.value)">图片</text>
</view> </view>
<view class="" v-if="indexs=='serch'"> <view class="" v-else>
{{items.tit}}: 注射疫苗{{items.list.length}}支 <view class="" v-if="items.value">
</view> {{items.tit}}: {{items.value}}
<view class="" v-if="indexs=='text'||indexs=='select'"> </view>
{{items.tit}}: {{items.value}}
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="" style="height: 100px">
</view>
</view> </view>
<view class="ripe-btn"> <view class="ripe-btn" @click="navgo(`/pages/detail/plant?land_id=${land_id}`)">
完成今日操作 完成今日操作
</view> </view>
<!-- 组件 --> <!-- 组件 -->
<view class=""> <view class="">
<u-popup :show="showPop" :round="10" :closeable='true' @close="popCloseFn" @open="showPop=true"> <u-popup :show="showPop" :round="10" :closeable='true' @close="showPop=false" @open="showPop=true">
<scroll-view scroll-y style="max-height: 90vh;"> <scroll-view scroll-y style="max-height: 90vh;">
<!-- 滚动内容 --> <!-- 滚动内容 -->
<view class="pop-content" v-for="item,index in popList" :key='index'> <view class="pop-content" v-for="item,index in popList" :key='index'>
@ -163,45 +109,8 @@
@change="change4(item.title)"></up-input> @change="change4(item.title)"></up-input>
</view> </view>
<view style="margin-bottom: 20rpx;" v-for="(item,index) in serchList" :key="item"> <view style="margin-bottom: 20rpx;" v-for="item in [1]" :key="item">
<u-swipe-action>
<u-swipe-action-item :options="options1"
style="border-radius: 20rpx;border: 1px solid #C7C6CD;"
@click="swipeDel(index)">
<view class="" style="padding: 20rpx 30rpx;">
<view class="swipe-action-tit">
<view class="">
编号: {{item.animal_code}}
</view>
<view class="" style="color: #00A15E;" v-if="item.animal_status==1">
健康
</view>
<view class="" style="color: #FFD736;" v-if="item.animal_status==2">
怀孕中
</view>
<view class="" style="color: #3274F9;" v-if="item.animal_status==3">
可出栏
</view>
<view class="" style="color: #3274F9;" v-if="item.animal_status==5">
可出栏
</view>
</view>
<view class="swipe-action-li">
<view class="">
养殖品种:{{item.animal_kind}}
</view>
<view class="">
年龄: {{item.animal_age}}个月
</view>
<view class="">
体重: {{item.animal_weight}}kg
</view>
</view>
</view>
</u-swipe-action-item>
</u-swipe-action>
</view> </view>
</view> </view>
</view> </view>
@ -226,24 +135,25 @@
ref, ref,
reactive reactive
} from "vue" } from "vue"
import landInfo from "@/components/plant/landInfo.vue" // import landInfo from "@/components/plant/landInfo.vue"
import pondCard from "@/components/aquatic/pondCard.vue"
import { import {
actionsListAPI, actionsListAPI,
actionsDetailAPI, actionsDetailAPI,
addLandCropRecordAPI, addLandCropRecordAPI,
landCropRecordListAPI, landCropRecordListAPI,
delLandCropRecordAPI, delLandCropRecordAPI,
ediLandCropRecordAPI, ediLandCropRecordAPI
animalSearchByCodeAPI } from "@/api/aquatic.js"
} from "@/api/animal.js"
import { import {
onLoad onLoad
} from "@dcloudio/uni-app" } from "@dcloudio/uni-app"
import { import {
addFishRecordAPI addFishRecordAPI
} from "@/api/aquatic.js" } from "@/api/aquatic.js"
import uplodeImg from "@/utils/uplodeImg.js" import uplodeImg from "@/utils/uplodeImg.js"
const serchList = reactive([])
const actionList = reactive([]) const actionList = reactive([])
const options1 = reactive([{ const options1 = reactive([{
text: '删除' text: '删除'
@ -256,24 +166,22 @@
showPicker.value = false showPicker.value = false
formData.select.value = e.value[0] formData.select.value = e.value[0]
} }
const land_id = ref(0)
const pond_id = ref(0) const pond_id = ref(0)
const crop_id = ref(0)
const type = ref(0) const type = ref(0)
const title = ref('')
const actionData = reactive({}) const actionData = reactive({})
const delIndex = ref(0) const delIndex = ref(0)
onLoad((options) => { onLoad((options) => {
type.value = options.type
land_id.value = options.land_id
pond_id.value = options.pond_id pond_id.value = options.pond_id
crop_id.value = options.crop_id title.value = options.title
getAcyionListFn(options.type) getAcyionListFn()
}) })
const getAcyionListFn = (type) => { const getAcyionListFn = () => {
actionList.splice(0, actionList.length) actionList.splice(0, actionList.length)
actionsListAPI({ actionsListAPI({
type: type type: 4,
pond_id: pond_id.value
}).then(res => { }).then(res => {
for (let key in res.data) { for (let key in res.data) {
actionData[key] = res.data[key] actionData[key] = res.data[key]
@ -283,6 +191,15 @@
actionList.push(...(res.data[key].action_record)) actionList.push(...(res.data[key].action_record))
} }
}) })
// actionList.splice(0, actionList.length)
// landCropRecordListAPI({
// crop_id: crop_id.value,
// action_type_id: 1
// }).then(res => {
// res.data.forEach(item => {
// actionList.push(item)
// })
// })
} }
const showPop = ref(false) const showPop = ref(false)
const baseData = reactive({ const baseData = reactive({
@ -300,11 +217,10 @@
}, },
serch: { serch: {
value: "", value: "",
tit: "", tit: ""
list: [],
}, },
}) })
let formData = reactive({ const formData = reactive({
text: { text: {
value: "", value: "",
tit: "" tit: ""
@ -319,8 +235,7 @@
}, },
serch: { serch: {
value: "", value: "",
tit: "", tit: ""
list: [],
}, },
}) })
// 操作类型,true为添加,false为编辑 // 操作类型,true为添加,false为编辑
@ -330,11 +245,12 @@
// console.log(formData) // console.log(formData)
if (actionType.value) { if (actionType.value) {
addLandCropRecordAPI({ addLandCropRecordAPI({
user_id: 307, pond_id: Number(pond_id.value),
action_id: action_id.value, action_id: action_id.value,
action_content: JSON.stringify(formData) action_content: JSON.stringify(formData)
}).then(res => { }).then(res => {
setPropertiesToNull(formData) setPropertiesToNull(formData)
getAcyionListFn()
}) })
} else { } else {
ediLandCropRecordAPI({ ediLandCropRecordAPI({
@ -342,10 +258,8 @@
action_content: JSON.stringify(formData) action_content: JSON.stringify(formData)
}) })
} }
console.log(baseData)
objFn(baseData, formData) objFn(baseData, formData)
getAcyionListFn(type.value)
serchList.splice(0, serchList.length)
} }
const navgo = (url) => { const navgo = (url) => {
@ -363,24 +277,13 @@
delLandCropRecordAPI({ delLandCropRecordAPI({
record_id: delIndex.value record_id: delIndex.value
}).then(res => { }).then(res => {
getAcyionListFn(type.value) getAcyionListFn()
}) })
} }
const editFn = (item) => { const editFn = (item) => {
console.log(item)
delIndex.value = item.id delIndex.value = item.id
showPopFn(item.action_id) showPopFn(item.action_id)
formData = deepCopy(item.action_content) objFn(item.action_content, formData)
if (item.action_content.serch.list.length) {
item.action_content.serch.list.forEach(item => {
animalSearchByCodeAPI({
code: item
}).then(res => {
serchList.push(res.data)
})
})
}
actionType.value = false actionType.value = false
} }
@ -410,11 +313,14 @@
change3(tit) change3(tit)
uplodeImg().then(res => { uplodeImg().then(res => {
formData.pic.value = res.data.image formData.pic.value = res.data.image
}) })
} }
const previewImage = (src) => { const previewImage = (src) => {
uni.previewImage({ uni.previewImage({
urls: [src], urls: [src],
}) })
} }
const change1 = (tit) => { const change1 = (tit) => {
@ -428,42 +334,6 @@
} }
const change4 = (tit) => { const change4 = (tit) => {
formData.serch.tit = tit formData.serch.tit = tit
if (formData.serch.value) {
animalSearchByCodeAPI({
code: formData.serch.value
}).then(res => {
if (res.data.id) {
serchList.push(res.data)
console.log(formData.serch, 54554)
formData.serch.list.push(formData.serch.value)
}
// formData.serch.list.push()
formData.serch.value = ''
})
}
}
function deepCopy(obj) {
if (typeof obj !== 'object' || obj === null) {
return obj;
}
var newObj = Array.isArray(obj) ? [] : {};
for (var key in obj) {
if (obj.hasOwnProperty(key)) {
newObj[key] = deepCopy(obj[key]);
}
}
return newObj;
}
const objFn = (res, data) => {
for (let key in res) {
data[key] = res[key]
}
} }
const setPropertiesToNull = (obj) => { const setPropertiesToNull = (obj) => {
for (var prop in obj) { for (var prop in obj) {
@ -476,21 +346,28 @@
} }
} }
} }
const objFn = (res, data, clear) => {
// if (clear) {
// for (let key in data) {
// data[key] = ''
// }
// } else {
// for (let key in res) {
// data[key] = res[key]
// }
// }
for (let key in res) {
data[key] = res[key]
}
}
const arrFn = (res, data) => { const arrFn = (res, data) => {
res.forEach((item, index) => { res.forEach((item, index) => {
data[index] = item data[index] = item
}) })
} }
const popCloseFn = () => {
showPop.value = false
serchList.splice(0, serchList.length)
setPropertiesToNull(formData)
}
const swipeDel = (e) => {
serchList.splice(e, 1);
formData.serch.list.splice(e, 1)
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@ -622,6 +499,7 @@
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
} }
} }
.swipe-action-tit { .swipe-action-tit {

153
pages/growRecord/index.vue
View File

@ -1,42 +1,8 @@
<template> <template>
<view :class="{popupShow:showPop}"> <view :class="{popupShow:showPop}">
<view class="cont"> <view class="cont">
<!-- <landInfo :land_id='land_id'></landInfo> -->
<!-- <view class="card"> <view class="operate" v-for="(item,index) in actionData" :key="index" v-show='title==index'>
<view class="tit">
<view class="">
1号土地
</view>
<view class="">
溯源码: 12302
</view>
</view>
<view class="card-li">
<view class="">
当前种植: 土豆
</view>
<view class="">
种植品牌: 的划分等级
</view>
</view>
<view class="card-li">
<view class="">
土地面积: 20亩
</view>
<view class="">
种子品牌: 的划分等级
</view>
</view>
<view class="card-li">
<view class="">
播种时间: 2020.12.01
</view>
</view>
</view> -->
<landInfo :land_id='land_id'></landInfo>
<view class="operate" v-for="(item,index) in actionData" :key="index">
<view class="tit"> <view class="tit">
{{index}} {{index}}
</view> </view>
@ -45,22 +11,6 @@
v-for="items,indexs in item.actions" :key='indexs'> v-for="items,indexs in item.actions" :key='indexs'>
{{items.name}} {{items.name}}
</view> </view>
<!-- <view class="operate-li" @tap="navgo('')">
喂食
</view>
<view class="operate-li" @tap="navgo('/pages/feedIng/vaccineInfo')">
注射疫苗
</view>
<view class="operate-li">
胶水dassdd
</view>
<view class="operate-li">
胶水
</view>
<view class="operate-li">
胶水
</view> -->
</view> </view>
<view class=""> <view class="">
@ -83,7 +33,8 @@
</view> </view>
<view class="fertilize-li"> <view class="fertilize-li">
<view class="fertilize-li-a" v-for="(items,indexs) in item.action_content" :key="indexs"> <view class="fertilize-li-a" v-for="(items,indexs) in item.action_content" v-show="items.value"
:key="indexs">
<view class="" v-if="indexs=='pic'"> <view class="" v-if="indexs=='pic'">
{{items.tit}}: <text style="color: #3274F9;" {{items.tit}}: <text style="color: #3274F9;"
@click="previewImage(items.value)">图片</text> @click="previewImage(items.value)">图片</text>
@ -98,14 +49,6 @@
</view> </view>
<!-- <view class="fertilize-li">
<view class="">
兑水浓度: 地生上的飞机
</view>
<view class="">
备注: 地生上的
</view>
</view> -->
</view> </view>
</view> </view>
</view> </view>
@ -170,40 +113,7 @@
</view> </view>
<view style="margin-bottom: 20rpx;" v-for="item in [1]" :key="item"> <view style="margin-bottom: 20rpx;" v-for="item in [1]" :key="item">
<u-swipe-action>
<u-swipe-action-item :options="options1"
style="border-radius: 20rpx;border: 1px solid #C7C6CD;">
<view class="" style="padding: 20rpx 30rpx;">
<view class="swipe-action-tit">
<view class="">
编号: 123456
</view>
<view class="" style="color: #00A15E;" v-if="true">
健康
</view>
<view class="" style="color: #FFD736;" v-if="0">
怀孕中
</view>
<view class="" style="color: #3274F9;" v-if="0">
可出栏
</view>
</view>
<view class="swipe-action-li">
<view class="">
养殖品种:黑山猪
</view>
<view class="">
年龄: 5年
</view>
<view class="">
体重: 150kg
</view>
</view>
</view>
</u-swipe-action-item>
</u-swipe-action>
</view> </view>
</view> </view>
</view> </view>
@ -259,14 +169,15 @@
formData.select.value = e.value[0] formData.select.value = e.value[0]
} }
const land_id = ref(0) const land_id = ref(0)
const pond_id = ref(0) const title = ref('')
const crop_id = ref(0) const crop_id = ref(0)
const type = ref(0) const type = ref(0)
const actionData = reactive({}) const actionData = reactive({})
const delIndex = ref(0) const delIndex = ref(0)
onLoad((options) => { onLoad((options) => {
title.value = options.title
land_id.value = options.land_id land_id.value = options.land_id
pond_id.value = options.pond_id // pond_id.value = options.pond_id
crop_id.value = options.crop_id crop_id.value = options.crop_id
// landCropRecordListAPI({ // landCropRecordListAPI({
// crop_id: crop_id.value // crop_id: crop_id.value
@ -276,23 +187,37 @@
// }) // })
// }) // })
getAcyionListFn() getAcyionListFn()
actionsListAPI({ // actionsListAPI({
type: options.type // type: options.type
}).then(res => { // }).then(res => {
for (let key in res.data) { // for (let key in res.data) {
actionData[key] = res.data[key] // actionData[key] = res.data[key]
} // }
}) // })
}) })
const getAcyionListFn = () => { const getAcyionListFn = () => {
actionList.splice(0, actionList.length) actionList.splice(0, actionList.length)
landCropRecordListAPI({ actionsListAPI({
type: 1,
crop_id: crop_id.value crop_id: crop_id.value
}).then(res => { }).then(res => {
res.data.forEach(item => { for (let key in res.data) {
actionList.push(item) actionData[key] = res.data[key]
}) actionData[key].action_record.forEach(item => {
item.action_content = JSON.parse(item.action_content)
})
actionList.push(...(res.data[key].action_record))
}
}) })
// actionList.splice(0, actionList.length)
// landCropRecordListAPI({
// crop_id: crop_id.value,
// action_type_id: 1
// }).then(res => {
// res.data.forEach(item => {
// actionList.push(item)
// })
// })
} }
const showPop = ref(false) const showPop = ref(false)
const baseData = reactive({ const baseData = reactive({
@ -342,6 +267,7 @@
action_id: action_id.value, action_id: action_id.value,
action_content: JSON.stringify(formData) action_content: JSON.stringify(formData)
}).then(res => { }).then(res => {
setPropertiesToNull(formData)
getAcyionListFn() getAcyionListFn()
}) })
} else { } else {
@ -350,7 +276,7 @@
action_content: JSON.stringify(formData) action_content: JSON.stringify(formData)
}) })
} }
console.log(baseData)
objFn(baseData, formData) objFn(baseData, formData)
} }
@ -427,6 +353,17 @@
const change4 = (tit) => { const change4 = (tit) => {
formData.serch.tit = tit formData.serch.tit = tit
} }
const setPropertiesToNull = (obj) => {
for (var prop in obj) {
if (obj.hasOwnProperty(prop)) {
if (typeof obj[prop] === 'object') {
setPropertiesToNull(obj[prop]);
} else {
obj[prop] = null;
}
}
}
}
const objFn = (res, data, clear) => { const objFn = (res, data, clear) => {
// if (clear) { // if (clear) {
// for (let key in data) { // for (let key in data) {

7
pages/index/index.vue
View File

@ -100,6 +100,13 @@
// }) // })
} }
onLoad((option) => {
console.log(option)
if (option.index) {
flag.value = option.index
}
})
initUserinfoFn() initUserinfoFn()
</script> </script>
<style lang="scss"> <style lang="scss">

7
pages/poultry/addPoultry.vue
View File

@ -2,7 +2,7 @@
<view class="content"> <view class="content">
<view class="head" v-if="addList.length"> <view class="head" v-if="addList.length">
已添加{{addList.length}}条畜生 已添加{{addList.length}}条家畜
</view> </view>
<view class="card"> <view class="card">
@ -113,6 +113,10 @@
} from "@/api/chick.js" } from "@/api/chick.js"
const navgo = () => { const navgo = () => {
if (formData.kind) {
nextFn()
}
uni.navigateTo({ uni.navigateTo({
url: "/pages/index/index" url: "/pages/index/index"
}) })
@ -183,7 +187,6 @@
} }
const formData = reactive({}) const formData = reactive({})
objFn(baseFormData, formData) objFn(baseFormData, formData)
const nextFn = () => { const nextFn = () => {
addAnimalAPI({ addAnimalAPI({
...formData ...formData

118
pages/poultry/allRecording.vue
View File

@ -1,78 +1,84 @@
<template> <template>
<view class="content"> <view class="content">
<view class="card"> <farmersCard></farmersCard>
<view class="tit"> <view class="histroy">
<view class=""> <view class="tit" style="margin-bottom: 40rpx;">
农户名称: 1号土地 历史操作记录
</view>
</view>
<view class="card-li">
<view class="">
种养殖类型: 土豆
</view>
<view class="">
养殖头数: 的划分等级
</view>
</view>
<view class="card-li">
<view class="">
土地面积: 20亩
</view>
<view class="">
公猪: 的划分等级
</view>
</view>
<view class="card-li">
<view class="">
养殖种类: 20亩
</view>
<view class="">
母猪: 的划分等级
</view>
</view>
<view class="card-li">
<view class="">
具体种类: 20亩
</view>
<view class="">
幼崽: 的划分等级
</view>
</view> </view>
<myTable :dataList='dataList'></myTable>
</view> </view>
<view class="" style="margin-bottom: 20rpx;">
饲养记录
</view>
<myTable></myTable>
</view> </view>
<!-- -->
</template> </template>
<script setup> <script setup>
import farmersCard from "@/components/poultry/farmersCard.vue"
import {
ref,
reactive
} from "vue"
import myTable from "@/components/myTable/index.vue" import myTable from "@/components/myTable/index.vue"
import {
actionsAPI
} from "@/api/animal.js"
import {
onLoad
} from "@dcloudio/uni-app"
const dataList = reactive({})
onLoad((option) => {
actionsAPI({
type: 2
}).then(res => {
for (let key in res.data[option.index].action_record) {
dataList[key] = res.data[option.index].action_record[key]
}
})
})
const navgo = (url) => {
uni.navigateTo({
url
})
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.card { .circumstance {
margin-bottom: 20rpx; width: 693.93rpx;
margin: 0 auto;
margin-bottom: 43rpx;
.tit { .card-tit {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding-bottom: 20rpx; margin-bottom: 28rpx;
border-bottom: 1px solid #EBF1EF;
} }
.card-li { .updata-btn {
margin-top: 20rpx; font-size: 26.29rpx;
// width: 192.76rpx;
padding: 0 30rpx;
height: 57.83rpx;
border: 1px solid #00A15E;
color: #00A15E;
display: flex; display: flex;
justify-content: space-between; justify-content: center;
align-items: center;
border-radius: 31.54rpx 31.54rpx 31.54rpx 31.54rpx;
} }
}
.table { .check {
margin-top: 20rpx; font-size: 29.79rpx;
height: 500rpx; text-align: center;
background-color: red; display: flex;
justify-content: center;
align-items: center;
}
.tab {
height: 500rpx;
background-color: red;
}
} }
</style> </style>

11
pages/poultry/feedDetail.vue
View File

@ -59,10 +59,17 @@
</view> </view>
<view class="card"> <view class="card">
<view class="card-li"> <view class="card-li">
<view class="" @click.capture="selectFoucsFn"> <view class="" @click.capture="selectFoucsFn">
养殖类型: {{baseData.kind}} 养殖品种: {{baseData.kind}}
</view>
<view class="" style="display: flex;align-items: center;">
具体种类: {{baseData.breed}}
</view>
</view>
<view class="card-li">
<view class="" @click.capture="selectFoucsFn">
养殖类型: {{baseData.animal_gender==1?'公':"母"}}
</view> </view>
<view class="" style="display: flex;align-items: center;"> <view class="" style="display: flex;align-items: center;">
体重: <up-input style="height: 49.07rpx;width: 215.54rpx;margin-left: 20rpx;" placeholder="请输入内容" 体重: <up-input style="height: 49.07rpx;width: 215.54rpx;margin-left: 20rpx;" placeholder="请输入内容"

43
pages/records/index.vue
View File

@ -50,7 +50,7 @@
</view> </view>
<myTable :dataList='dataList'></myTable> <myTable :dataList='dataList'></myTable>
</view> </view>
<view class="btn" @click="navgo(`/pages/growRecord/index?land_id=${land_id}`)"> <view class="btn" @click="navgo(`/pages/growRecord/index?land_id=${land_id}&crop_id=${crop_id}&type=1`)">
记录今日操作 记录今日操作
</view> </view>
</view> </view>
@ -60,13 +60,17 @@
import { import {
actionsListAPI, actionsListAPI,
actionsDetailAPI, actionsDetailAPI,
landCropRecordListAPI landCropRecordListAPI,
landCropRecordInfoAPI
} from "@/api/plant.js" } from "@/api/plant.js"
import myTable from "@/components/myTable/index.vue" import myTable from "@/components/myTable/index.vue"
import landInfo from "@/components/plant/landInfo.vue" import landInfo from "@/components/plant/landInfo.vue"
import { import {
onLoad onLoad
} from "@dcloudio/uni-app" } from "@dcloudio/uni-app"
import {
actionsAPI
} from "@/api/animal.js"
import { import {
reactive, reactive,
ref ref
@ -77,23 +81,38 @@
// console.log(res) // console.log(res)
// }) // })
const land_id = ref(0) const land_id = ref(0)
const crop_id = ref(0)
const dataList = reactive({}) const dataList = reactive({})
onLoad((option) => { onLoad((option) => {
land_id.value = option.land_id land_id.value = option.land_id
landCropRecordListAPI({ crop_id.value = option.crop_id
crop_id: option.crop_id actionsAPI({
type: 1,
crop_id: crop_id.value
}).then(res => { }).then(res => {
for (let key in res.data) { // console.log(res.data[option.index].action_record)
dataList[key] = res.data[key] for (let key in res.data[option.index].action_record) {
dataList[key] = res.data[option.index].action_record[key]
} }
console.log(dataList)
}) })
// landCropRecordInfoAPI({
// record_id: 41
// })
// landCropRecordListAPI({
// crop_id: 1,
// action_type_id: 1
// }).then(res => {
// for (let key in res.data) {
// dataList[key] = res.data[key]
// }
// console.log(dataList)
// })
}) })
actionsDetailAPI({ // actionsDetailAPI({
action_id: 2 // action_id: 2
}).then(res => { // }).then(res => {
// console.log(res) // // console.log(res)
}) // })
const navgo = (url) => { const navgo = (url) => {
uni.navigateTo({ uni.navigateTo({
url url

1
utils/syhttp.js
View File

@ -64,6 +64,7 @@ function baseRequest(url, method, data, {
} }
}, },
fail: (message) => { fail: (message) => {
console.log(message, '错误')
// uni.hideLoading() // uni.hideLoading()
uni.showToast({ uni.showToast({
title: '网络错误', title: '网络错误',