From dd43c95c5a020c1a828263cc5944ed6fb644b65d Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 05 五月 2023 08:53:18 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/~mayuhao/HazardInvestigationSystem
---
src/assets/newLogo.png | 0
/dev/null | 107 -----------------------------------------------------
src/assets/bg_login.jpg | 0
README.md | 4 +-
4 files changed, 2 insertions(+), 109 deletions(-)
diff --git a/README.md b/README.md
index 31a037e..dbfdbda 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## ztqt
+## HazardInvestigationSystem
-众泰前端
+
diff --git a/src/assets/bg_login.jpg b/src/assets/bg_login.jpg
new file mode 100644
index 0000000..1649d03
--- /dev/null
+++ b/src/assets/bg_login.jpg
Binary files differ
diff --git a/src/assets/newLogo.png b/src/assets/newLogo.png
new file mode 100644
index 0000000..6b56c6c
--- /dev/null
+++ b/src/assets/newLogo.png
Binary files differ
diff --git a/src/views/exam/component/classification.vue b/src/views/exam/component/classification.vue
deleted file mode 100644
index ce8c06f..0000000
--- a/src/views/exam/component/classification.vue
+++ /dev/null
@@ -1,65 +0,0 @@
-<template>
- <div >
- <button
- class="filter-btn"
- v-for="(item,index) in array"
- v-bind:class="{'active':index === num}"
- :key="item.id"
- @click="activeClick(item.id,index)">{{item.value}}</button>
- </div>
-</template>
-
-<script>
- export default {
- name: "classification",
- props: {
- array: {
- type: Array,
- default: () => [],
- required: true
- },
- },
- data(){
- return {
- num:'',
- isActive:false
- }
- },
- methods:{
- activeClick(id,index){
- this.num = index
- this.$emit("setId",id)
- }
- }
-
- }
-
-</script>
-
-<style scoped>
- .filter-btn{
- cursor: pointer;
- min-width: 112px;
- height: 32px;
- border-radius: 15px;
- border: 1px solid #e5e5e5;
- background-color: #fff;
- color: #000;
- font-size: 14px;
- margin-right: 20px;
- margin-bottom: 10px;
- }
-
- .filter-btn:hover{
- border-color: #fff;
- background-color: #b2d8ff;
- color: #fff;
- }
-
- .active{
- background-color: #5dadff;
- border-color: #5dadff;
- color: #fff;
- }
-
-</style>
diff --git a/src/views/exam/current.vue b/src/views/exam/current.vue
deleted file mode 100644
index c419bda..0000000
--- a/src/views/exam/current.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
- <div class="app-container">
-
- <div class="filter-container">
- <div class="basic_search" >
- <div style="display: inline-block">
- <span class="span-filter-label">考试名称：</span>
- <el-input v-model="filter.keyword" style="width: 200px" placeholder="请输入内容"></el-input>
- </div>
- <div style="display: inline-block;margin-left: 15px">
- <span class="span-filter-label">考试时间：</span>
- <el-date-picker
- v-model="rangeTime"
- type="datetimerange"
- start-placeholder="开始日期"
- end-placeholder="结束日期"
- :default-time="['00:00:00','23:59:59']">
- </el-date-picker>
- </div>
- <div style="display: inline-block;margin-left: 15px">
- <el-button
- style="margin-left: 10px;"
- type="primary"
- icon="el-icon-search"
- @click="queryHandle">
- </el-button>
- </div>
- </div>
-
- <div class="basic_search">
- <div>
- <classification :array="list" v-model="filter.type" @setId="setId"></classification>
- </div>
- </div>
- </div>
-
-
-
-
-
-
- </div>
-
-</template>
-
-<script>
- import classification from "./component/classification";
-
- import {currentExamList,classificationList} from '@/api/nanoexam'
- export default {
- name: "current",
- components:{
- classification
- },
- created(){
- this.classificationList()
- this.currentExamList()
- },
- data(){
- return {
- rangeTime:[],
- filter:{
- type:"",
- keyword:"",
- startExamTime:"",
- endExamTime:"",
- current:1,
- rowCount:4,
- },
- list:[
- {id:1,value:"全部"},
- {id:2,value:"4526465"},
- {id:3,value:"asdsad"},
- ]
- }
- },
- methods:{
- queryHandle(){
- console.log(this.filter.type)
- },
- currentExamList(){
-
- },
- classificationList(){
- classificationList({groupId: 2}).then(res=>{
- console.log(res.data)
- })
- },
- setId(id){
- this.filter.type = id
- }
- }
- }
-</script>
-
-<style scoped>
- .span-filter-label{
- font-size: 15px;
- color: #606266;
- margin-right: 4px;
- margin-left: 7px;
- }
-
- .basic_search{
- margin-bottom: 15px;
- }
-</style>
--
Gitblit v1.9.2