+
@@ -272,7 +272,7 @@
}, {
"key": "area_id",
"op": "eq",
- "value": this.select.area_id ? this.select.area_id : ''
+ "value": this.stateObj.is_admin ? '' : this.stateObj.area_id
}, {
"key": "year",
"op": "eq",
diff --git a/src/views/report/yeardata.vue b/src/views/report/yeardata.vue
index a8fbffa..3759ec1 100644
--- a/src/views/report/yeardata.vue
+++ b/src/views/report/yeardata.vue
@@ -12,7 +12,7 @@
-
+
@@ -215,7 +215,8 @@
const res = await index({
page_size: this.select.page_size,
page: this.select.page,
- table_name: this.select.table_name,
+ table_name: this.select.table_name,
+ is_auth: this.stateObj.is_admin ? '' : 1,
json_data_fields: ['area_id', 'business_id'],
filter: [{
"key": "business_id",
@@ -224,7 +225,7 @@
},{
"key": "area_id",
"op": "eq",
- "value": this.select.area_id ? this.select.area_id : ''
+ "value": this.stateObj.is_admin ? '' : this.stateObj.area_id
}, {
"key": "year",
"op": "eq",
diff --git a/vue.config.js b/vue.config.js
index c82404e..5201527 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -25,7 +25,7 @@ module.exports = {
* Detail: https://cli.vuejs.org/config/#publicpath
*/
publicPath: process.env.ENV === 'staging' ? '/admin_test' : '/admin',
- outputDir: '/Users/mac/Documents/朗业/2024/s-四世同堂-档案/sstt_dangan/public/admin_test',
+ outputDir: '/Users/mac/Documents/朗业/2024/s-四世同堂-档案/sstt_dangan/public/admin',
assetsDir: 'static',
css: {
loaderOptions: { // 向 CSS 相关的 loader 传递选项