Преглед изворни кода

2021-3-31 溯源界面贴图

zkl пре 4 година
родитељ
комит
83d20cdef1

+ 1 - 62
src/pages/symanger/farm/Base.vue

@@ -1,67 +1,6 @@
 <template>
 	<div style="cursor: default">
-		<el-breadcrumb separator-class="el-icon-arrow-right">
-			<el-breadcrumb-item>农场管理</el-breadcrumb-item>
-			<el-breadcrumb-item>基地管理</el-breadcrumb-item>
-		</el-breadcrumb>
-		<el-card class="box-card pad0">
-			<baidu-map
-				class="bm-view"
-				:center='center'
-				@ready="handler"
-				:zoom='zoom'
-			>
-				<bm-polygon
-					v-for="(item, index) in polygonPath"
-					:key="index"
-					:path="item"
-					stroke-color="#3173f6"
-					fill-color="rgba(48,114,246,.3)"
-					:fill-opacity="0.8"
-					:stroke-opacity="1"
-					:stroke-weight="3"
-				/>
-			</baidu-map>
-		</el-card>
-		<el-card class="box-card marT">
-			<div class="base-check">
-				<el-select
-					v-model="baseInfo.id"
-					class="new-style-sel"
-					@change="selectBase"
-				>
-					<el-option
-						v-for="item in baseList"
-						:key="item.id"
-						:label="item.farmname"
-						:value="item.id"
-					></el-option>
-				</el-select>
-				<div>
-					<el-button
-						type="primary"
-						style="margin-right: 5px"
-						size="mini"
-						@click="addBase()"
-						>新增基地</el-button
-					>
-					<el-button
-						type="primary"
-						style="margin-right: 5px"
-						size="mini"
-						@click="editBase()"
-						>编辑基地</el-button
-					>
-					<i class="el-icon-delete" @click="deletBase()"></i>
-				</div>
-			</div>
-			<div class="intro">
-				<p>负责人: {{ baseInfo.username }}</p>
-				<!-- <p>基地地址: {{baseInfo.addr || '无'}}</p> -->
-				<p>基地面积(亩): {{ baseInfo.farmarea || '无' }}</p>
-				<p>基地描述: {{ baseInfo.desc || '无' }}</p>
-			</div>
-		</el-card>
+		<img style="width: 100%; margin: 0 0 0 -20px;" src="../../../../static/img/1.jpg" alt="">	
 	</div>
 </template>
 

+ 1 - 171
src/pages/symanger/farm/Fields.vue

@@ -1,176 +1,6 @@
 <template>
 	<div style="cursor: default">
-		<el-breadcrumb separator-class="el-icon-arrow-right">
-			<el-breadcrumb-item>农场管理</el-breadcrumb-item>
-			<el-breadcrumb-item>地块管理</el-breadcrumb-item>
-		</el-breadcrumb>
-		<div class="search-box">
-			<div class="filter-box">
-				<el-select
-					size="small"
-					clearable
-					v-model="base"
-					@change="selChange"
-					placeholder="请选择基地名称"
-				>
-					<el-option
-						v-for="item in baseList"
-						:label="item.farmname"
-						:value="item.farmname"
-						:key="item.id"
-					></el-option>
-				</el-select>
-			</div>
-			<el-button type="primary" size="mini" @click="addfield()"
-				>新增地块</el-button
-			>
-		</div>
-		<el-row :gutter="10">
-			<el-col
-				:xs="24"
-				:sm="24"
-				:md="12"
-				:lg="6"
-				:xl="6"
-				v-for="item in fieldsList"
-				:key="item.id"
-			>
-				<el-card class="box-card">
-					<div class="img-box">
-						<img src="@/assets/images/sy/farmThing/more.png" />
-					</div>
-					<div class="detail">
-						<p class="borderLine">地块名称 : {{ item.landname }}</p>
-						<p class="borderLine">所属基地 : {{ item.farm }}</p>
-						<p class="borderLine">地块面积: {{ item.landarea }}㎡</p>
-						<!-- <p class="borderLine">地块位置 : {{ item.landaddr }}</p> -->
-					</div>
-					<div class="btns">
-						<a
-							:class="{ bg: itemId == item.id && btnindex == 1 ? true : false }"
-							@click="editField(item)"
-							>编辑</a
-						>
-						<a
-							:class="{ bg: itemId == item.id && btnindex == 2 ? true : false }"
-							@click="deletField(item)"
-							>删除</a
-						>
-					</div>
-				</el-card>
-			</el-col>
-		</el-row>
-		<el-pagination
-			background
-			layout="prev, pager, next"
-			:total="totalNum"
-			:page-size="8"
-			:current-page="page"
-			@current-change="changePage"
-		></el-pagination>
-		<!-- 添加地块弹框 -->
-		<el-dialog
-			title="添加地块"
-			:visible.sync="addFieldDialogVisible"
-			width="500px"
-			@close="addFieldDialogClosed"
-		>
-			<el-form
-				ref="addFieldFormRef"
-				:model="addFieldForm"
-				label-width="110px"
-				:rules="editFieldFormRules"
-			>
-				<el-form-item label="地块名称 : " prop="landname">
-					<el-input v-model="addFieldForm.landname"></el-input>
-				</el-form-item>
-				<el-form-item label="所属基地 : " prop="farm">
-					<el-select
-						v-model="addFieldForm.farm"
-						placeholder="请选择基地"
-						style="width: 100%"
-					>
-						<el-option
-							v-for="item in baseList"
-							:label="item.farmname"
-							:value="item.farmname"
-							:key="item.id"
-						></el-option>
-					</el-select>
-				</el-form-item>
-				<!-- <el-form-item label="地块用途 : " prop="landuse">
-					<el-select v-model="addFieldForm.landuse" placeholder="请选择地块用途" style="width: 100%;">
-						<el-option v-for="item in usefor" :label="item.label" :value="item.value" :key="item.value"></el-option>
-					</el-select>
-				</el-form-item> -->
-				<el-form-item label="地块面积(㎡) : " prop="landarea">
-					<el-input
-						type="number"
-						min="0"
-						v-model="addFieldForm.landarea"
-					></el-input>
-				</el-form-item>
-				<el-form-item label="地块描述 : " prop="landaddr">
-					<el-input v-model="addFieldForm.landaddr"></el-input>
-				</el-form-item>
-			</el-form>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="addFieldDialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="addFieldSubm">确 定</el-button>
-			</span>
-		</el-dialog>
-		<!-- 编辑地块弹框 -->
-		<el-dialog
-			title="编辑地块"
-			:visible.sync="editFieldDialogVisible"
-			width="500px"
-			@close="editFieldDialogClosed"
-		>
-			<el-form
-				ref="editFieldFormRef"
-				:model="editFieldForm"
-				label-width="110px"
-				:rules="editFieldFormRules"
-			>
-				<el-form-item label="地块名称 : " prop="landname">
-					<el-input disabled v-model="editFieldForm.landname"></el-input>
-				</el-form-item>
-				<el-form-item label="所属基地 : " prop="farm">
-					<el-select
-						disabled
-						v-model="editFieldForm.farm"
-						placeholder="请选择基地"
-						style="width: 100%"
-					>
-						<el-option
-							v-for="item in baseList"
-							:label="item.farmname"
-							:value="item.farmname"
-							:key="item.farmname"
-						></el-option>
-					</el-select>
-				</el-form-item>
-				<!-- <el-form-item label="地块用途 : " prop="landuse">
-					<el-select v-model="editFieldForm.landuse" placeholder="请选择地块用途" style="width: 100%;">
-						<el-option v-for="item in usefor" :label="item.label" :value="item.value" :key="item.value"></el-option>
-					</el-select>
-				</el-form-item> -->
-				<el-form-item label="土地面积(㎡) : " prop="landarea">
-					<el-input
-						type="number"
-						min="0"
-						v-model="editFieldForm.landarea"
-					></el-input>
-				</el-form-item>
-				<el-form-item label="地块位置 : " prop="landaddr">
-					<el-input v-model="editFieldForm.landaddr"></el-input>
-				</el-form-item>
-			</el-form>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="editFieldDialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="editSumb">确 定</el-button>
-			</span>
-		</el-dialog>
+		<img style="width: 100%; margin: 0 0 0 -20px;" src="../../../../static/img/2.jpg" alt="" class="">
 	</div>
 </template>
 

