Skip to content

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

Merge branch 'developer/yanjiaxu' into develop

parents 23e39a39 db2f2105
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 46 deletions
.env.production
View file @ c5663047
......@@ -10,4 +10,4 @@ VUE_APP_BASE_API = '/prod-api'
# 图片服务器地址
VUE_APP_IMAGE_API ='/'
VUE_APP_CLIENT_API = 'http://10.12.48.78:8090'
VUE_APP_CLIENT_API = 'http://10.12.48.80:1234'
.env.staging
View file @ c5663047
......@@ -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 = 'http://10.12.48.78:8090'
VUE_APP_CLIENT_API = 'http://10.12.48.80:1234'
src/assets/icons/svg/dashboard.svg
View file @ c5663047
<svg width="128" height="100" xmlns="http://www.w3.org/2000/svg"><path d="M27.429 63.638c0-2.508-.893-4.65-2.679-6.424-1.786-1.775-3.94-2.662-6.464-2.662-2.524 0-4.679.887-6.465 2.662-1.785 1.774-2.678 3.916-2.678 6.424 0 2.508.893 4.65 2.678 6.424 1.786 1.775 3.94 2.662 6.465 2.662 2.524 0 4.678-.887 6.464-2.662 1.786-1.775 2.679-3.916 2.679-6.424zm13.714-31.801c0-2.508-.893-4.65-2.679-6.424-1.785-1.775-3.94-2.662-6.464-2.662-2.524 0-4.679.887-6.464 2.662-1.786 1.774-2.679 3.916-2.679 6.424 0 2.508.893 4.65 2.679 6.424 1.785 1.774 3.94 2.662 6.464 2.662 2.524 0 4.679-.888 6.464-2.662 1.786-1.775 2.679-3.916 2.679-6.424zM71.714 65.98l7.215-27.116c.285-1.23.107-2.378-.536-3.443-.643-1.064-1.56-1.762-2.75-2.094-1.19-.33-2.333-.177-3.429.462-1.095.639-1.81 1.573-2.143 2.804l-7.214 27.116c-2.857.237-5.405 1.266-7.643 3.088-2.238 1.822-3.738 4.152-4.5 6.992-.952 3.644-.476 7.098 1.429 10.364 1.905 3.265 4.69 5.37 8.357 6.317 3.667.947 7.143.474 10.429-1.42 3.285-1.892 5.404-4.66 6.357-8.305.762-2.84.619-5.607-.429-8.305-1.047-2.697-2.762-4.85-5.143-6.46zm47.143-2.342c0-2.508-.893-4.65-2.678-6.424-1.786-1.775-3.94-2.662-6.465-2.662-2.524 0-4.678.887-6.464 2.662-1.786 1.774-2.679 3.916-2.679 6.424 0 2.508.893 4.65 2.679 6.424 1.786 1.775 3.94 2.662 6.464 2.662 2.524 0 4.679-.887 6.465-2.662 1.785-1.775 2.678-3.916 2.678-6.424zm-45.714-45.43c0-2.509-.893-4.65-2.679-6.425C68.68 10.01 66.524 9.122 64 9.122c-2.524 0-4.679.887-6.464 2.661-1.786 1.775-2.679 3.916-2.679 6.425 0 2.508.893 4.65 2.679 6.424 1.785 1.774 3.94 2.662 6.464 2.662 2.524 0 4.679-.888 6.464-2.662 1.786-1.775 2.679-3.916 2.679-6.424zm32 13.629c0-2.508-.893-4.65-2.679-6.424-1.785-1.775-3.94-2.662-6.464-2.662-2.524 0-4.679.887-6.464 2.662-1.786 1.774-2.679 3.916-2.679 6.424 0 2.508.893 4.65 2.679 6.424 1.785 1.774 3.94 2.662 6.464 2.662 2.524 0 4.679-.888 6.464-2.662 1.786-1.775 2.679-3.916 2.679-6.424zM128 63.638c0 12.351-3.357 23.78-10.071 34.286-.905 1.372-2.19 2.058-3.858 2.058H13.93c-1.667 0-2.953-.686-3.858-2.058C3.357 87.465 0 76.037 0 63.638c0-8.613 1.69-16.847 5.071-24.703C8.452 31.08 13 24.312 18.714 18.634c5.715-5.68 12.524-10.199 20.429-13.559C47.048 1.715 55.333.035 64 .035c8.667 0 16.952 1.68 24.857 5.04 7.905 3.36 14.714 7.88 20.429 13.559 5.714 5.678 10.262 12.446 13.643 20.301 3.38 7.856 5.071 16.09 5.071 24.703z"/></svg>
\ No newline at end of file
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 48 48">
<path stroke-linejoin="round" stroke-width="4" stroke="currentColor"
d="M44 44V20L24 4 4 20v24h12V26h16v18h12Z" data-follow-stroke="#333" />
<path stroke-linejoin="round" stroke-linecap="square" stroke-width="4" stroke="currentColor" d="M24 44V34"
data-follow-stroke="#333" />
</svg>
src/assets/icons/svg/permissions.svg 0 → 100644
View file @ c5663047
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24" height="24" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
<path
d="M20 10H6C4.89543 10 4 10.8954 4 12V38C4 39.1046 4.89543 40 6 40H42C43.1046 40 44 39.1046 44 38V35.5"
stroke="currentColor" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" />
<path d="M10 23H18" stroke="currentColor" stroke-width="4" stroke-linecap="round" />
<path d="M10 31H34" stroke="currentColor" stroke-width="4" stroke-linecap="round" />
<circle cx="34" cy="16" r="6" fill="currentColor" stroke="currentColor" stroke-width="4" stroke-linecap="round"
stroke-linejoin="round" />
<path d="M44 28.4187C42.0468 24.6023 37.9999 22 33.9999 22C29.9999 22 28.0071 23.1329 25.9502 25"
stroke="currentColor" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" />
</svg>
src/assets/icons/svg/xinxiku.svg
View file @ c5663047
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_1014_1046)">
<path fill-rule="evenodd" clip-rule="evenodd" d="M1.5 1C1.22386 1 1 1.22386 1 1.5V11.3175C1 11.5937 1.22386 11.8175 1.5 11.8175H4.10033H7.50085V13.5831C7.50085 13.6763 7.52635 13.7636 7.57076 13.8383H4.10059C3.82444 13.8383 3.60059 14.0621 3.60059 14.3383C3.60059 14.6144 3.82444 14.8383 4.10059 14.8383H11.9016C12.1777 14.8383 12.4016 14.6144 12.4016 14.3383C12.4016 14.0621 12.1777 13.8383 11.9016 13.8383H8.43095C8.47536 13.7636 8.50085 13.6763 8.50085 13.5831V11.8175H11.9013H14.5017C14.7778 11.8175 15.0017 11.5937 15.0017 11.3175V1.5C15.0017 1.22386 14.7778 1 14.5017 1H1.5ZM2 10.8175V2H14.0017V10.8175H11.9013H4.10033H2ZM5.90051 7.16398C5.90051 6.88784 5.67666 6.66398 5.40051 6.66398C5.12437 6.66398 4.90051 6.88784 4.90051 7.16398V8.67437C4.90051 8.95052 5.12437 9.17437 5.40051 9.17437C5.67666 9.17437 5.90051 8.95052 5.90051 8.67437V7.16398ZM8.50085 5.65355C8.50085 5.37741 8.277 5.15355 8.00085 5.15355C7.72471 5.15355 7.50085 5.37741 7.50085 5.65355V8.67433C7.50085 8.95048 7.72471 9.17433 8.00085 9.17433C8.277 9.17433 8.50085 8.95048 8.50085 8.67433V5.65355ZM10.6016 3.64319C10.8777 3.64319 11.1016 3.86705 11.1016 4.14319V8.67436C11.1016 8.9505 10.8777 9.17436 10.6016 9.17436C10.3254 9.17436 10.1016 8.9505 10.1016 8.67436V4.14319C10.1016 3.86705 10.3254 3.64319 10.6016 3.64319Z" fill="black"/>
<g clip-path="url(#clip0_1086_2519)">
<path d="M14.2222 3.64868H1.77778C1.34822 3.64868 1 3.98749 1 4.40544V14.2433C1 14.6612 1.34822 15 1.77778 15H14.2222C14.6518 15 15 14.6612 15 14.2433V4.40544C15 3.98749 14.6518 3.64868 14.2222 3.64868Z" stroke="currentColor" stroke-linejoin="round"/>
<path d="M5.64648 9.27026H10.3132" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M1 4.02703L3.72222 1H12.2778L15 4.02703" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
</g>
<defs>
<clipPath id="clip0_1014_1046">
<rect width="14" height="14" fill="white" transform="translate(1 1)"/>
<clipPath id="clip0_1086_2519">
<rect width="16" height="16" fill="white"/>
</clipPath>
</defs>
</svg>
src/components/Page/TaskStandard.vue
View file @ c5663047
......@@ -48,6 +48,7 @@ export default {
<style lang="scss" scoped>
.page-data {
padding: 0 24px;
padding-bottom: 24px;
}
.card-box {
......
src/components/Page/standardOption.vue
View file @ c5663047
......@@ -6,9 +6,9 @@ empty
<el-col :span="3">
<div class="standard-box">
<el-input
v-model="queryParams.value"
v-model="queryParams.name"
placeholder="输入标准关键词"
@keyup.enter="search()"
@keyup.enter.native="search()"
>
<i class="el-icon-search el-input__icon" slot="suffix"> </i>
</el-input>
......@@ -72,7 +72,7 @@ export default {
methods: {
search() {
this.queryParams.pageNum = 1
this.loadData()
this.$store.dispatch('standard/setStandardList',this.queryParams.name)
},
selectStandard(value) {
this.$store.dispatch('standard/setStandard', value)
......
src/store/modules/standard.js
View file @ c5663047
......@@ -19,8 +19,9 @@ const standard = {
setStandard({ commit }, standard) {
commit('SET_STANDARD', standard)
},
setStandardList({ commit }) {
setStandardList({ commit }, name) {
getStandardList({
name: name ? name : '',
pageNum: 1,
pageSize: 9999
}).then(res => {
......
src/views/processing/carReview/write-check-form/index.vue
View file @ c5663047
......@@ -470,9 +470,7 @@ export default {
},
createFilter(queryString) {
return files => {
return (
files.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0
)
return files.value.toLowerCase() === queryString.toLowerCase()
}
},
/**
......@@ -632,6 +630,9 @@ export default {
reviewEnterpriseArchiveId: ''
}
}
this.$nextTick(() => {
this.$refs.form.clearValidate()
})
} else {
this.taskModel = {}
}
......@@ -667,6 +668,9 @@ export default {
}
this.oldForm = this.form
this.$modal.msgSuccess('保存当前条目成功')
this.$nextTick(() => {
this.$refs.form.clearValidate()
})
} else {
this.$modal.msgError(res.msg)
}
......
src/views/processing/carTest/execution-test-plan/index.vue
View file @ c5663047
......@@ -23,7 +23,7 @@ export default {
},
mounted() {
const id = this.$route.query.id
this.url = `http://10.12.48.78:8090/car/complianceTestingCenter/projectOverView/project_items;${id}`
this.url = `http://10.12.48.80:1234/car/complianceTestingCenter/projectOverView/project_items;${id}`
},
methods: {}
}
......
src/views/processing/fileLibrary/index.vue
View file @ c5663047
......@@ -75,6 +75,7 @@
sortable
min-width="210"
prop="enterpriseName"
show-overflow-tooltip
align="left"
>
</el-table-column>
......@@ -82,6 +83,7 @@
prop="fileName"
label="文件名称"
min-width="220"
show-overflow-tooltip
align="left"
>
</el-table-column>
......@@ -89,6 +91,7 @@
prop="version"
label="文件版本"
min-width="100"
show-overflow-tooltip
align="left"
>
</el-table-column>
......@@ -96,6 +99,7 @@
prop="publishDate"
label="发布日期"
min-width="100"
show-overflow-tooltip
align="left"
>
<template slot-scope="scope">
......@@ -121,6 +125,7 @@
prop="storage"
label="存储位置"
min-width="210"
show-overflow-tooltip
align="left"
>
</el-table-column>
......@@ -128,6 +133,7 @@
prop="identifyNumber"
label="文件识别号"
min-width="170"
show-overflow-tooltip
align="left"
>
</el-table-column>
......
src/views/processing/systemReview/write-check-form/index.vue
View file @ c5663047
......@@ -485,9 +485,7 @@ export default {
},
createFilter(queryString) {
return files => {
return (
files.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0
)
return files.value.toLowerCase() === queryString.toLowerCase()
}
},
/**
......@@ -647,6 +645,9 @@ export default {
reviewEnterpriseArchiveId: ''
}
}
this.$nextTick(() => {
this.$refs.form.clearValidate()
})
} else {
this.taskModel = {}
}
......@@ -682,6 +683,9 @@ export default {
}
this.oldForm = this.form
this.$modal.msgSuccess('保存当前条目成功')
this.$nextTick(() => {
this.$refs.form.clearValidate()
})
} else {
this.$modal.msgError(res.msg)
}
......
src/views/setting/company/index.vue
View file @ c5663047
......@@ -81,6 +81,7 @@
</el-table-column>
<el-table-column
label="企业名称"
show-overflow-tooltip
prop="enterpriseName"
min-width="200"
align="left"
......@@ -88,6 +89,7 @@
</el-table-column>
<el-table-column
label="企业地址"
show-overflow-tooltip
min-width="200"
prop="address"
align="left"
......@@ -95,6 +97,7 @@
</el-table-column>
<el-table-column
label="企业邮编"
show-overflow-tooltip
prop="postcode"
min-width="200"
align="left"
......@@ -102,6 +105,7 @@
</el-table-column>
<el-table-column
label="企业联系人"
show-overflow-tooltip
prop="enterpriseContact"
min-width="200"
align="left"
......@@ -109,6 +113,7 @@
</el-table-column>
<el-table-column
label="联系电话"
show-overflow-tooltip
prop="contactNumber"
min-width="200"
align="left"
......@@ -117,6 +122,7 @@
<el-table-column
v-if="view == 2"
label="创建人员"
show-overflow-tooltip
prop="createBy"
min-width="200"
align="left"
......@@ -216,6 +222,15 @@ export default {
this.view = this.$route.query.view
},
methods: {
resetQuery() {
this.queryParams = {
pageNum: this.queryParams.pageNum,
pageSize: this.queryParams.pageSize,
isAsc: this.queryParams.isAsc,
orderByColumn: this.queryParams.orderByColumn
}
this.loadData()
},
sort_change(column, prop, order) {
this.queryParams.pageNum = 1 // 排序后返回第一页
if (column.order) {
......@@ -233,10 +248,15 @@ export default {
})
.then(() => {
this.model.uuid = id
this.model.destroy(() => {
this.refreshList = true
this.$message.success('删除成功')
})
this.model.destroy(
() => {
this.refreshList = true
this.$message.success('删除成功')
},
error => {
this.$message.error(error.data.msg)
}
)
})
.catch(() => {})
},
......
src/views/setting/testMatrix/useCaseDetails/index.vue
View file @ c5663047
......@@ -25,7 +25,7 @@ export default {
},
mounted() {
const id = this.$route.query.id
this.url = `http://10.12.48.78:8090/car/caseManage/case/casePublishDetail/case_items;${id}`
this.url = `http://10.12.48.80:1234/car/caseManage/case/casePublishDetail/case_items;${id}`
},
methods: {
newFileTest() {
......@@ -34,10 +34,11 @@ export default {
// fetchPolicy: 'no-cache',
mutation: FastTestProject,
variables: {
name: 'test108',
name: 'test122',
lawId: 'law_items;106',
principalUserId: 'user_items;2',
caseIdList: 'system;1',
systemId: 'system;1',
caseIdList: ['case_items;391'],
fileList: ['file_management_items;2']
}
})
......
src/views/system/config/index.vue
View file @ c5663047
......@@ -77,7 +77,7 @@
>新增</el-button
>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
v-hasPermi="['system:config:edit']"
type="success"
......@@ -88,7 +88,7 @@
@click="handleUpdate"
>修改</el-button
>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button
v-hasPermi="['system:config:remove']"
......@@ -101,7 +101,7 @@
>删除</el-button
>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
v-hasPermi="['system:config:export']"
type="warning"
......@@ -111,7 +111,7 @@
@click="handleExport"
>导出</el-button
>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button
v-hasPermi="['system:config:remove']"
......
src/views/system/dict/index.vue
View file @ c5663047
......@@ -78,7 +78,7 @@
>新增</el-button
>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
v-hasPermi="['system:dict:edit']"
type="success"
......@@ -89,7 +89,7 @@
@click="handleUpdate"
>修改</el-button
>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button
v-hasPermi="['system:dict:remove']"
......@@ -102,7 +102,7 @@
>删除</el-button
>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
v-hasPermi="['system:dict:export']"
type="warning"
......@@ -112,7 +112,7 @@
@click="handleExport"
>导出</el-button
>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button
v-hasPermi="['system:dict:remove']"
......
src/views/system/post/index.vue
View file @ c5663047
......@@ -64,7 +64,7 @@
>新增</el-button
>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
v-hasPermi="['system:post:edit']"
type="success"
......@@ -75,7 +75,7 @@
@click="handleUpdate"
>修改</el-button
>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button
v-hasPermi="['system:post:remove']"
......@@ -88,7 +88,7 @@
>删除</el-button
>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
v-hasPermi="['system:post:export']"
type="warning"
......@@ -98,7 +98,7 @@
@click="handleExport"
>导出</el-button
>
</el-col>
</el-col> -->
<right-toolbar
:show-search.sync="showSearch"
@queryTable="getList"
......
src/views/system/role/index.vue
View file @ c5663047
......@@ -77,7 +77,7 @@
>新增</el-button
>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
v-hasPermi="['system:role:edit']"
type="success"
......@@ -88,7 +88,7 @@
@click="handleUpdate"
>修改</el-button
>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button
v-hasPermi="['system:role:remove']"
......@@ -101,7 +101,7 @@
>删除</el-button
>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
v-hasPermi="['system:role:export']"
type="warning"
......@@ -111,7 +111,7 @@
@click="handleExport"
>导出</el-button
>
</el-col>
</el-col> -->
<right-toolbar
:show-search.sync="showSearch"
@queryTable="getList"
......
src/views/system/user/index.vue
View file @ c5663047
......@@ -107,7 +107,7 @@
>新增</el-button
>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
v-hasPermi="['system:user:edit']"
type="success"
......@@ -118,7 +118,7 @@
@click="handleUpdate"
>修改</el-button
>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button
v-hasPermi="['system:user:remove']"
......@@ -142,7 +142,7 @@
>导入</el-button
>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
v-hasPermi="['system:user:export']"
type="warning"
......@@ -152,7 +152,7 @@
@click="handleExport"
>导出</el-button
>
</el-col>
</el-col> -->
<right-toolbar
:show-search.sync="showSearch"
:columns="columns"
......
vue.config.js
View file @ c5663047
......@@ -42,7 +42,7 @@ module.exports = {
}
},
[process.env.VUE_APP_CLIENT_API]: {
target: `http://10.12.48.78:8090`,
target: `http://10.12.48.80:1234`,
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