diff --git a/attendance-performance-manager-ui/admin/src/views/check/attend/record/list.vue b/attendance-performance-manager-ui/admin/src/views/check/attend/record/list.vue index 3327f063bd15d7b09106aaea1f759dd7598bf4bc..261b1ba82686ea9f413ed62b1b3ff1f5a87908b5 100644 --- a/attendance-performance-manager-ui/admin/src/views/check/attend/record/list.vue +++ b/attendance-performance-manager-ui/admin/src/views/check/attend/record/list.vue @@ -74,7 +74,7 @@ export default { created() {}, methods: { handleCellClick(row, column, event, cell) { - if ((column.label = "鍥剧墖鍑瘉")) { + if ((column.label == "鍥剧墖鍑瘉")) { const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`; const regular = new RegExp(`.*\.${suffix}`); regular.test(row.filePaths); diff --git a/attendance-performance-manager-ui/admin/src/views/check/complain/record/list.vue b/attendance-performance-manager-ui/admin/src/views/check/complain/record/list.vue index d9a0f47773290e01d9f221d63c0f5d802aa83ca5..ca687c5209e62246adbac47094eab0e11e7c377a 100644 --- a/attendance-performance-manager-ui/admin/src/views/check/complain/record/list.vue +++ b/attendance-performance-manager-ui/admin/src/views/check/complain/record/list.vue @@ -74,7 +74,7 @@ export default { created() {}, methods: { handleCellClick(row, column, event, cell) { - if ((column.label = "鍥剧墖鍑瘉")) { + if ((column.label == "鍥剧墖鍑瘉")) { const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`; const regular = new RegExp(`.*\.${suffix}`); regular.test(row.filePaths); @@ -236,7 +236,7 @@ export default { { label: "鎶曡瘔璁惧", prop: "complainDevice" }, - { label: "缁╂晥瑙勫垯", prop: "ruleNme" }, + { label: "缁╂晥瑙勫垯", prop: "ruleName" }, { label: "鍔犲垎/鎵e垎鏂瑰紡", diff --git a/attendance-performance-manager-ui/admin/src/views/check/effect/record/list.vue b/attendance-performance-manager-ui/admin/src/views/check/effect/record/list.vue index d5e80cf400577411b040a9e5d984408632e3e06b..8817943b11568f323bb9590bc6ecfa1945ed1a71 100644 --- a/attendance-performance-manager-ui/admin/src/views/check/effect/record/list.vue +++ b/attendance-performance-manager-ui/admin/src/views/check/effect/record/list.vue @@ -74,7 +74,7 @@ export default { created() {}, methods: { handleCellClick(row, column, event, cell) { - if ((column.label = "鍥剧墖鍑瘉")) { + if ((column.label == "鍥剧墖鍑瘉")) { const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`; const regular = new RegExp(`.*\.${suffix}`); regular.test(row.filePaths); diff --git a/attendance-performance-manager-ui/admin/src/views/check/gowork/record/list.vue b/attendance-performance-manager-ui/admin/src/views/check/gowork/record/list.vue index 048ec26e11c140e6f323ed3b5ed6d1e2a8fe8100..22c7338ba25df34c7491599ef3551cd799c9b641 100644 --- a/attendance-performance-manager-ui/admin/src/views/check/gowork/record/list.vue +++ b/attendance-performance-manager-ui/admin/src/views/check/gowork/record/list.vue @@ -74,7 +74,7 @@ export default { created() {}, methods: { handleCellClick(row, column, event, cell) { - if ((column.label = "鍥剧墖鍑瘉")) { + if ((column.label == "鍥剧墖鍑瘉")) { const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`; const regular = new RegExp(`.*\.${suffix}`); regular.test(row.filePaths); diff --git a/attendance-performance-manager-ui/admin/src/views/check/other/record/list.vue b/attendance-performance-manager-ui/admin/src/views/check/other/record/list.vue index 7ff54cba3c8df85317eeb3dd3f57821b2d6ea7fe..5ed740e3875ccdee569967c52c4bc74115be8157 100644 --- a/attendance-performance-manager-ui/admin/src/views/check/other/record/list.vue +++ b/attendance-performance-manager-ui/admin/src/views/check/other/record/list.vue @@ -74,7 +74,7 @@ export default { created() {}, methods: { handleCellClick(row, column, event, cell) { - if ((column.label = "鍥剧墖鍑瘉")) { + if ((column.label == "鍥剧墖鍑瘉")) { const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`; const regular = new RegExp(`.*\.${suffix}`); regular.test(row.filePaths); diff --git a/attendance-performance-manager-ui/admin/src/views/check/review/record/list.vue b/attendance-performance-manager-ui/admin/src/views/check/review/record/list.vue index 05135d6e0bad6b81f699693ca9f55dbec6ad3062..5dbfa963ae2f3a5a36454103b2461e194d129908 100644 --- a/attendance-performance-manager-ui/admin/src/views/check/review/record/list.vue +++ b/attendance-performance-manager-ui/admin/src/views/check/review/record/list.vue @@ -74,7 +74,7 @@ export default { created() {}, methods: { handleCellClick(row, column, event, cell) { - if ((column.label = "鍥剧墖鍑瘉")) { + if ((column.label == "鍥剧墖鍑瘉")) { const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`; const regular = new RegExp(`.*\.${suffix}`); regular.test(row.filePaths); @@ -233,7 +233,7 @@ export default { formatter: this.formatterPic, }, - { label: "缁╂晥瑙勫垯", prop: "ruleNme" }, + { label: "缁╂晥瑙勫垯", prop: "ruleName" }, { label: "鍔犲垎/鎵e垎鏂瑰紡", diff --git a/attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/components/BarCharts.vue b/attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/components/BarCharts.vue index e03f5da1a640ab1ac67cb25d4a85d07bc703f82d..3cfe076dca2dabb919c1479505b9a7ea70f2b217 100644 --- a/attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/components/BarCharts.vue +++ b/attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/components/BarCharts.vue @@ -73,7 +73,11 @@ export default { tooltip: {}, xAxis: { data: this.chartsData.map(i => { - return i.ruleName || i.deptName || i.staffName + console.log(i) + if(this.title == "鐢宠瘔娆℃暟閮ㄩ棬鎺掑悕TOP20") return i.deptName + if(this.title == "鐢宠瘔娆℃暟涓汉鎺掑悕TOP20") return i.staffName + if(this.title == "鐢宠瘔娆℃暟瑙勫垯鎺掑悕TOP20") return i.ruleName + // return i.ruleName || i.deptName || i.staffName }) // this.title == "鐢宠瘔娆℃暟閮ㄩ棬鎺掑悕TOP20" // ? [ diff --git a/attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/list.vue b/attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/list.vue index 6de18e6d228892e9b4cca67f0560bc7588b881ee..ca8b48684430edf3daa82153c4faa5d310a3ca24 100644 --- a/attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/list.vue +++ b/attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/list.vue @@ -56,7 +56,7 @@ :id="'rule_20'" :legendName="'鐢宠瘔娆℃暟'" :styleObj="{ width: '1800px', height: '300px' }" - :chartsData="depChartsData" + :chartsData="ruleChartsData" /> </div> </div> @@ -92,7 +92,7 @@ export default { }, methods: { handleCellClick(row, column, event, cell) { - if ((column.label = "鍥剧墖鍑瘉")) { + if ((column.label == "鍥剧墖鍑瘉")) { const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`; const regular = new RegExp(`.*\.${suffix}`); regular.test(row.filePaths); diff --git a/attendance-performance-manager-ui/admin/src/views/perform/attend/record/drawershow.vue b/attendance-performance-manager-ui/admin/src/views/perform/attend/record/drawershow.vue index 6063c6dfbdc19c25f4b8b0cb96ffe6588601e7f0..6183dfbf33d1f4b4dd730cd42e5b4a6bd54c6f40 100644 --- a/attendance-performance-manager-ui/admin/src/views/perform/attend/record/drawershow.vue +++ b/attendance-performance-manager-ui/admin/src/views/perform/attend/record/drawershow.vue @@ -153,7 +153,7 @@ <el-row> <el-col :span="22"> <el-form-item label="缁╂晥瑙勫垯锛�"> - <p v-if="form.view == '鏌ョ湅'">{{ form.ruleNme }}</p> + <p v-if="form.view == '鏌ョ湅'">{{ form.ruleName }}</p> <div v-else> <el-col :span="22"> <el-select @@ -261,8 +261,8 @@ /> <Field label="瑙勫垯鍚嶇О" - prop="ruleNme" - v-model="form.ruleNme" + prop="ruleName" + v-model="form.ruleName" placeholder="璇疯緭鍏ヨ鍒欏悕绉�" /> <Field @@ -597,7 +597,7 @@ export default { processStatus: 1, remark: "", ruleId: "", - ruleNme: "", + ruleName: "", score: "", staffId: "", staffName: "", diff --git a/attendance-performance-manager-ui/admin/src/views/perform/attend/record/list.vue b/attendance-performance-manager-ui/admin/src/views/perform/attend/record/list.vue index dccae68c8c7a033d2ff4a4c7214c851777867c4e..506a0754afb2e639eff4e6a07b7175908ac13623 100644 --- a/attendance-performance-manager-ui/admin/src/views/perform/attend/record/list.vue +++ b/attendance-performance-manager-ui/admin/src/views/perform/attend/record/list.vue @@ -82,7 +82,7 @@ export default { created() {}, methods: { handleCellClick(row, column, event, cell) { - if ((column.label = "鍥剧墖鍑瘉")) { + if ((column.label == "鍥剧墖鍑瘉")) { const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`; const regular = new RegExp(`.*\.${suffix}`); regular.test(row.filePaths); @@ -246,7 +246,7 @@ export default { formatter: this.formatterPic, }, - { label: "缁╂晥瑙勫垯", prop: "ruleNme" }, + { label: "缁╂晥瑙勫垯", prop: "ruleName" }, { label: "鍔犲垎/鎵e垎鏂瑰紡", diff --git "a/attendance-performance-manager-ui/admin/src/views/perform/attend/record/list\357\274\210\345\216\237\350\200\203\345\213\244\347\273\251\346\225\210\347\256\241\347\220\206\357\274\211.vue" "b/attendance-performance-manager-ui/admin/src/views/perform/attend/record/list\357\274\210\345\216\237\350\200\203\345\213\244\347\273\251\346\225\210\347\256\241\347\220\206\357\274\211.vue" index 078c383e20c64d663991a6e6196f00f79eaadc66..14af5ba881f50f40db46af07c0b8c24f31d1dffd 100644 --- "a/attendance-performance-manager-ui/admin/src/views/perform/attend/record/list\357\274\210\345\216\237\350\200\203\345\213\244\347\273\251\346\225\210\347\256\241\347\220\206\357\274\211.vue" +++ "b/attendance-performance-manager-ui/admin/src/views/perform/attend/record/list\357\274\210\345\216\237\350\200\203\345\213\244\347\273\251\346\225\210\347\256\241\347\220\206\357\274\211.vue" @@ -180,7 +180,7 @@ export default { formatter: this.formatterDate, }, - { label: "瑙勫垯鍚嶇О", prop: "ruleNme" }, + { label: "瑙勫垯鍚嶇О", prop: "ruleName" }, { label: "寮傚父鏃堕棿", diff --git a/attendance-performance-manager-ui/admin/src/views/perform/attend/record/view.vue b/attendance-performance-manager-ui/admin/src/views/perform/attend/record/view.vue index c9da35faf53820b7f7228752ce172504a162b156..ea743b6d2f05e375d9bc4d13086ed1074c5f3fc7 100644 --- a/attendance-performance-manager-ui/admin/src/views/perform/attend/record/view.vue +++ b/attendance-performance-manager-ui/admin/src/views/perform/attend/record/view.vue @@ -36,7 +36,7 @@ {{form.ruleId}} </el-descriptions-item> <el-descriptions-item label="瑙勫垯鍚嶇О" label-class-name="labelClass" content-class-name="contentClass"> - {{form.ruleNme}} + {{form.ruleName}} </el-descriptions-item> <el-descriptions-item label="寮傚父鏃堕棿" label-class-name="labelClass" content-class-name="contentClass"> {{ util_formatterDate(form.errorTime)}} diff --git a/attendance-performance-manager-ui/admin/src/views/perform/complain/record/drawershow.vue b/attendance-performance-manager-ui/admin/src/views/perform/complain/record/drawershow.vue index 58479b9625896fdb9d066cc6f2fa1f124f15de88..787fbafe0892237beef78f08c617c0a458c9a5d1 100644 --- a/attendance-performance-manager-ui/admin/src/views/perform/complain/record/drawershow.vue +++ b/attendance-performance-manager-ui/admin/src/views/perform/complain/record/drawershow.vue @@ -205,7 +205,7 @@ <el-row> <el-col :span="22"> <el-form-item label="缁╂晥瑙勫垯锛�"> - <p v-if="form.view == '鏌ョ湅'">{{ form.ruleNme }}</p> + <p v-if="form.view == '鏌ョ湅'">{{ form.ruleName }}</p> <div v-else> <el-col :span="22"> <el-select diff --git a/attendance-performance-manager-ui/admin/src/views/perform/complain/record/list.vue b/attendance-performance-manager-ui/admin/src/views/perform/complain/record/list.vue index 384c82dcfcf0ee37c4dc7e0c693f0addaf93b973..1026e0936ae92b0410f789662b8ba0ee4a5fc482 100644 --- a/attendance-performance-manager-ui/admin/src/views/perform/complain/record/list.vue +++ b/attendance-performance-manager-ui/admin/src/views/perform/complain/record/list.vue @@ -82,7 +82,7 @@ export default { created() {}, methods: { handleCellClick(row, column, event, cell) { - if ((column.label = "鍥剧墖鍑瘉")) { + if ((column.label == "鍥剧墖鍑瘉")) { const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`; const regular = new RegExp(`.*\.${suffix}`); regular.test(row.filePaths); @@ -243,7 +243,7 @@ export default { { label: "鎶曡瘔璁惧", prop: "complainDevice" }, - { label: "缁╂晥瑙勫垯", prop: "ruleNme" }, + { label: "缁╂晥瑙勫垯", prop: "ruleName" }, { label: "鍔犲垎/鎵e垎鏂瑰紡", diff --git a/attendance-performance-manager-ui/admin/src/views/perform/effect/record/drawershow.vue b/attendance-performance-manager-ui/admin/src/views/perform/effect/record/drawershow.vue index f1af3e4b9c71978a4b22ce6efb6790719d240b86..c1d7398f5f4b5a11aa990d62b1c6e1c45b52558e 100644 --- a/attendance-performance-manager-ui/admin/src/views/perform/effect/record/drawershow.vue +++ b/attendance-performance-manager-ui/admin/src/views/perform/effect/record/drawershow.vue @@ -179,7 +179,7 @@ <el-row> <el-col :span="22"> <el-form-item label="缁╂晥瑙勫垯锛�"> - <p v-if="form.view == '鏌ョ湅'">{{ form.ruleNme }}</p> + <p v-if="form.view == '鏌ョ湅'">{{ form.ruleName }}</p> <div v-else> <el-col :span="22"> <el-select diff --git a/attendance-performance-manager-ui/admin/src/views/perform/effect/record/list.vue b/attendance-performance-manager-ui/admin/src/views/perform/effect/record/list.vue index 236c98861909b38f3f6d9c3ddc93ae8db22d0cc3..219b111d142d94a2930a79a9d0442adf32c36ef2 100644 --- a/attendance-performance-manager-ui/admin/src/views/perform/effect/record/list.vue +++ b/attendance-performance-manager-ui/admin/src/views/perform/effect/record/list.vue @@ -82,7 +82,7 @@ export default { created() {}, methods: { handleCellClick(row, column, event, cell) { - if ((column.label = "鍥剧墖鍑瘉")) { + if ((column.label == "鍥剧墖鍑瘉")) { const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`; const regular = new RegExp(`.*\.${suffix}`); regular.test(row.filePaths); diff --git a/attendance-performance-manager-ui/admin/src/views/perform/gowork/record/drawershow.vue b/attendance-performance-manager-ui/admin/src/views/perform/gowork/record/drawershow.vue index 3394d882365286eab7f56d9836b6272035711f80..6f64d34f25485247ed9d1ceea3cd302d5b581119 100644 --- a/attendance-performance-manager-ui/admin/src/views/perform/gowork/record/drawershow.vue +++ b/attendance-performance-manager-ui/admin/src/views/perform/gowork/record/drawershow.vue @@ -157,7 +157,7 @@ <el-row> <el-col :span="22"> <el-form-item label="缁╂晥瑙勫垯锛�"> - <p v-if="form.view == '鏌ョ湅'">{{ form.ruleNme }}</p> + <p v-if="form.view == '鏌ョ湅'">{{ form.ruleName }}</p> <div v-else> <el-col :span="22"> <el-select diff --git a/attendance-performance-manager-ui/admin/src/views/perform/gowork/record/list.vue b/attendance-performance-manager-ui/admin/src/views/perform/gowork/record/list.vue index f21a4fabba41ddce88a87cb8a4edaabe2fb829b4..947eb1928c320cfa9e481b076c1d20a9c2182a18 100644 --- a/attendance-performance-manager-ui/admin/src/views/perform/gowork/record/list.vue +++ b/attendance-performance-manager-ui/admin/src/views/perform/gowork/record/list.vue @@ -82,7 +82,7 @@ export default { created() {}, methods: { handleCellClick(row, column, event, cell) { - if ((column.label = "鍥剧墖鍑瘉")) { + if ((column.label == "鍥剧墖鍑瘉")) { const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`; const regular = new RegExp(`.*\.${suffix}`); regular.test(row.filePaths); diff --git a/attendance-performance-manager-ui/admin/src/views/perform/other/record/drawershow.vue b/attendance-performance-manager-ui/admin/src/views/perform/other/record/drawershow.vue index 3076f998ecc73c8e4d60d64d9514289a62f7d2a2..bd419cf847a1f44ebaba7239dd34aa6facd36d9a 100644 --- a/attendance-performance-manager-ui/admin/src/views/perform/other/record/drawershow.vue +++ b/attendance-performance-manager-ui/admin/src/views/perform/other/record/drawershow.vue @@ -117,7 +117,7 @@ <el-row> <el-col :span="22"> <el-form-item label="缁╂晥瑙勫垯锛�"> - <p v-if="form.view == '鏌ョ湅'">{{ form.ruleNme }}</p> + <p v-if="form.view == '鏌ョ湅'">{{ form.ruleName }}</p> <div v-else> <el-col :span="22"> <el-select diff --git a/attendance-performance-manager-ui/admin/src/views/perform/other/record/list.vue b/attendance-performance-manager-ui/admin/src/views/perform/other/record/list.vue index 0ce16dfb99d39769c3f9696414d9609ee1343f9e..9f6b61f0fa0e9763f39ecd92e97dc1acba9be005 100644 --- a/attendance-performance-manager-ui/admin/src/views/perform/other/record/list.vue +++ b/attendance-performance-manager-ui/admin/src/views/perform/other/record/list.vue @@ -82,7 +82,7 @@ export default { created() {}, methods: { handleCellClick(row, column, event, cell) { - if ((column.label = "鍥剧墖鍑瘉")) { + if ((column.label == "鍥剧墖鍑瘉")) { const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`; const regular = new RegExp(`.*\.${suffix}`); regular.test(row.filePaths); diff --git a/attendance-performance-manager-ui/admin/src/views/perform/review/record/drawershow.vue b/attendance-performance-manager-ui/admin/src/views/perform/review/record/drawershow.vue index 792d6caba5802540f1521403593b3f0e79420588..dbbf23c13960aca03b7e7e7a84534a0ebda75f53 100644 --- a/attendance-performance-manager-ui/admin/src/views/perform/review/record/drawershow.vue +++ b/attendance-performance-manager-ui/admin/src/views/perform/review/record/drawershow.vue @@ -170,7 +170,7 @@ <el-row> <el-col :span="22"> <el-form-item label="缁╂晥瑙勫垯锛�"> - <p v-if="form.view == '鏌ョ湅'">{{ form.ruleNme }}</p> + <p v-if="form.view == '鏌ョ湅'">{{ form.ruleName }}</p> <div v-else> <el-col :span="22"> <el-select diff --git a/attendance-performance-manager-ui/admin/src/views/perform/review/record/list.vue b/attendance-performance-manager-ui/admin/src/views/perform/review/record/list.vue index 124213ac7887f796ee2fef671fa7355128a33dfe..b84df96806144491aba2e42de4a02d3560fb6bdc 100644 --- a/attendance-performance-manager-ui/admin/src/views/perform/review/record/list.vue +++ b/attendance-performance-manager-ui/admin/src/views/perform/review/record/list.vue @@ -82,7 +82,7 @@ export default { created() {}, methods: { handleCellClick(row, column, event, cell) { - if ((column.label = "鍥剧墖鍑瘉")) { + if ((column.label == "鍥剧墖鍑瘉")) { const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`; const regular = new RegExp(`.*\.${suffix}`); regular.test(row.filePaths); @@ -241,7 +241,7 @@ export default { formatter: this.formatterPic, }, - { label: "缁╂晥瑙勫垯", prop: "ruleNme" }, + { label: "缁╂晥瑙勫垯", prop: "ruleName" }, { label: "鍔犲垎/鎵e垎鏂瑰紡",