{{ row.reignCount ?? 0 }}
diff --git a/src/views/door/doorTimes/index.vue b/src/views/door/doorTimes/index.vue
index 9800dfa..774c37d 100644
--- a/src/views/door/doorTimes/index.vue
+++ b/src/views/door/doorTimes/index.vue
@@ -15,6 +15,12 @@
+
+
+
+
+
+
{{ $t('common.queryBtn') }}
diff --git a/src/views/door/jglTotal/index.vue b/src/views/door/jglTotal/index.vue
new file mode 100644
index 0000000..ec9320d
--- /dev/null
+++ b/src/views/door/jglTotal/index.vue
@@ -0,0 +1,195 @@
+
+
+
+
+
+
+
+
+
+
+ {{ $t('common.queryBtn') }}
+
+ {{ $t('common.resetBtn') }}
+
+
+
+
+
+
+ {{ row.time }}
+ -
+ {{ row.weekStr }}
+
+
+
+
+
+ {{ row.enterCount }}
+ 次
+
+ (点击查看)
+
+
+
+
+
+
+
+ {{ row.exitCount }}
+ 次
+
+ (点击查看)
+
+
+
+
+
+
+ {{ row.exitOrExitCount }}次
+
+
+
+
+ {{ row.insideCount }}人
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/flow/create/all.vue b/src/views/flow/create/all.vue
index 32151e1..47f93d8 100644
--- a/src/views/flow/create/all.vue
+++ b/src/views/flow/create/all.vue
@@ -7,17 +7,12 @@
-
+ @click="activeStep = index">
+ :class="[activeStep === index ? 'bg-primary text-white' : 'border-current']">
{{ index + 1 }}
{{ $t(step.title) }}
@@ -47,18 +42,18 @@
-
+
- {{ $t('flow.submit') }}
+ {{ $t('flow.submit')
+ }}
+ :title="$t('flow.checkIng')" :sub-title="$t('flow.checkSubIng')">
@@ -68,7 +63,9 @@
-
+
+
+
{{ item }}
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 031ab7c..114193a 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -117,7 +117,7 @@ const getThemeConfig = computed(() => {
*/
const jumpAdminPanel = () => {
const isDev = import.meta.env.MODE == "development"
- const baseAdminUrl = isDev ? 'http://localhost:5173/device' : 'http://192.168.50.10:7001/device';
+ const baseAdminUrl = isDev ? 'http://localhost:5173/device' : 'http://123.157.250.162:7001/device';
const roleCodes = useUserInfoStore.userInfos?.roleCodes ?? []
if (!roleCodes || !roleCodes.length) {
openPlanUrl(baseAdminUrl, true)
diff --git a/src/views/third/thirdLog/index.vue b/src/views/third/thirdLog/index.vue
index 5d02519..58d39e0 100644
--- a/src/views/third/thirdLog/index.vue
+++ b/src/views/third/thirdLog/index.vue
@@ -51,13 +51,13 @@
-
+
-
+
@@ -123,6 +123,20 @@ const exportExcel = () => {
downBlobFile('/third/thirdLog/export', Object.assign(state.queryForm, { ids: selectObjs }), 'thirdLog.xlsx')
}
+// 获取日志详情
+const getJson = async (row: any, key: string) => {
+ try {
+ const { data, code } = await ThirdLogApi.getObj(row.id)
+ if (code != 0) {
+ throw new Error("获取日志详情失败")
+ }
+ return data[key]
+ } catch (error) {
+ console.log("获取日志详情,意外的错误error:", error);
+ return ""
+ }
+}
+
// 多选事件
const selectionChangHandle = (objs: { id: string }[]) => {
selectObjs.value = objs.map(({ id }) => id);
diff --git a/src/views/todo/routing-manage/form.vue b/src/views/todo/routing-manage/form.vue
new file mode 100755
index 0000000..1d551c9
--- /dev/null
+++ b/src/views/todo/routing-manage/form.vue
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/todo/routing-manage/index.vue b/src/views/todo/routing-manage/index.vue
new file mode 100755
index 0000000..5ec7c6b
--- /dev/null
+++ b/src/views/todo/routing-manage/index.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('common.queryBtn') }}
+
+
+ {{ $t('common.resetBtn') }}
+
+
+
+
+ 新 增
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/todo/service-manage/detail.vue b/src/views/todo/service-manage/detail.vue
new file mode 100644
index 0000000..777413b
--- /dev/null
+++ b/src/views/todo/service-manage/detail.vue
@@ -0,0 +1,144 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/todo/service-manage/form.vue b/src/views/todo/service-manage/form.vue
new file mode 100755
index 0000000..9261047
--- /dev/null
+++ b/src/views/todo/service-manage/form.vue
@@ -0,0 +1,168 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/todo/service-manage/index.vue b/src/views/todo/service-manage/index.vue
new file mode 100755
index 0000000..c9b7141
--- /dev/null
+++ b/src/views/todo/service-manage/index.vue
@@ -0,0 +1,218 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('common.queryBtn') }}
+
+
+ {{ $t('common.resetBtn') }}
+
+
+
+
+ 新 增
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.startDate }}
+ 至
+ {{ row.dueDate }}
+
+ 未设置
+
+
+
+
+
+ {{ row.completedDate }}
+ 未完成
+
+
+
+
+
+ 开始
+
+
+ 完成
+
+
+ 编辑
+
+
+ 详情
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/todo/todo-record/form.vue b/src/views/todo/todo-record/form.vue
index 231248f..42cbe39 100755
--- a/src/views/todo/todo-record/form.vue
+++ b/src/views/todo/todo-record/form.vue
@@ -1,6 +1,6 @@
-
+
@@ -9,7 +9,7 @@
-
+
@@ -23,7 +23,7 @@
-
+
diff --git a/src/views/todo/todo-record/index.vue b/src/views/todo/todo-record/index.vue
index 602864c..8945ac8 100755
--- a/src/views/todo/todo-record/index.vue
+++ b/src/views/todo/todo-record/index.vue
@@ -38,8 +38,9 @@
@click="handleDelete(selectObjs)">
删除
-
+
+
未完成
-
+
@@ -116,6 +117,7 @@ import { BasicTableProps, useTable } from "/@/hooks/table";
import * as todoRecordApi from "/@/api/todo/todoRecord"
import { useMessage, useMessageBox } from "/@/hooks/message";
import { useDict } from '/@/hooks/dict';
+import { usePanel } from "/@/stores/panel"
// 引入组件
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
@@ -132,6 +134,8 @@ const showSearch = ref(true)
const selectObjs = ref([]) as any
const multiple = ref(true)
+const storesPanel = usePanel()
+
const state: BasicTableProps = reactive({
queryForm: {},
pageList: todoRecordApi.fetchList
@@ -213,4 +217,22 @@ const doDone = async (row: any) => {
useMessage().error(err.msg);
}
}
+
+onBeforeMount(() => {
+ const query: any = useRoute().query
+ if (query && query.action == 'panel') {
+ if (query.params) {
+ Object.assign(state.queryForm, JSON.parse(query.params))
+ getDataList()
+ }
+ storesPanel.openFromPanel()
+ }
+})
+
+onBeforeUnmount(() => {
+ const query = useRoute().query
+ if (query && query.action == 'panel') {
+ storesPanel.closeFromPanel()
+ }
+})