+ 1 - 163
src/pages/symanger/farmThing/applyFertilizer.vue

@@ -1,168 +1,6 @@
 <template>
 	<div style="cursor: default">
-		<el-breadcrumb separator-class="el-icon-arrow-right">
-			<el-breadcrumb-item>农事管理</el-breadcrumb-item>
-			<el-breadcrumb-item>施肥</el-breadcrumb-item>
-		</el-breadcrumb>
-		<div class="search-box">
-			<div class="filter-box">
-				<el-select
-					size="small"
-					v-model="base"
-					clearable
-					@change="selChange"
-					placeholder="请选择基地名称"
-				>
-					<el-option
-						v-for="item in baseList"
-						:label="item.farmname"
-						:value="item.farmname"
-						:key="item.id"
-					></el-option>
-				</el-select>
-				<el-select
-					size="small"
-					v-model="pickcode"
-					clearable
-					@change="selChange"
-					placeholder="请选择采收状态"
-				>
-					<el-option label="已采收" value="1"></el-option>
-					<el-option label="未采收" value="0"></el-option>
-				</el-select>
-			</div>
-			<el-button type="primary" size="mini" @click="fertiAdd">新增</el-button>
-		</div>
-		<el-row :gutter="10">
-			<el-col
-				:xs="24"
-				:sm="24"
-				:md="12"
-				:lg="6"
-				:xl="6"
-				v-for="item in fieldsList"
-				:key="item.id"
-			>
-				<el-card class="box-card">
-					<img
-						class="tag"
-						v-if="item.is_pick == '1'"
-						src="@/assets/images/sy/farmThing/picked.png"
-					/>
-					<div class="img-box">
-						<img src="@/assets/images/sy/farmThing/applyFertilizer.png" />
-					</div>
-					<div class="detail">
-						<p class="borderLine">操作基地 : {{ item.farm }}</p>
-						<p class="borderLine">操作地块 : {{ item.land }}</p>
-						<p class="borderLine">肥料名称 : {{ item.itemname }}</p>
-						<p class="borderLine">施肥用量(kg) : {{ item.manureuse }}</p>
-						<p class="borderLine">
-							施肥时间 : {{ (item.uptime * 1000) | formatTime }}
-						</p>
-						<p class="borderLine">批次 : {{ item.batch }}</p>
-						<p class="borderLine">操作人 : {{ item.user }}</p>
-					</div>
-					<div class="btns">
-						<a
-							:class="{ bg: itemId == item.id && btnindex == 1 ? true : false }"
-							@click="fertiEdit(item)"
-							>编辑</a
-						>
-						<a
-							:class="{ bg: itemId == item.id && btnindex == 2 ? true : false }"
-							@click="fertiDelet(item)"
-							>删除</a
-						>
-					</div>
-				</el-card>
-			</el-col>
-		</el-row>
-		<el-pagination
-			background
-			layout="prev, pager, next"
-			:total="totalNum"
-			:page-size="8"
-			:current-page="page"
-			@current-change="changePage"
-		></el-pagination>
-		<!-- 新增弹框 -->
-		<el-dialog
-			title="新增"
-			:visible.sync="farmThingAddDialogVisible"
-			width="30%"
-			@close="AddDialogClosed"
-		>
-			<template v-if="planted.length > 0">
-				<el-form
-					ref="addFormRef"
-					:model="addForm"
-					label-width="116px"
-					:rules="addFormRules"
-				>
-					<el-form-item label="所属地块 : " prop="pro_cascader">
-						<el-cascader
-							v-model="addForm.pro_cascader"
-							:options="planted"
-							:props="{
-								expandTrigger: 'hover',
-								label: 'farmname',
-								value: 'farmname'
-							}"
-						></el-cascader>
-					</el-form-item>
-					<el-form-item label="肥料名称 : " prop="fertilizer_name">
-						<el-input v-model="addForm.fertilizer_name"></el-input>
-					</el-form-item>
-					<el-form-item label="使用总量(kg) : " prop="weight">
-						<el-input v-model="addForm.weight"></el-input>
-					</el-form-item>
-					<el-form-item label="操作人 : " prop="operator">
-						<el-input v-model="addForm.operator"></el-input>
-					</el-form-item>
-				</el-form>
-				<span slot="footer" class="dialog-footer">
-					<el-button @click="farmThingAddDialogVisible = false"
-						>取 消</el-button
-					>
-					<el-button type="primary" @click="addSubm">确认</el-button>
-				</span>
-			</template>
-			<template v-else>
-				<div class="noPlanted">暂无正在种植的地块!</div>
-			</template>
-		</el-dialog>
-		<!-- 编辑地块弹框 -->
-		<el-dialog
-			title="编辑"
-			:visible.sync="farmThingEditDialogVisible"
-			width="30%"
-			@close="EditDialogClosed"
-		>
-			<el-form
-				ref="editFormRef"
-				:model="editForm"
-				label-width="116px"
-				:rules="addFormRules"
-			>
-				<el-form-item label="所属地块 : " prop="pro_cascader">
-					<el-input disabled v-model="editForm.pro_cascader"></el-input>
-				</el-form-item>
-				<el-form-item label="肥料名称 : " prop="fertilizer_name">
-					<el-input v-model="editForm.fertilizer_name"></el-input>
-				</el-form-item>
-				<el-form-item label="使用总量(kg) : " prop="weight">
-					<el-input v-model="editForm.weight"></el-input>
-				</el-form-item>
-				<el-form-item label="操作人 : " prop="operator">
-					<el-input v-model="editForm.operator"></el-input>
-				</el-form-item>
-			</el-form>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="farmThingEditDialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="editSubm">确认</el-button>
-			</span>
-		</el-dialog>
+		<img style="width: 100%; margin: 0 0 0 -20px;" src="../../../../static/img/4.jpg" alt="" class="">
 	</div>
 </template>
 

+ 1 - 174
src/pages/symanger/farmThing/harvest.vue

@@ -1,179 +1,6 @@
 <template>
 	<div style="cursor: default">
