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

src/components/admin/recheckMonitor.vue

@@ -62,8 +62,6 @@
 					{{ scope.$index+1 }}
 				</template>
 			</el-table-column>
-			<!-- <el-table-column :key="" 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/jc.vue

@@ -229,13 +229,17 @@ let groupname = window.sessionStorage.getItem('groupname')
         subMenuName: '专项监测',
         path: '/jc/specialMonitorcd'
       }
-	  ,
+	  // ,
     // {
     //     id: '3-5',
     //     subMenuName: '退回任务',
     //     path: '/jc/returnTaskcd'
     //   },
-  
+    //   {
+    //     id: '3-6',
+    //     subMenuName: '数据统计',
+    //     path: '/jc/dataStatistics'
+    //   }
 	  ]
     },]
     this.menuList = data

src/components/jc/dataStatistics.vue

@@ -0,0 +1,55 @@
+<template>
+<div>
+    <el-breadcrumb separator-class="el-icon-arrow-right">
+			<el-breadcrumb-item :to="{ path: '/jc/workbench' }">首页</el-breadcrumb-item>
+			<el-breadcrumb-item>数据统计</el-breadcrumb-item>
+	</el-breadcrumb>
+    <div id="charts">
+    <div class="chart">
+    <tasksChart taskClass = "例行监测"></tasksChart>
+    </div>
+    <div>
+    <tasksChart taskClass = "专项监测"></tasksChart>
+    </div>
+    </div>
+    <!-- <mutiChart></mutiChart> -->
+</div>
+</template>
+<script>
+  import tasksChart from './tasksChart'
+//   import mutiChart from './mutiChart'
+export default {
+    
+    name: "dataStatistics",
+    data() {
+      return {
+      }
+    },
+    components: {
+        tasksChart,
+    },
+    mounted() {
+		},
+    created() {
+		},
+    methods: {
+        
+    }
+  }
+
+</script>
+<style lang="less" scoped>
+    #charts{
+        width: 100%;
+        height: 30rem;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        .chart{
+            margin-right: 8rem;
+        }
+        .tasksChart{
+            margin: 1.875rem;
+        }
+    }
+</style>

src/components/jc/fillSampleReport.vue

@@ -1,7 +1,7 @@
 <template>
 	<div>
 		<el-breadcrumb separator-class="el-icon-arrow-right">
-			<el-breadcrumb-item>首页</el-breadcrumb-item>
+			<el-breadcrumb-item :to="{ path: '/jc/workbench' }">首页</el-breadcrumb-item>
 			<!-- <el-breadcrumb-item :to="{ path: '/jc/setTaskcd'}">例行检测</el-breadcrumb-item> -->
 			<!-- <el-breadcrumb-item>承担单位</el-breadcrumb-item>
 			<el-breadcrumb-item :to="{ path: '/jc/routineMonitor' }">例行检测</el-breadcrumb-item>
@@ -11,7 +11,7 @@
 			<el-breadcrumb-item>填报抽样单</el-breadcrumb-item>
 		</el-breadcrumb>
 		<div id="sjinformation">
-			<el-steps :active="active" finish-status="success" style="width:70%; margin:auto;">
+			<el-steps :active="active" finish-status="finish" style="width:70%; margin:auto;">
 			<!-- <el-step title="步骤 1" description="填报抽样单编号"></el-step> -->
 			<el-step title="步骤 1" description="填报受检单位信息"></el-step>
 			<el-step title="步骤 2" description="填报样品信息"></el-step>
@@ -45,7 +45,7 @@
 			</el-form>
 
 			<div class="footer">
-				<el-button type="success" style="margin-bottom:30px;" size="small" @click="next1()">下一步</el-button>
+				<el-button type="primary" style="margin-bottom:30px;" size="small" @click="next1()">下一步</el-button>
 			</div>
 		</div>
 		<!-- 样品信息 -->
@@ -71,7 +71,7 @@
 				<el-table-column label="操作" align="center">
 						<template slot-scope="scope">
 						<el-col style="margin-bottom: 5px;">
