YangJian0701 1 year ago
parent
commit
81c1914809

BIN
dist.rar


+ 1 - 1
src/router/index.js

@@ -34,7 +34,7 @@ const routes = [
 			icons:'gongsixinxi',
 			component: () => import('@/views/CompanyAccount/index.vue'),
 			meta: {
-				title: '公司账户',
+				title: '任务管理',
 				authority:2//0全显示,1管理,2用户
 			},
 		},{

+ 4 - 5
src/utils/base.js

@@ -1,11 +1,10 @@
 let baseURL = ''
 //是否在控制台显示请求日志,本地环境启用,打包环境禁用
 let showHttpLog = false 
-besURL = 'https://coldverify.coldbaozhida.com/api/'
-devURL = 'http://47.111.15.17:6300'//测试环境 development
-proURL = 'http://47.111.15.17:6300'//生产环境 production
+besURL = 'https://coldverify.coldbaozhida.com/api/'//生产环境 production
+devURL = 'https://coldverify.coldbaozhida.com/testapi'//测试环境 development
+
 module.exports = {
-	// baseURL:process.env.NODE_ENV=="development"?devURL:proURL,
-	baseURL:'https://coldverify.coldbaozhida.com/api/',
+	baseURL:process.env.NODE_ENV=="development"?devURL:besURL,
 	showHttpLog:showHttpLog
 }

+ 2 - 2
src/utils/http.js

@@ -1,12 +1,12 @@
 import axios from 'axios'
-import { baseURL } from './base.js'
+import { baseURL,devURL } from './base.js'
 import router from '../router/index.js'
 import store from '@/store'
 import qs from 'qs'
 import elementui from 'element-ui'
 // 创建 axios 实例
 const service = axios.create({
-	baseURL: baseURL,
+	baseURL:baseURL,
 	withCredentials: false,// 是否跨站点访问控制请求
 	timeout: 60000,
 	headers: {

+ 2 - 2
src/views/CompanyAccount/index.vue

@@ -3,14 +3,14 @@
 		<div class="CompanyAccount-mai">
 			<div class="CompanyAccount1">
 				<div class="CompanyAccount1-R">
-					<el-input v-model="pages.T_name" placeholder="请输入账户" @keyup.enter.native="search(0)" clearable>
+					<el-input v-model="pages.T_name" placeholder="请输入任务" @keyup.enter.native="search(0)" clearable>
 					</el-input>
 					<el-button class="s1 sBtn" type="primary" icon="el-icon-search" @click="search(0)">搜索</el-button>
 				</div>
 			</div>
 			<div class="CompanyAccount2">
 				<el-table :data="tableData" border size="small">
-					<el-table-column label="账号">
+					<el-table-column label="任务">
 						<template slot-scope="scope">
 							<span>{{ scope.row.T_name }}</span>
 						</template>

+ 11 - 11
src/views/calibrationCertificate/index.vue

@@ -9,13 +9,13 @@
 					搜索:
 				</div>
 				<el-input v-model="pages.T_sn" placeholder="请输入证书编号" @keyup.enter.native="search" clearable></el-input>
-				<el-input v-model="pages.T_layout_no" placeholder="请输入布局编号" @keyup.enter.native="search" clearable style="margin-left: 10px;"></el-input>
+				<!-- <el-input v-model="pages.T_layout_no" placeholder="请输入布局编号" @keyup.enter.native="search" clearable style="margin-left: 10px;"></el-input> -->
 			</div>
 		</div>
 		<div class="calibrationCertificate2">
 			<el-table :data="tableData" border size="small">
 				
-				<el-table-column  prop="T_layout_no" width="180">
+				<!-- <el-table-column  prop="T_layout_no" width="180">
 					<template #header>
 						<div style="display: flex;align-items: center;cursor: pointer;" @click="filtFun('layout')">
 							布局编号
@@ -25,7 +25,7 @@
 							</div>
 						</div>
 					</template>
-				</el-table-column>
+				</el-table-column> -->
 				
 				<el-table-column label="证书编号" width="180">
 					<template slot-scope="scope">
@@ -78,9 +78,9 @@
 			<!-- 时间流程按钮后的编辑 -->
 			<div style="padding: 20px;">
 				<el-form :model="form" :rules="rules" ref="ruleForm">
-					<el-form-item label="布局编号" label-width="80px" prop="T_layout_no">
+					<!-- <el-form-item label="布局编号" label-width="80px" prop="T_layout_no">
 						<el-input v-model="form.T_layout_no" autocomplete="off"></el-input>
-					</el-form-item>
+					</el-form-item> -->
 					<el-form-item label="证书编号" label-width="80px" prop="T_sn">
 						<el-input v-model="form.T_sn" autocomplete="off"></el-input>
 					</el-form-item>
@@ -195,16 +195,16 @@
 						message: '请输入证书编号',
 						trigger: 'blur'
 					}],
-					T_layout_no:[{
-						required: true,
-						message: '请输入布局编号',
-						trigger: 'blur'
-					}],
+					// T_layout_no:[{
+					// 	required: true,
+					// 	message: '请输入布局编号',
+					// 	trigger: 'blur'
+					// }],
 				},
 				titles:'',
 				form: {
 					T_sn: '',
-					T_layout_no:'',
+					// T_layout_no:'',
 					
 				},
 				innerDrawer2: false,