-		<el-breadcrumb separator-class="el-icon-arrow-right">
-			<el-breadcrumb-item>农事管理</el-breadcrumb-item>
-			<el-breadcrumb-item>采收</el-breadcrumb-item>
-		</el-breadcrumb>
-		<div class="search-box">
-			<div class="filter-box">
-				<el-select
-					size="small"
-					v-model="base"
-					clearable
-					@change="selChange"
-					placeholder="请选择基地名称"
-				>
-					<el-option
-						v-for="item in baseList"
-						:label="item.farmname"
-						:value="item.farmname"
-						:key="item.id"
-					></el-option>
-				</el-select>
-			</div>
-			<el-button type="primary" size="mini" @click="harvAdd">新增</el-button>
-		</div>
-		<el-row :gutter="10">
-			<el-col
-				:xs="24"
-				:sm="24"
-				:md="12"
-				:lg="6"
-				:xl="6"
-				v-for="item in pickList"
-				:key="item.id"
-			>
-				<el-card class="box-card">
-					<div class="img-box">
-						<img src="@/assets/images/sy/farmThing/harvest.png" />
-					</div>
-					<div class="detail">
-						<p class="borderLine">采收基地 : {{ item.farm }}</p>
-						<p class="borderLine">采收地块 : {{ item.land }}</p>
-						<p class="borderLine">产品名称 : {{ item.pickname }}</p>
-						<p class="borderLine">采收总量(kg) : {{ item.picktotal }}</p>
-						<p class="borderLine">
-							采收时间 : {{ (item.uptime * 1000) | formatTime }}
-						</p>
-						<p class="borderLine">批次 : {{ item.batch }}</p>
-						<p class="borderLine">操作人 : {{ item.user }}</p>
-					</div>
-					<!-- <div class="btns">
-						<a
-							:class="{ bg: itemId == item.id && btnindex == 1 ? true : false }"
-							@click="harvEdit(item)"
-							>编辑</a
-						>
-						<a
-							:class="{ bg: itemId == item.id && btnindex == 2 ? true : false }"
-							@click="showQRcode(item.id)"
-							>二维码</a
-						>
-					</div> -->
-					<div class="btns2">
-						<a
-							:class="{ bg: itemId == item.id ? true : false }"
-							@click="showQRcode(item.backcode)"
-							>二维码</a
-						>
-					</div>
-				</el-card>
-			</el-col>
-		</el-row>
-		<el-pagination
-			background
-			layout="prev, pager, next"
-			:total="totalNum"
-			:page-size="8"
-			:current-page="page"
-			@current-change="changePage"
-		></el-pagination>
-		<!-- 新增弹框 -->
-		<el-dialog
-			title="新增"
-			:visible.sync="farmThingAddDialogVisible"
-			width="30%"
-			@close="AddDialogClosed"
-		>
-			<template v-if="planted.length > 0">
-				<el-form
-					ref="addFormRef"
-					:model="addForm"
-					label-width="116px"
-					:rules="addFormRules"
-				>
-					<el-form-item label="所属地块 : " prop="pro_cascader">
-						<el-cascader
-							style="width: 100%"
-							@change="harvCascaderChange"
-							v-model="addForm.pro_cascader"
-							:options="planted"
-							:props="{
-								expandTrigger: 'hover',
-								label: 'farmname',
-								value: 'farmname'
-							}"
-						></el-cascader>
-					</el-form-item>
-					<el-form-item label="采收总量(kg) : " prop="har_total">
-						<el-input v-model="addForm.har_total"></el-input>
-					</el-form-item>
-					<el-form-item label="操作人 : " prop="operator">
-						<el-input v-model="addForm.operator"></el-input>
-					</el-form-item>
-				</el-form>
-				<span slot="footer" class="dialog-footer">
-					<el-button @click="farmThingAddDialogVisible = false"
-						>取 消</el-button
-					>
-					<el-button type="primary" @click="addSubm">确认</el-button>
-				</span>
-			</template>
-			<template v-else>
-				<div class="noPlanted">暂无正在种植的地块!</div>
-			</template>
-		</el-dialog>
-		<!-- 编辑地块弹框 -->
-		<el-dialog
-			title="编辑"
-			:visible.sync="farmThingEditDialogVisible"
-			width="350px"
-			@close="EditDialogClosed"
-		>
-			<el-form
-				ref="editFormRef"
-				:model="editForm"
-				label-width="116px"
-				:rules="addFormRules"
-			>
-				<el-form-item label="所属地块 : " prop="pro_cascader">
-					<el-cascader
-						style="width: 100%"
-						@change="harvCascaderChange"
-						v-model="editForm.pro_cascader"
-						:options="planted"
-						:props="{
-							expandTrigger: 'hover',
-							label: 'farmname',
-							value: 'farmname'
-						}"
-					></el-cascader>
-				</el-form-item>
-				<el-form-item label="采收总量(kg) : " prop="har_total">
-					<el-input v-model="editForm.har_total"></el-input>
-				</el-form-item>
-				<el-form-item label="批次名称 : " prop="batch_name">
-					<el-input v-model="editForm.batch_name"></el-input>
-				</el-form-item>
-				<el-form-item label="操作人 : " prop="operator">
-					<el-input v-model="editForm.operator"></el-input>
-				</el-form-item>
-			</el-form>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="farmThingEditDialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="editSubm">确认</el-button>
-			</span>
-		</el-dialog>
-		<!-- 生成二维码 -->
-		<el-dialog
-			title="追溯二维码"
-			:visible.sync="showQRcodeDialogVisible"
-			width="350px"
-			@close="QRcodeDialogClosed"
-		>
-			<div id="qrCode" ref="QRcodeShowImg"></div>
-			<!-- <p>{{ QRcode }}</p> -->
-		</el-dialog>
+		<img style="width: 100%; margin: 0 0 0 -20px;" src="../../../../static/img/7.jpg" alt="" class="">
 	</div>
 </template>
 

+ 1 - 157
src/pages/symanger/farmThing/more.vue

@@ -1,162 +1,6 @@
 <template>
 	<div style="cursor: default">