-							<el-button type="success" size="mini" @click="deleteSample(scope.row.id)">删除</el-button>
+							<el-button type="primary" size="mini" @click="deleteSample(scope.row.id)">删除</el-button>
 						</el-col>
 					</template>
 				</el-table-column>
@@ -82,7 +82,7 @@
 			</el-pagination>
 
 			<div class="footer">
-				<el-button type="success" style="margin-bottom:30px;" size="small" @click="next2()">下一步</el-button>
+				<el-button type="primary" style="margin-bottom:30px;" size="small" @click="next2()">下一步</el-button>
 			</div>
 
 		</div>
@@ -129,7 +129,7 @@
 				</el-form-item>
 			</el-form>
 						<div class="footer">
-				<el-button type="success" style="margin-bottom:30px;" size="small" @click="next3()">完成</el-button>
+				<el-button type="primary" style="margin-bottom:30px;" size="small" @click="next3()">完成</el-button>
 			</div>
 		</div>
 			<!-- <div class="footer">
@@ -185,7 +185,7 @@
 				</el-form-item>
 			</el-form>
 			<div class="footer">
-				<el-button type="success" style="margin-bottom:30px;" size="small" @click="postSample('form')">确定</el-button>
+				<el-button type="primary" style="margin-bottom:30px;" size="small" @click="postSample('form')">确定</el-button>
 			</div>
 		</el-dialog>
 </div>

src/components/jc/returnTaskcd.vue

@@ -4,8 +4,8 @@
 
 			<div slot="header" class="clearfix">
 				<el-breadcrumb separator-class="el-icon-arrow-right">
-					<el-breadcrumb-item>首页</el-breadcrumb-item>
-					<el-breadcrumb-item>承担单位</el-breadcrumb-item>
+					<el-breadcrumb-item :to="{ path: '/jc/workbench' }">首页</el-breadcrumb-item>
+					<!-- <el-breadcrumb-item>承担单位</el-breadcrumb-item> -->
 					<el-breadcrumb-item>退回任务</el-breadcrumb-item>
 
 				</el-breadcrumb>

src/components/jc/routineMonitor.vue

@@ -255,12 +255,12 @@ const HeadersList = [{
 			}
 		},
 
