Skip to content

W
web
Commit 9b4a045a authored by jiaxu.yan's avatar jiaxu.yan
Browse files
Options

Merge branch 'developer/yanjiaxu' into develop

parents 025eb195 0e9b0fe4
Hide whitespace changes
Inline Side-by-side
Showing with 481 additions and 37 deletions
.env.production
View file @ 9b4a045a
......@@ -10,4 +10,4 @@ VUE_APP_BASE_API = '/prod-api'
# 图片服务器地址
VUE_APP_IMAGE_API ='/'
VUE_APP_CLIENT_API = 'https://10.12.48.78/usecase'
VUE_APP_CLIENT_API = 'http://10.12.48.78:8090'
.env.staging
View file @ 9b4a045a
......@@ -9,4 +9,4 @@ VUE_APP_BASE_API = 'http://49.232.167.247:22032'
# 图片服务器地址
VUE_APP_IMAGE_API = 'http://49.232.167.247:22037'
VUE_APP_CLIENT_API = 'https://10.12.48.78/usecase'
VUE_APP_CLIENT_API = 'http://10.12.48.78:8090'
public/index.html
View file @ 9b4a045a
......@@ -3,9 +3,9 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<% if (process.env.NODE_ENV === 'production') { %>
<!-- <% if (process.env.NODE_ENV === 'production') { %>
<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
<% } %>
<% } %> -->
<meta name="renderer" content="webkit">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
......
src/store/modules/standard.js
View file @ 9b4a045a
......@@ -24,7 +24,6 @@ const standard = {
pageNum: 1,
pageSize: 9999
}).then(res => {
console.log(res.rows)
if (res.code === 200) {
standard.state.standard = res.rows[0].id
commit('SET_STANDARD_LIST', res.rows)
......
src/views/processing/archivedTask/index.vue
View file @ 9b4a045a
......@@ -13,7 +13,7 @@
v-for="(item, key) in standardList"
:key="key"
:value="item.id"
:label="item.name"
:label="item.standardNo + item.name"
></el-option>
</el-select>
</el-form-item>
......@@ -82,7 +82,9 @@
:key="index"
class="task-card-box"
>
<div class="inspection-standard">检验依据：《{{ item.name }}》</div>
<div class="inspection-standard">
检验依据：{{ item.standardNo }}《{{ item.name }}》
</div>
<div class="card-content">
<div class="card-cell">
<div class="cell-label">任务编号</div>
......@@ -98,7 +100,7 @@
@click="goNext('/task/task-detail?taskId=' + item.id)"
>
{{ item.taskName ? item.taskName : '---' }}
<span class="green">(已归档)</span>
<!-- <span class="green">(已归档)</span> -->
</el-link>
</div>
</div>
......@@ -106,9 +108,9 @@
<div class="cell-label">车辆型号</div>
<div
class="cell-value"
:title="item.taskName ? item.taskName : '---'"
:title="item.productModel ? item.productModel : '---'"
>
{{ item.taskName ? item.taskName : '---' }}
{{ item.productModel ? item.productModel : '---' }}
</div>
</div>
<div class="card-cell">
......@@ -197,7 +199,7 @@
type="primary"
plain
size="mini"
@click="goNext('/processing/fileLibrary?id=' + item.id)"
@click="goNext('/processing/checkFileLibrary?id=' + item.id)"
>车企文件库</el-button
>
</div>
......
src/views/processing/carReview/write-check-form/components/sceneDialog.vue
View file @ 9b4a045a
......@@ -23,11 +23,11 @@
label-position="top"
class="scene-form"
>
<el-form-item label="评审要求分类" prop="reviewType">
<el-form-item label="标准要求分类" prop="reviewType">
<!-- 下拉框 -->
<el-select
v-model="sceneForm.reviewType"
placeholder="请选择评审要求分类"
placeholder="请选择标准要求分类"
style="width: 100%"
>
<el-option
......@@ -101,10 +101,10 @@ export default {
sceneForm: {},
sceneRules: {
reviewType: [
{ required: true, message: '请选择评审类型', trigger: 'change' }
{ required: true, message: '请选择标准要求分类', trigger: 'change' }
],
sceneClassification: [
{ required: true, message: '请选择场景分类', trigger: 'change' }
{ required: true, message: '请选择评审类型', trigger: 'change' }
],
sceneContent: [
{ required: true, message: '请输入场景内容', trigger: 'blur' }
......
src/views/processing/checkFileLibrary/components/dialog.vue 0 → 100644
View file @ 9b4a045a
<template>
<el-dialog
:visible.sync="dialogManger.dialogVisible"
:title="modelTitle"
width="1200"
append-to-body
destroy-on-close
:close-on-click-modal="false"
:before-close="handleClose"
>
<el-form
ref="fileRef"
:model="model"
label-width="100px"
label-position="top"
class="file-form-class"
:rules="rules"
>
<el-row :gutter="40">
<el-col :span="12">
<el-form-item label="企业名称" prop="enterpriseName">
<el-input
v-model="model.enterpriseName"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="文件版本" prop="version">
<el-input v-model="model.version" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="文件状态" prop="status">
<el-select
v-model="model.status"
placeholder="请选择"
style="width: 100%"
>
<el-option
v-for="item in dict.type.file_status"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="文件识别号" prop="identifyNumber">
<el-input
v-model="model.identifyNumber"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="存储位置" prop="storage">
<el-input v-model="model.storage" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="文件名称" prop="fileName">
<el-input
v-model="model.fileName"
placeholder="请输入"
:disabled="true"
></el-input>
</el-form-item>
<el-form-item label="发布日期" prop="publishDate">
<el-date-picker
v-model="model.publishDate"
value-format="yyyy-MM-dd"
type="date"
placeholder="选择日期"
style="width: 100%"
>
</el-date-picker>
</el-form-item>
<el-form-item label="文件照片" prop="photo">
<ImageUpload v-model="model.photo" :limit="1"></ImageUpload>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer">
<el-button @click="handleClose()"> 取消</el-button>
<el-button type="primary" @click="handleConfirm()"> 保存</el-button>
</div>
</el-dialog>
</template>
<script>
export default {
props: {
dialogManger: {
type: Object,
default() {
return {
dialogVisible: false,
dialogEditId: 0
}
}
}
},
dicts: ['file_status'],
data() {
return {
model: this.$modelDataSource({
url: '/review/enterprise/archive',
dataKey: 'model',
attributes: {
id: 0,
enterpriseName: '',
fileName: '',
version: '',
publishDate: '',
status: '',
storage: '',
identifyNumber: '',
photo: '',
taskId: ''
}
}),
rules: {
enterpriseName: [
{ required: true, message: '请输入企业名称', trigger: 'blur' }
],
fileName: [
{ required: true, message: '请输入文件名称', trigger: 'blur' }
],
version: [
{ required: true, message: '请输入文件版本', trigger: 'blur' }
],
publishDate: [
{ required: true, message: '请选择发布日期', trigger: 'change' }
],
status: [
{ required: true, message: '请选择文件状态', trigger: 'change' }
],
storage: [
{ required: true, message: '请输入存储位置', trigger: 'blur' }
],
identifyNumber: [
{ required: true, message: '请输入文件识别号', trigger: 'blur' }
],
photo: [
{ required: true, message: '请选择文件照片', trigger: 'change' }
]
}
}
},
computed: {
modelTitle() {
return this.dialogManger.dialogEditId ? '编辑' : '新增' + '校验场景'
}
},
watch: {
'dialogManger.dialogEditId'(newValue) {
this.model.fetch(
newValue,
{},
() => {
this.dialogManger.dialogVisible = true
},
() => {
this.$emit('refresh')
}
)
}
},
methods: {
handleClose() {
this.$emit('close')
},
handleConfirm() {
this.$refs['fileRef'].validate(valid => {
if (valid) {
this.model.save(
() => {
this.dialogManger.dialogVisible = false
this.$emit('refresh')
},
errors => {}
)
}
})
}
}
}
</script>
src/views/processing/checkFileLibrary/index.vue 0 → 100644
View file @ 9b4a045a
<template>
<task-standard>
<div slot="header-right">
<header-button icon="arrow-left" type="no-line" @click="goBack">
返回
</header-button>
</div>
<el-form ref="queryForm" :model="queryParams" size="small" :inline="true">
<template v-if="showSearch">
<el-form-item prop="fileName" label="文件名称">
<el-input
v-model="queryParams.fileName"
placeholder="请输入"
clearable
@keyup.enter.native="loadData"
/>
</el-form-item>
<el-form-item prop="status" label="文件状态">
<el-select v-model="queryParams.status" placeholder="请选择">
<el-option
v-for="item in dict.type.file_status"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="identifyNumber" label="文件识别号">
<el-input
v-model="queryParams.identifyNumber"
placeholder="请输入"
clearable
@keyup.enter.native="loadData"
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>查询</el-button
>
<el-button
type="default"
icon="el-icon-refresh"
size="mini"
@click="resetQuery"
>重置</el-button
>
</el-form-item>
</template>
<!-- <el-form-item>
<right-toolbar
:show-search.sync="showSearch"
@queryTable="loadData"
></right-toolbar>
</el-form-item> -->
</el-form>
<el-table
v-loading="tableLoading"
border
:scroll-x="'1500px'"
:default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData"
>
<el-table-column type="index" width="55" label="序号" align="center">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column
label="所属车企"
sortable
min-width="210"
prop="enterpriseName"
align="left"
>
</el-table-column>
<el-table-column
prop="fileName"
label="文件名称"
min-width="220"
align="left"
>
</el-table-column>
<el-table-column
prop="version"
label="文件版本"
min-width="100"
align="left"
>
</el-table-column>
<el-table-column
prop="publishDate"
label="发布日期"
min-width="100"
align="left"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.publishDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column
prop="status"
label="文件状态"
min-width="100"
align="left"
>
<template slot-scope="scope">
<el-tag v-if="scope.row.status == 0" size="medium" type="success"
>{{ getDictData(dict.type.file_status, scope.row.status) }}
</el-tag>
<el-tag v-else size="medium" type="warning"
>{{ getDictData(dict.type.file_status, scope.row.status) }}
</el-tag>
</template>
</el-table-column>
<el-table-column
prop="storage"
label="存储位置"
min-width="210"
align="left"
>
</el-table-column>
<el-table-column
prop="identifyNumber"
label="文件识别号"
min-width="170"
align="left"
>
</el-table-column>
<el-table-column
prop="photo"
label="文件照片"
min-width="80"
align="left"
>
<template slot-scope="scope">
<img
:src="baseUrl + scope.row.photo"
alt="文件照片"
width="36"
height="36"
/>
</template>
</el-table-column>
<el-table-column
prop="createBy"
label="创建人员"
min-width="130"
align="left"
>
</el-table-column>
<el-table-column
label="创建时间"
min-width="170"
align="left"
sortable
prop="createTime"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
v-if="view == 1"
label="操作"
align="center"
min-width="90"
fixed="right"
class-name="fixed-width"
>
<template slot-scope="scope">
<page-button
style="margin: 0 auto"
icon="edit"
title="修改"
@click.native="handleUpdate(scope.row.id)"
></page-button>
</template>
</el-table-column>
</el-table>
<yan-dialog
:dialog-manger="dialogManger"
@refresh="refreshList = true"
@close="dialogManger.dialogVisible = false"
></yan-dialog>
<pagination
:total="total"
:background="false"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="loadData"
>
</pagination>
</task-standard>
</template>
<script>
import page from '@/mixins/page'
import dialog from './components/dialog.vue'
import routerMixins from '@/mixins/router'
export default {
components: {
'yan-dialog': dialog
},
dicts: ['file_status'],
mixins: [page, routerMixins],
data() {
return {
// 弹窗管理器
dialogManger: {
dialogVisible: false,
refreshList: false,
dialogEditId: 0
},
refreshList: false,
baseUrl: process.env.VUE_APP_IMAGE_API,
listUrl: '/review/enterprise/archive/findEnterpriseArchiveByTaskId',
// 表格loading状态
tableLoading: false,
// 表格数据
tableData: [],
view: ''
}
},
watch: {
refreshList(newVal) {
if (newVal) {
this.loadData()
this.refreshList = false
}
}
},
created() {
this.queryParams.taskId = this.$route.query.id
this.view = this.$route.query.view
},
methods: {
resetQuery() {
// this.refs.queryForm.restForm() this.resetForm("queryForm");
this.queryParams = {
pageNum: this.queryParams.pageNum,
pageSize: this.queryParams.pageSize,
taskId: this.$route.query.id
}
this.handleQuery()
},
handleUpdate(id) {
this.dialogManger.dialogVisible = true
this.dialogManger.dialogEditId = id
}
}
}
</script>
<style lang="scss" scoped></style>
src/views/processing/fileLibrary/index.vue
View file @ 9b4a045a
......@@ -12,6 +12,7 @@
v-model="queryParams.fileName"
placeholder="请输入"
clearable
@keyup.enter.native="loadData"
/>
</el-form-item>
<el-form-item prop="status" label="文件状态">
......@@ -30,6 +31,7 @@
v-model="queryParams.identifyNumber"
placeholder="请输入"
clearable
@keyup.enter.native="loadData"
/>
</el-form-item>
<el-form-item>
......@@ -107,7 +109,10 @@
align="left"
>
<template slot-scope="scope">
<el-tag size="medium" type="success"
<el-tag v-if="scope.row.status == 0" size="medium" type="success"
>{{ getDictData(dict.type.file_status, scope.row.status) }}
</el-tag>
<el-tag v-else size="medium" type="warning"
>{{ getDictData(dict.type.file_status, scope.row.status) }}
</el-tag>
</template>
......
src/views/processing/processed-review/index.vue
View file @ 9b4a045a
......@@ -13,7 +13,7 @@
v-for="(item, key) in standardList"
:key="key"
:value="item.id"
:label="item.name"
:label="item.standardNo + item.name"
></el-option>
</el-select>
</el-form-item>
......@@ -197,7 +197,7 @@
type="primary"
plain
size="mini"
@click="goNext('/processing/fileLibrary?id=' + item.id)"
@click="goNext('/processing/checkFileLibrary?id=' + item.id)"
>车企文件库</el-button
>
</div>
......
src/views/processing/retention-file/index.vue
View file @ 9b4a045a
......@@ -58,6 +58,7 @@ export default {
return {
task: {},
taskId: 1,
view: '',
fileUrl:
'http://storage.xuetangx.com/public_assets/xuetangx/PDF/PlayerAPI_v1.0.6.pdf'
}
......@@ -67,6 +68,7 @@ export default {
this.taskId = this.$route.query.id
this.getTaskDetail()
}
this.view = this.$route.query.view
},
methods: {
async getTaskDetail() {
......
src/views/processing/systemReview/write-check-form/components/sceneDialog.vue
View file @ 9b4a045a
......@@ -23,11 +23,11 @@
label-position="top"
class="scene-form"
>
<el-form-item label="评审要求分类" prop="reviewType">
<el-form-item label="标准要求分类" prop="reviewType">
<!-- 下拉框 -->
<el-select
v-model="sceneForm.reviewType"
placeholder="请选择评审要求分类"
placeholder="请选择标准要求分类"
style="width: 100%"
>
<el-option
......@@ -101,10 +101,10 @@ export default {
sceneForm: {},
sceneRules: {
reviewType: [
{ required: true, message: '请选择评审类型', trigger: 'change' }
{ required: true, message: '请选择标准要求分类', trigger: 'change' }
],
sceneClassification: [
{ required: true, message: '请选择场景分类', trigger: 'change' }
{ required: true, message: '请选择评审类型', trigger: 'change' }
],
sceneContent: [
{ required: true, message: '请输入场景内容', trigger: 'blur' }
......
src/views/processing/systemReview/write-check-form/index.vue
View file @ 9b4a045a
......@@ -653,6 +653,8 @@ export default {
this.$modal.msgError(res.msg)
}
})
} else {
this.$message.error('您有未保存内容，请点击保存按钮')
}
}
})
......
src/views/processing/unprocessed-review/index.vue
View file @ 9b4a045a
......@@ -13,7 +13,7 @@
v-for="(item, key) in standardList"
:key="key"
:value="item.id"
:label="item.name"
:label="item.standardNo + item.name"
></el-option>
</el-select>
</el-form-item>
......@@ -443,7 +443,6 @@ export default {
* 企业文件库
*/
handleFileLibrary(item) {
console.log(item)
this.$router.push({
path: '/processing/fileLibrary?id=' + item.id
})
......
src/views/setting/company/index.vue
View file @ 9b4a045a
......@@ -74,6 +74,7 @@
border
:scroll-x="'1500px'"
:data="tableData"
:default-sort="{ prop: 'createTime', order: 'descending' }"
@sort-change="sort_change"
>
<el-table-column type="index" width="55" label="序号" align="center">
......
src/views/setting/testMatrix/useCaseDetails/index.vue
View file @ 9b4a045a
......@@ -19,7 +19,8 @@ export default {
data() {
return {
id: this.$route.query,
url: 'https://10.12.48.78/usecase/car/caseManage/case/casePublishDetail/case_items;375'
url: 'http://10.12.48.78:8090/car/caseManage/case/casePublishDetail/case_items;375'
// http://10.12.48.80:1234/car/caseManage/case/casePublishDetail/case_items;375
}
},
mounted() {
......
src/views/task/on/index.vue
View file @ 9b4a045a
......@@ -24,7 +24,7 @@
v-for="(item, key) in standardList"
:key="key"
:value="item.id"
:label="item.name"
:label="item.standardNo + item.name"
></el-option>
</el-select>
</el-form-item>
......@@ -462,7 +462,7 @@
type="primary"
plain
size="mini"
@click="goNext('/processing/fileLibrary?id=' + item.id)"
@click="goNext('/processing/checkFileLibrary?id=' + item.id)"
>车企文件库</el-button
>
</div>
......@@ -585,15 +585,6 @@ export default {
* 耗时计算
*/
getHourDiff,
/**
* 企业文件库
*/
handleFileLibrary(item) {
console.log(item)
this.$router.push({
path: '/processing/fileLibrary?id=' + item.id
})
},
/**
* 开始任务
* @param {} item 单项数据
......
vue.config.js
View file @ 9b4a045a
......@@ -42,7 +42,7 @@ module.exports = {
}
},
[process.env.VUE_APP_CLIENT_API]: {
target: `https://10.12.48.78/usecase`,
target: `http://10.12.48.78:8090`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_CLIENT_API]: ''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment