Merge branch 'master' of http://git.in.ahbd.net/aielab/jcxt_qd

package-lock.json

@@ -1668,6 +1668,16 @@
           "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
           "dev": true
         },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "cacache": {
           "version": "13.0.1",
           "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-13.0.1.tgz?cache=0&sync_timestamp=1616431156987&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcacache%2Fdownload%2Fcacache-13.0.1.tgz",
@@ -1694,6 +1704,53 @@
             "unique-filename": "^1.1.1"
           }
         },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true,
+          "optional": true
+        },
+        "loader-utils": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
+          "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz",
@@ -1710,6 +1767,16 @@
             "minipass": "^3.1.1"
           }
         },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
         "terser-webpack-plugin": {
           "version": "2.3.8",
           "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.3.8.tgz?cache=0&sync_timestamp=1610194262897&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-2.3.8.tgz",
@@ -1726,6 +1793,18 @@
             "terser": "^4.6.12",
             "webpack-sources": "^1.4.3"
           }
+        },
+        "vue-loader-v16": {
+          "version": "npm:vue-loader@16.8.3",
+          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
+          "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          }
         }
       }
     },
@@ -11548,87 +11627,6 @@
         }
       }
     },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.8.3",
-      "resolved": "https://registry.npmmirror.com/vue-loader/download/vue-loader-16.8.3.tgz",
-      "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz",
-          "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.2.tgz",
-          "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.nlark.com/color-convert/download/color-convert-2.0.1.tgz",
-          "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.nlark.com/color-name/download/color-name-1.1.4.tgz",
-          "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz",
-          "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-          "dev": true,
-          "optional": true
-        },
-        "loader-utils": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmmirror.com/loader-utils/download/loader-utils-2.0.2.tgz",
-          "integrity": "sha1-1uO0+4GHByGuTghoqxHdY4NowSk=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1626703342506&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
-          "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "vue-resize-directive": {
       "version": "1.2.0",
       "resolved": "https://registry.nlark.com/vue-resize-directive/download/vue-resize-directive-1.2.0.tgz",

src/components/admin.vue

@@ -151,7 +151,7 @@
 						//      id: '5-4',
 						//      subMenuName: '退回任务',
 						//      path: '/admin/retask'