-		<el-breadcrumb separator-class="el-icon-arrow-right">
-			<el-breadcrumb-item>农事管理</el-breadcrumb-item>
-			<el-breadcrumb-item>更多</el-breadcrumb-item>
-		</el-breadcrumb>
-		<div class="search-box">
-			<div class="filter-box">
-				<el-select
-					size="small"
-					v-model="base"
-					clearable
-					@change="selChange"
-					placeholder="请选择基地名称"
-				>
-					<el-option
-						v-for="item in baseList"
-						:label="item.farmname"
-						:value="item.farmname"
-						:key="item.id"
-					></el-option>
-				</el-select>
-				<el-select
-					size="small"
-					v-model="pickcode"
-					clearable
-					@change="selChange"
-					placeholder="请选择采收状态"
-				>
-					<el-option label="已采收" value="1"></el-option>
-					<el-option label="未采收" value="0"></el-option>
-				</el-select>
-			</div>
-			<el-button type="primary" size="mini" @click="sprayAdd">新增</el-button>
-		</div>
-		<el-row :gutter="10">
-			<el-col
-				:xs="24"
-				:sm="24"
-				:md="12"
-				:lg="6"
-				:xl="6"
-				v-for="item in fieldsList"
-				:key="item.id"
-			>
-				<el-card class="box-card">
-					<img
-						class="tag"
-						v-if="item.is_pick == '1'"
-						src="@/assets/images/sy/farmThing/picked.png"
-					/>
-					<div class="img-box">
-						<img src="@/assets/images/sy/farmThing/more.png" />
-					</div>
-					<div class="detail">
-						<p class="borderLine">操作基地 : {{ item.farm }}</p>
-						<p class="borderLine">操作地块 : {{ item.land }}</p>
-						<p class="borderLine">操作事项 : {{ item.jobname }}</p>
-						<p class="borderLine">
-							操作日期 : {{ (item.uptime * 1000) | formatTime }}
-						</p>
-						<p class="borderLine">批次名称 : {{ item.batch }}</p>
-						<p class="borderLine">操作人 : {{ item.user }}</p>
-					</div>
-					<div class="btns">
-						<a
-							:class="{ bg: itemId == item.id && btnindex == 1 ? true : false }"
-							@click="sprayEdit(item)"
-							>编辑</a
-						>
-						<a
-							:class="{ bg: itemId == item.id && btnindex == 2 ? true : false }"
-							@click="sprayDelet(item.id)"
-							>删除</a
-						>
-					</div>
-				</el-card>
-			</el-col>
-		</el-row>
-		<el-pagination
-			background
-			layout="prev, pager, next"
-			:total="totalNum"
-			:page-size="8"
-			:current-page="page"
-			@current-change="changePage"
-		></el-pagination>
-		<!-- 新增弹框 -->
-		<el-dialog
-			title="新增"
-			:visible.sync="farmThingAddDialogVisible"
-			width="30%"
-			@close="AddDialogClosed"
-		>
-			<template v-if="planted.length > 0">
-				<el-form
-					ref="addFormRef"
-					:model="addForm"
-					label-width="116px"
-					:rules="addFormRules"
-				>
-					<el-form-item label="所属地块 : " prop="pro_cascader">
-						<el-cascader
-							style="width: 100%"
-							v-model="addForm.pro_cascader"
-							:options="planted"
-							:props="{
-								expandTrigger: 'hover',
-								label: 'farmname',
-								value: 'farmname'
-							}"
-						></el-cascader>
-					</el-form-item>
-					<el-form-item label="操作事项 : " prop="opt_items">
-						<el-input v-model="addForm.opt_items"></el-input>
-					</el-form-item>
-					<el-form-item label="操作人 : " prop="operator">
-						<el-input v-model="addForm.operator"></el-input>
-					</el-form-item>
-				</el-form>
-				<span slot="footer" class="dialog-footer">
-					<el-button @click="farmThingAddDialogVisible = false"
-						>取 消</el-button
-					>
-					<el-button type="primary" @click="addSubm">确认</el-button>
-				</span>
-			</template>
-			<template v-else>
-				<div class="noPlanted">暂无正在种植的地块!</div>
-			</template>
-		</el-dialog>
-		<!-- 编辑地块弹框 -->
-		<el-dialog
-			title="编辑"
-			:visible.sync="farmThingEditDialogVisible"
-			width="30%"
-			@close="EditDialogClosed"
-		>
-			<el-form
-				ref="editFormRef"
-				:model="editForm"
-				label-width="116px"
-				:rules="addFormRules"
-			>
-				<el-form-item label="所属地块 : " prop="pro_cascader">
-					<el-input disabled v-model="editForm.pro_cascader"></el-input>
-				</el-form-item>
-				<el-form-item label="操作事项 : " prop="opt_items">
-					<el-input v-model="editForm.opt_items"></el-input>
-				</el-form-item>
-				<el-form-item label="操作人 : " prop="operator">
-					<el-input v-model="editForm.operator"></el-input>
-				</el-form-item>
-			</el-form>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="farmThingEditDialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="editSubm">确认</el-button>
-			</span>
-		</el-dialog>
+		<img style="width: 100%; margin: 0 0 0 -20px;" src="../../../../static/img/8.jpg" alt="" class="">
 	</div>
 </template>
 

+ 1 - 155
src/pages/symanger/farmThing/plant.vue

@@ -1,160 +1,6 @@
 <template>
 	<div style="cursor: default">
-		<el-breadcrumb separator-class="el-icon-arrow-right">
-			<el-breadcrumb-item>农事管理</el-breadcrumb-item>
-			<el-breadcrumb-item>种植</el-breadcrumb-item>
-		</el-breadcrumb>
-		<div class="search-box">
-			<div class="filter-box">
-				<el-select size="small" v-model="base" clearable @change="selChange" placeholder="请选择基地名称">
-					<el-option
-						v-for="item in FieldCascader"
-						:label="item.farmname"
-						:value="item.farmname"
-						:key="item.id"
-					></el-option>
-				</el-select>
-				<el-select size="small" v-model="pickcode" clearable  @change="selChange" placeholder="请选择采收状态">
-					<el-option label="已采收" value="1"></el-option>
-					<el-option label="未采收" value="0"></el-option>
-				</el-select>
-			</div>
-			<el-button type="primary" size="mini" @click="plantAdd">新增</el-button>
-		</div>
-		<el-row :gutter="10">
-			<el-col
-				:xs="24"
-				:sm="24"
-				:md="12"
-				:lg="6"
-				:xl="6"
-				v-for="item in fieldsList"
-				:key="item.backcode"
-			>
-				<el-card class="box-card">
-					<img
-						class="tag"
-						v-if="item.pickcode == '1'"
-						src="@/assets/images/sy/farmThing/picked.png"
-					/>
-					<div class="img-box">
-						<img src="@/assets/images/sy/farmThing/plant.png" />
-					</div>
-					<div class="detail">
-						<p class="borderLine">种植基地 : {{ item.farm }}</p>
-						<p class="borderLine">种植地块 : {{ item.land }}</p>
-						<p class="borderLine">
-							采收状态 : {{ item.pickcode == 1 ? '已采收' : '未采收' }}
-						</p>
-						<p class="borderLine">类别 : {{ item.planttype }}</p>
-						<p class="borderLine">名称 : {{ item.plantname }}</p>
-						<p class="borderLine">批次 : {{ item.batch }}</p>
-						<p class="borderLine">
-							种植时间 : {{ (item.uptime * 1000) | formatTime }}
-						</p>
-					</div>
-					<div class="btns">
-						<a
-							:class="{ bg: itemId == item.id && btnindex == 1 ? true : false }"
-							@click="plantEdit(item)"
-							>编辑</a
-						>
-						<a
-							:class="{ bg: itemId == item.id && btnindex == 2 ? true : false }"
-							@click="plantDelet(item.id, item.backcode)"
-							>删除</a
-						>
-					</div>
-				</el-card>
-			</el-col>
-		</el-row>
-		<el-pagination
-			background
-			layout="prev, pager, next"
-			:total="totalNum"
-			:page-size="8"
-			:current-page="page"
-			@current-change="changePage"
-		></el-pagination>
-		<!-- 新增弹框 -->
-		<el-dialog
-			title="新增"
-			:visible.sync="farmThingAddDialogVisible"
-			width="30%"
-			@close="AddDialogClosed"
-		>
-			<el-form
-				ref="addFormRef"
-				:model="addForm"
-				label-width="90px"
-				:rules="addFormRules"
-			>
-				<el-form-item label="所属地块 : " prop="pro_cascader">
-					<el-cascader
-						v-model="addForm.pro_cascader"
-						:options="FieldCascader"
-						:props="{
-							expandTrigger: 'hover',
-							label: 'farmname',
-							value: 'farmname'
-						}"
-					></el-cascader>
-				</el-form-item>
-				<el-form-item label="产品类别 : " prop="pro_type">
-					<el-input v-model="addForm.pro_type"></el-input>
-				</el-form-item>
-				<el-form-item label="产品名称 : " prop="pro_name">
-					<el-input v-model="addForm.pro_name"></el-input>
-				</el-form-item>
-				<el-form-item label="批次名称 : " prop="batch_name">
-					<el-input v-model="addForm.batch_name"></el-input>
-				</el-form-item>
-			</el-form>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="farmThingAddDialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="addSubm">确认</el-button>
-			</span>
-		</el-dialog>
-		<!-- 编辑地块弹框 -->
-		<el-dialog
-			title="编辑"
-			:visible.sync="farmThingEditDialogVisible"
-			width="30%"
-			@close="EditDialogClosed"
-		>
-			<el-form
-				ref="editFormRef"
-				:model="editForm"
-				label-width="90px"
-				:rules="addFormRules"
-			>
-				<el-form-item label="所属地块 : " prop="pro_cascader">
-					<el-cascader
-						disabled
-						v-model="editForm.pro_cascader"
-						:options="FieldCascader"
-						:props="{
-							expandTrigger: 'hover',
-							label: 'farmname',
-							value: 'farmname'
-						}"
-					></el-cascader>
-				</el-form-item>
-				<el-form-item label="产品类别 : " prop="pro_type">
-					<el-input v-model="editForm.pro_type"></el-input>
-				</el-form-item>
-				<el-form-item label="产品名称 : " prop="pro_name">
-					<el-input v-model="editForm.pro_name"></el-input>
-				</el-form-item>
-				<el-form-item label="批次名称 : " prop="batch_name">
-					<el-input v-model="editForm.batch_name"></el-input>
-				</el-form-item>
-			</el-form>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="farmThingEditDialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="editSubm">确认</el-button>
-			</span>
-		</el-dialog>
+		<img style="width: 100%; margin: 0 0 0 -20px;" src="../../../../static/img/3.jpg" alt="" class="">
 	</div>
 </template>
 

