Merge branch 'master' of http://192.168.3.53:11080/aielab/jcxt_qd

src/components/admin/addTask.vue

@@ -59,7 +59,7 @@
 			</el-form-item>
 			<el-form-item label="附件" required>
 				<el-upload class="upload-demo" :file-list="fileList" drag :headers="myHeaders"
-					action="http://syjcapi.aielab.net/api/v1/ossUpload" :on-success="uploadSuccess"
+					action="http://new.syjc.com/api/v1/ossUpload" :on-success="uploadSuccess"
 					:limit="1">
 					<i class="el-icon-upload"></i>
 					<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
@@ -104,7 +104,7 @@
 	export default {
 		data() {
 			return {
-				rymc: rymc,		//从本地缓存获取发布单位
+				// rymc: rymc,		//从本地缓存获取发布单位
 				myHeaders: {
 					Authorization: 'bearer'+ token			//上传文件添加token
 				},
@@ -157,7 +157,7 @@
 						// fixed: 'left'
 					}, {
 						label: '所属区域',
-						prop: 'dtRelyOnUnit',
+						prop: 'ssqy',
 						width: 300
 						// fixed: 'left'
 					}
@@ -227,12 +227,18 @@
 				if (result.data.code == 0) {
 					this.testList = result.data.data.rows
 					this.total = result.data.data.total
+				}else{
+					this.$message({
+						type: 'error',
+						message: result.data.message
+					})
 				}
 			},
 			// 获取检测机构列表
 			async getTestList() {
 				this.queryInfo['token'] = token
 				const result = await this.$http.post('getTestList', this.queryInfo)
+				console.log(result);
 				// 判断业务逻辑
 				if (result.data.code == 0) {
 					this.testList = result.data.data.rows

src/components/admin/routineMonitor.vue

@@ -484,7 +484,7 @@
 				// var val = this.selectedData;
 				this.pubarr = this.multipleSelection;
 				for (let i = 0; i < length; i++) {
-					if (this.pubarr[i].ispublic == '1') {
+					if (this.pubarr[i].ispublic == 1) {
 						this.pubarr[i].ispublic = 2
 						canPub = 1
 					} else {

src/components/jc/inputSample.vue

@@ -66,7 +66,7 @@
 	</el-descriptions-item>
 	<el-descriptions-item label="抽样基数" prop="sample_base" class="labelItem" size="mini" required>
 		<el-input v-model="form.sample_base" style="width:180px"></el-input>
-		<a> * 单位 </a><el-input v-model="form.sample_base_unit" clearable="true" style="width:180px"></el-input>
+		<a> * 单位 </a><el-input v-model="form.sample_base_unit1" clearable="true" style="width:180px"></el-input>
 	</el-descriptions-item>
 	<el-descriptions-item label="*抽样场所" prop="sample_ground" class="labelItem" size="mini" required >
 							<el-radio v-model="form.sample_ground" label="生产基地/企业">生产基地/企业</el-radio>

src/components/jc/jcobj.vue

@@ -393,9 +393,9 @@
 					this.modelForm.type_id = res.data.name.type_id
 					this.modelForm.product=res.data.product
 					this.modelForm.pesticides=res.data.pesticides
-					console.log(res.data.product.map(el=>el.name).join(','))
-					this.productText = res.data.product.map(el=>el.name).join(',')
-					this.pesticidesText = res.data.pesticides.map(el=>el.name).join(',')
+					console.log(res.data.product.map(el=>el.product_name).join(','))
+					this.productText = res.data.product.map(el=>el.product_name).join(',')
+					this.pesticidesText = res.data.pesticides.map(el=>el.test_name).join(',')
 					console.log(this.modelForm.pesticides)
 					console.log(this.modelForm.product)
 				}

src/components/jc/routineMonitor.vue

@@ -14,11 +14,11 @@
 			<el-row :gutter="50" style="margin-right: 0px;">
 				<el-form style="display: flex; flex-direction: row;" size="mini">
 					<el-form-item label="年度" class="select">
-						<el-date-picker v-model="queryInfo.taskyear" style="width: 110px;" value-format="yyyy"
+						<el-date-picker v-model="queryInfo.year" style="width: 110px;" value-format="yyyy"
 							type="year" clearable />
 					</el-form-item>
 					<el-form-item label="任务状态" class="select">
-						<el-select v-model="queryInfo.status" style="width: 110px;">
+						<el-select v-model="queryInfo.ispublic" style="width: 110px;">
 							<el-option v-for="item in taskstatus" :key="item.value" :label="item.label"
 								:value="item.value">
 							</el-option>
@@ -33,7 +33,7 @@
 							:picker-options="pickerOptions" clearable />
 					</el-form-item>
 					<el-form-item label="任务名称" class="select">
-						<el-input v-model="queryInfo.taskname"></el-input>
+						<el-input v-model="queryInfo.task_name"></el-input>
 					</el-form-item>
 					<!-- 查询 -->
 					<el-button style="height: 28px;margin-left: 10px;" size="mini" type="success" @click="searchData()">查询</el-button>
@@ -65,7 +65,6 @@
 					align="center" :width="table.width" :fixed="table.fixed" />
 				<el-table-column prop="ispublic" label="任务状态" align="center">
 					<template slot-scope="scope">
-						<!-- <el-tag type="success" v-if="scope.row.ispublic==1">已发布</el-tag> -->
 						<el-tag type="danger" v-if="scope.row.ispublic==2">废止</el-tag>
 						<el-tag type="info" v-if="scope.row.ispublic==3">已结束，未完成</el-tag>
 						<el-tag type="success" v-if="scope.row.ispublic==4">已结束，已完成</el-tag>
@@ -188,6 +187,7 @@ const HeadersList = [{
 					},
 
 				],
+				total:'',
 				// 数据表格数据
 				tableData: [],
 				// 批量删除选中数据
@@ -297,7 +297,7 @@ const HeadersList = [{
 					starttime:'',
 					endtime:'',
 					ispublic:'',
-					pageSize:10,
+					pageSize:'',
 					pageNum:1,
 					task_class:'例行监测'
 				}

src/components/jc/routineMonitorqt.vue

@@ -289,7 +289,7 @@
 				const {
 					data: res
 				} = await this.$http.post(
-					"getTaskListTest", this.queryInfo
+					"getTaskTest", this.queryInfo
 				);
 				console.log(res)
 				this.tableData = res.data.rows

src/components/jc/setTask.vue

@@ -12,10 +12,10 @@
 			<el-tab-pane label="基本信息" name="first">
 				<el-form :model="readForm" label-position="right" label-width="auto" style="margin-left: 35%;">
 					<el-form-item label="发布单位:" prop="releaser" class="labelItem" required>
-						<div>{{readForm.releaser}}</div>
+						<div>{{readForm.releaserInfo.rymc}}</div>
 					</el-form-item>
 					<el-form-item label="任务名称:" prop="task_name" class="labelItem" required>
-						<div>{{readForm.task_name}}</div>
+						<div>{{readForm.taskInfo.task_name}}</div>
 					</el-form-item>
 					<el-form-item label="任务优先级:" prop="level" class="labelItem" required>
 						<div v-if="readForm.level=='0'">一般</div>
@@ -23,7 +23,7 @@
 						<div v-else>特急</div>
 					</el-form-item>
 					<el-form-item label="监测类型:" prop="task_class" width="70px" class="labelItem" required>
-						<div>{{readForm.task_class}}</div>
+						<div>{{readForm.taskInfo.task_class}}</div>
 					</el-form-item>
 					<el-form-item label="检测模型:" prop="bindForm.test_model_id" width="70px" class="labelItem" required>
 						<el-select v-model="bindForm.test_model_id" size="mini" placeholder="请选择">
@@ -38,7 +38,7 @@
 						</el-select>
 					</el-form-item>
 					<el-form-item label="年度:" prop="year" class="labelItem" required>
-						<div>{{readForm.year}}</div>
+						<div>{{readForm.taskInfo.year}}</div>
 					</el-form-item>
 				<!-- 	<el-form-item label="发布机构所属区域:" prop="year" class="labelItem" required>
 						<div>{{readForm.year}}</div>
@@ -50,23 +50,23 @@
 						<div>{{readForm.batch}}</div>
 					</el-form-item> -->
 					<el-form-item label="任务时间:" prop="starttime" width="200px" class="labelItem" required>
-						<div>{{readForm.starttime}} 至 {{readForm.endtime}}</div>
+						<div>{{readForm.taskInfo.starttime}} 至 {{readForm.taskInfo.endtime}}</div>
 					</el-form-item>
 					<el-form-item label="抽样信息上报截止时间:" size="mini" class="labelItem" required>
 						<el-date-picker v-model="bindForm.endtime_cydsb" type="date" value-format="yyyy-MM-dd">
 						</el-date-picker>
 					</el-form-item>
 					<el-form-item label="附件:" prop="file_url" class="labelItem">
-						<div v-if="readForm.file_url==null">无</div>
-						<el-link v-else type="primary" :href="readForm.file_url">{{readForm.file_name}}</el-link>
+						<div v-if="readForm.taskInfo.file_url==null">无</div>
+						<el-link v-else type="primary" :href="readForm.taskInfo.file_url">{{readForm.taskInfo.file_name}}</el-link>
 					</el-form-item>
 					<el-form-item label="文件号:" prop="filenum" width="200px" class="labelItem">
-						<div v-if="readForm.filenum==null">无</div>
-						<div v-else>{{readForm.filenum}}</div>
+						<div v-if="readForm.taskInfo.filenum==null">无</div>
+						<div v-else>{{readForm.taskInfo.filenum}}</div>
 					</el-form-item>
 					<el-form-item label="备注:" prop="log" class="labelItem">
-						<div v-if="readForm.log==null">无</div>
-						<div v-else>{{readForm.log}}</div>
+						<div v-if="readForm.taskInfo.log==null">无</div>
+						<div v-else>{{readForm.taskInfo.log}}</div>
 					</el-form-item>
 
 				</el-form>
@@ -274,18 +274,48 @@
 				activeName: 'first',
 				id: 0,
 				readForm: {
-					releaser: '',
-					task_name: '',
-					level: '',
-					task_class: '',
-					year: '',
+					// releaser: '',
+					// task_name: '',
+					// level: '',
+					// task_class: '',
+					// year: '',
+					modelInfo:{
+						creattime:'',
+						id:'',
+						name:'',
+						type_id:'',
+						updatetime:'',
+						user_id:'',
+					},
 					releaserInfo:{
-						groupname: ''
+						groupname: '',
+						rymc:'',
+					},
+					taskInfo:{
+						base_file_url: null,
+						batch: '',
+						creater: null,
+						createtime: null,
+						endtime: null,
+						endtime_cydsb: null,
+						file_name: null,
+						file_url: null,
+						filenum: null,
+						id: null,
+						industry: null,
+						is_divide: null,
+						ispublic:null,
+						level:null,
+						log: null,
+						main_unit: null,
+						releaser:null,
+						starttime: null,
+						status: null,
+						task_class: null,
+						task_name:null,
+						test_model_id:null,
+						year: null,
 					},						
-					endtime: '',
-					file_url: '',
-					filenum: '',
-					log: ''
 				},
 				queryInfo: {
 					pageNum: 1,
@@ -337,11 +367,11 @@
 				delarr: [],
 				// 模型列表
 				options: [{
-					id: '',
-					name: '' 
+					id: null,
+					name: null
 				}],
 				bindForm: {
-					test_model_id: '',
+					test_model_id: null,
 					endtime_cydsb: '',
 					is_divide: ''
 				},
@@ -407,14 +437,14 @@
 			console.log(this.$route.params.id)
 			this.getTaskDetail()
 			this.getmodelList()
-			this.getUnderTask()
+			// this.getUnderTask()
 		},
 		created() {
 			this.task_id = this.$route.params.id
 			console.log(this.$route.params.id)
 			this.getTaskDetail()
 			this.getmodelList()
-			this.getUnderTask()
+			// this.getUnderTask()
 		},
 
 		methods: {
@@ -575,7 +605,6 @@
 					}
 				);
 				this.options = res.data.rows
-				console.log(this.options)
 			},
 			// 绑定模型
 			async bindModel() {
@@ -643,23 +672,27 @@
 					}
 				}
 				this.readForm = res.data
+				this.underTask = res.data.unitTaskList.rows
+				this.underTasktotal = res.data.unitTaskList.total
 				console.log(this.readForm)
-				this.bindForm.is_divide = res.data.is_divide
-				this.bindForm.test_model_id = Number(res.data.test_model_id)
-				if(res.data.test_model_id === null) {
+				this.bindForm.is_divide = res.data.taskInfo.is_divide
+				this.bindForm.endtime_cydsb = res.data.taskInfo.endtime_cydsb
+				// this.bindForm.test_model_id = Number(res.data.taskInfo.test_model_id)
+				if(res.data.taskInfo.test_model_id === null) {
 					this.bindForm.test_model_id = undefined
 				}else
 				{
-					this.bindForm.test_model_id = Number(res.data.test_model_id)
+					this.bindForm.test_model_id = Number(res.data.taskInfo.test_model_id)
 				}
-				this.bindForm.endtime_cydsb = res.data.endtime_cydsb
+				console.log(this.bindForm.test_model_id)
+				
 				console.log(this.divideOptions.id)
 			},
 
 			/** 修复当用户在大于1的分页进行数据搜索没有返回值的问题 */
 			setPageNum() {
 				this.queryInfo.pageNum = 1
-				this.getSampleList()()
+				this.getSampleList()
 			},
 			setSelectedRow() {
 				// 设置当前页已选项
@@ -675,14 +708,13 @@
 			/** 监听每页显示多少数据的改变 */
 			handleSizeChange(newSize) {
 				this.queryInfo.pageSize = newSize
-				console.log(this.queryInfo.pageSize)
-				this.getUnderTask()
+				this.getTaskDetail()
 			},
 
 			/** 监听页码的改变 */
 			handleCurrentChange(newPage) {
 				this.queryInfo.pageNum = newPage
-				this.getUnderTask()
+				this.getTaskDetail()
 			},
 			// 批量勾选
 			handleSelectionChange(val) {

src/components/jc/setTaskcd.vue

@@ -12,34 +12,34 @@
 			<el-tab-pane label="任务详情" name="first">
 				<el-descriptions class="margin-top" title="例行监测任务" :column="2" :size="size" border>
 					<el-descriptions-item>
-						<template slot="label">
+						<template slot="label" prop="releaser">
 							发布单位
 						</template>
-						{{readForm.releaser}}
+						{{readForm.releaserInfo.rymc}}
 					</el-descriptions-item>
 					<el-descriptions-item>
 						<template slot="label">
 							年度
 						</template>
-						{{readForm.year}}
+						{{readForm.taskInfo.year}}
 					</el-descriptions-item>
 					<el-descriptions-item>
 						<template slot="label">
 							开始时间和结束时间
 						</template>
-						{{readForm.starttime}}-{{readForm.endtime}}
+						{{readForm.taskInfo.starttime}}-{{readForm.taskInfo.endtime}}
 					</el-descriptions-item>
 					<el-descriptions-item>
 						<template slot="label">
 							抽样信息上报截止时间
 						</template>
-						{{readForm.endtime_cydsb}}
+						{{readForm.taskInfo.endtime_cydsb}}
 					</el-descriptions-item>
 					<el-descriptions-item>
 						<template slot="label">
 							监测类型
 						</template>
-						{{readForm.task_class}}
+						{{readForm.taskInfo.task_class}}
 					</el-descriptions-item>
 					<el-descriptions-item>
 						<template slot="label">
@@ -54,15 +54,15 @@
 						<template slot="label">
 							抽检分离
 						</template>
-						<span v-if="readForm.is_divide==1">是</span>
-						<span v-if="readForm.is_divide==0">否</span>
+						<span v-if="readForm.taskInfo.is_divide==1">是</span>
+						<span v-if="readForm.taskInfo.is_divide==0">否</span>
 					</el-descriptions-item>
 					<el-descriptions-item>
 						<template slot="label">
 							附件
 						</template>
 						<div v-if="readForm.file_url==null">无</div>
-						<el-link v-else type="primary" :href="readForm.file_url">下载附件</el-link>
+						<el-link v-else type="primary" :href="readForm.taskInfo.file_url">下载附件</el-link>
 					</el-descriptions-item>
 
 				</el-descriptions>
@@ -71,7 +71,7 @@
 						<template slot="label">
 							备注
 						</template>
-						{{readForm.log}}
+						{{readForm.taskInfo.log}}
 					</el-descriptions-item>
 				</el-descriptions>
 				<el-descriptions class="margin-top" :size="size" border>
@@ -105,7 +105,9 @@
 				</div>
 			</el-tab-pane>
 
-			<el-tab-pane v-if="sampleShow==true" label="抽样" name="second">
+			<el-tab-pane label="抽样" name="second">
+			<!-- <el-tab-pane v-if="sampleShow==true" label="抽样" name="second"> -->
+
 				<!-- 头部搜索栏 -->
 				
 					<el-form style="display: flex; flex-direction: column;" ref="form2" :model="queryInfo">
@@ -213,7 +215,8 @@
 					layout="total, sizes, prev, pager, next, jumper" :total="total" background />
 			</el-tab-pane>
 
-			<el-tab-pane  v-if="checkShow==true"  label="检测" name="third">
+			<el-tab-pane label="检测" name="third">
+			<!-- <el-tab-pane  v-if="checkShow==true"  label="检测" name="third"> -->
 
 				<!--  表格数据区域-->
 				<el-table :data="tableData" border stripe highlight-current-row style="width: 100%"
@@ -463,7 +466,9 @@
 				id: 0,
 				productNameText: '',
 				pesticidesNameText: '',
-				readForm: {},
+				readForm: {
+					
+				},
 				underTask: [],
 				underTasktotal: '0',
 				queryInfo: {
@@ -477,6 +482,35 @@
 					sample_unit_name: '',
 					sample_ground: '',
 				},
+				releaserInfo:{
+						groupname: '',
+						rymc:'',
+					},
+				taskInfo:{
+						base_file_url: null,
+						batch: '',
+						creater: null,
+						createtime: null,
+						endtime: null,
+						endtime_cydsb: null,
+						file_name: null,
+						file_url: null,
+						filenum: null,
+						id: null,
+						industry: null,
+						is_divide: null,
+						ispublic:null,
+						level:null,
+						log: null,
+						main_unit: null,
+						releaser:null,
+						starttime: null,
+						status: null,
+						task_class: null,
+						task_name:null,
+						test_model_id:null,
+						year: null,
+					},					
 				// 填报对话框弹出
 				inputDialogShow: false,
 				cellStyle: {
@@ -631,7 +665,7 @@
 			this.getTaskDetail()
 			this.getSampleList()
 			// this.getmodelList()
-			this.getUnderTask()
+			// this.getUnderTask()
 		},
 
 		methods: {
@@ -685,7 +719,9 @@
 				const {
 					data: res
 				} = await this.$http.post("getTaskDetail", {
-					task_id: that.task_id
+					task_id: that.task_id,
+					pageNum: that.queryInfo.pageNum,
+					pageSize: that.queryInfo.pageSize
 				});
 				console.log(res.data.product)
 				if (res.data.product.length > 0) {
@@ -702,8 +738,10 @@
 				that.readForm = res.data
 				that.productNameText = that.readForm.product.map(el => el.product_name).join('、 ')
 				that.pesticidesNameText = that.readForm.pesticides.map(el => el.test_name).join('、 ')
+				that.underTask = res.data.underTaskList.rows
+				that.underTasktotal = res.data.underTaskList.total
 				// 抽检不分离
-				if (that.readForm.is_divide == 0) {
+				if (that.taskInfo.is_divide == 0) {
 					this.sampleShow = true
 					this.checkShow = true
 				}

src/components/jc/specialMonitorcd.vue

@@ -14,11 +14,11 @@
 			<el-row :gutter="50" style="margin-right: 0px;">
 				<el-form style="display: flex; flex-direction: row;" size="mini">
 					<el-form-item label="年度" class="select">
-						<el-date-picker v-model="queryInfo.taskyear" style="width: 110px;" value-format="yyyy"
+						<el-date-picker v-model="queryInfo.year" style="width: 110px;" value-format="yyyy"
 							type="year" clearable />
 					</el-form-item>
 					<el-form-item label="任务状态" class="select">
-						<el-select v-model="queryInfo.status" style="width: 110px;">
+						<el-select v-model="queryInfo.ispublic" style="width: 110px;">
 							<el-option v-for="item in taskstatus" :key="item.value" :label="item.label"
 								:value="item.value">
 							</el-option>
@@ -33,7 +33,7 @@
 							:picker-options="pickerOptions" clearable />
 					</el-form-item>
 					<el-form-item label="任务名称" class="select">
-						<el-input v-model="queryInfo.taskname"></el-input>
+						<el-input v-model="queryInfo.task_name"></el-input>
 					</el-form-item>
 					<!-- 查询 -->
 					<el-button style="height: 28px;margin-left: 10px;" size="mini" type="success" @click="searchData()">查询</el-button>
@@ -71,14 +71,14 @@
 						<el-tag type="warning" v-if="scope.row.ispublic==5">执行中</el-tag>
 					</template>
 				</el-table-column>
-				<el-table-column prop="status" label="任务优先级" width="100"  align="center">
+				<el-table-column prop="level" label="任务优先级" width="100"  align="center">
 					<template slot-scope="scope">
 						<el-tag type="success" v-if="scope.row.level==0">一般</el-tag>
 						<el-tag type="warning" v-if="scope.row.level==1">紧急</el-tag>
 						<el-tag type="danger" v-if="scope.row.level==2">特急</el-tag>
 					</template>
 				</el-table-column>
-				<el-table-column prop="status" label="附件" width="80" align="center">
+				<el-table-column prop="file_url" label="附件" width="80" align="center">
 					<template slot-scope="scope">
 						<el-link type="primary" :href="scope.row.fileurl">下载</el-link>
 					</template>
@@ -140,9 +140,7 @@ const HeadersList = [{
 		name: '',
 		data() {
 			return {
-				currentPage: 1,
 				total: 0,
-				pageNum: 10,
 				cellStyle: {
 					padding: 2 + 'px'
 				},
@@ -192,7 +190,11 @@ const HeadersList = [{
 				tableData: [],
 				// 批量删除选中数据
 				multipleSelection: [],
-				queryInfo: {},
+				queryInfo: {
+					pageSize:10,
+					pageNum:1,
+					currentPage:1,
+				},
 				// 任务状态选项
 				taskstatus: [{
 					value: '',

src/components/jc/specialMonitorqt.vue

@@ -286,7 +286,7 @@
 				const {
 					data: res
 				} = await this.$http.post(
-					"getTaskListTest", this.queryInfo
+					"getTaskTest", this.queryInfo
 				);
 				console.log(res)
 				this.tableData = res.data.rows

src/components/jc/taskdetail.vue

@@ -1,35 +1,35 @@
 <template>
 	<div id="pdf1">
-		<el-descriptions class="margin-top" :title="readForm.task_class+'任务'" :column="2" :size="size" border>
+		<el-descriptions class="margin-top" :title="readForm.taskInfo.task_class+'任务'" :column="2" :size="size" border>
 			<el-descriptions-item>
 				<template slot="label">
 					发布单位
 				</template>
-				{{readForm.releaser}}
+				{{readForm.releaserInfo.rymc}}
 			</el-descriptions-item>
 			<el-descriptions-item>
 				<template slot="label">
 					年度
 				</template>
-				{{readForm.year}}
+				{{readForm.taskInfo.year}}
 			</el-descriptions-item>
 			<el-descriptions-item>
 				<template slot="label">
 					开始时间和结束时间
 				</template>
-				{{readForm.starttime}}-{{readForm.endtime}}
+				{{readForm.taskInfo.starttime}}-{{readForm.taskInfo.endtime}}
 			</el-descriptions-item>
 			<el-descriptions-item>
 				<template slot="label">
 					抽样信息上报截止时间
 				</template>
-				{{readForm.endtime_cydsb}}
+				{{readForm.taskInfo.endtime_cydsb}}
 			</el-descriptions-item>
 			<el-descriptions-item>
 				<template slot="label">
 					监测类型
 				</template>
-				{{readForm.task_class}}
+				{{readForm.taskInfo.task_class}}
 			</el-descriptions-item>
 			<el-descriptions-item>
 				<template slot="label">
@@ -44,15 +44,15 @@
 				<template slot="label">
 					抽检分离
 				</template>
-				<span v-if="readForm.is_divide==1">是</span>
-				<span v-if="readForm.is_divide==0">否</span>
+				<span v-if="readForm.taskInfo.is_divide==1">是</span>
+				<span v-if="readForm.taskInfo.is_divide==0">否</span>
 			</el-descriptions-item>
 			<el-descriptions-item>
 				<template slot="label">
 					附件
 				</template>
-				<div v-if="readForm.file_url==null">无</div>
-				<el-link v-else type="primary" :href="readForm.file_url">下载附件</el-link>
+				<div v-if="readForm.taskInfo.file_url==null">无</div>
+				<el-link v-else type="primary" :href="readForm.taskInfo.file_url">下载附件</el-link>
 			</el-descriptions-item>
 
 		</el-descriptions>
@@ -61,7 +61,7 @@
 				<template slot="label">
 					备注
 				</template>
-				{{readForm.log}}
+				{{readForm.taskInfo.log}}
 			</el-descriptions-item>
 		</el-descriptions>
 		<el-descriptions class="margin-top" :size="size" border>
@@ -99,9 +99,54 @@
 				activeName: 'first',
 				id: 0,
 				task_id: this.task_id,
-				readForm: {},
-				// rowStyle: '',
-				// cellStyle: '',
+				readForm: {
+					// releaser: '',
+					// task_name: '',
+					// level: '',
+					// task_class: '',
+					// year: '',
+					modelInfo:{
+						creattime:'',
+						id:'',
+						name:'',
+						type_id:'',
+						updatetime:'',
+						user_id:'',
+					},
+					releaserInfo:{
+						groupname: '',
+						rymc:'',
+					},
+					taskInfo:{
+						base_file_url: null,
+						batch: '',
+						creater: null,
+						createtime: null,
+						endtime: null,
+						endtime_cydsb: null,
+						file_name: null,
+						file_url: null,
+						filenum: null,
+						id: null,
+						industry: null,
+						is_divide: null,
+						ispublic:null,
+						level:null,
+						log: null,
+						main_unit: null,
+						releaser:null,
+						starttime: null,
+						status: null,
+						task_class: null,
+						task_name:null,
+						test_model_id:null,
+						year: null,
+					},						
+					endtime: '',
+					file_url: '',
+					filenum: '',
+					log: ''
+				},
 				size: '',
 				// 机构地域表格数据
 				underTask: [],
@@ -135,7 +180,7 @@
 		},
 		created() {
 			this.getTaskDetail();
-			this.getUnderTask();
+			// this.getUnderTask();
 		},
 		methods: {
 			handleClick(tab, event) {
@@ -147,38 +192,49 @@
 				const {
 					data: res
 				} = await this.$http.post("getTaskDetail", {
-					task_id: this.task_id
+					task_id: that.task_id
 				});
 				console.log(res.data.product)
-				if (res.data.product.length > 0) {
-					if (res.data.product[0].type_id == '1') {
+				// if (res.data.modelInfo.product.length > 0) {
+					if (res.data.modelInfo.type_id == '1') {
 						res.data.model_type = '种植业'
-					} else if (res.data.product[0].type_id == '2') {
+					} else if (res.data.modelInfo.type_id == '2') {
 						res.data.model_type = '畜牧业'
-					} else if (res.data.product[0].type_id == '3') {
+					} else if (res.data.modelInfo.type_id == '3') {
 						res.data.model_type = '渔业'
-					} else {
+					} else if (res.data.modelInfo.type_id == '4') {
 						res.data.model_type = '其他'
+					}else {
+						res.data.model_type = '无'
 					}
-				}
+				// }
 				this.readForm = res.data
-				console.log(this.readForm)
+				this.underTask = res.data.unitTaskList.rows
+				this.underTasktotal = res.data.unitTaskList.total
+				console.log(this.readForm.product)
+				
+				this.readForm.taskInfo.is_divide = res.data.taskInfo.is_divide
+					
+				this.readForm.taskInfo.endtime_cydsb = res.data.taskInfo.endtime_cydsb
+			
 				that.productNameText = that.readForm.product.map(el => el.product_name).join('、 ')
+				console.log(that.productNameText)
 				that.pesticidesNameText = that.readForm.pesticides.map(el => el.test_name).join('、 ')
-				
+			
+				console.log(this.divideOptions.id)
 			},
 			// 获取机构地域表格
-			async getUnderTask() {
+			// async getUnderTask() {
 
-				const result = await this.$http.post('getUnderTask', {
-					task_id: this.task_id
-				})
-				// 判断业务逻辑
-				if (result.data.code == 0) {
-					this.underTask = result.data.data.rows
-					this.underTasktotal = result.data.data.total
-				}
-			},
+			// 	const result = await this.$http.post('getUnderTask', {
+			// 		task_id: this.task_id
+			// 	})
+			// 	// 判断业务逻辑
+			// 	if (result.data.code == 0) {
+			// 		this.underTask = result.data.data.rows
+			// 		this.underTasktotal = result.data.data.total
+			// 	}
+			// },
 		}
 	}
 </script>

src/components/login.vue

@@ -58,6 +58,7 @@ let windowHalfY = window.innerHeight / 2;
 					login_name: '',
 					pwd: ''
 				},
+				msg: null,
 				rend:null,
 				containers:null,
 				// 长度校验
@@ -65,6 +66,7 @@ let windowHalfY = window.innerHeight / 2;
 			}
 		},
 		// 方法绑定
+	
 		methods: {
 			// 检测是否初始化系统
 			// async isSysteInit () {
@@ -81,6 +83,8 @@ let windowHalfY = window.innerHeight / 2;
 				const message = this.$message
 				const route = this.$router
 				this.$refs.loginForm.validate(async valid => {
+					window.localStorage.setItem('token', '')
+
 					var loginButton = this.$refs.loginButton
 					// 判断是否合法
 					if (valid) {
@@ -91,12 +95,13 @@ let windowHalfY = window.innerHeight / 2;
 							// 登录成功保存用户账号
 							// 存储token
 							// 存身份信息
-							window.sessionStorage.setItem('token', result.data.data.token)
-							window.sessionStorage.setItem('groupname', result.data.data.groupname)
-							window.sessionStorage.setItem('name', result.data.data.name)
-							window.sessionStorage.setItem('qydm', result.data.data.qydm)
-							window.sessionStorage.setItem('rybh', result.data.data.rybh)
-							window.sessionStorage.setItem('rymc', result.data.data.rymc)
+							// window.sessionStorage.setItem('token', result.data.data.token)
+							 window.localStorage.setItem('token', result.data.data.token)
+							// window.sessionStorage.setItem('groupname', result.data.data.groupname)
+							// window.sessionStorage.setItem('name', result.data.data.name)
+							// window.sessionStorage.setItem('qydm', result.data.data.qydm)
+							// window.sessionStorage.setItem('rybh', result.data.data.rybh)
+							// window.sessionStorage.setItem('rymc', result.data.data.rymc)
 							this.containers.style.cssText=("z-index:-1;height:0px;")
 							// this.met.visible=false;
 							// this.rend.setSize(0,0)
@@ -108,11 +113,12 @@ let windowHalfY = window.innerHeight / 2;
 								route.push('/admin')
 							}
 							
-						} else if (result.data.code == -1) {
+						} else if (result.data.code != 0) {
 							// loginButton.loading = false
 							this.containers.style.cssText=("z-index:-1")
+							this.msg = result.data.msg
 							message({
-								message: '密码错误！',
+								message: this.msg,
 								type: 'error',
 								showClose: true,
 								center: true

src/main.js

@@ -12,15 +12,17 @@ import axios from 'axios'
 
 
 // 使用axios
-axios.defaults.baseURL = 'http://syjcapi.aielab.net/api/v1'
+// axios.defaults.baseURL = 'http://syjcapi.aielab.net/api/v1'
+//axios.defaults.baseURL = 'http://192.168.3.52/api/v1'
+axios.defaults.baseURL = 'http://new.syjc.com/api/v1'
 Vue.prototype.$http = axios
 Vue.config.productionTip = false
 axios.interceptors.request.use(
   config => {
   // 判断是否存在token，如果存在的话，则每个http header都加上token
-    let token = sessionStorage.getItem('token')
-    if (!config.headers.hasOwnProperty('Authorization') && token) {
-      config.headers.Authorization = 'bearer ' + token
+    let token = localStorage.getItem('token')
+    if (!config.headers.hasOwnProperty('Access-token') && token) {
+      config.headers.Authorization = token
     }
     return config
   },