From 2a53d3e6774678eeebf2b0f028c6aec2c70a4774 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 10 十一月 2023 09:55:38 +0800
Subject: [PATCH] 2023.11.10
---
src/views/notice/NoticeManage.vue | 53 ++++++----
src/api/index.js | 6
src/views/fytz/enforce-case/EnforceCase.vue | 9 +
src/components/core/SiderMenu.vue | 188 +++++++++++++++++++++++--------------
src/composables/formConfirm.js | 2
vite.config.js | 5
src/router/index.js | 6 +
7 files changed, 170 insertions(+), 99 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index f6755aa..df62e89 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -2,10 +2,10 @@
import { ElMessage } from 'element-plus';
const ip1 = 'http://47.100.191.150:9005/';
-// const ip1 = 'http://192.168.1.12:8080/';
+// const ip1 = 'http://192.168.1.9:8080/';
// const ip2 = 'http://47.100.191.150:9006/';
-// const ip2 = 'http://192.168.1.6:8080/';
-const ip2 = 'https://fyami.com.cn/';
+const ip2 = 'http://192.168.1.8:8080/';
+// const ip2 = 'https://fyami.com.cn/';
//椋炵窘鐩戠
const $fysp = axios.create({
diff --git a/src/components/core/SiderMenu.vue b/src/components/core/SiderMenu.vue
index 6e3eeeb..995fc80 100644
--- a/src/components/core/SiderMenu.vue
+++ b/src/components/core/SiderMenu.vue
@@ -55,70 +55,70 @@
icon: 'Search',
name: '闂瀹℃牳',
},
- {
- path: '/changecheck',
- icon: 'Search',
- name: '鏁存敼瀹℃牳',
- },
+ // {
+ // path: '/changecheck',
+ // icon: 'Search',
+ // name: '鏁存敼瀹℃牳',
+ // },
],
},
- {
- path: '/ledger',
- icon: 'Search',
- name: '鍙拌处瀹℃牳',
- },
- {
- icon: 'Search',
- name: '涓氬姟鍒嗘瀽',
- children: [
- {
- path: '/analysis/profollow',
- icon: 'Search',
- name: '闂鍔ㄦ�佽窡韪�',
- },
- {
- path: '/analysis/proanalysis',
- icon: 'Search',
- name: '闂鏁存敼鍒嗘瀽',
- },
- {
- path: '/analysis/standardjudge',
- icon: 'Search',
- name: '瑙勮寖鎬ц瘎浼�',
- },
- ],
- },
- {
- path: '/dailyreport',
- icon: 'Search',
- name: '鏃ユ姤绠＄悊',
- },
- {
- icon: 'Search',
- name: '鍦烘櫙鎶ュ憡',
- children: [
- {
- path: '/scenereport/construction',
- icon: 'Search',
- name: '宸ュ湴',
- },
- {
- path: '/scenereport/wharf',
- icon: 'Search',
- name: '鐮佸ご',
- },
- {
- path: '/scenereport/mixing',
- icon: 'Search',
- name: '鎼呮媽绔�',
- },
- {
- path: '/scenereport/storage',
- icon: 'Search',
- name: '鍫嗗満',
- },
- ],
- },
+ // {
+ // path: '/ledger',
+ // icon: 'Search',
+ // name: '鍙拌处瀹℃牳',
+ // },
+ // {
+ // icon: 'Search',
+ // name: '涓氬姟鍒嗘瀽',
+ // children: [
+ // {
+ // path: '/analysis/profollow',
+ // icon: 'Search',
+ // name: '闂鍔ㄦ�佽窡韪�',
+ // },
+ // {
+ // path: '/analysis/proanalysis',
+ // icon: 'Search',
+ // name: '闂鏁存敼鍒嗘瀽',
+ // },
+ // {
+ // path: '/analysis/standardjudge',
+ // icon: 'Search',
+ // name: '瑙勮寖鎬ц瘎浼�',
+ // },
+ // ],
+ // },
+ // {
+ // path: '/dailyreport',
+ // icon: 'Search',
+ // name: '鏃ユ姤绠＄悊',
+ // },
+ // {
+ // icon: 'Search',
+ // name: '鍦烘櫙鎶ュ憡',
+ // children: [
+ // {
+ // path: '/scenereport/construction',
+ // icon: 'Search',
+ // name: '宸ュ湴',
+ // },
+ // {
+ // path: '/scenereport/wharf',
+ // icon: 'Search',
+ // name: '鐮佸ご',
+ // },
+ // {
+ // path: '/scenereport/mixing',
+ // icon: 'Search',
+ // name: '鎼呮媽绔�',
+ // },
+ // {
+ // path: '/scenereport/storage',
+ // icon: 'Search',
+ // name: '鍫嗗満',
+ // },
+ // ],
+ // },
{
path: '/notice',
icon: 'Search',
@@ -132,10 +132,10 @@
group: true,
name: '椋炵窘鐩戠',
children: [
- {
- path: '/fysp/userInfo',
- name: '璐︽埛淇℃伅',
- },
+ // {
+ // path: '/fysp/userInfo',
+ // name: '璐︽埛淇℃伅',
+ // },
{
path: '/fysp/sceneInfo',
name: '鍦烘櫙淇℃伅',
@@ -155,14 +155,60 @@
],
},
{
- path: '/scenereport/storage',
icon: 'Search',
- name: '鎺掓薄鎶借繍',
+ name: '涓氬姟鍒嗘瀽',
+ children: [
+ {
+ group: true,
+ name: '椋炵窘鐩戠',
+ children: [
+ {
+ path: '/fysp/userInfo',
+ name: '璐︽埛淇℃伅',
+ },
+ {
+ path: '/fysp/sceneInfo',
+ name: '鍦烘櫙淇℃伅',
+ },
+ ],
+ },
+ {
+ group: true,
+ name: '椋炵窘鐜',
+ children: [
+ // {
+ // path: '/fytz/userInfo',
+ // name: '璐︽埛淇℃伅',
+ // },
+ ],
+ },
+ ],
},
+ // {
+ // path: '/scenereport/storage',
+ // icon: 'Search',
+ // name: '鎺掓薄鎶借繍',
+ // },
+ // {
+ // path: '/common/userMatch',
+ // icon: 'Connection',
+ // name: '璐︽埛鍖归厤',
+ // },
{
- path: '/common/userMatch',
- icon: 'Connection',
- name: '璐︽埛鍖归厤',
+ icon: 'Search',
+ name: '璧勬簮绠＄悊',
+ children: [
+ {
+ path: '/fytz/enforceCase',
+ icon: 'Search',
+ name: '鐫ｅ療妗堜緥',
+ },
+ // {
+ // path: '/changecheck',
+ // icon: 'Search',
+ // name: '鏁存敼瀹℃牳',
+ // },
+ ],
},
],
};
diff --git a/src/composables/formConfirm.js b/src/composables/formConfirm.js
index 5f43ccf..306b125 100644
--- a/src/composables/formConfirm.js
+++ b/src/composables/formConfirm.js
@@ -52,7 +52,7 @@
formObj,
(nv, ov) => {
if (!isReset && nv != ov) {
- formObjClone = useCloned(formObj, { manual: true });
+ formObjClone = useCloned(nv, { manual: true });
}
if (!isReset && nv === ov) {
edit.value = true;
diff --git a/src/router/index.js b/src/router/index.js
index 4a6d578..6cc5749 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -123,6 +123,12 @@
component: () => import('@/views/fytz/user/UserEdit.vue'),
meta: { transition: 'slide-left' },
},
+ {
+ //鐜繚鐫ｅ療妗堜緥
+ name: 'enforceCase',
+ path: '/fytz/enforceCase',
+ component: () => import('@/views/fytz/enforce-case/EnforceCase.vue'),
+ },
/**********************************閫氱敤妯″潡***********************************************/
{
diff --git a/src/views/fytz/enforce-case/EnforceCase.vue b/src/views/fytz/enforce-case/EnforceCase.vue
new file mode 100644
index 0000000..42ebc3d
--- /dev/null
+++ b/src/views/fytz/enforce-case/EnforceCase.vue
@@ -0,0 +1,9 @@
+<template>
+ <div>LedgerManage</div>
+</template>
+
+<script>
+export default {
+ name: 'LedgerManage',
+};
+</script>
diff --git a/src/views/notice/NoticeManage.vue b/src/views/notice/NoticeManage.vue
index bcdcd05..35c111f 100644
--- a/src/views/notice/NoticeManage.vue
+++ b/src/views/notice/NoticeManage.vue
@@ -118,18 +118,18 @@
/>
<el-table-column width="160" prop="ecCreator" label="鍒涘缓浜�" />
<!-- <el-table-column prop="ecPicurl" label="鍥剧墖" /> -->
- <!-- <el-table-column prop="ecReceiverid" label="绛炬敹浜�" /> -->
+ <el-table-column prop="ecReceiverid" label="绛炬敹浜�" />
</el-table>
<!-- <el-affix :offset="0" position="bottom"> -->
- <el-pagination
- class="el-pagination"
- v-model:current-page="currentPage"
- v-model:page-size="pageSize"
- :page-sizes="[10, 20, 50, 100]"
- :background="true"
- layout="total, sizes, prev, pager, next, jumper"
- :total="total"
- />
+ <el-pagination
+ class="el-pagination"
+ v-model:current-page="currentPage"
+ v-model:page-size="pageSize"
+ :page-sizes="[10, 20, 50, 100]"
+ :background="true"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="total"
+ />
<!-- </el-affix> -->
<CompNoticeAddDrawer
v-model:drawer="drawer"
@@ -173,12 +173,12 @@
// }
currentPage(nValue, oValue) {
if (nValue != oValue) {
- this.onNoticeType()
+ this.onNoticeType();
}
},
pageSize(nValue, oValue) {
if (nValue != oValue) {
- this.onNoticeType()
+ this.onNoticeType();
}
},
},
@@ -204,13 +204,13 @@
type: noticeType,
subtype: noticeSubType,
page: this.currentPage,
- perPage: this.pageSize
+ perPage: this.pageSize,
})
.then((res) => {
if (res.success) {
this.tableData = res.data;
- this.currentPage = res.head.page
- this.total = res.head.totalCount
+ this.currentPage = res.head.page;
+ this.total = res.head.totalCount;
}
})
.finally(() => {
@@ -219,15 +219,21 @@
// noticeApi.getNotification().then()
},
districtFormatter(row) {
- let district = '鏈缃�';
- this.districts.forEach((d) => {
- if (d.value == row.ecExtension1) {
- district = d.label;
- return;
- }
- });
- if (row.ecExtension1 == null) {
+ let district = '';
+ if (row.ecExtension1 == null || row.ecExtension1 == '0;') {
district = '鍏ㄩ儴';
+ } else if (row.ecExtension1 == '-1') {
+ district = '鏈缃�';
+ } else {
+ row.ecExtension1.split(';').forEach((t) => {
+ this.districts.forEach((d) => {
+ if (t == d.value) {
+ district += d.label + '銆�';
+ return;
+ }
+ });
+ });
+ district = district.slice(0, district.length - 1)
}
return district;
},
@@ -246,6 +252,7 @@
}
});
});
+ scene = scene.slice(0, scene.length - 1)
}
return scene;
},
diff --git a/vite.config.js b/vite.config.js
index 4f220f0..72a283a 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -23,7 +23,7 @@
include: [/\.vue$/, /\.vue\?vue/, /\.md$/],
resolvers: [
ElementPlusResolver({
- importStyle: 'sass'
+ importStyle: 'sass',
}),
],
dts: 'src/components.d.ts',
@@ -71,4 +71,7 @@
},
},
},
+ server: {
+ host: '0.0.0.0',
+ },
});
--
Gitblit v1.9.3