+ 1 - 159
src/pages/symanger/farmThing/sale.vue

@@ -1,164 +1,6 @@
 <template>
 	<div style="cursor: default">
-		<el-breadcrumb separator-class="el-icon-arrow-right">
-			<el-breadcrumb-item>农事管理</el-breadcrumb-item>
-			<el-breadcrumb-item>销售</el-breadcrumb-item>
-		</el-breadcrumb>
-		<div class="search-box">
-			<div class="filter-box">
-				<el-select
-					size="small"
-					v-model="base"
-					clearable
-					@change="selChange"
-					placeholder="请选择基地名称"
-				>
-					<el-option
-						v-for="item in baseList"
-						:label="item.farmname"
-						:value="item.farmname"
-						:key="item.id"
-					></el-option>
-				</el-select>
-			</div>
-			<el-button type="primary" size="mini" @click="saleAdd">新增</el-button>
-		</div>
-		<el-card class="box-card">
-			<el-table :data="tableData" stripe style="width: 100%">
-				<el-table-column prop="sellname" label="产品名称"></el-table-column>
-				<el-table-column prop="backcode" label="追溯码"></el-table-column>
-				<el-table-column prop="farm" label="农场"></el-table-column>
-				<el-table-column prop="land" label="地块"></el-table-column>
-				<el-table-column prop="selltime" label="销售日期"></el-table-column>
-				<el-table-column prop="sellnum" label="数量/kg"></el-table-column>
-				<el-table-column prop="clientname" label="客户名称"></el-table-column>
-				<el-table-column prop="clienttel" label="客户电话"></el-table-column>
-				<el-table-column prop="user" label="经办人"></el-table-column>
-				<el-table-column label="操作">
-					<template slot-scope="scope">
-						<el-button
-							size="mini"
-							type="info"
-							icon="el-icon-edit"
-							@click="saleEdit(scope.row)"
-							>编辑</el-button
-						>
-						<!-- <el-button
-							size="mini"
-							type="danger"
-							icon="el-icon-delete"
-							@click="saleDelet(scope.row.id)"
-							>删除</el-button
-						> -->
-					</template>
-				</el-table-column>
-			</el-table>
-			<el-pagination
-				background
-				layout="prev, pager, next"
-				:total="totalNum"
-				:current-page="page"
-				@current-change="changePage"
-			></el-pagination>
-		</el-card>
-		<!-- 新增销售弹框 -->
-		<el-dialog
-			title="新增"
-			:visible.sync="farmThingAddDialogVisible"
-			width="30%"
-			@close="AddDialogClosed"
-		>
-			<el-form
-				ref="addFormRef"
-				:model="addForm"
-				label-width="100px"
-				:rules="addFormRules"
-			>
-				<el-form-item label="销售批次 : " prop="sourceCode">
-					<el-select
-						v-model="addForm.sourceCode"
-						style="width: 100%"
-						@change="selSourceCode()"
-					>
-						<el-option
-							v-for="item in harvestList"
-							:key="item.id"
-							:label="item.pickname + '-' + item.backcode"
-							:value="item.backcode"
-						></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="产品名称 : " prop="name">
-					<el-input disabled v-model="addForm.name"></el-input>
-				</el-form-item>
-				<el-form-item label="数量/kg : " prop="saleNum">
-					<el-input disabled v-model="addForm.saleNum"></el-input>
-				</el-form-item>
-				<el-form-item label="种植基地 : " prop="farm">
-					<el-input disabled v-model="addForm.farm"></el-input>
-				</el-form-item>
-				<el-form-item label="种植地块 : " prop="land">
-					<el-input disabled v-model="addForm.land"></el-input>
-				</el-form-item>
-				<el-form-item label="销售日期 : " prop="saleDate">
-					<el-date-picker
-						type="datetime"
-						placeholder="选择日期"
-						v-model="addForm.saleDate"
-						style="width: 100%"
-					></el-date-picker>
-				</el-form-item>
-				<el-form-item label="客户名称 : " prop="customerName">
-					<el-input v-model="addForm.customerName"></el-input>
-				</el-form-item>
-				<el-form-item label="客户电话 : " prop="customerTel">
-					<el-input v-model="addForm.customerTel"></el-input>
-				</el-form-item>
-				<el-form-item label="经办人 : " prop="operator">
-					<el-input v-model="addForm.operator"></el-input>
-				</el-form-item>
-			</el-form>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="farmThingAddDialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="addSubm">确认</el-button>
-			</span>
-		</el-dialog>
-		<!-- 编辑销售弹框 -->
-		<el-dialog
-			title="编辑"
-			:visible.sync="farmThingEditDialogVisible"
-			width="30%"
-			@close="EditDialogClosed"
-		>
-			<el-form
-				ref="editFormRef"
-				:model="editForm"
-				label-width="100px"
-				:rules="addFormRules"
-			>
-				<el-form-item label="销售日期 : " prop="saleDate">
-					<el-date-picker
-						type="datetime"
-						placeholder="选择日期"
-						v-model="editForm.saleDate"
-						style="width: 100%"
-					></el-date-picker>
-				</el-form-item>
-				<el-form-item label="客户名称 : " prop="customerName">
-					<el-input v-model="editForm.customerName"></el-input>
-				</el-form-item>
-				<el-form-item label="客户电话 : " prop="customerTel">
-					<el-input v-model="editForm.customerTel"></el-input>
-				</el-form-item>
-				<el-form-item label="经办人 : " prop="operator">
-					<el-input v-model="editForm.operator"></el-input>
-				</el-form-item>
-			</el-form>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="farmThingEditDialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="editSubm">确认</el-button>
-			</span>
-		</el-dialog>
+		<img style="width: 100%; margin: 0 0 0 -20px;" src="../../../../static/img/9.jpg" alt="" class="">
 	</div>
 </template>
 

+ 1 - 157
src/pages/symanger/farmThing/spray.vue

@@ -1,162 +1,6 @@
 <template>
 	<div style="cursor: default">
