Skip to content

A
attendance-performance-platform
Commit baca5a58 authored by 姬鋆屾's avatar 姬鋆屾
Browse files
Options

推

parent 65bdde1e
Hide whitespace changes
Inline Side-by-side
Showing with 366 additions and 147 deletions
attendance-performance-manager-ui/admin/.env.development
View file @ baca5a58
#开发环境 #开发环境
NODE_ENV = "development" NODE_ENV = "development"
VUE_APP_API_BASE_URL= http://192.168.0.98:11039 VUE_APP_API_BASE_URL= http://112.19.80.237:11039
\ No newline at end of file # VUE_APP_API_BASE_URL= http://192.168.0.98:11039
\ No newline at end of file
attendance-performance-manager-ui/admin/src/views/attendance/group/groupTemplate.vue
View file @ baca5a58
...@@ -33,6 +33,14 @@ ...@@ -33,6 +33,14 @@
<div>参与考勤人员</div> <div>参与考勤人员</div>
<div class="ml20">未设置</div> <div class="ml20">未设置</div>
</div> </div>
<div
class="flex flex-align-center mt10"
style="color:#1890ff;font-size:14px"
v-else
>
<div>参与考勤人员</div>
<div class="ml20">已设置</div>
</div>
<!-- <div class="flex flex-align-center mt10" style="color:#999;font-size:14px"> <!-- <div class="flex flex-align-center mt10" style="color:#999;font-size:14px">
<div>无需考勤人员</div> <div>无需考勤人员</div>
...@@ -56,6 +64,14 @@ ...@@ -56,6 +64,14 @@
<div>主负责人</div> <div>主负责人</div>
<div class="ml20">未设置</div> <div class="ml20">未设置</div>
</div> </div>
<div
class="flex flex-align-center mt10"
style="color:#1890ff;font-size:14px"
v-else
>
<div>主负责人</div>
<div class="ml20">已设置</div>
</div>
<!-- <div class="flex flex-align-center mt10" style="color:#999;font-size:14px"> <!-- <div class="flex flex-align-center mt10" style="color:#999;font-size:14px">
<div>子负责人</div> <div>子负责人</div>
<div class="ml20">未设置</div> <div class="ml20">未设置</div>
...@@ -70,26 +86,25 @@ ...@@ -70,26 +86,25 @@
<div class="flex flex-align-center mt20"> <div class="flex flex-align-center mt20">
<div>考勤时间</div> <div>考勤时间</div>
<el-button type="text" class="ml20" @click="drawershow('drawer3')" <el-button type="text" class="ml20" @click="drawershow('drawer3')"
>设置</el-button >设置
> </el-button>
</div> </div>
<div <div
class="flex flex-align-center mt10" class="flex flex-align-center mt10"
v-if="setParams.type === ''" v-if="!setParams.type"
style="color:#999;font-size:14px" style="color:#999;font-size:14px"
> >
<div>考勤类型</div> <div>考勤时间</div>
<div class="ml20">未设置</div> <div class="ml20">未设置</div>
</div> </div>
<div <div
class="flex flex-align-center mt10" class="flex flex-align-center mt10"
style="color:#999;font-size:14px" style="color:#1890ff;font-size:14px"
v-if="setParams.type === ''" v-else
> >
<div>工作日设置</div> <div>考勤时间</div>
<div class="ml20">未设置</div> <div class="ml20">已设置</div>
</div> </div>
<div style="height:20px"></div> <div style="height:20px"></div>
...@@ -106,9 +121,17 @@ ...@@ -106,9 +121,17 @@
style="color:#999;font-size:14px" style="color:#999;font-size:14px"
v-if="setParams.attendanceType == ''" v-if="setParams.attendanceType == ''"
> >
<div>考勤方式</div> <div>打卡方式</div>
<div class="ml20">未设置</div> <div class="ml20">未设置</div>
</div> </div>
<div
class="flex flex-align-center mt10"
style="color:#1890ff;font-size:14px"
v-else
>
<div>打卡方式</div>
<div class="ml20">已设置</div>
</div>
<div class="mt20"> <div class="mt20">
<el-button type="primary" @click="saveSetform">保存设置</el-button> <el-button type="primary" @click="saveSetform">保存设置</el-button>
<el-button @click="allReset">全部重置</el-button> <el-button @click="allReset">全部重置</el-button>
...@@ -317,6 +340,14 @@ ...@@ -317,6 +340,14 @@
</div> </div>
</el-radio-group> </el-radio-group>
</div> </div>
<div class="button_box" style="width: 100%;margin: 20px">
<el-button type="primary" @click="() => (drawer = false)"
>保存</el-button
>
<el-button style="margin-left: 20px;" @click="() => (drawer = false)"
>取消</el-button
>
</div>
</div> </div>
</el-drawer> </el-drawer>
...@@ -1031,11 +1062,15 @@ export default { ...@@ -1031,11 +1062,15 @@ export default {
allReset() { allReset() {
// 置空无关项 // 置空无关项
this.changeRadio(); this.changeRadio();
console.log(this.setParams);
// 先大概处理 // 先大概处理
for (let key in this.setParams) { for (let key in this.setParams) {
this.setParams[key] = ""; this.setParams[key] = "";
} }
for (let key in this.groupResponsibleEntity) {
this.groupResponsibleEntity[key] = "";
}
this.setParams.attendanceGroupStaffList = []; this.setParams.attendanceGroupStaffList = [];
this.attendArr = []; this.attendArr = [];
this.attendArrId = []; this.attendArrId = [];
......
attendance-performance-manager-ui/admin/src/views/check/attend/record/drawershow.vue
View file @ baca5a58
...@@ -98,8 +98,19 @@ ...@@ -98,8 +98,19 @@
: [form.filePaths] : [form.filePaths]
" "
> >
</el-image> --> <
<filepReview v-if="form.filePaths" :src="form.filePaths"/> /el-image> -->
<filepReview
v-if="form.filePaths || form.snapPath"
:src="
form.filePaths && form.filePaths !== ''
? form.snapPath && form.snapPath !== ''
? form.filePaths + ',' + form.snapPath
: form.filePaths
: form.snapPath
"
/>
<span v-else>--</span> <span v-else>--</span>
</el-col> </el-col>
</el-row> </el-row>
...@@ -176,7 +187,7 @@ ...@@ -176,7 +187,7 @@
<el-option <el-option
v-for="item in kaoqinArr" v-for="item in kaoqinArr"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name + '：' + item.content"
:value="item.id" :value="item.id"
> >
</el-option></el-select </el-option></el-select
...@@ -390,15 +401,17 @@ export default { ...@@ -390,15 +401,17 @@ export default {
components: {}, components: {},
created() { created() {
this.changePath("check/attend/record"); this.changePath("check/attend/record");
this.$post("/perform/rules/category/list", { page: 1, size: -1 }).then( this.$post("/perform/rules/category/list", {
(res) => { page: 1,
if (res.code == 1) { size: -1,
this.kaoqinCateArr = res.data.data; type: 1,
} else { }).then((res) => {
this.kaoqinCateArr = []; if (res.code == 1) {
} this.kaoqinCateArr = res.data.data;
} else {
this.kaoqinCateArr = [];
} }
); });
}, },
data() { data() {
return { return {
......
attendance-performance-manager-ui/admin/src/views/check/attend/record/list.vue
View file @ baca5a58
...@@ -226,9 +226,25 @@ export default { ...@@ -226,9 +226,25 @@ export default {
{ {
label: "图片凭证", label: "图片凭证",
prop: "filePaths",
width: 150, width: 150,
formatter: this.formatterPic, formatter: (row) => {
row.snapPath && row.snapPath !== ""
? (row.filePaths =
row.filePaths && row.filePaths !== ""
? row.filePaths + "," + row.snapPath
: row.snapPath)
: (row.filePaths = row.filePaths);
return (
// <el-image
// src={val.indexOf("http") == -1 ? baseUrl + val : val}
// preview-src-list={
// val.indexOf("http") == -1 ? [baseUrl + val] : [val]
// }
// style="width: 100px"
// ></el-image>
<filepReview src={row.filePaths} />
);
},
}, },
{ label: "绩效规则", prop: "ruleName" }, { label: "绩效规则", prop: "ruleName" },
......
attendance-performance-manager-ui/admin/src/views/check/complain/record/drawershow.vue
View file @ baca5a58
...@@ -112,7 +112,16 @@ ...@@ -112,7 +112,16 @@
" "
> >
</el-image> --> </el-image> -->
<filepReview v-if="form.filePaths" :src="form.filePaths"/> <filepReview
v-if="form.filePaths || form.snapPath"
:src="
form.filePaths && form.filePaths !== ''
? form.snapPath && form.snapPath !== ''
? form.filePaths + ',' + form.snapPath
: form.filePaths
: form.snapPath
"
/>
<span v-else>--</span> <span v-else>--</span>
</el-col> </el-col>
</el-row> </el-row>
...@@ -189,7 +198,7 @@ ...@@ -189,7 +198,7 @@
<el-option <el-option
v-for="item in kaoqinArr" v-for="item in kaoqinArr"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name + '：' + item.content"
:value="item.id" :value="item.id"
> >
</el-option></el-select </el-option></el-select
...@@ -423,15 +432,17 @@ export default { ...@@ -423,15 +432,17 @@ export default {
components: {}, components: {},
created() { created() {
this.changePath("check/complain/record"); this.changePath("check/complain/record");
this.$post("/perform/rules/category/list", { page: 1, size: -1 }).then( this.$post("/perform/rules/category/list", {
(res) => { page: 1,
if (res.code == 1) { size: -1,
this.kaoqinCateArr = res.data.data; type: 2,
} else { }).then((res) => {
this.kaoqinCateArr = []; if (res.code == 1) {
} this.kaoqinCateArr = res.data.data;
} else {
this.kaoqinCateArr = [];
} }
); });
}, },
data() { data() {
return { return {
......
attendance-performance-manager-ui/admin/src/views/check/complain/record/list.vue
View file @ baca5a58
...@@ -230,11 +230,28 @@ export default { ...@@ -230,11 +230,28 @@ export default {
{ {
label: "图片凭证", label: "图片凭证",
prop: "filePaths",
width: 150, width: 150,
formatter: this.formatterPic, formatter: (row) => {
row.snapPath && row.snapPath !== ""
? (row.filePaths =
row.filePaths && row.filePaths !== ""
? row.filePaths + "," + row.snapPath
: row.snapPath)
: (row.filePaths = row.filePaths);
return (
// <el-image
// src={val.indexOf("http") == -1 ? baseUrl + val : val}
// preview-src-list={
// val.indexOf("http") == -1 ? [baseUrl + val] : [val]
// }
// style="width: 100px"
// ></el-image>
<filepReview src={row.filePaths} />
);
},
}, },
{ label: "投诉设备", prop: "complainDevice" }, { label: "投诉设备", prop: "complainDevice" },
{ label: "绩效规则", prop: "ruleName" }, { label: "绩效规则", prop: "ruleName" },
......
attendance-performance-manager-ui/admin/src/views/check/effect/record/drawershow.vue
View file @ baca5a58
...@@ -87,7 +87,16 @@ ...@@ -87,7 +87,16 @@
" "
> >
</el-image> --> </el-image> -->
<filepReview v-if="form.filePaths" :src="form.filePaths"/> <filepReview
v-if="form.filePaths || form.snapPath"
:src="
form.filePaths && form.filePaths !== ''
? form.snapPath && form.snapPath !== ''
? form.filePaths + ',' + form.snapPath
: form.filePaths
: form.snapPath
"
/>
<span v-else>--</span> <span v-else>--</span>
</el-col> </el-col>
</el-row> </el-row>
...@@ -164,7 +173,7 @@ ...@@ -164,7 +173,7 @@
<el-option <el-option
v-for="item in kaoqinArr" v-for="item in kaoqinArr"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name + '：' + item.content"
:value="item.id" :value="item.id"
> >
</el-option></el-select </el-option></el-select
...@@ -392,15 +401,17 @@ export default { ...@@ -392,15 +401,17 @@ export default {
components: {}, components: {},
created() { created() {
this.changePath("check/effect/record"); this.changePath("check/effect/record");
this.$post("/perform/rules/category/list", { page: 1, size: -1 }).then( this.$post("/perform/rules/category/list", {
(res) => { page: 1,
if (res.code == 1) { size: -1,
this.kaoqinCateArr = res.data.data; type: 4,
} else { }).then((res) => {
this.kaoqinCateArr = []; if (res.code == 1) {
} this.kaoqinCateArr = res.data.data;
} else {
this.kaoqinCateArr = [];
} }
); });
}, },
data() { data() {
return { return {
......
attendance-performance-manager-ui/admin/src/views/check/effect/record/list.vue
View file @ baca5a58
...@@ -221,7 +221,12 @@ export default { ...@@ -221,7 +221,12 @@ export default {
{ {
label: "时长", label: "时长",
prop: "duration", prop: "duration",
formatter: this.formatter, formatter: (row) => {
console.log(row);
return row.duration && row.duration !== ""
? row.duration + "s"
: "--";
},
}, },
{ {
...@@ -233,9 +238,25 @@ export default { ...@@ -233,9 +238,25 @@ export default {
{ {
label: "图片凭证", label: "图片凭证",
prop: "filePaths",
width: 150, width: 150,
formatter: this.formatterPic, formatter: (row) => {
row.snapPath && row.snapPath !== ""
? (row.filePaths =
row.filePaths && row.filePaths !== ""
? row.filePaths + "," + row.snapPath
: row.snapPath)
: (row.filePaths = row.filePaths);
return (
// <el-image
// src={val.indexOf("http") == -1 ? baseUrl + val : val}
// preview-src-list={
// val.indexOf("http") == -1 ? [baseUrl + val] : [val]
// }
// style="width: 100px"
// ></el-image>
<filepReview src={row.filePaths} />
);
},
}, },
{ label: "绩效规则", prop: "ruleName" }, { label: "绩效规则", prop: "ruleName" },
......
attendance-performance-manager-ui/admin/src/views/check/gowork/record/drawershow.vue
View file @ baca5a58
...@@ -89,7 +89,16 @@ ...@@ -89,7 +89,16 @@
" "
> >
</el-image> --> </el-image> -->
<filepReview v-if="form.filePaths" :src="form.filePaths"/> <filepReview
v-if="form.filePaths || form.snapPath"
:src="
form.filePaths && form.filePaths !== ''
? form.snapPath && form.snapPath !== ''
? form.filePaths + ',' + form.snapPath
: form.filePaths
: form.snapPath
"
/>
<span v-else>--</span> <span v-else>--</span>
</el-col> </el-col>
</el-row> </el-row>
...@@ -166,7 +175,7 @@ ...@@ -166,7 +175,7 @@
<el-option <el-option
v-for="item in kaoqinArr" v-for="item in kaoqinArr"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name + '：' + item.content"
:value="item.id" :value="item.id"
> >
</el-option></el-select </el-option></el-select
...@@ -387,15 +396,17 @@ export default { ...@@ -387,15 +396,17 @@ export default {
components: {}, components: {},
created() { created() {
this.changePath("check/gowork/record"); this.changePath("check/gowork/record");
this.$post("/perform/rules/category/list", { page: 1, size: -1 }).then( this.$post("/perform/rules/category/list", {
(res) => { page: 1,
if (res.code == 1) { size: -1,
this.kaoqinCateArr = res.data.data; type: 3,
} else { }).then((res) => {
this.kaoqinCateArr = []; if (res.code == 1) {
} this.kaoqinCateArr = res.data.data;
} else {
this.kaoqinCateArr = [];
} }
); });
}, },
data() { data() {
return { return {
......
attendance-performance-manager-ui/admin/src/views/check/gowork/record/list.vue
View file @ baca5a58
...@@ -220,9 +220,25 @@ export default { ...@@ -220,9 +220,25 @@ export default {
{ {
label: "图片凭证", label: "图片凭证",
prop: "filePaths",
width: 150, width: 150,
formatter: this.formatterPic, formatter: (row) => {
row.snapPath && row.snapPath !== ""
? (row.filePaths =
row.filePaths && row.filePaths !== ""
? row.filePaths + "," + row.snapPath
: row.snapPath)
: (row.filePaths = row.filePaths);
return (
// <el-image
// src={val.indexOf("http") == -1 ? baseUrl + val : val}
// preview-src-list={
// val.indexOf("http") == -1 ? [baseUrl + val] : [val]
// }
// style="width: 100px"
// ></el-image>
<filepReview src={row.filePaths} />
);
},
}, },
{ label: "绩效规则", prop: "ruleName" }, { label: "绩效规则", prop: "ruleName" },
......
attendance-performance-manager-ui/admin/src/views/check/other/record/drawershow.vue
View file @ baca5a58
...@@ -85,7 +85,16 @@ ...@@ -85,7 +85,16 @@
" "
> >
</el-image> --> </el-image> -->
<filepReview v-if="form.filePaths" :src="form.filePaths"/> <filepReview
v-if="form.filePaths || form.snapPath"
:src="
form.filePaths && form.filePaths !== ''
? form.snapPath && form.snapPath !== ''
? form.filePaths + ',' + form.snapPath
: form.filePaths
: form.snapPath
"
/>
<span v-else>--</span> <span v-else>--</span>
</el-col> </el-col>
</el-row> </el-row>
...@@ -162,7 +171,7 @@ ...@@ -162,7 +171,7 @@
<el-option <el-option
v-for="item in kaoqinArr" v-for="item in kaoqinArr"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name + '：' + item.content"
:value="item.id" :value="item.id"
> >
</el-option></el-select </el-option></el-select
...@@ -384,15 +393,17 @@ export default { ...@@ -384,15 +393,17 @@ export default {
components: {}, components: {},
created() { created() {
this.changePath("check/other/record"); this.changePath("check/other/record");
this.$post("/perform/rules/category/list", { page: 1, size: -1 }).then( this.$post("/perform/rules/category/list", {
(res) => { page: 1,
if (res.code == 1) { size: -1,
this.kaoqinCateArr = res.data.data; type: 5,
} else { }).then((res) => {
this.kaoqinCateArr = []; if (res.code == 1) {
} this.kaoqinCateArr = res.data.data;
} else {
this.kaoqinCateArr = [];
} }
); });
}, },
data() { data() {
return { return {
......
attendance-performance-manager-ui/admin/src/views/check/other/record/list.vue
View file @ baca5a58
...@@ -228,9 +228,25 @@ export default { ...@@ -228,9 +228,25 @@ export default {
// { label: "绩效规则id", prop: "ruleId", formatter: this.formatter }, // { label: "绩效规则id", prop: "ruleId", formatter: this.formatter },
{ {
label: "图片凭证", label: "图片凭证",
prop: "filePaths",
width: 150, width: 150,
formatter: this.formatterPic, formatter: (row) => {
row.snapPath && row.snapPath !== ""
? (row.filePaths =
row.filePaths && row.filePaths !== ""
? row.filePaths + "," + row.snapPath
: row.snapPath)
: (row.filePaths = row.filePaths);
return (
// <el-image
// src={val.indexOf("http") == -1 ? baseUrl + val : val}
// preview-src-list={
// val.indexOf("http") == -1 ? [baseUrl + val] : [val]
// }
// style="width: 100px"
// ></el-image>
<filepReview src={row.filePaths} />
);
},
}, },
{ label: "绩效规则", prop: "ruleName" }, { label: "绩效规则", prop: "ruleName" },
......
attendance-performance-manager-ui/admin/src/views/check/review/record/drawershow.vue
View file @ baca5a58
...@@ -90,7 +90,16 @@ ...@@ -90,7 +90,16 @@
" "
> >
</el-image> --> </el-image> -->
<filepReview v-if="form.filePaths" :src="form.filePaths"/> <filepReview
v-if="form.filePaths || form.snapPath"
:src="
form.filePaths && form.filePaths !== ''
? form.snapPath && form.snapPath !== ''
? form.filePaths + ',' + form.snapPath
: form.filePaths
: form.snapPath
"
/>
<span v-else>--</span> <span v-else>--</span>
</el-col> </el-col>
</el-row> </el-row>
...@@ -167,7 +176,7 @@ ...@@ -167,7 +176,7 @@
<el-option <el-option
v-for="item in kaoqinArr" v-for="item in kaoqinArr"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name + '：' + item.content"
:value="item.id" :value="item.id"
> >
</el-option></el-select </el-option></el-select
...@@ -390,15 +399,17 @@ export default { ...@@ -390,15 +399,17 @@ export default {
components: {}, components: {},
created() { created() {
this.changePath("check/review/record"); this.changePath("check/review/record");
this.$post("/perform/rules/category/list", { page: 1, size: -1 }).then( this.$post("/perform/rules/category/list", {
(res) => { page: 1,
if (res.code == 1) { size: -1,
this.kaoqinCateArr = res.data.data; type: 2,
} else { }).then((res) => {
this.kaoqinCateArr = []; if (res.code == 1) {
} this.kaoqinCateArr = res.data.data;
} else {
this.kaoqinCateArr = [];
} }
); });
}, },
data() { data() {
return { return {
......
attendance-performance-manager-ui/admin/src/views/check/review/record/list.vue
View file @ baca5a58
...@@ -229,9 +229,25 @@ export default { ...@@ -229,9 +229,25 @@ export default {
{ {
label: "图片凭证", label: "图片凭证",
prop: "filePaths",
width: 150, width: 150,
formatter: this.formatterPic, formatter: (row) => {
row.snapPath && row.snapPath !== ""
? (row.filePaths =
row.filePaths && row.filePaths !== ""
? row.filePaths + "," + row.snapPath
: row.snapPath)
: (row.filePaths = row.filePaths);
return (
// <el-image
// src={val.indexOf("http") == -1 ? baseUrl + val : val}
// preview-src-list={
// val.indexOf("http") == -1 ? [baseUrl + val] : [val]
// }
// style="width: 100px"
// ></el-image>
<filepReview src={row.filePaths} />
);
},
}, },
{ label: "绩效规则", prop: "ruleName" }, { label: "绩效规则", prop: "ruleName" },
......
attendance-performance-manager-ui/admin/src/views/perform/attend/record/drawershow.vue
View file @ baca5a58
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
" "
> >
</el-image> --> </el-image> -->
<filepReview v-if="form.filePaths" :src="form.filePaths"/> <filepReview v-if="form.filePaths" :src="form.filePaths" />
<span v-else>--</span> <span v-else>--</span>
</div> </div>
<ImageUpload <ImageUpload
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
<el-option <el-option
v-for="item in ruleArr" v-for="item in ruleArr"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name + '：' + item.content"
:value="item.id" :value="item.id"
> >
</el-option></el-select </el-option></el-select
...@@ -385,15 +385,17 @@ export default { ...@@ -385,15 +385,17 @@ export default {
} }
}); });
// 获取规则分类 // 获取规则分类
this.$post("/perform/rules/category/list", { page: 1, size: -1 }).then( this.$post("/perform/rules/category/list", {
(res) => { page: 1,
if (res.code == 1) { size: -1,
this.kaoqinCateArr = res.data.data; type: 1,
} else { }).then((res) => {
this.kaoqinCateArr = []; if (res.code == 1) {
} this.kaoqinCateArr = res.data.data;
} else {
this.kaoqinCateArr = [];
} }
); });
}, },
data() { data() {
return { return {
......
attendance-performance-manager-ui/admin/src/views/perform/complain/record/drawershow.vue
View file @ baca5a58
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
" "
> >
</el-image> --> </el-image> -->
<filepReview v-if="form.filePaths" :src="form.filePaths"/> <filepReview v-if="form.filePaths" :src="form.filePaths" />
<span v-else>--</span> <span v-else>--</span>
</div> </div>
<ImageUpload <ImageUpload
...@@ -233,7 +233,7 @@ ...@@ -233,7 +233,7 @@
<el-option <el-option
v-for="item in ruleArr" v-for="item in ruleArr"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name + '：' + item.content"
:value="item.id" :value="item.id"
> >
</el-option></el-select </el-option></el-select
...@@ -425,15 +425,17 @@ export default { ...@@ -425,15 +425,17 @@ export default {
}); });
// 获取规则分类 // 获取规则分类
this.$post("/perform/rules/category/list", { page: 1, size: -1 }).then( this.$post("/perform/rules/category/list", {
(res) => { page: 1,
if (res.code == 1) { size: -1,
this.kaoqinCateArr = res.data.data; type: 2,
} else { }).then((res) => {
this.kaoqinCateArr = []; if (res.code == 1) {
} this.kaoqinCateArr = res.data.data;
} else {
this.kaoqinCateArr = [];
} }
); });
}, },
data() { data() {
return { return {
......
attendance-performance-manager-ui/admin/src/views/perform/effect/record/drawershow.vue
View file @ baca5a58
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
" "
> >
</el-image> --> </el-image> -->
<filepReview v-if="form.filePaths" :src="form.filePaths"/> <filepReview v-if="form.filePaths" :src="form.filePaths" />
<span v-else>--</span> <span v-else>--</span>
</div> </div>
<ImageUpload <ImageUpload
...@@ -208,7 +208,7 @@ ...@@ -208,7 +208,7 @@
<el-option <el-option
v-for="item in ruleArr" v-for="item in ruleArr"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name + '：' + item.content"
:value="item.id" :value="item.id"
> >
</el-option></el-select </el-option></el-select
...@@ -395,15 +395,17 @@ export default { ...@@ -395,15 +395,17 @@ export default {
}); });
// 获取规则分类 // 获取规则分类
this.$post("/perform/rules/category/list", { page: 1, size: -1 }).then( this.$post("/perform/rules/category/list", {
(res) => { page: 1,
if (res.code == 1) { size: -1,
this.kaoqinCateArr = res.data.data; type: 4,
} else { }).then((res) => {
this.kaoqinCateArr = []; if (res.code == 1) {
} this.kaoqinCateArr = res.data.data;
} else {
this.kaoqinCateArr = [];
} }
); });
}, },
data() { data() {
return { return {
......
attendance-performance-manager-ui/admin/src/views/perform/gowork/record/drawershow.vue
View file @ baca5a58
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
" "
> >
</el-image> --> </el-image> -->
<filepReview v-if="form.filePaths" :src="form.filePaths"/> <filepReview v-if="form.filePaths" :src="form.filePaths" />
<span v-else>--</span> <span v-else>--</span>
</div> </div>
<ImageUpload <ImageUpload
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
<el-option <el-option
v-for="item in ruleArr" v-for="item in ruleArr"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name + '：' + item.content"
:value="item.id" :value="item.id"
> >
</el-option></el-select </el-option></el-select
...@@ -365,15 +365,17 @@ export default { ...@@ -365,15 +365,17 @@ export default {
}); });
// 获取规则分类 // 获取规则分类
this.$post("/perform/rules/category/list", { page: 1, size: -1 }).then( this.$post("/perform/rules/category/list", {
(res) => { page: 1,
if (res.code == 1) { size: -1,
this.kaoqinCateArr = res.data.data; type: 3,
} else { }).then((res) => {
this.kaoqinCateArr = []; if (res.code == 1) {
} this.kaoqinCateArr = res.data.data;
} else {
this.kaoqinCateArr = [];
} }
); });
}, },
data() { data() {
return { return {
......
attendance-performance-manager-ui/admin/src/views/perform/other/record/drawershow.vue
View file @ baca5a58
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
" "
> >
</el-image> --> </el-image> -->
<filepReview v-if="form.filePaths" :src="form.filePaths"/> <filepReview v-if="form.filePaths" :src="form.filePaths" />
<span v-else>--</span> <span v-else>--</span>
</div> </div>
<ImageUpload <ImageUpload
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
<el-option <el-option
v-for="item in ruleArr" v-for="item in ruleArr"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name + '：' + item.content"
:value="item.id" :value="item.id"
> >
</el-option></el-select </el-option></el-select
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="22"> <el-col :span="22">
<el-form-item :label="form.subAddType==1?'加分分值':'扣分分值'"> <el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'">
<p>{{ form.score }}</p> <p>{{ form.score }}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -326,15 +326,17 @@ export default { ...@@ -326,15 +326,17 @@ export default {
}); });
// 获取规则分类 // 获取规则分类
this.$post("/perform/rules/category/list", { page: 1, size: -1 }).then( this.$post("/perform/rules/category/list", {
(res) => { page: 1,
if (res.code == 1) { size: -1,
this.kaoqinCateArr = res.data.data; type: 5,
} else { }).then((res) => {
this.kaoqinCateArr = []; if (res.code == 1) {
} this.kaoqinCateArr = res.data.data;
} else {
this.kaoqinCateArr = [];
} }
); });
}, },
data() { data() {
return { return {
......
attendance-performance-manager-ui/admin/src/views/perform/review/record/drawershow.vue
View file @ baca5a58
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
" "
> >
</el-image> --> </el-image> -->
<filepReview v-if="form.filePaths" :src="form.filePaths"/> <filepReview v-if="form.filePaths" :src="form.filePaths" />
<span v-else>--</span> <span v-else>--</span>
</div> </div>
<ImageUpload <ImageUpload
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
<el-option <el-option
v-for="item in ruleArr" v-for="item in ruleArr"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name + '：' + item.content"
:value="item.id" :value="item.id"
> >
</el-option></el-select </el-option></el-select
...@@ -380,15 +380,17 @@ export default { ...@@ -380,15 +380,17 @@ export default {
}); });
// 获取规则分类 // 获取规则分类
this.$post("/perform/rules/category/list", { page: 1, size: -1 }).then( this.$post("/perform/rules/category/list", {
(res) => { page: 1,
if (res.code == 1) { size: -1,
this.kaoqinCateArr = res.data.data; type: 2,
} else { }).then((res) => {
this.kaoqinCateArr = []; if (res.code == 1) {
} this.kaoqinCateArr = res.data.data;
} else {
this.kaoqinCateArr = [];
} }
); });
}, },
data() { data() {
return { return {
......
attendance-performance-manager-ui/admin/vue.config.js
View file @ baca5a58
...@@ -18,7 +18,8 @@ module.exports = { ...@@ -18,7 +18,8 @@ module.exports = {
proxy: { proxy: {
'/attendance': { '/attendance': {
//target: 'http://192.168.0.98:11039', //target: 'http://192.168.0.98:11039',
target: 'http://localhost:17500', target: 'http://112.19.80.237:11039',
// target: 'http://localhost:17500',
changeOrigin: true, changeOrigin: true,
secure: false, secure: false,
cookieDomainRewrite: 'localhost', cookieDomainRewrite: 'localhost',
......
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