Skip to content

F
founder_vue
Commit 46f368e1 by liyuhang19990520
Options

修改

parent 687a20c7
Showing with 961 additions and 149 deletions
dist.zip
No preview for this file type
public/JsonData/CODE_JSRYGSXL.json 0 → 100644
{
"code":200,
"data":{
"rows":[
{
"ids":"80821",
"label":"教学序列",
"codeType":"CODE_JSRYGSXL",
"text":"教学序列",
"pId":null,
"id":"01",
"isParent":false,
"children":[]
},
{
"ids":"80822",
"label":"行政序列",
"codeType":"CODE_JSRYGSXL",
"text":"行政序列",
"pId":null,
"id":"02",
"isParent":false,
"children":[]
},
{
"ids":"80823",
"label":"讲师序列",
"codeType":"CODE_JSRYGSXL",
"text":"讲师序列",
"pId":null,
"id":"03",
"isParent":false,
"children":[]
}
]
},
"success":true,
"message":"成功"
}
\ No newline at end of file
src/api/menuDataApi/artisanManageApi.js
...@@ -7,11 +7,11 @@ export const getArtisanList = params => ...@@ -7,11 +7,11 @@ export const getArtisanList = params =>
// 技术人员信息（新增） // 技术人员信息（新增）
export const addArtisan = params => export const addArtisan = params =>
postJson(`${baseUrl}/artisanController/saveArtisan`, params) postform(`${baseUrl}/artisanController/saveArtisan`, params)
// 技术人员信息（编辑） // 技术人员信息（编辑）
export const editArtisan = params => export const editArtisan = params =>
postJson(`${baseUrl}/artisanController/updateArtisanById`, params) postform(`${baseUrl}/artisanController/updateArtisanById`, params)
// 技术人员信息（详情） // 技术人员信息（详情）
export const getArtisanDetail = params => export const getArtisanDetail = params =>
......
src/api/menuDataApi/jobDogManageApi.js
...@@ -31,3 +31,14 @@ export const extractJobDog = params => ...@@ -31,3 +31,14 @@ export const extractJobDog = params =>
// 警犬复训（详情） // 警犬复训（详情）
export const getJobDogDetail = params => export const getJobDogDetail = params =>
postJson(`${baseUrl}/refreshment/dogDetail`, params) postJson(`${baseUrl}/refreshment/dogDetail`, params)
// 审批及提请
export const addSp = params =>
postJson(`${baseUrl}/spmanager/addSp`, params)
// 警犬复训审批查询
export const dogSpQuery = params =>
postJson(`${baseUrl}/refreshment/dogSpQuery`, params)
src/assets/img/delete.svg 0 → 100644
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1619254008879" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8502" width="32" height="32" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><style type="text/css"></style></defs><path d="M215.893333 874.666667a43.946667 43.946667 0 0 0 44.373334 42.666666h518.186666a43.946667 43.946667 0 0 0 44.373334-42.666666V309.333333H215.893333z m436.693334-434.986667a36.693333 36.693333 0 0 1 37.12-36.266667h7.253333a36.693333 36.693333 0 0 1 37.12 36.266667v354.56a36.693333 36.693333 0 0 1-37.12 36.266667h-7.253333a36.693333 36.693333 0 0 1-37.12-36.266667z m-177.493334 0a36.48 36.48 0 0 1 36.906667-36.266667h7.466667a36.48 36.48 0 0 1 36.906666 36.266667v354.56a36.48 36.48 0 0 1-36.906666 36.266667H512a36.48 36.48 0 0 1-36.906667-36.266667z m-170.666666 0a36.48 36.48 0 0 1 36.906666-36.266667h7.466667a36.48 36.48 0 0 1 36.906667 36.266667v354.56a36.48 36.48 0 0 1-36.906667 36.266667H341.333333a36.48 36.48 0 0 1-36.906666-36.266667z m533.333333-246.186667H600.746667V142.933333A36.48 36.48 0 0 0 563.84 106.666667h-96.213333a36.693333 36.693333 0 0 0-37.12 36.266666v50.56H186.24A36.693333 36.693333 0 0 0 149.333333 229.76v36.053333h725.333334v-36.053333a36.693333 36.693333 0 0 0-36.906667-36.266667z" p-id="8503" fill="#ffffff"></path></svg>
\ No newline at end of file
src/assets/img/sjl.svg 0 → 100644
<svg xmlns="http://www.w3.org/2000/svg" width="1440" height="143" viewBox="0 0 1440 143">
<defs>
<style>
.cls-1 {
fill: #d9e4ff;
}
.cls-2 {
fill: #898b9e;
font-size: 10px;
}
.cls-2, .cls-6 {
font-family: MicrosoftYaHei, Microsoft YaHei;
}
.cls-3 {
fill: #cfcfcf;
}
.cls-4 {
fill: #3c74fd;
}
.cls-5, .cls-6 {
fill: #333;
}
.cls-5, .cls-7 {
font-size: 13px;
font-family: MicrosoftYaHei-Bold, Microsoft YaHei;
font-weight: 700;
}
.cls-6 {
font-size: 12px;
}
.cls-7 {
fill: #0ebb15;
}
</style>
</defs>
<g id="组_1042" data-name="组 1042" transform="translate(-20 -309)">
<rect id="矩形_1462" data-name="矩形 1462" class="cls-1" width="1440" height="3" transform="translate(20 339)"/>
<text id="李警官丨20104110" class="cls-2" transform="translate(32 387)"><tspan x="0" y="0">李警官</tspan><tspan class="cls-3" y="0">丨</tspan><tspan y="0">20104110</tspan></text>
<text id="厂桥派出所" class="cls-2" transform="translate(32 407)"><tspan x="0" y="0">厂桥派出所</tspan></text>
<circle id="椭圆_104" data-name="椭圆 104" class="cls-4" cx="4.5" cy="4.5" r="4.5" transform="translate(32 336)"/>
<text id="数据采集" class="cls-5" transform="translate(32 367)"><tspan x="0" y="0">数据采集</tspan></text>
<text id="_2021.3.15_" data-name="2021.3.15 " class="cls-6" transform="translate(32 322)"><tspan x="0" y="0">2021.3.15 </tspan></text>
<text id="李警官丨20104110-2" data-name="李警官丨20104110" class="cls-2" transform="translate(169 387)"><tspan x="0" y="0">李警官</tspan><tspan class="cls-3" y="0">丨</tspan><tspan y="0">20104110</tspan></text>
<text id="厂桥派出所-2" data-name="厂桥派出所" class="cls-2" transform="translate(169 407)"><tspan x="0" y="0">厂桥派出所</tspan></text>
<circle id="椭圆_106" data-name="椭圆 106" class="cls-4" cx="4.5" cy="4.5" r="4.5" transform="translate(169 336)"/>
<text id="数据上报" class="cls-5" transform="translate(169 367)"><tspan x="0" y="0">数据上报</tspan></text>
<text id="_2021.3.15" data-name="2021.3.15" class="cls-6" transform="translate(169 322)"><tspan x="0" y="0">2021.3.15</tspan></text>
<text id="李警官丨20104110-3" data-name="李警官丨20104110" class="cls-2" transform="translate(306 387)"><tspan x="0" y="0">李警官</tspan><tspan class="cls-3" y="0">丨</tspan><tspan y="0">20104110</tspan></text>
<text id="厂桥派出所-3" data-name="厂桥派出所" class="cls-2" transform="translate(306 405)"><tspan x="0" y="0">厂桥派出所</tspan></text>
<circle id="椭圆_106-2" data-name="椭圆 106" class="cls-4" cx="4.5" cy="4.5" r="4.5" transform="translate(306 336)"/>
<text id="标记命案" class="cls-5" transform="translate(306 367)"><tspan x="0" y="0">标记命案</tspan></text>
<text id="_2021.3.15-2" data-name="2021.3.15" class="cls-6" transform="translate(306 322)"><tspan x="0" y="0">2021.3.15</tspan></text>
<text id="李警官丨20104110-4" data-name="李警官丨20104110" class="cls-2" transform="translate(580 387)"><tspan x="0" y="0">李警官</tspan><tspan class="cls-3" y="0">丨</tspan><tspan y="0">20104110</tspan></text>
<text id="厂桥派出所-4" data-name="厂桥派出所" class="cls-2" transform="translate(580 405)"><tspan x="0" y="0">厂桥派出所</tspan></text>
<circle id="椭圆_106-3" data-name="椭圆 106" class="cls-4" cx="4.5" cy="4.5" r="4.5" transform="translate(580 336)"/>
<text id="立案提请审批" class="cls-5" transform="translate(580 367)"><tspan x="0" y="0">立案提请审批</tspan></text>
<text id="_2021.3.15-3" data-name="2021.3.15" class="cls-6" transform="translate(580 322)"><tspan x="0" y="0">2021.3.15</tspan></text>
<text id="李警官丨20104110-5" data-name="李警官丨20104110" class="cls-2" transform="translate(717 387)"><tspan x="0" y="0">李警官</tspan><tspan class="cls-3" y="0">丨</tspan><tspan y="0">20104110</tspan></text>
<text id="厂桥派出所-5" data-name="厂桥派出所" class="cls-2" transform="translate(717 405)"><tspan x="0" y="0">厂桥派出所</tspan></text>
<circle id="椭圆_106-4" data-name="椭圆 106" class="cls-4" cx="4.5" cy="4.5" r="4.5" transform="translate(717 336)"/>
<text id="立案审批通过" class="cls-7" transform="translate(717 367)"><tspan x="0" y="0">立案审批通过</tspan></text>
<text id="_2021.3.15-4" data-name="2021.3.15" class="cls-6" transform="translate(717 322)"><tspan x="0" y="0">2021.3.15</tspan></text>
<text id="立案审批初审意见为通过_审批意见是..." data-name="立案审批初审意见为通过，审批意见是..." class="cls-6" transform="translate(717 414)"><tspan x="0" y="13">立案审批初审意见为通</tspan><tspan x="0" y="31">过，审批意见是...</tspan></text>
<text id="李警官丨20104110-6" data-name="李警官丨20104110" class="cls-2" transform="translate(903 387)"><tspan x="0" y="0">李警官</tspan><tspan class="cls-3" y="0">丨</tspan><tspan y="0">20104110</tspan></text>
<text id="厂桥派出所-6" data-name="厂桥派出所" class="cls-2" transform="translate(903 405)"><tspan x="0" y="0">厂桥派出所</tspan></text>
<circle id="椭圆_107" data-name="椭圆 107" class="cls-4" cx="4.5" cy="4.5" r="4.5" transform="translate(903 336)"/>
<text id="侦查终结采集" class="cls-5" transform="translate(903 367)"><tspan x="0" y="0">侦查终结采集</tspan></text>
<text id="_2021.3.15-5" data-name="2021.3.15" class="cls-6" transform="translate(903 322)"><tspan x="0" y="0">2021.3.15</tspan></text>
<text id="李警官丨20104110-7" data-name="李警官丨20104110" class="cls-2" transform="translate(443 387)"><tspan x="0" y="0">李警官</tspan><tspan class="cls-3" y="0">丨</tspan><tspan y="0">20104110</tspan></text>
<text id="厂桥派出所-7" data-name="厂桥派出所" class="cls-2" transform="translate(443 405)"><tspan x="0" y="0">厂桥派出所</tspan></text>
<circle id="椭圆_108" data-name="椭圆 108" class="cls-4" cx="4.5" cy="4.5" r="4.5" transform="translate(443 336)"/>
<text id="立案修改" class="cls-5" transform="translate(443 367)"><tspan x="0" y="0">立案修改</tspan></text>
<text id="_2021.3.16" data-name="2021.3.16" class="cls-6" transform="translate(443 322)"><tspan x="0" y="0">2021.3.16</tspan></text>
<text id="李警官丨20104110-8" data-name="李警官丨20104110" class="cls-2" transform="translate(1040 387)"><tspan x="0" y="0">李警官</tspan><tspan class="cls-3" y="0">丨</tspan><tspan y="0">20104110</tspan></text>
<text id="厂桥派出所-8" data-name="厂桥派出所" class="cls-2" transform="translate(1040 405)"><tspan x="0" y="0">厂桥派出所</tspan></text>
<circle id="椭圆_109" data-name="椭圆 109" class="cls-4" cx="4.5" cy="4.5" r="4.5" transform="translate(1040 336)"/>
<text id="侦查终结提请审批" class="cls-5" transform="translate(1040 367)"><tspan x="0" y="0">侦查终结提请审批</tspan></text>
<text id="_2021.3.15-6" data-name="2021.3.15" class="cls-6" transform="translate(1040 322)"><tspan x="0" y="0">2021.3.15</tspan></text>
<text id="李警官丨20104110-9" data-name="李警官丨20104110" class="cls-2" transform="translate(1177 387)"><tspan x="0" y="0">李警官</tspan><tspan class="cls-3" y="0">丨</tspan><tspan y="0">20104110</tspan></text>
<text id="厂桥派出所-9" data-name="厂桥派出所" class="cls-2" transform="translate(1177 405)"><tspan x="0" y="0">厂桥派出所</tspan></text>
<circle id="椭圆_110" data-name="椭圆 110" class="cls-4" cx="4.5" cy="4.5" r="4.5" transform="translate(1177 336)"/>
<text id="侦查终结审批" class="cls-5" transform="translate(1177 367)"><tspan x="0" y="0">侦查终结审批</tspan></text>
<text id="_2021.3.15-7" data-name="2021.3.15" class="cls-6" transform="translate(1177 322)"><tspan x="0" y="0">2021.3.15</tspan></text>
<text id="李警官丨20104110-10" data-name="李警官丨20104110" class="cls-2" transform="translate(1314 387)"><tspan x="0" y="0">李警官</tspan><tspan class="cls-3" y="0">丨</tspan><tspan y="0">20104110</tspan></text>
<text id="厂桥派出所-10" data-name="厂桥派出所" class="cls-2" transform="translate(1314 405)"><tspan x="0" y="0">厂桥派出所</tspan></text>
<circle id="椭圆_111" data-name="椭圆 111" class="cls-4" cx="4.5" cy="4.5" r="4.5" transform="translate(1314 336)"/>
<text id="侦查终结受限修改" class="cls-5" transform="translate(1314 367)"><tspan x="0" y="0">侦查终结受限修改</tspan></text>
<text id="_2021.3.15-8" data-name="2021.3.15" class="cls-6" transform="translate(1314 322)"><tspan x="0" y="0">2021.3.15</tspan></text>
</g>
</svg>
src/assets/spStyle/bootstrap-new.min.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/assets/spStyle/style.css 0 → 100644
@charset "utf-8";
.box {
margin: 1rem;
width: 18.75rem;
}
.box img {
width: 100%;
}
.btn {
border: none;
color: white;
overflow: hidden;
margin: 1rem;
padding: 0;
text-transform: uppercase;
width: 150px;
height: 40px;
cursor:pointer;
}
.btn.color-1 {
background-color: #426fc5;
margin-top:50px;
font-weight: 600;
}
.btn.color-2 {
background-color: #00897b;
}
.btn.color-3 {
background-color: #f6774f;
}
.btn.color-4 {
background-color: #e94043;
}
.btn-border.color-1 {
background-color: transparent;
border: 2px solid #426fc5;
color: #426fc5;
}
.btn-border.color-2 {
background-color: transparent;
border: 2px solid #00897b;
color: #00897b;
}
.btn-border.color-3 {
background-color: transparent;
border: 2px solid #f6774f;
color: #f6774f;
}
.btn-border.color-4 {
background-color: transparent;
border: 2px solid #e94043;
color: #e94043;
}
.btn-round {
border-radius: 10em;
}
.material-design {
position: relative;
}
.material-design canvas {
opacity: 0.25;
position: absolute;
top: 0;
left: 0;
}
.container {
align-content: center;
align-items: flex-start;
display: flex;
flex-direction: row;
flex-wrap: wrap;
justify-content: center;
margin: 0 auto;
max-width: 46rem;
}
src/assets/styles/fonts/fontawesome-webfont.svg 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/assets/styles/fonts/glyphicons-halflings-regular.svg 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/assets/styles/login.scss
#home { #home {
width: 100%; width: 100%;
height: 100%; height: 100%;
position: fixed; position: fixed;
background-image: url(../../assets/img/login/loginbc.png); background-image: url(../../assets/img/login/loginbc.png);
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
z-index: 100; z-index: 100;
} }
.logo { .logo {
width: 42px; height: 35px;
height: 49px; margin-top: 64px;
margin-top: 64px; margin-left: 80px;
margin-left: 80px;
} }
.login-container { .login-container {
position: absolute; position: absolute;
/* top: 138px; */ /* top: 138px; */
bottom: 69px; bottom: 69px;
right: -24.5%; right: -24.5%;
width: 100%; width: 100%;
height: 100%; height: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
} }
.jinhui { .jinhui {
width: 88px; width: 88px;
height: 88px; height: 88px;
} }
.title { .title {
width: 240px; width: 240px;
font-size: 24px; font-size: 24px;
font-family: Source Han Sans CN; font-family: Source Han Sans CN;
font-weight: bold; font-weight: bold;
line-height: 41px; line-height: 41px;
color: #1A1A1C; color: #1a1a1c;
opacity: 1; opacity: 1;
margin: 38px auto 0px; margin: 38px auto 0px;
} }
.inputs /deep/.el-input__inner { .inputs /deep/.el-input__inner {
height: 48px; height: 48px;
background: rgba(255, 255, 255, 1) !important; background: rgba(255, 255, 255, 1) !important;
border-radius: 4px; border-radius: 4px;
text-indent: 2em; text-indent: 2em;
} }
.icon { .icon {
height: 20px; height: 20px;
width: 20px; width: 20px;
} }
.footer { .footer {
width: 100%; width: 100%;
height: 120px; height: 120px;
background: #1C60FF; background: #1c60ff;
opacity: 1; opacity: 1;
position: relative; position: relative;
top: 818px; top: 818px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex-wrap: nowrap; flex-wrap: nowrap;
align-content: normal; align-content: normal;
justify-content: space-evenly; justify-content: space-evenly;
align-items: center; align-items: center;
} }
.fontsize { .fontsize {
font-size: 14px; font-size: 14px;
font-family: Source Han Sans CN; font-family: Source Han Sans CN;
font-weight: 400; font-weight: 400;
line-height: 24px; line-height: 24px;
color: #DEE7EB; color: #dee7eb;
opacity: 1; opacity: 1;
} }
src/assets/styles/main.scss
...@@ -592,4 +592,7 @@ div#driver-page-overlay { ...@@ -592,4 +592,7 @@ div#driver-page-overlay {
.el-upload-list__item { .el-upload-list__item {
// width: 400px; // width: 400px;
}
/deep/ .el-upload__input {
display: none !important;
} }
\ No newline at end of file
src/router/modules/index.js
...@@ -149,11 +149,35 @@ export default [ ...@@ -149,11 +149,35 @@ export default [
routeNames: ["jobDogManageEdit", "jobDogManageAdd", "jobDogManageBatchAdd"] routeNames: ["jobDogManageEdit", "jobDogManageAdd", "jobDogManageBatchAdd"]
} }
}, },
{
path: 'jobDogRefreshment',
name: 'jobDogRefreshment',
component: () => import('@/views/jobDogRefreshment/index.vue'),
meta: {
title: '工作犬复训审批',
isOneMenu: false,
keepAlive: true,
oneMenuName: 'jqjsgzgl',
paixu: 3,
routeNames: ["jobDogManageSp"]
}
},
// 工作犬复训管理（编辑页）
{
path: 'jobDogManageSp',
name: 'jobDogManageSp',
component: () => import('@/views/jobDogRefreshment/components/jobDogManageSp.vue'),
meta: {
title: '工作犬复训审批',
// 编辑新增页面此字段务必设置为true
isEditPage: true
}
},
// 工作犬复训管理（编辑页） // 工作犬复训管理（编辑页）
{ {
path: 'jobDogManageEdit', path: 'jobDogManageEdit',
name: 'jobDogManageEdit', name: 'jobDogManageEdit',
component: () => import('@/views/jobDogManage/components/jobDogManageEdit.vue'), component: () => import('@/views/jobDogManage/components/jobDogManageEdit2.vue'),
meta: { meta: {
title: '工作犬复训管理-编辑', title: '工作犬复训管理-编辑',
// 编辑新增页面此字段务必设置为true // 编辑新增页面此字段务必设置为true
...@@ -164,7 +188,7 @@ export default [ ...@@ -164,7 +188,7 @@ export default [
{ {
path: 'jobDogManageAdd', path: 'jobDogManageAdd',
name: 'jobDogManageAdd', name: 'jobDogManageAdd',
component: () => import('@/views/jobDogManage/components/jobDogManageEdit.vue'), component: () => import('@/views/jobDogManage/components/jobDogManageEdit2.vue'),
meta: { meta: {
title: '工作犬复训管理-新增', title: '工作犬复训管理-新增',
// 编辑新增页面此字段务必设置为true // 编辑新增页面此字段务必设置为true
...@@ -191,9 +215,11 @@ export default [ ...@@ -191,9 +215,11 @@ export default [
title: '工作犬等级评定管理', title: '工作犬等级评定管理',
isOneMenu: false, isOneMenu: false,
oneMenuName: 'jqjsgzgl', oneMenuName: 'jqjsgzgl',
paixu: 3 paixu: 4
} }
}, },
// 警犬技术人员管理（只有一级菜单） // 警犬技术人员管理（只有一级菜单）
{ {
path: 'artisanManage', path: 'artisanManage',
...@@ -211,7 +237,7 @@ export default [ ...@@ -211,7 +237,7 @@ export default [
{ {
path: 'artisanManageEdit', path: 'artisanManageEdit',
name: 'artisanManageEdit', name: 'artisanManageEdit',
component: () => import('@/views/artisanManage/components/artisanManageEdit.vue'), component: () => import('@/views/artisanManage/components/artisanManageEdit2.vue'),
meta: { meta: {
title: '警犬技术人员管理-编辑', title: '警犬技术人员管理-编辑',
// 编辑新增页面此字段务必设置为true // 编辑新增页面此字段务必设置为true
...@@ -222,7 +248,7 @@ export default [ ...@@ -222,7 +248,7 @@ export default [
{ {
path: 'artisanManageAdd', path: 'artisanManageAdd',
name: 'artisanManageAdd', name: 'artisanManageAdd',
component: () => import('@/views/artisanManage/components/artisanManageEdit.vue'), component: () => import('@/views/artisanManage/components/artisanManageEdit2.vue'),
meta: { meta: {
title: '警犬技术人员管理-新增', title: '警犬技术人员管理-新增',
// 编辑新增页面此字段务必设置为true // 编辑新增页面此字段务必设置为true
......
src/utils/guide.js 0 → 100644
export default [
{
element: '#sjjc',
popover: {
title: '数据检测',
description: '点击即可进行数据质量检查\n',
position: 'left'
}
},
{
element: '#more',
popover: {
title: '更多',
description: '点击即可展开更多信息\n',
position: 'bottom'
}
},
{
element: '#yhxx',
popover: {
title: '用户信息',
description: '用户信息\n',
position: 'bottom'
}
},
{
element: '#spbtn',
popover: {
title: '数据审批栏',
description: '点击按钮可进行数据审批操作\n',
position: 'top'
}
}
]
src/utils/params2.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/utils/rules2.js
...@@ -138,6 +138,14 @@ var rules = { ...@@ -138,6 +138,14 @@ var rules = {
callback() callback()
} }
}, },
nameRules: (rule, value, callback) => {
let reg = /^[\u4E00-\u9FA5]{2,4}$/;
if (!reg.test(value)) {
callback(new Error('姓名只能为两到四个汉字'))
} else {
callback()
}
},
jqzpRules: (rule, value, callback) => { jqzpRules: (rule, value, callback) => {
if (value.length <= 0) { if (value.length <= 0) {
callback(new Error('警犬照片最少上传一张')) callback(new Error('警犬照片最少上传一张'))
......
src/utils/tableHeaderParams.js
...@@ -30,8 +30,8 @@ export const getJsryglAllColumns = () => { ...@@ -30,8 +30,8 @@ export const getJsryglAllColumns = () => {
prop: "gsdwGajgjgdm", prop: "gsdwGajgjgdm",
}, },
{ {
label: "警务技术序列", label: "归属序列",
prop: "jwjsxlForName", prop: "jwjsxl",
}, },
{ {
label: "所带警犬", label: "所带警犬",
...@@ -41,6 +41,10 @@ export const getJsryglAllColumns = () => { ...@@ -41,6 +41,10 @@ export const getJsryglAllColumns = () => {
label: "从事警犬技术工作时间", label: "从事警犬技术工作时间",
prop: "workYears", prop: "workYears",
}, },
{
label: "带犬年限",
prop: "dqnx",
},
] ]
return arr return arr
...@@ -70,10 +74,6 @@ export const getJsryglDefaultColumns = () => { ...@@ -70,10 +74,6 @@ export const getJsryglDefaultColumns = () => {
prop: "gsdwGajgjgdm", prop: "gsdwGajgjgdm",
}, },
{ {
label: "警务技术序列",
prop: "jwjsxlForName",
},
{
label: "从事警犬技术工作时间", label: "从事警犬技术工作时间",
prop: "workYears", prop: "workYears",
}, },
...@@ -94,10 +94,6 @@ export const getJsdwglAllColumns = () => { ...@@ -94,10 +94,6 @@ export const getJsdwglAllColumns = () => {
prop: "dwmc", prop: "dwmc",
}, },
{ {
label: "行政区划",
prop: "xzqhForName",
},
{
label: "单位领导", label: "单位领导",
prop: "dwld", prop: "dwld",
}, },
...@@ -180,23 +176,15 @@ export const getJygzqglAllColumns = () => { ...@@ -180,23 +176,15 @@ export const getJygzqglAllColumns = () => {
prop: "birthDate", prop: "birthDate",
}, },
{ {
label: "归属单位",
prop: "trainingUnit",
},
{
label: "归属警种", label: "归属警种",
prop: "policeCategoryForName", prop: "policeCategoryForName",
}, },
{ {
label: "使用类别",
prop: "useCategoryForName",
},
{
label: "工作犬等级", label: "工作犬等级",
prop: "trainingLevelIdForName", prop: "trainingLevelIdForName",
}, },
{ {
label: "警用犬种", label: "品种",
prop: "speciesIdForName", prop: "speciesIdForName",
}, },
{ {
...@@ -239,10 +227,6 @@ export const getJygzqglDefaultColumns = () => { ...@@ -239,10 +227,6 @@ export const getJygzqglDefaultColumns = () => {
prop: "birthDate", prop: "birthDate",
}, },
{ {
label: "归属单位",
prop: "trainingUnit",
},
{
label: "工作犬等级", label: "工作犬等级",
prop: "trainingLevelIdForName", prop: "trainingLevelIdForName",
}, },
...@@ -267,11 +251,7 @@ export const getGzqfxglAllColumns = () => { ...@@ -267,11 +251,7 @@ export const getGzqfxglAllColumns = () => {
}, },
{ {
label: "工作犬等级", label: "工作犬等级",
prop: "trainingLevelIdForName", prop: "trainingLevelId",
},
{
label: "培训次数",
prop: "trainCountForName",
}, },
{ {
label: "归属单位", label: "归属单位",
...@@ -282,20 +262,24 @@ export const getGzqfxglAllColumns = () => { ...@@ -282,20 +262,24 @@ export const getGzqfxglAllColumns = () => {
prop: "checkUnit", prop: "checkUnit",
}, },
{ {
label: "培训日期", label: "审批节点",
prop: "pxrq", prop: "spFlowStr",
},
{
label: "考核日期",
prop: "checkDate",
}, },
{ {
label: "考核人员", label: "考核人员",
prop: "checkStaff", prop: "checkStaff",
}, },
{ {
label: "培训科目", label: "考核科目",
prop: "trainSubjectForName", prop: "trainSubjectForName",
}, },
{ {
label: "备注", label: "审批状态",
prop: "remark", prop: "spstatusStr",
}, },
] ]
return arr return arr
...@@ -313,10 +297,6 @@ export const getGzqfxglDefaultColumns = () => { ...@@ -313,10 +297,6 @@ export const getGzqfxglDefaultColumns = () => {
prop: "chipCode", prop: "chipCode",
}, },
{ {
label: "培训次数",
prop: "trainCountForName",
},
{
label: "归属单位", label: "归属单位",
prop: "trainingUnit", prop: "trainingUnit",
}, },
...@@ -336,22 +316,10 @@ export const getJyzqAllColumns = () => { ...@@ -336,22 +316,10 @@ export const getJyzqAllColumns = () => {
prop: "dna", prop: "dna",
}, },
{ {
label: "所属单位",
prop: "trainingUnit",
},
{
label: "出生日期", label: "出生日期",
prop: "birthDate", prop: "birthDate",
}, },
{ {
label: "警用犬种",
prop: "speciesId",
},
{
label: "服役期限",
prop: "fyqx",
},
{
label: "疫苗接种", label: "疫苗接种",
prop: "ymjz", prop: "ymjz",
}, },
...@@ -364,10 +332,6 @@ export const getJyzqAllColumns = () => { ...@@ -364,10 +332,6 @@ export const getJyzqAllColumns = () => {
prop: "inbreedingCoefficient", prop: "inbreedingCoefficient",
}, },
{ {
label: "警犬状态",
prop: "healthStatus",
},
{
label: "犬名", label: "犬名",
prop: "name", prop: "name",
}, },
...@@ -383,6 +347,10 @@ export const getJyzqAllColumns = () => { ...@@ -383,6 +347,10 @@ export const getJyzqAllColumns = () => {
label: "犬只来源", label: "犬只来源",
prop: "dogSource", prop: "dogSource",
}, },
{
label: "归属单位",
prop: "trainingUnit",
},
] ]
return arr return arr
} }
...@@ -398,14 +366,6 @@ export const getJyzqDefaultColumns = () => { ...@@ -398,14 +366,6 @@ export const getJyzqDefaultColumns = () => {
label: "DNA编号", label: "DNA编号",
prop: "dna", prop: "dna",
}, },
{
label: "所属单位",
prop: "trainingUnit",
},
{
label: "警用犬种",
prop: "speciesId",
},
] ]
return arr return arr
} }
......
src/views/artisanManage/index.vue
...@@ -21,12 +21,12 @@ ...@@ -21,12 +21,12 @@
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="警务技术序列" label="归属序列"
class="elItemClass" class="elItemClass"
> >
<el-select <el-select
clearable clearable
placeholder="请选择警务技术序列" placeholder="请选择归属序列"
v-model="formData.jwjsxl" v-model="formData.jwjsxl"
> >
<el-option <el-option
...@@ -178,15 +178,16 @@ ...@@ -178,15 +178,16 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="item.prop === 'personName'">{{ scope.row.personName }}</span> <span v-if="item.prop === 'personName'">{{ scope.row.personName }}</span>
<span v-if="item.prop === 'idNo'">{{ scope.row.idNo }}</span> <span v-else-if="item.prop === 'idNo'">{{ scope.row.idNo }}</span>
<span v-if="item.prop === 'gender'">{{ (scope.row.gender === '1') ? ('男') : (scope.row.gender === '0' ? '女' : '') }}</span> <span v-else-if="item.prop === 'gender'">{{ (scope.row.gender === '1') ? ('男') : (scope.row.gender === '0' ? '女' : '') }}</span>
<span v-if="item.prop === 'birthDate'">{{ scope.row.birthDate }}</span> <span v-else-if="item.prop === 'birthDate'">{{ scope.row.birthDate }}</span>
<span v-if="item.prop === 'isjwzyForName'">{{ scope.row.isjwzyForName }}</span> <span v-else-if="item.prop === 'isjwzyForName'">{{ scope.row.isjwzyForName }}</span>
<span v-if="item.prop === 'school'">{{ scope.row.school }}</span> <span v-else-if="item.prop === 'school'">{{ scope.row.school }}</span>
<span v-if="item.prop === 'gsdwGajgjgdm'">{{ scope.row.gsdwGajgjgdm }}</span> <span v-else-if="item.prop === 'gsdwGajgjgdm'">{{ scope.row.gsdwGajgjgdm }}</span>
<span v-if="item.prop === 'jwjsxlForName'">{{ scope.row.jwjsxlForName }}</span> <span v-else-if="item.prop === 'jwjsxlForName'">{{ scope.row.jwjsxlForName }}</span>
<span v-if="item.prop === 'sxjq'">{{ scope.row.sxjq ? scope.row.sxjq + ' / 头' : '' }}</span> <span v-else-if="item.prop === 'sxjq'">{{ scope.row.sxjq ? scope.row.sxjq + ' / 头' : '' }}</span>
<span v-if="item.prop === 'workYears'">{{ scope.row.workYears ? scope.row.workYears + ' / 年' : '' }}</span> <span v-else-if="item.prop === 'workYears'">{{ scope.row.workYears ? scope.row.workYears + ' / 年' : '' }}</span>
<span v-else>{{ scope.row[item.prop] }}</span>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
...@@ -297,7 +298,7 @@ export default { ...@@ -297,7 +298,7 @@ export default {
}, },
mounted() {}, mounted() {},
async activated() { async activated() {
this.jwjsxlOptions = await getJsonDataApi("CODE_JWJXXL"); this.jwjsxlOptions = await getJsonDataApi("CODE_JSRYGSXL");
this.shifouOptions = await getJsonDataApi("CODE_YN"); this.shifouOptions = await getJsonDataApi("CODE_YN");
this.shifouOptions.unshift({ this.shifouOptions.unshift({
id: "", id: "",
...@@ -310,7 +311,7 @@ export default { ...@@ -310,7 +311,7 @@ export default {
} else { } else {
this.colPropArr = this.headerSettInfo.defaultColumns; this.colPropArr = this.headerSettInfo.defaultColumns;
} }
console.log(this.colPropArr)
this.getLists(this.currentPage); this.getLists(this.currentPage);
}, },
methods: { methods: {
...@@ -389,6 +390,7 @@ export default { ...@@ -389,6 +390,7 @@ export default {
name: "artisanManageEdit", name: "artisanManageEdit",
query: { query: {
id: row.idNo, id: row.idNo,
xxzjbh: row.id
}, },
}); });
}, },
......
src/views/dataJq/header.vue
<template> <template>
<div class="hearder"> <div class="hearder">
<img <div>
class="hearder_one" <img
src="./img/title.png" height="70"
alt="" class="hearder_one2"
/> src="@/assets/img/jqlogo.png"
alt=""
/>
<img
height="30"
class="hearder_one"
src="@/assets/img/jqTitle.png"
alt=""
/>
</div>
<div class="hearder_two"> <div class="hearder_two">
<div class="hearder_two_input"> <div class="hearder_two_input">
<el-input <el-input
...@@ -15,15 +24,9 @@ ...@@ -15,15 +24,9 @@
<div class="hearder_two_button">检索</div> <div class="hearder_two_button">检索</div>
</div> </div>
<div class="hearder_three"> <div class="hearder_three">
<span <span class="hearder_three_left" @click="getSy">系统首页</span>
class="hearder_three_left"
@click="getSy"
>系统首页</span>
<span class="hearder_three_right"> <span class="hearder_three_right">
<img <img src="../../assets/img/tb1.png" alt="" />
src="../../assets/img/tb1.png"
alt=""
>
</span> </span>
</div> </div>
</div> </div>
...@@ -61,7 +64,11 @@ export default { ...@@ -61,7 +64,11 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
&_one { &_one {
margin: 13px 22px; margin: 13px 22px 13px 0px;
height: 20px;
}
&_one2 {
margin-left: 13px;
} }
&_two { &_two {
margin: 7px; margin: 7px;
......
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