-		<el-breadcrumb separator-class="el-icon-arrow-right">
-			<el-breadcrumb-item>农事管理</el-breadcrumb-item>
-			<el-breadcrumb-item>喷药</el-breadcrumb-item>
-		</el-breadcrumb>
-		<div class="search-box">
-			<div class="filter-box">
-				<el-select
-					size="small"
-					v-model="base"
-					clearable
-					@change="selChange"
-					placeholder="请选择基地名称"
-				>
-					<el-option
-						v-for="item in baseList"
-						:label="item.farmname"
-						:value="item.farmname"
-						:key="item.id"
-					></el-option>
-				</el-select>
-				<el-select
-					size="small"
-					v-model="pickcode"
-					clearable
-					@change="selChange"
-					placeholder="请选择采收状态"
-				>
-					<el-option label="已采收" value="1"></el-option>
-					<el-option label="未采收" value="0"></el-option>
-				</el-select>
-			</div>
-			<el-button type="primary" size="mini" @click="sprayAdd">新增</el-button>
-		</div>
-		<el-row :gutter="10">
-			<el-col
-				:xs="24"
-				:sm="24"
-				:md="12"
-				:lg="6"
-				:xl="6"
-				v-for="item in fieldsList"
-				:key="item.id"
-			>
-				<el-card class="box-card">
-					<img
-						class="tag"
-						v-if="item.is_pick == '1'"
-						src="@/assets/images/sy/farmThing/picked.png"
-					/>
-					<div class="img-box">
-						<img src="@/assets/images/sy/farmThing/spray.png" />
-					</div>
-					<div class="detail">
-						<p class="borderLine">操作基地 : {{ item.farm }}</p>
-						<p class="borderLine">操作地块 : {{ item.land }}</p>
-						<p class="borderLine">药品名称 : {{ item.mediname }}</p>
-						<p class="borderLine">
-							喷药时间 : {{ (item.uptime * 1000) | formatTime }}
-						</p>
-						<p class="borderLine">批次 : {{ item.batch }}</p>
-						<p class="borderLine">操作人 : {{ item.user }}</p>
-					</div>
-					<div class="btns">
-						<a
-							:class="{ bg: itemId == item.id && btnindex == 1 ? true : false }"
-							@click="sprayEdit(item)"
-							>编辑</a
-						>
-						<a
-							:class="{ bg: itemId == item.id && btnindex == 2 ? true : false }"
-							@click="sprayDelet(item)"
-							>删除</a
-						>
-					</div>
-				</el-card>
-			</el-col>
-		</el-row>
-		<el-pagination
-			background
-			layout="prev, pager, next"
-			:total="totalNum"
-			:page-size="8"
-			:current-page="page"
-			@current-change="changePage"
-		></el-pagination>
-		<!-- 新增弹框 -->
-		<el-dialog
-			title="新增"
-			:visible.sync="farmThingAddDialogVisible"
-			width="30%"
-			@close="AddDialogClosed"
-		>
-			<template v-if="planted.length > 0">
-				<el-form
-					ref="addFormRef"
-					:model="addForm"
-					label-width="116px"
-					:rules="addFormRules"
-				>
-					<el-form-item label="所属地块 : " prop="pro_cascader">
-						<el-cascader
-							style="width: 100%"
-							v-model="addForm.pro_cascader"
-							:options="planted"
-							:props="{
-								expandTrigger: 'hover',
-								label: 'farmname',
-								value: 'farmname'
-							}"
-						></el-cascader>
-					</el-form-item>
-					<el-form-item label="药品名称 : " prop="spray_name">
-						<el-input v-model="addForm.spray_name"></el-input>
-					</el-form-item>
-					<el-form-item label="操作人 : " prop="operator">
-						<el-input v-model="addForm.operator"></el-input>
-					</el-form-item>
-				</el-form>
-				<span slot="footer" class="dialog-footer">
-					<el-button @click="farmThingAddDialogVisible = false"
-						>取 消</el-button
-					>
-					<el-button type="primary" @click="addSubm">确认</el-button>
-				</span>
-			</template>
-			<template v-else>
-				<div class="noPlanted">暂无正在种植的地块!</div>
-			</template>
-		</el-dialog>
-		<!-- 编辑地块弹框 -->
-		<el-dialog
-			title="编辑"
-			:visible.sync="farmThingEditDialogVisible"
-			width="30%"
-			@close="EditDialogClosed"
-		>
-			<el-form
-				ref="editFormRef"
-				:model="editForm"
-				label-width="116px"
-				:rules="addFormRules"
-			>
-				<el-form-item label="所属地块 : " prop="pro_cascader">
-					<el-input disabled v-model="editForm.pro_cascader"></el-input>
-				</el-form-item>
-				<el-form-item label="药品名称 : " prop="spray_name">
-					<el-input v-model="editForm.spray_name"></el-input>
-				</el-form-item>
-				<el-form-item label="操作人 : " prop="operator">
-					<el-input v-model="editForm.operator"></el-input>
-				</el-form-item>
-			</el-form>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="farmThingEditDialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="editSubm">确认</el-button>
-			</span>
-		</el-dialog>
+		<img style="width: 100%; margin: 0 0 0 -20px;" src="../../../../static/img/5.jpg" alt="" class="">
 	</div>
 </template>
 

+ 1 - 239
src/pages/symanger/farmThing/transport.vue

@@ -1,244 +1,6 @@
 <template>
 	<div style="cursor: default">