-						// }
+						// },
 						{
 						     id: '5-5',
 						     subMenuName: '数据统计',

src/components/admin/addTaskJcObject copy.vue

@@ -16,31 +16,27 @@
 			</el-form-item>
 			<el-form-item prop="sample_address" label="地区"   >
 				<el-cascader  :options="region" v-model="sample_address"
-					@change="handleChange">
+					@change="handleChange" clearable>
 				</el-cascader>
 			</el-form-item>
+
+				<!-- <el-form-item prop="sample_address" label="地区"   >
+					<el-cascader :options="options" :props="props" v-model="sample_address" clearable ></el-cascader>
+				</el-form-item> -->
+
+
+
 		<!-- 底部按钮 -->
 			<el-form-item>
 				<el-button type="success" @click="onSubmit()">保存</el-button>
 				<el-button @click="reBack">返回</el-button>
 			</el-form-item>
 		</el-form>
-
+<!-- 抽样机构 -->
 		<!-- 选择抽样机构对话框 -->
 		<template scope-slot="scope">
 			<el-dialog title="机构选择" :visible.sync="getOrganizationsShow1" width="50%" :close-on-click-modal="false" @open="getOrganizations1()" class="dialogItem">
 			<el-form v-if="getOrganizationsShow1" :model="getOrganizationsForm1">
-									<!-- 检索功能 -->
-									<!-- <el-row :gutter="20">
-										<el-col :span="6">
-											<el-form-item label="单位名称" >
-													<el-input v-model="queryInfo1.name"></el-input>
-											</el-form-item>
-										</el-col>
-										<el-col :span="6">
-											<el-button type="success" @click="search()" style="margin-top:40px">搜索</el-button>
-										</el-col>
-									</el-row> -->
 			<!--  表格数据区域-->
 				<el-table ref="multipleTable" :data="testList" row-key="id" @selection-change="handleSelectionChange1"
 					border stripe highlight-current-row style="width: 100%">
@@ -54,7 +50,7 @@
 						:prop="table.prop" align="center" :width="table.width" :fixed="table.fixed" />
 				</el-table>
 		<div class="footer">
-<!--抽样机构分页器区域-->
+	<!--抽样机构分页器区域-->
 			<el-pagination @size-change="handleSizeChange1" @current-change="handleCurrentChange1"
 				:current-page="queryInfo1.pageNum" :page-sizes="[1,10, 15, 20]" :page-size="queryInfo1.pageSize"
 				layout="total, sizes, prev, pager, next, jumper" :total="total" background />
@@ -65,7 +61,7 @@
 		</el-dialog>
 		</template>
 		
-
+<!-- 检测机构 -->
 		<!-- 选择检测机构对话框 -->
 		<el-dialog title="机构选择" :visible.sync="getOrganizationsShow2" width="50%" :close-on-click-modal="false" @open="getOrganizations2()" class="dialogItem">
 			<el-form v-if="getOrganizationsShow2" :model="getOrganizationsForm2">
@@ -82,7 +78,7 @@
 						:prop="table.prop" align="center" :width="table.width" :fixed="table.fixed" />
 				</el-table>
 				<div class="footer">
-<!--检测机构分页器区域-->
+	<!--检测机构分页器区域-->
 					<el-pagination @size-change="handleSizeChange2" @current-change="handleCurrentChange2"
 						:current-page="queryInfo2.pageNum" :page-sizes="[1,10, 15, 20]" :page-size="queryInfo2.pageSize"
 						layout="total, sizes, prev, pager, next, jumper" :total="total2" background />
@@ -92,7 +88,18 @@
 			</el-form>
 		</el-dialog>
 			
-
+<!-- 地区表格区域 -->
+			<el-table ref="multipleTable" :data="regionList" row-key="id" @selection-change="handleSelectionChange3"
+					border stripe highlight-current-row style="width: 100%">
+					<el-table-column type="selection" :reserve-selection="true" width="50"></el-table-column>
+					<el-table-column label="序号" width="50px">
+						<template slot-scope="scope">
+							{{ scope.$index+1 }}
+						</template>
+					</el-table-column>
+					<el-table-column :key="table.prop" v-for="table in tableHeader3" :label="table.label"
+						:prop="table.prop" align="center" :width="table.width" :fixed="table.fixed" />
+			</el-table>
 	</div>
 </template>
 <script>
@@ -106,6 +113,8 @@ import {
 	export default {
 		data() {
 			return {
+				// 地区单选
+				props: { multiple: true },
 				CodeToText:'',
 					form: {
 					// name:'',
@@ -117,7 +126,7 @@ import {
 					groupname:'',
 					properties:'',
 					main_unit:[],
-					check_unit:[],
+					check_unit:[], 
 					sample_org_id:'',
 					check_org_id:''
 				},
@@ -147,8 +156,9 @@ import {
 				// 	label: '企业'
 				// }],
 				// 抽样地区
-				region: regionData,
-				sample_address:'',
+				// region: regionData,
+				region: regionData[11].children,
+				sample_address:[],
 				// 机构地域表格数据
 				underTask: [],
 				underTasktotal: 0,

src/components/admin/addTaskJcObject.vue

@@ -88,7 +88,13 @@
 			</el-form>
 		</el-dialog>
 			
-
+<!-- 地区表格区域 -->
+			<div class="diqubiaoge">
+				<el-table  ref="multipleTable" :data="regionList" row-key="id" border stripe highlight-current-row >
+					<el-table-column :key="table.prop" v-for="table in tableHeader3" :label="table.label"
+						:prop="table.prop" align="center" :width="table.width" :fixed="table.fixed" />
+				</el-table>
+			</div>
 	</div>
 </template>
 <script>
@@ -209,6 +215,8 @@ import {
 				testList: [],
 				// 检测机构列表
 				testList2: [],
+				// 地区
+				regionList: [],
 				// 表头
 				tableHeader: [{
 						label: '单位名称',
@@ -228,6 +236,20 @@ import {
 						// fixed: 'left'
 					}
 				],
+				tableHeader3:[{
+					label: '抽样机构',
+					prop:'form.main_unit',
+					width:260,
+				},{
+					label: '检测机构',
+					prop:'form.check_unit',
+					width:260,
+				},{
+					label: '地区',
+					prop:'sample_address',
+					// width:260,
+				},
+				],
 				// 总共多少条数据
 				total: 0,
 				total2: 0,
@@ -423,4 +445,9 @@ import {
 		flex-direction: row;
 		justify-content: space-between;
 	}
+	.diqubiaoge{
+		display: flex;
+        justify-content: center;
+		 width: 50%
+	}
 </style>

src/components/admin/addTaskJd.vue

@@ -131,29 +131,29 @@
 			 this.task_class = this.$route.params.task_class
 			 this.postTasks()
 		},
-		mounted() {
-			let that = this
-			// this.$nextTick(() => {
-			// 	console.log(that.multipleSelection)
-			//         that.multipleSelection.forEach((row) => {
-			//           that.$refs.multipleTable.toggleRowSelection(
-			//             that.testList.find((item) => {
-			//               return row==item; 
-			//             }),
-			//             true
-			//           );
-			//         });
-			//       });
-			// this.$nextTick(() => {
-			//   this.testList.forEach(outerItem => {
-			//     this.multipleSelection[this.page.current - 1] && this.multipleSelection[this.page.current - 1].forEach(item => {
-			//       if(outerItem.id == item.id) {
-			//         this.$refs.multipleTable.toggleRowSelection(outerItem,true);
-			//       }
-			//     })
-			//   })
-			// })
-		},
+		// mounted() {
+		// 	let that = this
+		// 	// this.$nextTick(() => {
+		// 	// 	console.log(that.multipleSelection)
+		// 	//         that.multipleSelection.forEach((row) => {
+		// 	//           that.$refs.multipleTable.toggleRowSelection(
+		// 	//             that.testList.find((item) => {
+		// 	//               return row==item; 
+		// 	//             }),
+		// 	//             true
+		// 	//           );
+		// 	//         });
+		// 	//       });
+		// 	// this.$nextTick(() => {
+		// 	//   this.testList.forEach(outerItem => {
+		// 	//     this.multipleSelection[this.page.current - 1] && this.multipleSelection[this.page.current - 1].forEach(item => {
+		// 	//       if(outerItem.id == item.id) {
+		// 	//         this.$refs.multipleTable.toggleRowSelection(outerItem,true);
+		// 	//       }
+		// 	//     })
+		// 	//   })
+		// 	// })
+		// },
 		methods: {
 			//保存
 			async onSubmit() {

src/components/admin/checkMonitor.vue

@@ -54,11 +54,11 @@
 		<div class="rightButton">
 			<el-row :gutter="90" style="margin-right: 0px;">
 				<div style="display: flex;flex-direction: row;float: right;">
-					<el-button type="primary" size="small" plain icon="el-icon-plus" @click="add()">新增</el-button>
-					<el-button type="primary" size="small" plain icon="el-icon-edit-outline" @click="ispublic()">发布
+					<!-- <el-button type="primary" size="small" plain icon="el-icon-plus" @click="add()">新增</el-button> -->
+					<el-button type="primary" size="small" icon="el-icon-edit-outline" @click="ispublic()">发布
 					</el-button>
-					<el-button type="primary" size="small" plain icon="el-icon-scissors" @click="repeal()">废止</el-button>
-					<el-button type="primary" size="small" plain icon="el-icon-delete" @click="delArray()">删除</el-button>
+					<el-button type="primary" size="small" icon="el-icon-scissors" @click="repeal()">废止</el-button>
+					<el-button type="primary" size="small" icon="el-icon-delete" @click="delArray()">删除</el-button>
 					<!-- <el-button type="primary" size="small" plain icon="el-icon-download">导出</el-button> -->
 				</div>
 			</el-row>
@@ -104,12 +104,12 @@
 				<!-- 操作按钮区域的作用域插槽 -->
 				<template slot-scope="scope">
 					<el-col style="margin-bottom: 5px;">
-						<el-button type="success" size="mini" @click="readDialogVisible1(scope.row)" style="margin-top:5px">详情</el-button>
-						<el-button type="success" size="mini" @click="sendBack(scope.row)" style="margin-top:5px" >退回</el-button>
+						<el-button size="mini" @click="readDialogVisible1(scope.row)" style="margin-top:5px">详情</el-button>
+						<el-button type="info" size="mini" @click="sendBack(scope.row)" style="margin-top:5px" >退回</el-button>
 					</el-col>
 					<el-col style="margin-bottom: 5px;">
-						<el-button type="success" size="mini" plain @click="getJcds(scope.row.id)" style="margin-top:5px">检测单</el-button> 
-						<el-button type="success" size="mini" plain @click="sampleList(scope.row.id)">抽样单</el-button>
+						<el-button type="primary" size="mini" plain @click="getJcds(scope.row.id)" style="margin-top:5px">检测单</el-button> 
+						<el-button type="primary" size="mini" plain @click="sampleList(scope.row.id)">抽样单</el-button>
 					</el-col>
 				</template>
 			</el-table-column>

src/components/admin/conSole.vue

@@ -6,20 +6,29 @@
 	</el-breadcrumb>
 
     <div class="workblock">
+        <!-- 搜索机构 -->
         <div class="block" @click="searchInstitution()">
-            <el-image style="width: 150px; height: 150px" :src=r></el-image>
+            <el-image class="imagee" style="width: 150px; height: 150px" :src=a></el-image>
         </div>
+        <!-- 监测任务 -->
         <div class="block" @click="monitoringTasks()">
-            <el-image style="width: 150px; height: 150px" :src=s></el-image>
+            <el-image class="imagee" style="width: 150px; height: 150px" :src=b></el-image>
         </div>
+        <!-- 历史任务    -->
         <div class="block" @click="queryTask()">
-            <el-image style="width: 150px; height: 150px" :src=p></el-image>
+            <el-image class="imagee" style="width: 150px; height: 150px" :src=c></el-image>
         </div>
+        <!-- 退回任务 -->
+        <div class="block" @click="tuiHui()">
+            <el-image class="imagee" style="width: 150px; height: 150px" :src=d></el-image>
+        </div>
+        <!-- 系统介绍 -->
         <div class="block"  @click="SystemIntroduction()">
-            <el-image style="width: 150px; height: 150px" :src=sy></el-image>
+            <el-image class="imagee" style="width: 150px; height: 150px" :src=e></el-image>
         </div>
+        <!-- 数据统计 -->
         <div class="block"  @click="searchDataChart()">
-            <el-image style="width: 150px; height: 150px" :src=ss></el-image>
+            <el-image class="imagee" style="width: 150px; height: 150px" :src=f></el-image>
         </div>
     </div>
 
@@ -32,11 +41,12 @@
 export default {
     data() {
       return {
-        r: require('../../assets/img/jgcx.png'),
-        s: require('../../assets/img/jcrw.png'),
-        p: require('../../assets/img/jccx.png'),
-        sy: require('../../assets/img/xtjs.png'),
-        ss: require('../../assets/img/sjtj.png'),
+        a: require('../../assets/img/jgcx.png'),
+        b: require('../../assets/img/jcrw.png'),
+        c: require('../../assets/img/lsrw.png'),
+        d: require('../../assets/img/tuihui.png'),
+        e: require('../../assets/img/sjfx.png'),
+        f: require('../../assets/img/xtjs.png'),
          msg: 'Welcome to Your Vue.js App'
       }
     },
@@ -61,14 +71,19 @@ export default {
                 path: '/admin/routineMonitor'
             })
         },
+        async tuiHui() {
+            this.$router.push({
+                path: '/admin/reTask'
+            })
+        },
         async SystemIntroduction() {
             this.$router.push({
-                path: '/admin/systemIntro'
+                path: '/admin/dataEchart'
             })
         },
         async searchDataChart() {
             this.$router.push({
-                path: '/admin/dataEchart'
+                path: '/admin/systemIntro'
             })
         },
     }
@@ -84,13 +99,20 @@ export default {
         height: 28rem;
     .block{
         margin: 1.25rem 1.25rem;
+        // box-shadow: 10px 10px 5px #888888;
         }
         .block:hover {
             // box-shadow: 0px 0px 0px #ccc;
             transition-duration: 0.4s;
             transform: scale(1.05);
+            
             // z-index: 10;
-            //  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1)
+            // box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1)
+             
+        }
+        .imagee{
+            box-shadow: 8px 5px 20px #cecece;
         }
+     
     }
 </style>

src/components/admin/getJcds.vue

@@ -15,7 +15,7 @@
         <!-- 操作 -->
         <el-table-column label="操作" align="center" fixed="right">
         <template slot-scope="scope">
-            <el-button @click="read(scope.row.task_id,scope.row.id)" style="margin:5px 0" type="success" size="small" >查看检测单列表</el-button>
+            <el-button @click="read(scope.row.task_id,scope.row.id)" style="margin:5px 0" type="primary" size="small" >查看检测单列表</el-button>
         </template>
         </el-table-column>
     </el-table>
@@ -102,7 +102,8 @@ export default {
                         task_id:this.$route.params.id
                         }
                 })
-            }else{
+            }
+            else if(this.parentName == '退回任务'){
                  this.$router.push({
                     name:'reTask',
                     params:{
@@ -132,9 +133,12 @@ export default {
 					name:'readCheckList',
 					params: {
 					task_id:task_id,
-                    task_profile_id:id
+                    task_profile_id:id,
+                    parentName:this.parentName,
 					}
+                    
 				})
+                console.log(parentName)
 		},
           //分页器
                 handleSizeChange(val) {

src/components/admin/reTask.vue

@@ -56,10 +56,10 @@
 			<el-row :gutter="90" style="margin-right: 0px;">
 				<div style="display: flex;flex-direction: row;float: right;">
 					<!-- <el-button type="primary" size="small" plain icon="el-icon-plus" @click="add()">新增</el-button> -->
-					<el-button type="primary" size="small" plain icon="el-icon-edit-outline" @click="ispublic()">发布
+					<el-button type="primary" size="small"  icon="el-icon-edit-outline" @click="ispublic()">发布
 					</el-button>
-					<el-button type="primary" size="small" plain icon="el-icon-scissors" @click="repeal()">废止</el-button>
-					<el-button type="primary" size="small" plain icon="el-icon-delete" @click="delArray()">删除</el-button>
+					<el-button type="primary" size="small"  icon="el-icon-scissors" @click="repeal()">废止</el-button>
+					<el-button type="danger" size="small"  icon="el-icon-delete" @click="delArray()">删除</el-button>
 					<!-- <el-button type="primary" size="small" plain icon="el-icon-download">导出</el-button> -->
 				</div>
 			</el-row>
@@ -102,13 +102,13 @@
 				<!-- 操作按钮区域的作用域插槽 -->
 				<template slot-scope="scope">
 					<el-col style="margin-bottom: 5px;">
-						<el-button type="success" size="mini" @click="readDialogVisible1(scope.row)" style="margin-top:5px">查看详情</el-button>
+						<el-button  size="mini" @click="readDialogVisible1(scope.row)" style="margin-top:5px">查看详情</el-button>
 						<!-- <el-button type="success" size="mini" @click="sendBack(scope.row)" style="margin-top:5px" >退回</el-button> -->
-						<el-button type="success" size="mini"  @click="editInform(scope.row.id)">编辑</el-button>
+						<el-button type="primary"  size="mini"  @click="editInform(scope.row.id)">编辑</el-button>
 					</el-col>
 					<el-col style="margin-bottom: 5px;">
-						<el-button type="success" size="mini" plain @click="getJcds(scope.row.id)" style="margin-top:5px">检测单</el-button> 
-						<el-button type="success" size="mini" plain @click="sampleList(scope.row.id)">抽样单</el-button>
+						<el-button type="primary" size="mini" plain @click="getJcds(scope.row.id)" style="margin-top:5px">检测单</el-button> 
+						<el-button type="primary" size="mini" plain @click="sampleList(scope.row.id)">抽样单</el-button>
 					</el-col>
 				</template>
 			</el-table-column>

src/components/admin/readCheck.vue

@@ -52,6 +52,7 @@
 		name: 'inputSample',
 		data() {
 			return {
+				parentName:'',
 				myHeaders: {Authorization: 'bearer' + token},
 				fileList: [],
 				form: {},
@@ -101,6 +102,8 @@
 			this.task_id = this.$route.params.task_id
 			this.task_profile_id = this.$route.params.task_profile_id
 			this.jcd_id = this.$route.params.jcd_id
+			this.parentName = this.$route.params.parentName
+			console.log(this.parentName)
 			// console.log(this.task_id)
 			// console.log(this.task_profile_id)
 			this.getJcd()
@@ -143,9 +146,11 @@
 					name: 'readCheckList',
 					params: {
 						task_id: this.$route.params.task_id,
-						task_profile_id: this.$route.params.task_profile_id
+						task_profile_id: this.$route.params.task_profile_id,
+						parentName:this.parentName
 					}
 				})
+				console.log(parentName)
 			}
 		},
 	}

src/components/admin/readCheckList.vue

@@ -5,6 +5,7 @@
 	    <div slot="header" class="clearfix">
             <el-breadcrumb separator-class="el-icon-arrow-right">		
             <el-breadcrumb-item >首页</el-breadcrumb-item>
+            <el-breadcrumb-item >{{parentName}}</el-breadcrumb-item>
             <el-breadcrumb-item>查看检测单列表</el-breadcrumb-item>
             </el-breadcrumb>
 		</div>
@@ -141,6 +142,8 @@ export default{
        this.cyd_id = this.$route.params.cyd_id
        this.task_id = this.$route.params.task_id,
        this.task_profile_id = this.$route.params.task_profile_id
+       this.parentName = this.$route.params.parentName
+       console.log(this.parentName)
        this.getJcds()
     //    this.getSamples()
    },
@@ -203,7 +206,8 @@ export default{
             this.$router.push({
                 name:'getJcds',
                 params:{
-                    id: this.$route.params.task_id
+                    id: this.$route.params.task_id,
+                    parentName:this.parentName,
                 }
             })
         },
@@ -221,14 +225,15 @@ export default{
                 this.tableData2 = res.data.rows
                 console.log(res.data.rows)
         },
-        //查看检测单
+        //查看检测单详情
          getCheckList(id){
             this.$router.push({
                 name:'readCheck',
                 params:{
                    jcd_id: id,
                    task_id:this.$route.params.task_id,
-                   task_profile_id:this.$route.params.task_profile_id
+                   task_profile_id:this.$route.params.task_profile_id,
+                   parentName:this.parentName,
                 }
             })
         },

src/components/admin/recheckMonitor.vue

@@ -62,8 +62,6 @@
 					{{ scope.$index+1 }}
 				</template>
 			</el-table-column>
-			<!-- <el-table-column v-for="table in tableHeader" :label="table.label" :prop="table.prop" align="center"
-				:width="table.width" :fixed="table.fixed" /> -->
 			<el-table-column label="操作" align="center" fixed="right">
 				<!-- 操作按钮区域的作用域插槽 -->
 				<template slot-scope="scope">

src/components/admin/routineMonitor.vue

@@ -265,14 +265,24 @@
 					label: '废止'
 				}, {
 					value: '5',
-					label: '执行中'
+					label: '已查看'
 				}, {
-					value: '3',
-					label: '已结束，未完成'
+					value: '9',
+					label: '执行中'
 				}, {
-					value: '4',
-					label: '已结束，已完成'
-				}],
+					value: '13',
+					label: '抽样中'
+				},{
+					value: '17',
+					label: '检测中'
+				},{
+					value: '21',
+					label: '已完成'
+				},{
+					value: '25',
+					label: '未完成'
+				}
+				],
 				// 日期选择器快捷选项
 				pickerOptions: {
 					// disabledDate(time) {

src/components/admin/specialMonitor.vue

@@ -55,11 +55,11 @@
 		<div class="rightButton">
 			<el-row :gutter="90" style="margin-right: 0px;">
 				<div style="display: flex;flex-direction: row;float: right;">
-					<el-button type="primary" size="small" plain icon="el-icon-plus" @click="add()">新增</el-button>
-					<el-button type="primary" size="small" plain icon="el-icon-edit-outline" @click="ispublic()">发布
+					<!-- <el-button type="primary" size="small" plain icon="el-icon-plus" @click="add()">新增</el-button> -->
+					<el-button type="primary" size="small" icon="el-icon-edit-outline" @click="ispublic()">发布
 					</el-button>
-					<el-button type="primary" size="small" plain icon="el-icon-scissors" @click="repeal()">废止</el-button>
-					<el-button type="primary" size="small" plain icon="el-icon-delete" @click="delArray()">删除</el-button>
+					<el-button type="primary" size="small" icon="el-icon-scissors" @click="repeal()">废止</el-button>
+					<el-button type="danger" size="small" icon="el-icon-delete" @click="delArray()">删除</el-button>
 					<!-- <el-button type="primary" size="small" plain icon="el-icon-download">导出</el-button> -->
 				</div>
 			</el-row>
@@ -105,14 +105,14 @@
 				<!-- 操作按钮区域的作用域插槽 -->
 				<template slot-scope="scope">
 					<el-col style="margin-bottom: 5px;">
-						<el-button type="success" size="mini" @click="readDialogVisible1(scope.row)" style="margin-top:5px">详情</el-button>
-						<el-button type="success" size="mini" @click="sendBack(scope.row.id)" style="margin-top:5px">退回</el-button>
+						<el-button size="mini" @click="readDialogVisible1(scope.row)" style="margin-top:5px">详情</el-button>
+						<el-button type="info" size="mini" @click="sendBack(scope.row.id)" style="margin-top:5px">退回</el-button>
 					</el-col>
 					<el-col style="margin-bottom: 5px;">
 						<!-- <el-button type="success" size="mini" plain @click="takeTheLeadReportList(scope.row.id)" style="margin-top:5px">牵头单位报告</el-button> -->
-						<el-button type="success" size="mini" plain @click="getJcds(scope.row.id)" style="margin-top:5px">检测单</el-button> 
+						<el-button type="primary" size="mini" plain @click="getJcds(scope.row.id)" style="margin-top:5px">检测单</el-button> 
 						<!-- <el-button type="success" size="mini" plain @click="undertakeReport(scope.row.id)">承担单位报告</el-button> -->
-						<el-button type="success" size="mini" plain @click="sampleList(scope.row.id)">抽样单</el-button>
+						<el-button type="primary" size="mini" plain @click="sampleList(scope.row.id)">抽样单</el-button>
 					</el-col>
 				</template>
 			</el-table-column>