YangJian0701 1 year ago
parent
commit
2fb9b52b23
3 changed files with 281 additions and 388 deletions
  1. 8 2
      src/api/companyManagement.js
  2. 273 190
      src/views/companyManagement/index.vue
  3. 0 196
      src/views/companyManagement/test.js

+ 8 - 2
src/api/companyManagement.js

@@ -16,14 +16,20 @@ const companyManagement = {
 	TaskAdd: '/Task/Add',
 	AdminList_All: '/Admin/List_All',
 	TaskDel: '/Task/Del',
-	
+	tempClassList:'/VerifyTemplate/Class_List',
 	TaskGet: '/Task/Get',
 	TaskEx: '/TaskData/List',
-	
 	DowloadExc: '/TaskData/Export_Data_Excel',
 	
 	
 }
+export function tempClassList(data) {
+	return axios({
+		url: companyManagement.tempClassList,
+		method: 'post',
+		data:data
+	})
+}
 export function DowloadExc(data) {
 	return axios({
 		url: companyManagement.DowloadExc,

+ 273 - 190
src/views/companyManagement/index.vue

@@ -9,7 +9,8 @@
 				<div class="companyManagement1-Rtx">
 					搜索:
 				</div>
-				<el-input v-model="pages.T_name" placeholder="请输入公司名称" @keyup.enter.native="search" clearable></el-input>
+				<el-input v-model="pages.T_name" placeholder="请输入公司名称" @keyup.enter.native="search" clearable>
+				</el-input>
 			</div>
 		</div>
 		<div class="companyManagement2">
@@ -21,7 +22,8 @@
 				</el-table-column>
 				<el-table-column label="隐藏/公开" width="180">
 					<template slot-scope="scope">
-						<el-switch v-model="scope.row.T_Show" active-color="#409EFF" inactive-color="#ccc" :inactive-value="0" :active-value="1" @change="Changswitch(scope.row)">
+						<el-switch v-model="scope.row.T_Show" active-color="#409EFF" inactive-color="#ccc"
+							:inactive-value="0" :active-value="1" @change="Changswitch(scope.row)">
 						</el-switch>
 					</template>
 				</el-table-column>
@@ -45,7 +47,8 @@
 					</el-form-item>
 					<el-form-item label="权限" :label-width="LabelWidth" prop="T_power">
 						<el-select v-model="form.T_power" placeholder="请选择活动区域">
-							<el-option :label="item.T_name" :value="item.Id" v-for="(item,index) in optionsPir" :key="index"></el-option>
+							<el-option :label="item.T_name" :value="item.Id" v-for="(item,index) in optionsPir"
+								:key="index"></el-option>
 						</el-select>
 					</el-form-item>
 					<el-form-item label="用户名" :label-width="LabelWidth" prop="T_user">
@@ -63,8 +66,7 @@
 				</el-form>
 			</div>
 		</el-drawer>
-		<el-drawer title="任务列表" :visible.sync="Drawer" direction="rtl" ref="drawer"
-			size="90%">
+		<el-drawer title="任务列表" :visible.sync="Drawer" direction="rtl" ref="drawer" size="90%">
 			<div class="demo-drawers">
 				<el-button type="primary" icon="el-icon-plus" @click="NewsRenwu">添加任务</el-button>
 				<div style="margin-top: 10px;">
@@ -82,13 +84,14 @@
 								  <el-step title="报告编写" :description="scope.row.T_reporting_name"></el-step>
 								  <el-step title="交付审核" :description="scope.row.T_delivery_name"></el-step>
 								</el-steps> -->
-								
-								
+
+
 								<div class="steps">
 									<div class="steps_start" :class="scope.row.T_scheme_state==0?'public0':'public1'">
 										<div class="steps_start_lin">
 											<div class="steps_start_lin1">
-												<i :class="scope.row.T_scheme_state==1?'el-icon-check':'el-icon-close'"></i>
+												<i
+													:class="scope.row.T_scheme_state==1?'el-icon-check':'el-icon-close'"></i>
 											</div>
 											<div class="steps_start_lin2"></div>
 										</div>
@@ -99,13 +102,15 @@
 											{{scope.row.T_scheme_name}}
 										</div>
 									</div>
-									<div class="steps_process" :class="scope.row.T_collection_state==0?'public0':'public1'">
+									<div class="steps_process"
+										:class="scope.row.T_collection_state==0?'public0':'public1'">
 										<div class="steps_start_lin">
 											<div class="steps_start_lin1">
-												<i :class="scope.row.T_collection_state==1?'el-icon-check':'el-icon-close'"></i>
+												<i
+													:class="scope.row.T_collection_state==1?'el-icon-check':'el-icon-close'"></i>
 											</div>
 											<div class="steps_start_lin2">
-												
+
 											</div>
 										</div>
 										<div class="steps_start_tit">
@@ -115,13 +120,15 @@
 											{{scope.row.T_collection_name}}
 										</div>
 									</div>
-									<div class="steps_process" :class="scope.row.T_reporting_state==0?'public0':'public1'">
+									<div class="steps_process"
+										:class="scope.row.T_reporting_state==0?'public0':'public1'">
 										<div class="steps_start_lin">
 											<div class="steps_start_lin1">
-												<i :class="scope.row.T_reporting_state==1?'el-icon-check':'el-icon-close'"></i>
+												<i
+													:class="scope.row.T_reporting_state==1?'el-icon-check':'el-icon-close'"></i>
 											</div>
 											<div class="steps_start_lin2">
-												
+
 											</div>
 										</div>
 										<div class="steps_start_tit">
@@ -134,7 +141,8 @@
 									<div class="steps_end" :class="scope.row.T_delivery_state==0?'public0':'public1'">
 										<div class="steps_start_lin">
 											<div class="steps_start_lin1">
-												<i :class="scope.row.T_delivery_state==1?'el-icon-check':'el-icon-close'"></i>
+												<i
+													:class="scope.row.T_delivery_state==1?'el-icon-check':'el-icon-close'"></i>
 											</div>
 										</div>
 										<div class="steps_start_tit">
@@ -149,7 +157,8 @@
 						</el-table-column>
 						<el-table-column label="隐藏/公开" width="80">
 							<template slot-scope="scope">
-								<el-switch v-model="scope.row.T_Show" active-color="#409EFF" inactive-color="#ccc" :inactive-value="0" :active-value="1" @change="Changswitch1(scope.row)">
+								<el-switch v-model="scope.row.T_Show" active-color="#409EFF" inactive-color="#ccc"
+									:inactive-value="0" :active-value="1" @change="Changswitch1(scope.row)">
 								</el-switch>
 							</template>
 						</el-table-column>
@@ -176,13 +185,13 @@
 					</el-table>
 				</div>
 				<div style="margin-top: 10px;">
-					<el-pagination @current-change="handleCurrentChange111"
-						:current-page="pages1.page" :page-size="pages1.page_z" layout="total, prev, pager, next, jumper"
-						:total="total1">
+					<el-pagination @current-change="handleCurrentChange111" :current-page="pages1.page"
+						:page-size="pages1.page_z" layout="total, prev, pager, next, jumper" :total="total1">
 					</el-pagination>
 				</div>
 			</div>
-			<el-drawer title="查看日志" :append-to-body="true" :visible.sync="innerDrawer1" size="60%"><!-- 日志 -->
+			<el-drawer title="查看日志" :append-to-body="true" :visible.sync="innerDrawer1" size="60%">
+				<!-- 日志 -->
 				<div style="padding: 20px;">
 					<el-table :data="tableData2" border size="small">
 						<el-table-column label="用户名" :show-overflow-tooltip="true">
@@ -207,31 +216,35 @@
 						</el-table-column>
 					</el-table>
 					<div style="margin-top: 10px;">
-						<el-pagination @current-change="handleCurrentChange2"
-							:current-page="pages2.page" :page-size="pages2.page_z" layout="total, prev, pager, next, jumper"
-							:total="total2">
+						<el-pagination @current-change="handleCurrentChange2" :current-page="pages2.page"
+							:page-size="pages2.page_z" layout="total, prev, pager, next, jumper" :total="total2">
 						</el-pagination>
 					</div>
 				</div>
 			</el-drawer>
-			<el-drawer title="查看报告" :append-to-body="true" :visible.sync="innerDrawer2" size="80%"><!-- 查看报告 -->
-				
+			<el-drawer title="查看报告" :append-to-body="true" :visible.sync="innerDrawer2" size="80%">
+				<!-- 查看报告 -->
+
 				<div style="padding: 20px;">
 					<div style="margin-bottom:50px;display: flex;">
 						<el-descriptions title="报告信息" border>
-						    <el-descriptions-item label="报告名称">{{BaoGaoData.T_name}}</el-descriptions-item>
-						    <el-descriptions-item label="创建时间">{{BaoGaoData.CreateTime}}</el-descriptions-item>
-						    <el-descriptions-item label="修改时间">{{BaoGaoData.UpdateTime}}</el-descriptions-item>
+							<el-descriptions-item label="报告名称">{{BaoGaoData.T_name}}</el-descriptions-item>
+							<el-descriptions-item label="创建时间">{{BaoGaoData.CreateTime}}</el-descriptions-item>
+							<el-descriptions-item label="修改时间">{{BaoGaoData.UpdateTime}}</el-descriptions-item>
 						</el-descriptions>
 					</div>
 					<div style="margin-bottom: 50px;">
 						<div style="margin-bottom:20px;font-size: 16px; font-weight: 700;">查看/下载pdf</div>
 						<div>
-							<el-button type="primary" :disabled="BaoGaoData.T_pdf1===''?true:false" size="small" icon="el-icon-download" @click="ShowPdf(0,BaoGaoData.T_pdf1)">验证方案</el-button>
-							<el-button type="primary" :disabled="BaoGaoData.T_pdf2===''?true:false" size="small" icon="el-icon-download" @click="ShowPdf(0,BaoGaoData.T_pdf2)">验证报告</el-button>
-							<el-button type="primary" :disabled="BaoGaoData.T_pdf3===''?true:false" size="small" icon="el-icon-download" @click="ShowPdf(1,BaoGaoData.T_pdf3)">校准证书</el-button>
-							<el-button type="primary" size="small" icon="el-icon-download" @click="Dowload">下载验证数据</el-button>
-							
+							<el-button type="primary" :disabled="BaoGaoData.T_pdf1===''?true:false" size="small"
+								icon="el-icon-download" @click="ShowPdf(0,BaoGaoData.T_pdf1)">验证方案</el-button>
+							<el-button type="primary" :disabled="BaoGaoData.T_pdf2===''?true:false" size="small"
+								icon="el-icon-download" @click="ShowPdf(0,BaoGaoData.T_pdf2)">验证报告</el-button>
+							<el-button type="primary" :disabled="BaoGaoData.T_pdf3===''?true:false" size="small"
+								icon="el-icon-download" @click="ShowPdf(1,BaoGaoData.T_pdf3)">校准证书</el-button>
+							<el-button type="primary" size="small" icon="el-icon-download" @click="Dowload">下载验证数据
+							</el-button>
+
 						</div>
 					</div>
 					<div style="margin-bottom: 50px;">
@@ -243,15 +256,19 @@
 							</div> -->
 						</div>
 						<div class="Baogao">
-							<el-date-picker class="s1" v-model="TimeValue" size="small" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange"
-								range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="searchTimeData">
+							<el-date-picker class="s1" v-model="TimeValue" size="small"
+								value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="至"
+								start-placeholder="开始日期" end-placeholder="结束日期" @change="searchTimeData">
 							</el-date-picker>
-							<el-input size="small" class="s1" v-model="form2.T_sn" @keyup.enter.native="search1" placeholder="请输入SN" clearable></el-input>
-							<el-input size="small" class="s1" v-model="form2.T_id" @keyup.enter.native="search1" placeholder="请输入编号" clearable></el-input>
-							<el-button size="small" class="s1" type="primary" icon="el-icon-search" @click="search1">搜索</el-button>
+							<el-input size="small" class="s1" v-model="form2.T_sn" @keyup.enter.native="search1"
+								placeholder="请输入SN" clearable></el-input>
+							<el-input size="small" class="s1" v-model="form2.T_id" @keyup.enter.native="search1"
+								placeholder="请输入编号" clearable></el-input>
+							<el-button size="small" class="s1" type="primary" icon="el-icon-search" @click="search1">搜索
+							</el-button>
 						</div>
-						
-						
+
+
 						<el-table :data="tableData3" border size="small">
 							<el-table-column label="ID">
 								<template slot-scope="scope">
@@ -276,13 +293,13 @@
 						</el-table>
 					</div>
 					<div class="companyManagement3">
-						<el-pagination @current-change="handleCurrentChange3" :current-page="form2.page" :page-size="form2.page_z"
-							layout="total, prev, pager, next, jumper" :total="total3">
+						<el-pagination @current-change="handleCurrentChange3" :current-page="form2.page"
+							:page-size="form2.page_z" layout="total, prev, pager, next, jumper" :total="total3">
 						</el-pagination>
 					</div>
 				</div>
-				<el-drawer title="校准证书" :visible.sync="innerDrawer211" direction="rtl" ref="drawers" :append-to-body="true"
-      :modal-append-to-body="false">
+				<el-drawer title="校准证书" :visible.sync="innerDrawer211" direction="rtl" ref="drawers"
+					:append-to-body="true" :modal-append-to-body="false">
 					<div class="demo-drawers" style="z-index: 999999;">
 						<div style="margin-bottom: 20px;font-size: 14px;color: #C0C4CC;">请选择对应的校准证书查看:</div>
 						<div style="display: grid;grid-template-columns: 1fr 1fr;grid-gap: 10px;">
@@ -299,35 +316,44 @@
 							<el-input v-model="form1.T_name" autocomplete="off"></el-input>
 						</el-form-item>
 						<el-form-item label="截至时间" label-width="80px" prop="T_deadline">
-							<el-date-picker type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期" v-model="form1.T_deadline" style="width: 100%;">
+							<el-date-picker type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期"
+								v-model="form1.T_deadline" style="width: 100%;">
 							</el-date-picker>
 						</el-form-item>
 						<el-form-item label="任务模板" label-width="80px" prop="T_VerifyTemplate_id">
 							<div style="display: flex;align-items: center;">
-								<el-cascader v-model="cascaderData" :options="optionsData" @change="handleChange" :props="{ checkStrictly: true }" style="margin-right: 10px;"></el-cascader>
-								<el-select :disabled="cascaderData==''?true:false" v-model="form1.T_VerifyTemplate_id" placeholder="请选择任务模板">
-									<el-option :label="item.T_name" :value="item.T_VerifyTemplate_id" v-for="(item,index) in optionsRw" :key="index"></el-option>
+								<el-cascader v-model="cascaderData" @focus="getTempApi" clearable :props="optionProps"
+									:options="optionsData" @change="GetTempListApi" style="margin-right: 10px;">
+								</el-cascader>
+								<el-select :disabled="cascaderData==''?true:false" v-model="form1.T_VerifyTemplate_id"
+									placeholder="请选择任务模板">
+									<el-option :label="item.T_name" :value="item.T_VerifyTemplate_id"
+										v-for="(item,index) in optionsRw" :key="index"></el-option>
 								</el-select>
 							</div>
 						</el-form-item>
 						<el-form-item label="实施方案" label-width="80px" prop="T_scheme">
 							<el-select v-model="form1.T_scheme" placeholder="请选择实施方案">
-								<el-option :label="item.T_name+'('+item.T_power_name+')'" :value="item.T_uuid" v-for="(item,index) in optionsFz" :key="index"></el-option>
+								<el-option :label="item.T_name+'('+item.T_power_name+')'" :value="item.T_uuid"
+									v-for="(item,index) in optionsFz" :key="index"></el-option>
 							</el-select>
 						</el-form-item>
 						<el-form-item label="数据采集" label-width="80px" prop="T_collection">
 							<el-select v-model="form1.T_collection" placeholder="请选择数据采集">
-								<el-option :label="item.T_name+'('+item.T_power_name+')'" :value="item.T_uuid" v-for="(item,index) in optionsFz" :key="index"></el-option>
+								<el-option :label="item.T_name+'('+item.T_power_name+')'" :value="item.T_uuid"
+									v-for="(item,index) in optionsFz" :key="index"></el-option>
 							</el-select>
 						</el-form-item>
 						<el-form-item label="报告编辑" label-width="80px" prop="T_reporting">
 							<el-select v-model="form1.T_reporting" placeholder="请选择报告编辑">
-								<el-option :label="item.T_name+'('+item.T_power_name+')'" :value="item.T_uuid" v-for="(item,index) in optionsFz" :key="index"></el-option>
+								<el-option :label="item.T_name+'('+item.T_power_name+')'" :value="item.T_uuid"
+									v-for="(item,index) in optionsFz" :key="index"></el-option>
 							</el-select>
 						</el-form-item>
 						<el-form-item label="交付审核" label-width="80px" prop="T_delivery">
 							<el-select v-model="form1.T_delivery" placeholder="请选择交付审核">
-								<el-option :label="item.T_name+'('+item.T_power_name+')'" :value="item.T_uuid" v-for="(item,index) in optionsFz" :key="index"></el-option>
+								<el-option :label="item.T_name+'('+item.T_power_name+')'" :value="item.T_uuid"
+									v-for="(item,index) in optionsFz" :key="index"></el-option>
 							</el-select>
 						</el-form-item>
 						<el-form-item label-width="80px">
@@ -345,49 +371,69 @@
 </template>
 
 <script>
-	import {UserList,UserUp,UserAdd,UserPowerAll,TaskList,TaskUp,TaskLogsList,TaskAdd,TempList,AdminList_All,TaskDel,TaskGet,TaskEx,DowloadExc
+	import {
+		UserList,
+		UserUp,
+		UserAdd,
+		UserPowerAll,
+		TaskList,
+		TaskUp,
+		TaskLogsList,
+		TaskAdd,
+		TempList,
+		AdminList_All,
+		TaskDel,
+		TaskGet,
+		TaskEx,
+		DowloadExc,
+		tempClassList
 	} from "@/api/companyManagement"
 	import pdf from "./pdf"
 	import download from "downloadjs"
-	import options from "./test.js"
 	export default {
 		name: 'companyManagement',
-		components:{
+		components: {
 			pdf
 		},
-		filters:{
-			stepVal(e){
-				if(e.T_scheme_state==1){
+		filters: {
+			stepVal(e) {
+				if (e.T_scheme_state == 1) {
 					return 1
-				}else if(e.T_collection_state==1){
+				} else if (e.T_collection_state == 1) {
 					return 2
-				}else if(e.T_reporting_state==1){
+				} else if (e.T_reporting_state == 1) {
 					return 3
-				}else if(e.T_delivery_state==1){
+				} else if (e.T_delivery_state == 1) {
 					return 4
-				}else{
+				} else {
 					return null
 				}
-			}	
+			}
 		},
 		data() {
 			return {
-				cascaderData:'',
-				optionsData : options,
-				TimeValue:'',
+				optionProps: {
+					value: 'Id',
+					label: 'T_name',
+					children: 'Children',
+					checkStrictly: true
+				},
+				cascaderData: '',
+				optionsData: [],
+				TimeValue: '',
 				form: {
 					T_power: '', // 权限
-					T_name: '',  // 某某公司名称
-					T_user: '',  // 登录用户名
-					T_pass: '',  // 密码 MD5
-					T_passstr: '',  // 密码明文
+					T_name: '', // 某某公司名称
+					T_user: '', // 登录用户名
+					T_pass: '', // 密码 MD5
+					T_passstr: '', // 密码明文
 				},
 				form2: {
 					T_task_id: '', // 权限
-					T_sn:'',  // 某某公司名称
-					T_id:'',
-					Time_start: '',  // 登录用户名
-					Time_end: '',  // 密码 MD5
+					T_sn: '', // 某某公司名称
+					T_id: '',
+					Time_start: '', // 登录用户名
+					Time_end: '', // 密码 MD5
 					page: 1,
 					page_z: 5,
 				},
@@ -415,13 +461,13 @@
 				},
 				form1: {
 					T_name: '', // 任务名称
-					T_uuid: '',  // 用户的 UUID
-					T_VerifyTemplate_id: '',  // 任务模板id
-					T_deadline: '',  // 截止时间
-					T_scheme: '',  // 实施方案 负责人uuid
-					T_collection: '',  // 数据采集 负责人uuid
-					T_reporting: '',  //报告编写 负责人uuid
-					T_delivery: '',  // 交付审核 负责人uuid
+					T_uuid: '', // 用户的 UUID
+					T_VerifyTemplate_id: '', // 任务模板id
+					T_deadline: '', // 截止时间
+					T_scheme: '', // 实施方案 负责人uuid
+					T_collection: '', // 数据采集 负责人uuid
+					T_reporting: '', //报告编写 负责人uuid
+					T_delivery: '', // 交付审核 负责人uuid
 				},
 				rules1: {
 					T_name: [{
@@ -460,20 +506,20 @@
 						trigger: 'blur'
 					}],
 				},
-				BaoGaoData:{},
-				optionsPir:[],
-				optionsRw:[],
-				optionsFz:[],
-				value:true,
+				BaoGaoData: {},
+				optionsPir: [],
+				optionsRw: [],
+				optionsFz: [],
+				value: true,
 				title: '添加任务',
 				LabelWidth: "80px",
 				LabelWidth1: "120px",
 				loading: false,
 				dialog: false,
 				innerDrawer: false,
-				innerDrawer1: false,//日志
-				innerDrawer2: false,//查看报告
-				innerDrawer211: false,//查看报告
+				innerDrawer1: false, //日志
+				innerDrawer2: false, //查看报告
+				innerDrawer211: false, //查看报告
 				Drawer: false, //任务管理
 				total: 0,
 				total1: 0,
@@ -485,13 +531,13 @@
 					T_name: ''
 				},
 				pages1: {
-					T_uuid:'',
+					T_uuid: '',
 					T_name: '',
 					page: 1,
 					page_z: 5,
 				},
 				pages2: {
-					T_task_id:'',
+					T_task_id: '',
 					page: 1,
 					page_z: 10,
 				},
@@ -499,8 +545,8 @@
 				tableData1: [],
 				tableData2: [],
 				tableData3: [],
-				blNum:null,
-				radioXuan:[],
+				blNum: null,
+				radioXuan: [],
 				radio1: '',
 			}
 		},
@@ -508,32 +554,66 @@
 			this.GetUserListApi()
 		},
 		methods: {
-			handleChange(e){
-				console.log('飒飒大苏打',this.cascaderData)
+			//分类列表
+			getTempApi() {
+				tempClassList({}).then(res => {
+					console.log('分类列表', res)
+					if (res.data.Code == 200) {
+						var arr = res.data.Data
+						this.optionsData = this.recursion(arr)
+					}
+				})
+			},
+			recursion(items, childrenName = 'Children') {
+				for (let i = 0; i < items.length; i++) {
+					const item = items[i]
+					// 当前对象存在children
+					if (item && item[childrenName]) {
+						// children为空数组时删除
+						if (item[childrenName].length === 0) {
+							delete item[childrenName]
+						} else {
+							// 递归当前children数组
+							this.recursion(item[childrenName], childrenName = 'Children')
+						}
+					}
+				}
+				return items
+			},
+			GetTempListApi(e) {
+				console.log('飒飒大苏打', e,this.cascaderData.join('/')+'/')
+				TempList({
+					T_class:e[e.length-1]
+				}).then(res => {
+					console.log('报错', res)
+					if (res.data.Code === 200) {
+						this.optionsRw = res.data.Data.List
+					}
+				})
 			},
 			radioInput() {
 				var values = this.radio1.split(",")[1]
 				this.$refs.pdf.SetPdf(values)
 			},
-			ShowPdf(e,obj){
-				if(e==1){
+			ShowPdf(e, obj) {
+				if (e == 1) {
 					this.radioXuan = obj.split("|")
 					this.innerDrawer211 = true
-				}else{
+				} else {
 					this.$refs.pdf.SetPdf(e)
 				}
 			},
 			submitForm1(formName) {
 				this.$refs[formName].validate((valid) => {
-			 	if (valid) {
-						console.log('验证通过',this.form1)
-						if(this.blNum==1){
+					if (valid) {
+						console.log('验证通过', this.form1)
+						if (this.blNum == 1) {
 							this.GetTaskAddApi()
-						}else{
-							TaskUp(this.form1).then(res=>{
-								if(res.data.Code===200){
+						} else {
+							TaskUp(this.form1).then(res => {
+								if (res.data.Code === 200) {
 									this.$message.success('编辑成功')
-									this.innerDrawer=false
+									this.innerDrawer = false
 									this.pages1.page = 1
 									this.GetTaskListApi()
 								}
@@ -544,43 +624,36 @@
 					}
 				});
 			},
-			GetTaskAddApi(){
-				TaskAdd(this.form1).then(res=>{
-					console.log('添加',res)
-					if(res.data.Code===200){
+			GetTaskAddApi() {
+				TaskAdd(this.form1).then(res => {
+					console.log('添加', res)
+					if (res.data.Code === 200) {
 						this.$message.success('添加任务成功')
-						this.innerDrawer=false
+						this.innerDrawer = false
 						this.pages1.page = 1
 						this.GetTaskListApi()
 					}
 				})
 			},
-			NewsRenwu(){
-				if(this.$refs.ruleForm1!=undefined){
+			NewsRenwu() {
+				if (this.$refs.ruleForm1 != undefined) {
 					this.$refs.ruleForm1.clearValidate()
 				}
-				this.innerDrawer=true
+				this.innerDrawer = true
 				this.blNum = 1
 				this.form1 = this.$options.data().form
 				this.form1.T_uuid = this.pages1.T_uuid
 			},
-			
-			GetAdminList_AllApi(){
-				AdminList_All({}).then(res=>{
-					console.log('负责人',res)
-					if(res.data.Code===200){
+
+			GetAdminList_AllApi() {
+				AdminList_All({}).then(res => {
+					console.log('负责人', res)
+					if (res.data.Code === 200) {
 						this.optionsFz = res.data.Data.List
 					}
 				})
 			},
-			GetTempListApi(){
-				TempList({}).then(res=>{
-					console.log('报错',res)
-					if(res.data.Code===200){
-						this.optionsRw = res.data.Data.List
-					}
-				})
-			},
+			
 			handleEdit(e) {
 				this.pages1.T_uuid = e.T_uuid
 				this.Drawer = true
@@ -588,31 +661,31 @@
 				this.GetTaskListApi()
 				this.GetAdminList_AllApi()
 			},
-			GetTaskListApi(){
-				TaskList(this.pages1).then(res=>{
-					if(res.data.Code===200){
+			GetTaskListApi() {
+				TaskList(this.pages1).then(res => {
+					if (res.data.Code === 200) {
 						this.tableData1 = res.data.Data.List
 						this.total1 = res.data.Data.Num
 					}
 				})
 			},
-			NewsMang(){
+			NewsMang() {
 				this.dialog = true
 				this.GetPowerAllApi()
-				if(this.$refs.ruleForm!=undefined){
+				if (this.$refs.ruleForm != undefined) {
 					this.$refs.ruleForm.clearValidate()
 				}
 			},
-			GetPowerAllApi(){
-				UserPowerAll({}).then(res=>{
-					if(res.data.Code===200){
+			GetPowerAllApi() {
+				UserPowerAll({}).then(res => {
+					if (res.data.Code === 200) {
 						this.optionsPir = res.data.Data.List
 					}
 				})
 			},
 			submitForm(formName) {
 				this.$refs[formName].validate((valid) => {
-			 	if (valid) {
+					if (valid) {
 						this.form.T_pass = this.$md5(this.form.T_passstr)
 						this.SetUserAddApi()
 					} else {
@@ -620,10 +693,10 @@
 					}
 				});
 			},
-			SetUserAddApi(){
-				UserAdd(this.form).then(res=>{
+			SetUserAddApi() {
+				UserAdd(this.form).then(res => {
 					console.log()
-					if(res.data.Code===200){
+					if (res.data.Code === 200) {
 						this.$message.success('新增公司成功')
 						this.dialog = false
 						this.pages.page = 1
@@ -631,25 +704,25 @@
 					}
 				})
 			},
-			Changswitch(val){
-				UserUp(val).then(res=>{
-					if(res.data.Code===200){
+			Changswitch(val) {
+				UserUp(val).then(res => {
+					if (res.data.Code === 200) {
 						this.$message.success('设置成功')
 						this.GetUserListApi()
 					}
 				})
 			},
-			Changswitch1(val){
-				TaskUp(val).then(res=>{
-					if(res.data.Code===200){
+			Changswitch1(val) {
+				TaskUp(val).then(res => {
+					if (res.data.Code === 200) {
 						this.$message.success('设置成功')
 						this.GetTaskListApi()
 					}
 				})
 			},
-			GetUserListApi(){
-				UserList(this.pages).then(res=>{
-					if(res.data.Code===200){
+			GetUserListApi() {
+				UserList(this.pages).then(res => {
+					if (res.data.Code === 200) {
 						this.tableData = res.data.Data.List
 						this.total = res.data.Data.Num
 					}
@@ -673,25 +746,25 @@
 				this.pages2.page = val
 				this.GetTaskLogsListApi()
 			},
-			GetTaskLogsListApi(){
-				TaskLogsList(this.pages2).then(res=>{
-					console.log('日志',res)
-					if(res.data.Code===200){
+			GetTaskLogsListApi() {
+				TaskLogsList(this.pages2).then(res => {
+					console.log('日志', res)
+					if (res.data.Code === 200) {
 						this.tableData2 = res.data.Data.List
 						this.total2 = res.data.Data.Num
 					}
 				})
 			},
-			commands(e,obj){
-				console.log(e,obj)
-				switch(e){
+			commands(e, obj) {
+				console.log(e, obj)
+				switch (e) {
 					case 'a':
 						this.pages2.T_task_id = obj.T_task_id
 						this.innerDrawer1 = true
 						this.GetTaskLogsListApi()
 						break
 					case 'b':
-						if(this.$refs.ruleForm1!=undefined){
+						if (this.$refs.ruleForm1 != undefined) {
 							this.$refs.ruleForm1.clearValidate()
 						}
 						this.blNum = 2
@@ -703,14 +776,15 @@
 						this.form1.T_scheme = obj.T_scheme
 						this.form1.T_reporting = obj.T_reporting
 						this.form1.T_delivery = obj.T_delivery
-						this.form1.T_task_id = obj.T_task_id 
+						this.form1.T_task_id = obj.T_task_id
 						this.innerDrawer = true
-						this.GetTempListApi()
 						break
 					case 'c':
-						TaskGet({T_task_id:obj.T_task_id}).then(res=>{
-							console.log('查看报告',res)
-							if(res.data.Code===200){
+						TaskGet({
+							T_task_id: obj.T_task_id
+						}).then(res => {
+							console.log('查看报告', res)
+							if (res.data.Code === 200) {
 								this.BaoGaoData = res.data.Data
 							}
 						})
@@ -719,31 +793,33 @@
 						this.innerDrawer2 = true
 						break
 					default:
-					this.$confirm('此操作将永久删除该任务, 是否继续?', '提示', {
-						confirmButtonText: '立即删除',
-						cancelButtonText: '取消',
-						type: 'warning',
-						center: true
-					}).then(() => {
-						TaskDel({T_task_id: obj.T_task_id}).then(res=>{
-							if(res.data.Code==200){
-								this.$message.success('删除成功!')
-								this.pages1.page = 1
-								this.GetTaskListApi()
-							}
-						})
-					}).catch(() => {
-						this.$message({
-							type: 'info',
-							message: '已取消删除'
-						});
+						this.$confirm('此操作将永久删除该任务, 是否继续?', '提示', {
+							confirmButtonText: '立即删除',
+							cancelButtonText: '取消',
+							type: 'warning',
+							center: true
+						}).then(() => {
+							TaskDel({
+								T_task_id: obj.T_task_id
+							}).then(res => {
+								if (res.data.Code == 200) {
+									this.$message.success('删除成功!')
+									this.pages1.page = 1
+									this.GetTaskListApi()
+								}
+							})
+						}).catch(() => {
+							this.$message({
+								type: 'info',
+								message: '已取消删除'
+								});
 					});
 				}
 			},
-			GetTaskExApi(){
-				TaskEx(this.form2).then(res=>{
-					console.log('威威',res)
-					if(res.data.Code===200){
+			GetTaskExApi() {
+				TaskEx(this.form2).then(res => {
+					console.log('威威', res)
+					if (res.data.Code === 200) {
 						this.tableData3 = res.data.Data.List
 						this.total3 = res.data.Data.Num
 					}
@@ -754,10 +830,10 @@
 				this.GetTaskExApi()
 			},
 			searchTimeData(e) {
-				if(e!=null){
+				if (e != null) {
 					this.form2.Time_start = e[0]
 					this.form2.Time_end = e[1]
-				}else{
+				} else {
 					this.form2.Time_start = ''
 					this.form2.Time_end = ''
 				}
@@ -770,7 +846,7 @@
 				this.GetTaskExApi()
 			},
 			Dowload() { //下载数据
-				console.log('下载',this.form2,pams)
+				console.log('下载', this.form2, pams)
 				var pams = {
 					T_task_id: this.form2.T_task_id,
 					T_sn_list: '',
@@ -797,34 +873,41 @@
 
 <style lang="scss" scoped>
 	@import '../../assets/css/steps.scss';
+
 	// 在填充数据之前隐藏
 	[v-cloak] {
 		display: none;
 	}
+
 	.el-input {
 		margin-right: 10px;
 		width: 200px;
 	}
-	.Baogao{
+
+	.Baogao {
 		// display: grid;
 		// grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
 		// grid-gap: 10px;
 		display: flex;
 		align-items: center;
 		flex-wrap: wrap;
-		margin-bottom: 20px	;
-		.s1{
+		margin-bottom: 20px;
+
+		.s1 {
 			margin-bottom: 10px;
 			margin-right: 10px;
 		}
 	}
+
 	.demo-drawers {
 		padding: 20px;
 	}
+
 	/deep/.el-step__title {
-	    font-size: 12px !important;
-	    line-height: 23px;
+		font-size: 12px !important;
+		line-height: 23px;
 	}
+
 	.companyManagement {
 		.companyManagement1 {
 			display: flex;

+ 0 - 196
src/views/companyManagement/test.js

@@ -1,196 +0,0 @@
-const options = [{
-	value: 'zhinan',
-	label: '指南',
-	children: [{
-		value: 'shejiyuanze',
-		label: '设计原则',
-		children: [{
-			value: 'yizhi',
-			label: '一致'
-		}, {
-			value: 'fankui',
-			label: '反馈'
-		}, {
-			value: 'xiaolv',
-			label: '效率'
-		}, {
-			value: 'kekong',
-			label: '可控'
-		}]
-	}, {
-		value: 'daohang',
-		label: '导航',
-		children: [{
-			value: 'cexiangdaohang',
-			label: '侧向导航'
-		}, {
-			value: 'dingbudaohang',
-			label: '顶部导航'
-		}]
-	}]
-}, {
-	value: 'zujian',
-	label: '组件',
-	children: [{
-		value: 'basic',
-		label: 'Basic',
-		children: [{
-			value: 'layout',
-			label: 'Layout 布局'
-		}, {
-			value: 'color',
-			label: 'Color 色彩'
-		}, {
-			value: 'typography',
-			label: 'Typography 字体'
-		}, {
-			value: 'icon',
-			label: 'Icon 图标'
-		}, {
-			value: 'button',
-			label: 'Button 按钮'
-		}]
-	}, {
-		value: 'form',
-		label: 'Form',
-		children: [{
-			value: 'radio',
-			label: 'Radio 单选框'
-		}, {
-			value: 'checkbox',
-			label: 'Checkbox 多选框'
-		}, {
-			value: 'input',
-			label: 'Input 输入框'
-		}, {
-			value: 'input-number',
-			label: 'InputNumber 计数器'
-		}, {
-			value: 'select',
-			label: 'Select 选择器'
-		}, {
-			value: 'cascader',
-			label: 'Cascader 级联选择器'
-		}, {
-			value: 'switch',
-			label: 'Switch 开关'
-		}, {
-			value: 'slider',
-			label: 'Slider 滑块'
-		}, {
-			value: 'time-picker',
-			label: 'TimePicker 时间选择器'
-		}, {
-			value: 'date-picker',
-			label: 'DatePicker 日期选择器'
-		}, {
-			value: 'datetime-picker',
-			label: 'DateTimePicker 日期时间选择器'
-		}, {
-			value: 'upload',
-			label: 'Upload 上传'
-		}, {
-			value: 'rate',
-			label: 'Rate 评分'
-		}, {
-			value: 'form',
-			label: 'Form 表单'
-		}]
-	}, {
-		value: 'data',
-		label: 'Data',
-		children: [{
-			value: 'table',
-			label: 'Table 表格'
-		}, {
-			value: 'tag',
-			label: 'Tag 标签'
-		}, {
-			value: 'progress',
-			label: 'Progress 进度条'
-		}, {
-			value: 'tree',
-			label: 'Tree 树形控件'
-		}, {
-			value: 'pagination',
-			label: 'Pagination 分页'
-		}, {
-			value: 'badge',
-			label: 'Badge 标记'
-		}]
-	}, {
-		value: 'notice',
-		label: 'Notice',
-		children: [{
-			value: 'alert',
-			label: 'Alert 警告'
-		}, {
-			value: 'loading',
-			label: 'Loading 加载'
-		}, {
-			value: 'message',
-			label: 'Message 消息提示'
-		}, {
-			value: 'message-box',
-			label: 'MessageBox 弹框'
-		}, {
-			value: 'notification',
-			label: 'Notification 通知'
-		}]
-	}, {
-		value: 'navigation',
-		label: 'Navigation',
-		children: [{
-			value: 'menu',
-			label: 'NavMenu 导航菜单'
-		}, {
-			value: 'tabs',
-			label: 'Tabs 标签页'
-		}, {
-			value: 'breadcrumb',
-			label: 'Breadcrumb 面包屑'
-		}, {
-			value: 'dropdown',
-			label: 'Dropdown 下拉菜单'
-		}, {
-			value: 'steps',
-			label: 'Steps 步骤条'
-		}]
-	}, {
-		value: 'others',
-		label: 'Others',
-		children: [{
-			value: 'dialog',
-			label: 'Dialog 对话框'
-		}, {
-			value: 'tooltip',
-			label: 'Tooltip 文字提示'
-		}, {
-			value: 'popover',
-			label: 'Popover 弹出框'
-		}, {
-			value: 'card',
-			label: 'Card 卡片'
-		}, {
-			value: 'carousel',
-			label: 'Carousel 走马灯'
-		}, {
-			value: 'collapse',
-			label: 'Collapse 折叠面板'
-		}]
-	}]
-}, {
-	value: 'ziyuan',
-	label: '资源',
-	children: [{
-		value: 'axure',
-		label: 'Axure Components'
-	}, {
-		value: 'sketch',
-		label: 'Sketch Templates'
-	}, {
-		value: 'jiaohu',
-		label: '组件交互文档'
-	}]
-}]
-export default options