-		<el-breadcrumb separator-class="el-icon-arrow-right">
-			<el-breadcrumb-item>农事管理</el-breadcrumb-item>
-			<el-breadcrumb-item>运输</el-breadcrumb-item>
-		</el-breadcrumb>
-		<div class="search-box">
-			<div class="filter-box">
-				<el-select
-					size="small"
-					v-model="base"
-					clearable
-					@change="selChange"
-					placeholder="请选择基地名称"
-				>
-					<el-option
-						v-for="item in baseList"
-						:label="item.farmname"
-						:value="item.farmname"
-						:key="item.id"
-					></el-option>
-				</el-select>
-			</div>
-			<el-button type="primary" size="mini" @click="saleAdd">新增</el-button>
-		</div>
-		<el-card class="box-card">
-			<el-table :data="tableData" stripe style="width: 100%">
-				<el-table-column prop="transname" label="产品名称"></el-table-column>
-				<el-table-column prop="backcode" label="追溯码"></el-table-column>
-				<el-table-column prop="farm" label="农场"></el-table-column>
-				<el-table-column prop="land" label="地块"></el-table-column>
-				<el-table-column prop="stime" label="发货日期"></el-table-column>
-				<el-table-column prop="etime" label="预期到货日期"></el-table-column>
-				<el-table-column prop="address" label="目的地"></el-table-column>
-				<el-table-column prop="trans" label="运输方法"></el-table-column>
-				<el-table-column prop="user" label="经办人"></el-table-column>
-				<el-table-column label="操作" width="180">
-					<template slot-scope="scope">
-						<el-button
-							size="mini"
-							type="info"
-							icon="el-icon-edit"
-							@click="transEdit(scope.row)"
-							>编辑</el-button
-						>
-						<el-button
-							size="mini"
-							type="danger"
-							icon="el-icon-delete"
-							@click="transDelet(scope.row.id)"
-							>删除</el-button
-						>
-					</template>
-				</el-table-column>
-			</el-table>
-			<el-pagination
-				background
-				layout="prev, pager, next"
-				:total="totalNum"
-				:current-page="page"
-				@current-change="changePage"
-			></el-pagination>
-		</el-card>
-		<!-- 新增运输弹框 -->
-		<el-dialog
-			title="新增"
-			:visible.sync="farmThingAddDialogVisible"
-			width="30%"
-			@close="AddDialogClosed"
-		>
-			<el-form
-				ref="addFormRef"
-				:model="addForm"
-				label-width="120px"
-				:rules="addFormRules"
-			>
-				<el-form-item label="运输批次 : " prop="backcode">
-					<el-select
-						v-model="addForm.backcode"
-						style="width: 100%"
-						@change="selSourceCode()"
-					>
-						<el-option
-							v-for="item in selltList"
-							:key="item.id"
-							:label="item.sellname + '-' + item.backcode"
-							:value="item.backcode"
-						></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="产品名称 : " prop="name">
-					<el-input disabled v-model="addForm.name"></el-input>
-				</el-form-item>
-				<el-form-item label="种植基地 : " prop="farm">
-					<el-input disabled v-model="addForm.farm"></el-input>
-				</el-form-item>
-				<el-form-item label="种植地块 : " prop="land">
-					<el-input disabled v-model="addForm.land"></el-input>
-				</el-form-item>
-				<el-form-item label="发货日期 : " prop="sendDate">
-					<el-date-picker
-						type="datetime"
-						placeholder="选择日期"
-						v-model="addForm.sendDate"
-						style="width: 100%"
-					></el-date-picker>
-				</el-form-item>
-				<el-form-item label="预计到货日期 : " prop="arrivalDate">
-					<el-date-picker
-						type="datetime"
-						placeholder="选择日期"
-						v-model="addForm.arrivalDate"
-						style="width: 100%"
-					></el-date-picker>
-				</el-form-item>
-				<!-- <el-form-item label="发货地 : " prop="sendAddr">
-					<el-select v-model="addForm.sendAddr" style="width: 100%;">
-						<el-option v-for="item in baseList" :key="item.id" :label="item.farmname" :value="item.id"></el-option>
-					</el-select>
-				</el-form-item>-->
-				<el-form-item label="目的地 : " prop="destination" class="addressItem">
-					<el-input
-						disabled
-						v-model="addForm.destination"
-						placeholder="请定位"
-					></el-input>
-					<el-button type="primary" size="mini" @click="goLocation"
-						>地图定位</el-button
-					>
-				</el-form-item>
-				<el-form-item label="详细地址 : " prop="addrDetail">
-					<el-input required v-model="addForm.addrDetail"></el-input>
-				</el-form-item>
-				<el-form-item label="运输方法 : " prop="shipping">
-					<el-input v-model="addForm.shipping"></el-input>
-				</el-form-item>
-				<el-form-item label="经办人 : " prop="user">
-					<el-input v-model="addForm.user"></el-input>
-				</el-form-item>
-			</el-form>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="farmThingAddDialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="addSubm">确认</el-button>
-			</span>
-		</el-dialog>
-		<!-- 编辑运输弹框 -->
-		<el-dialog
-			title="编辑"
-			:visible.sync="farmThingEditDialogVisible"
-			width="30%"
-			@close="EditDialogClosed"
-		>
-			<el-form
-				ref="editFormRef"
-				:model="editForm"
-				label-width="120px"
-				:rules="addFormRules"
-			>
-				<el-form-item label="发货日期 : " prop="sendDate">
-					<el-date-picker
-						type="datetime"
-						placeholder="选择日期"
-						v-model="editForm.sendDate"
-						style="width: 100%"
-					></el-date-picker>
-				</el-form-item>
-				<el-form-item label="预计到货日期 : " prop="arrivalDate">
-					<el-date-picker
-						type="datetime"
-						placeholder="选择日期"
-						v-model="editForm.arrivalDate"
-						style="width: 100%"
-					></el-date-picker>
-				</el-form-item>
-				<!-- <el-form-item label="发货地 : " prop="sendAddr">
-					<el-select v-model="editForm.sendAddr" style="width: 100%;">
-						<el-option v-for="item in baseList" :key="item.id" :label="item.farmname" :value="item.id"></el-option>
-					</el-select>
-				</el-form-item>-->
-				<el-form-item label="目的地 : " prop="destination" class="addressItem">
-					<el-input
-						disabled
-						v-model="editForm.destination"
-						placeholder="请定位"
-					></el-input>
-					<el-button type="primary" size="mini" @click="goLocation"
-						>地图定位</el-button
-					>
-				</el-form-item>
-				<el-form-item label="详细地址 : " prop="addrDetail">
-					<el-input v-model="editForm.addrDetail"></el-input>
-				</el-form-item>
-				<el-form-item label="运输方法 : " prop="shipping">
-					<el-input v-model="editForm.shipping"></el-input>
-				</el-form-item>
-				<el-form-item label="经办人 : " prop="user">
-					<el-input v-model="editForm.user"></el-input>
-				</el-form-item>
-			</el-form>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="farmThingEditDialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="editSubm">确认</el-button>
-			</span>
-		</el-dialog>
-		<!-- 添加定位弹框 -->
-		<el-dialog
-			class="map_dialog"
-			title="添加定位"
-			v-if="addLocationDialogVisible"
-			:visible.sync="addLocationDialogVisible"
-			width="800px"
-			@close="addLocationDialogClosed"
-		>
-			<el-form
-				:inline="true"
-				:model="locationForm"
-				class="demo-form-inline"
-				size="mini"
-			>
-				<el-form-item label="地区">
-					<el-input v-model="locationAddr"></el-input>
-				</el-form-item>
-				<el-form-item>
-					<el-button type="primary" size="mini" @click="locationSearch"
-						>定位</el-button
-					>
-				</el-form-item>
-			</el-form>
-			<baidu-map
-				class="Bmap"
-				:center="center"
-				:zoom="mapZoom"
-				:scroll-wheel-zoom="true"
-				@ready="handlerBMap"
-				@click="locationPoint"
-			></baidu-map>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="addLocationDialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="addLocationSubm">确 定</el-button>
-			</span>
-		</el-dialog>
+		<img style="width: 100%; margin: 0 0 0 -20px;" src="../../../../static/img/10.jpg" alt="" class="">
 	</div>
 </template>
 

+ 1 - 156
src/pages/symanger/farmThing/watering.vue

@@ -1,161 +1,6 @@
 <template>
 	<div style="cursor: default">