-		mounted: function() {
-			this.gettaskList()
-		},
-		created() {
+		mounted() {
 			this.gettaskList()
 		},
+		// created() {
+		// 	this.gettaskList()
+		// },
 		methods: {
 			handleSizeChange(val) {
 				this.queryInfo.pageSize = val;

src/components/jc/setTaskcd.vue

@@ -147,9 +147,9 @@
 						:prop="table.prop" align="center" :width="table.width" :fixed="table.fixed" />
 					<el-table-column label="操作" align="center" fixed="right">
 					<template slot-scope="scope">
-						<el-button style="margin:5px 0" type="success" size="small" plain @click="input(scope.row.id)">填报抽样单
+						<el-button style="margin:5px 0" type="primary" size="small" plain @click="input(scope.row.id)">填报抽样单
 						</el-button>
-						<el-button style="margin-bottom:5px" type="success" size="small" @click="getCydlist(scope.row.id)">查看抽样单列表
+						<el-button style="margin-bottom:5px" type="primary" size="small" @click="getCydlist(scope.row.id)">查看抽样单列表
 						</el-button>
 							<!-- <el-button type="success" size="small" plain @click="sampleDetail(scope.row.sample_id)" @focus="getSampleListDialog = true">查看抽样单列表
 						</el-button> -->
@@ -211,7 +211,7 @@
 					:prop="table.prop" align="center" :width="table.width" :fixed="table.fixed" />
 				<el-table-column label="操作" align="center" fixed="right">
 				<template slot-scope="scope">
-					<el-button style="margin:5px 0" type="success" size="small" @click="getJcdList(scope.row.id)">查看检测单列表
+					<el-button style="margin:5px 0" type="primary" size="small" @click="getJcdList(scope.row.id)">查看检测单列表
 					</el-button>
 				</template>
 				</el-table-column>
@@ -232,7 +232,7 @@
 						:prop="table.prop" align="center" :width="table.width" :fixed="table.fixed" />
 					<el-table-column label="操作" align="center" fixed="right" width="350px">
 						<template slot-scope="scope">
-							<el-button style="margin:5px 5px" type="success" size="mini" plain
+							<el-button style="margin:5px 5px" type="primary" size="mini" plain
 								@click="getSamplesLists(scope.row.id)">获取样品列表</el-button>
 							
 							<!-- <el-button style="margin:5px 5px" type="primary" size="mini" plain @click="creatpdf(scope.row.sample_id)">生成检测报告
@@ -265,7 +265,7 @@
 				<el-table-column label="操作" align="center">
 						<template slot-scope="scope">
 						<el-col style="margin-bottom: 5px;">
-							<el-button style="margin:5px 5px" type="success" size="mini" v-if="scope.row.jcd==null" plain
+							<el-button style="margin:5px 5px" type="primary" size="mini" v-if="scope.row.jcd==null" plain
 								@click="getJcdObj(scope.row.id,scope.row.cyd_id)">填报检测单</el-button>
 							<!-- <el-button style="margin:5px 5px" type="primary" v-else size="mini" plain @click="update(scope.row)">修改</el-button> -->
 							<el-button style="margin:5px 5px" type="primary" size="mini" plain @click="putJcdStatus(scope.row.jcd.id,scope.row.cyd_id)" v-else-if="scope.row.jcd.jcd_status == '1'">上报检测单
@@ -323,7 +323,7 @@
 			</div>
 			<!-- <div v-show="jcd.jcd_result==0"> -->
 			<div style="display: flex;flex-direction: row;float: right;margin-bottom: 10px;" v-show="jcd.jcd_result==0">
-				<el-button type="success" size="small" plain @click="addJcxItemDialog = true">新增不合格项</el-button>
+				<el-button type="primary" size="small" plain @click="addJcxItemDialog = true">新增不合格项</el-button>
 			</div>
 			<div  v-show="jcd.jcd_result==0" id="additems">
 			<!--  表格数据区域-->
@@ -338,7 +338,7 @@
 				<el-table-column label="操作" align="center">
 					<template slot-scope="scope">
 						<el-col>
-							<el-button type="success" size="mini" @click="delJcdItem(scope.row.id)">删除</el-button>
+							<el-button type="primary" size="mini" @click="delJcdItem(scope.row.id)">删除</el-button>
 						</el-col>
 					</template>
 				</el-table-column>
@@ -397,7 +397,7 @@
 
 		
 			<div class="footer">
-				<el-button type="success" style="margin-bottom:30px;" size="small" @click="putJcd()">完成</el-button>
+				<el-button type="primary" style="margin-bottom:30px;" size="small" @click="putJcd()">完成</el-button>
 			</div>
 			</el-dialog>
 
@@ -426,7 +426,7 @@
 				</el-form>
 				</div>
 			<div class="footer">
-				<el-button type="success" style="margin-bottom:30px;" size="small" @click="postJcdItem('jcxform')">保存</el-button>
+				<el-button type="primary" style="margin-bottom:30px;" size="small" @click="postJcdItem('jcxform')">保存</el-button>
 			</div>
 			</el-dialog>
 			<!-- ///////////////////////////////////////////检测报告生成-------难、、、、、、、、、、、、、、、、、、、、、、 -->

src/components/jc/specialMonitorcd.vue

@@ -88,7 +88,7 @@
 				<el-table-column label="操作" align="center" fixed="right">
 					<!-- 操作按钮区域的作用域插槽 -->
 					<template slot-scope="scope">
-						<el-button type="success" size="mini" @click="runtask(scope.row.id)">执行任务</el-button>
+						<el-button type="primary" size="mini" @click="runtask(scope.row.id)">执行任务</el-button>
 
 					</template>
 				</el-table-column>
@@ -258,6 +258,7 @@ const HeadersList = [{
 			handleSizeChange(val) {
 				this.queryInfo.pageSize = val;
 				console.log(`每页 ${val} 条`);
+				this.gettaskList()
 			},
 			handleCurrentChange(val) {
 				this.queryInfo.pageNum = val;

src/components/jc/workbench.vue

@@ -9,28 +9,34 @@
             <el-image style="width: 9.5rem; height: 9.5rem" :src=r></el-image>
         </div>
         <div class="block" @click="getSpecialMonitor()">
-            <el-image style="width: 9.5rem; height: 9.5rem" :src=s></el-image>
+            <el-image class="imagee" style="width: 9.5rem; height: 9.5rem" :src=s></el-image>
+        </div>
+        <div class="block" @click="getReturnTask()">
+            <el-image class="imagee" style="width: 9.5rem; height: 9.5rem" :src = re></el-image>
         </div>
         <div class="block" @click="getSubjectInformation()">
-            <el-image style="width: 9.5rem; height: 9.5rem" :src=p></el-image>
+            <el-image class="imagee" style="width: 9.5rem; height: 9.5rem" :src=p></el-image>
+        </div>
+        <div class="block" @click="getDataStatistic()">
+            <el-image class="imagee" style="width: 9.5rem; height: 9.5rem" :src=ds></el-image>
         </div>
         <div class="block" @click="getsy()">
-            <el-image style="width: 9.5rem; height: 9.5rem" :src=sy></el-image>
+            <el-image class="imagee" style="width: 9.5rem; height: 9.5rem" :src=sy></el-image>
         </div>
     </div>
-    <div id="charts">
+    <!-- <div id="charts">
     <div class="chart">
     <tasksChart taskClass = "例行监测"></tasksChart>
     </div>
     <div>
     <tasksChart taskClass = "专项监测"></tasksChart>
     </div>
-    </div>
+    </div> -->
     <!-- <mutiChart></mutiChart> -->
 </div>
 </template>
 <script>
-  import tasksChart from './tasksChart'
+//   import tasksChart from './tasksChart'
 //   import mutiChart from './mutiChart'
 export default {
     
@@ -39,14 +45,16 @@ export default {
       return {
         r: require('../../assets/img/routineMo.png'),
         s: require('../../assets/img/specialMo.png'),
+        re: require('../../assets/img/returnTask.png'),
         p: require('../../assets/img/personalCenter.png'),
+        ds: require('../../assets/img/datastatistic.png'),
         sy: require('../../assets/img/systemIntroduction.png')
       }
     },
-    components: {
-        tasksChart,
-        // mutiChart
-    },
+    // components: {
+    //     tasksChart,
+    //     // mutiChart
+    // },
     mounted() {
 		},
     created() {
@@ -63,11 +71,21 @@ export default {
                 path: '/jc/specialMonitorcd',
             }) 
         },
+        async getReturnTask() {
+            this.$router.push({
+                path: '/jc/returnTaskcd',
+            }) 
+        },
         async getSubjectInformation() {
             this.$router.push({
                 path: '/jc/subjectInformation'
             })
         },
+        async getDataStatistic() {
+            this.$router.push({
+                path: '/jc/dataStatistics'
+            })
+        },
         async getsy() {
             this.$router.push({
                 path: '/jc/systemIntroduce'
@@ -82,20 +100,30 @@ export default {
         display: flex;
         justify-content: center;
         align-items: center;
-        height: 35%;
+        height: 30rem;
         margin-bottom: 1.25rem;
         .block{
             margin: 1.25rem 1.25rem;
         }
-    }
-    #charts{
-        display: flex;
-        justify-content: center;
-        .chart{
-            margin-right: 8rem;
+        .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)
         }
-        .tasksChart{
-            margin: 1.875rem;
+        .imagee{
+            box-shadow: 8px 5px 20px #cecece;
         }
     }
+    // #charts{
+    //     display: flex;
+    //     justify-content: center;
+    //     .chart{
+    //         margin-right: 8rem;
+    //     }
+    //     .tasksChart{
+    //         margin: 1.875rem;
+    //     }
+    // }
 </style>

src/router/index.js

@@ -255,6 +255,10 @@ const routes = [{
 			path: '/jc/mutiChart',
 			name:'mutiChart',
 			component: () => import('../components/jc/mutiChart')
+		},{
+			path: '/jc/dataStatistics',
+			name:'dataStatistics',
+			component: () => import('../components/jc/dataStatistics')
 		}
 		]
 	},{