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

src/components/jc.vue

@@ -8,6 +8,7 @@
     <el-container class="admin-container">
       <!--页面头部(上边)-->
       <el-header>
+      
         <div class="admin-logo-container">
       <!--    <img
             class="admin-logo"
@@ -21,10 +22,14 @@
             退出
           </el-button>
         </div>
+      </el-header>
         <div class="admin-wel">
           <span>您好！检测单位--{{dwname}}</span>
+          <!-- <el-button @click="logout" style="float:right">
+            退出
+          </el-button> -->
         </div>
-      </el-header>
+        
       <!--页面主体部分-->
       <el-container>
         <!--页面侧边栏(左边)-->
@@ -234,11 +239,12 @@ let groupname = window.sessionStorage.getItem('groupname')
         subMenuName: '专项监测',
         path: '/jc/specialMonitorcd'
       }
-	  ,{
-        id: '3-5',
-        subMenuName: '退回任务',
-        path: '/jc/returnTaskcd'
-      },
+	  ,
+    // {
+    //     id: '3-5',
+    //     subMenuName: '退回任务',
+    //     path: '/jc/returnTaskcd'
+    //   },
    //{
    //      id: '3-6',
    //      subMenuName: '报告汇总',
@@ -448,10 +454,16 @@ let groupname = window.sessionStorage.getItem('groupname')
         right: 15px;
     }
     .admin-wel{
-      display:flex
+      display:flex;
+      margin: .625rem ;
+      margin-left: .9375rem;
+      font-size: .9375rem;
+      font-weight: 600;
+    }
+    /deep/ .el-menu-item is-active{
+      color: #3a8ee6;
     }
     /deep/ #footer {
-
         // display: flex;
         // flex-direction: row;
         // position: absolute;

src/components/jc/routineMonitor.vue

@@ -36,9 +36,9 @@
 						<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>
+					<el-button style="height: 28px;margin-left: 10px;" size="mini" type="primary" @click="searchData()">查询</el-button>
 					<!-- 重置 -->
-					<el-button style="height: 28px;margin-left: 5px;"  size="mini" type="success" @click="reset()">重置</el-button>
+					<el-button style="height: 28px;margin-left: 5px;"  size="mini" type="primary" @click="reset()">重置</el-button>
 				</el-form>
 			</el-row>
 			<!--  头部钮区域-->
@@ -88,8 +88,12 @@
 				<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-col>
+						<el-button type="primary" style="margin-top:5px;" size="mini" @click="runtask(scope.row.id)">执行任务</el-button>
+						</el-col>
+						<el-col>
+						<el-button type="success" style="margin:5px 0px;" size="mini" @click="up(scope.row.id)">上报任务</el-button>
+						</el-col>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -254,6 +258,9 @@ const HeadersList = [{
 		mounted: function() {
 			this.gettaskList()
 		},
+		created() {
+			this.gettaskList()
+		},
 		methods: {
 			handleSizeChange(val) {
 				this.queryInfo.pageSize = val;
@@ -304,7 +311,7 @@ const HeadersList = [{
 				}
 				this.gettaskList()
 			},
-			runtask(id) {
+			async runtask(id) {
 				console.log(id)
 				this.$router.push({
 					name: 'setTaskcd',
@@ -313,6 +320,25 @@ const HeadersList = [{
 					}
 				})
 			},
+			async up(id){
+				this.$confirm('上报任务后不可撤回, 是否继续?', '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+					}).then(() => {
+					this.$message({
+						type: 'success',
+						message: '任务上报成功!'
+					});
+					this.task_id = id
+					this.uptask(task_id)
+					}).catch(() => {
+					this.$message({
+						type: 'info',
+						message: '已取消上报'
+					});  
+					});
+			},
 			// 导出Excel
 			async exportData() {
 			

src/components/jc/specialMonitorcd.vue

@@ -36,9 +36,9 @@
 						<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>
+					<el-button style="height: 28px;margin-left: 10px;" size="mini" type="primary" @click="searchData()">查询</el-button>
 					<!-- 重置 -->
-					<el-button style="height: 28px;margin-left: 5px;"  size="mini" type="success" @click="reset()">重置</el-button>
+					<el-button style="height: 28px;margin-left: 5px;"  size="mini" type="primary" @click="reset()">重置</el-button>
 				</el-form>
 			</el-row>
 			<!--  头部钮区域-->

src/components/jc/subjectInformation.vue

@@ -94,7 +94,7 @@
 			</el-form>
 
 			<div class="footer">
-				<el-button type="success" style="margin-bottom:30px;" size="small" @click="save()">保存</el-button>
+				<el-button type="primary" style="margin-bottom:30px;" size="small" @click="save()">保存</el-button>
 			</div>
 		</div>
     </div>

src/components/jc/systemIntroduce.vue

@@ -0,0 +1,39 @@
+<template>
+    <div class="workblock">
+        <div class="block">
+            <el-image style="width: ; height: " :src=r></el-image>
+        </div>
+    </div>
+</template>
+<script>
+
+export default {
+    data() {
+      return {
+        r: require('../../assets/img/liuchengtu.jpg')
+      }
+    },
+    mounted() {
+		},
+    created() {
+		},
+    methods: {
+        // async getRoutineMonitor() {
+        //     this.$router.push({
+        //         path: '/jc/routineMonitor',
+        //     })
+        // }
+    }
+  }
+
+</script>
+<style lang="less" scoped>
+    .workblock{
+        display: flex;
+        justify-content: center;
+        height: 80%;
+        .block{
+            margin: 1.25rem auto;
+        }
+    }
+</style>

src/components/jc/workbench.vue

@@ -9,7 +9,7 @@
         <div class="block" @click="getSubjectInformation()">
             <el-image style="width: 150px; height: 150px" :src=p></el-image>
         </div>
-        <div class="block">
+        <div class="block" @click="getsy()">
             <el-image style="width: 150px; height: 150px" :src=sy></el-image>
         </div>
     </div>
@@ -44,6 +44,11 @@ export default {
             this.$router.push({
                 path: '/jc/subjectInformation'
             })
+        },
+        async getsy() {
+            this.$router.push({
+                path: '/jc/systemIntroduce'
+            })
         }
     }
   }
@@ -53,7 +58,9 @@ export default {
     .workblock{
         display: flex;
         justify-content: center;
-        height: 80%;
+        align-items: center;
+        height: 28rem;
+        margin: auto;
         .block{
             margin: 1.25rem 1.25rem;
         }

src/router/index.js

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