-		<el-breadcrumb separator-class="el-icon-arrow-right">
-			<el-breadcrumb-item>农事管理</el-breadcrumb-item>
-			<el-breadcrumb-item>灌溉</el-breadcrumb-item>
-		</el-breadcrumb>
-		<div class="search-box">
-			<div class="filter-box">
-				<el-select
-					size="small"
-					v-model="base"
-					clearable
-					@change="selChange"
-					placeholder="请选择基地名称"
-				>
-					<el-option
-						v-for="item in baseList"
-						:label="item.farmname"
-						:value="item.farmname"
-						:key="item.id"
-					></el-option>
-				</el-select>
-				<el-select
-					size="small"
-					v-model="pickcode"
-					clearable
-					@change="selChange"
-					placeholder="请选择采收状态"
-				>
-					<el-option label="已采收" value="1"></el-option>
-					<el-option label="未采收" value="0"></el-option>
-				</el-select>
-			</div>
-			<el-button type="primary" size="mini" @click="plantAdd">新增</el-button>
-		</div>
-		<el-row :gutter="10">
-			<el-col
-				:xs="24"
-				:sm="24"
-				:md="12"
-				:lg="6"
-				:xl="6"
-				v-for="item in fieldsList"
-				:key="item.id"
-			>
-				<el-card class="box-card">
-					<img
-						class="tag"
-						v-if="item.is_pick == '1'"
-						src="@/assets/images/sy/farmThing/picked.png"
-					/>
-					<div class="img-box">
-						<img src="@/assets/images/sy/farmThing/watering.png" />
-					</div>
-					<div class="detail">
-						<p class="borderLine">操作基地 : {{ item.farm }}</p>
-						<p class="borderLine">操作地块 : {{ item.land }}</p>
-						<p class="borderLine">灌溉面积(亩) : {{ item.area }}</p>
-						<p class="borderLine">
-							灌溉日期 : {{ (item.uptime * 1000) | formatTime }}
-						</p>
-						<p class="borderLine">批次 : {{ item.batch }}</p>
-						<p class="borderLine">操作人 : {{ item.user }}</p>
-					</div>
-					<div class="btns">
-						<a
-							:class="{ bg: itemId == item.id && btnindex == 1 ? true : false }"
-							@click="plantEdit(item)"
-							>编辑</a
-						>
-						<a
-							:class="{ bg: itemId == item.id && btnindex == 2 ? true : false }"
-							@click="plantDelet(item.id)"
-							>删除</a
-						>
-					</div>
-				</el-card>
-			</el-col>
-		</el-row>
-		<el-pagination
-			background
-			layout="prev, pager, next"
-			:total="totalNum"
-			:page-size="8"
-			:current-page="page"
-			@current-change="changePage"
-		></el-pagination>
-		<!-- 新增弹框 -->
-		<el-dialog
-			title="新增"
-			:visible.sync="farmThingAddDialogVisible"
-			width="30%"
-			@close="AddDialogClosed"
-		>
-			<template v-if="planted.length > 0">
-				<el-form
-					ref="addFormRef"
-					:model="addForm"
-					label-width="116px"
-					:rules="addFormRules"
-				>
-					<el-form-item label="所属地块 : " prop="pro_cascader">
-						<el-cascader
-							v-model="addForm.pro_cascader"
-							:options="planted"
-							:props="{
-								expandTrigger: 'hover',
-								label: 'farmname',
-								value: 'farmname'
-							}"
-						></el-cascader>
-					</el-form-item>
-					<el-form-item label="灌溉面积(亩) : " prop="area">
-						<el-input v-model="addForm.area"></el-input>
-					</el-form-item>
-					<el-form-item label="操作人 : " prop="operator">
-						<el-input v-model="addForm.operator"></el-input>
-					</el-form-item>
-				</el-form>
-				<span slot="footer" class="dialog-footer">
-					<el-button @click="farmThingAddDialogVisible = false"
-						>取 消</el-button
-					>
-					<el-button type="primary" @click="addSubm">确认</el-button>
-				</span>
-			</template>
-			<template v-else>
-				<div class="noPlanted">暂无正在种植的地块!</div>
-			</template>
-		</el-dialog>
-		<!-- 编辑地块弹框 -->
-		<el-dialog
-			title="编辑"
-			:visible.sync="farmThingEditDialogVisible"
-			width="30%"
-			@close="EditDialogClosed"
-		>
-			<el-form
-				ref="editFormRef"
-				:model="editForm"
-				label-width="116px"
-				:rules="addFormRules"
-			>
-				<el-form-item label="所属地块 : " prop="pro_cascader">
-					<el-input disabled v-model="editForm.pro_cascader"></el-input>
-				</el-form-item>
-				<el-form-item label="灌溉面积(亩) : " prop="area">
-					<el-input v-model="editForm.area"></el-input>
-				</el-form-item>
-				<el-form-item label="操作人 : " prop="operator">
-					<el-input v-model="editForm.operator"></el-input>
-				</el-form-item>
-			</el-form>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="farmThingEditDialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="editSubm">确认</el-button>
-			</span>
-		</el-dialog>
+		<img style="width: 100%; margin: 0 0 0 -20px;" src="../../../../static/img/6.jpg" alt="" class="">
 	</div>
 </template>
 

+ 1 - 96
src/pages/symanger/resultInfo/resultInfoList.vue

@@ -1,101 +1,6 @@
 <template>
 	<div style="cursor: default">
-		<el-breadcrumb separator-class="el-icon-arrow-right">
-			<el-breadcrumb-item>溯源管理</el-breadcrumb-item>
-			<el-breadcrumb-item>溯源信息</el-breadcrumb-item>
-		</el-breadcrumb>
-		<div class="search-box">
-			<div class="filter-box">
-				<el-select
-					size="small"
-					v-model="base"
-					clearable
-					@change="selChange"
-					placeholder="请选择基地名称"
-				>
-					<el-option
-						v-for="item in baseList"
-						:label="item.farmname"
-						:value="item.farmname"
-						:key="item.id"
-					></el-option>
-				</el-select>
-			</div>
-		</div>
-		<el-row :gutter="10">
-			<el-col
-				:xs="24"
-				:sm="24"
-				:md="12"
-				:lg="6"
-				:xl="6"
-				v-for="item in pickList"
-				:key="item.id"
-			>
-				<el-card class="box-card">
-					<div class="img-box">
-						<img src="@/assets/images/sy/resultInfo/icon.png" />
-					</div>
-					<div class="detail">
-						<p class="borderLine">产品名称 : {{ item.pickname }}</p>
-						<p class="borderLine">基地 : {{ item.farm }}</p>
-						<p class="borderLine">地块 : {{ item.land }}</p>
-						<p class="borderLine">批次 : {{ item.batch }}</p>
-						<p class="borderLine">总量 : {{ item.picktotal }}kg</p>
-						<p class="borderLine">
-							采收日期 : {{ (item.uptime * 1000) | formatTime }}
-						</p>
-					</div>
-					<div class="btns">
-						<el-button
-							type="primary"
-							icon="el-icon-document"
-							size="mini"
-							plain
-							@click="lookProduct(item.backcode)"
-							>详情</el-button
-						>
-						<el-button
-							type="primary"
-							icon="el-icon-edit"
-							size="mini"
-							plain
-							@click="editProduct(item.backcode)"
-							>编辑</el-button
-						>
-						<el-button
-							type="primary"
-							icon="iconfont icon-saomiaoshibie380"
-							size="mini"
-							plain
-							@click="showQRcodeFun(item.backcode)"
-							>二维码</el-button
-						>
-					</div>
-				</el-card>
-			</el-col>
-		</el-row>
-		<el-pagination
-			background
-			layout="prev, pager, next"
-			:total="totalNum"
-			:page-size="8"
-			:current-page="page"
-			@current-change="changePage"
-		></el-pagination>
-		<el-dialog
-			title="追溯二维码"
-			:visible.sync="showQRcodeVisible"
-			width="350px"
-			@close="QRcodeDialogClosed"
-		>
-			<div id="qrCode" ref="QRcodeShowImg"></div>
-			<p>{{ QRcode }}</p>
-			<!-- <span slot="footer" class="dialog-footer">
-               <el-button @click="showQRcodeVisible= false">取 消</el-button>
-               <el-button type="primary" @click="addUserSubm">确认</el-button>
-			</span>-->
-		</el-dialog>
+		<img style="width: 100%; margin: 0 0 0 -20px;" src="../../../../static/img/11.jpg" alt="" class="">
 	</div>
 </template>
 


BIN
static/img/10.jpg


BIN
static/img/11.jpg