This commit is contained in:
sjl
2024-11-18 09:02:57 +08:00
parent a8eaccc53e
commit 5cdbee88b4
54 changed files with 375 additions and 836 deletions

View File

@@ -57,14 +57,11 @@
<script lang="ts" setup name="ResourceDialog">
import { defineProps, defineEmits,watch,ref, type Ref, computed } from 'vue';
import { dialogMiddle } from '@/utils/elementBind'
import { ElMessage, FormInstance, FormItemRule } from 'element-plus'
import { ElMessage, type FormInstance, type FormItemRule } from 'element-plus'
import { useDictStore } from '@/stores/modules/dict'
import { type Function } from '@/api/function/interface'
import {addFunction,updateFunction,getFunctionListNoButton} from '@/api/function/index.ts'
import type { Function } from "@/api/user/interface/function"
import {addFunction,updateFunction,getFunctionListNoButton} from '@/api/user/function/index'
import IconSelect from '@/components/SelectIcon/index.vue'
import { functionList } from '@/api/function/functionExample.ts'
import { min } from 'lodash';
import { Console } from 'console';
const value = ref()
// 树形节点配置
const defaultProps = {

View File

@@ -26,13 +26,13 @@
<script setup lang='tsx' name='useProTable'>
import { ref ,reactive} from 'vue'
import { useHandleData } from '@/hooks/useHandleData'
import { type Function } from '@/api/function/interface'
import type { Function } from "@/api/user/interface/function"
import ProTable from '@/components/ProTable/index.vue'
import {CirclePlus, Delete, EditPen,HomeFilled} from '@element-plus/icons-vue'
import type { ColumnProps, ProTableInstance } from '@/components/ProTable/interface'
import { useDictStore } from '@/stores/modules/dict'
import ResourcePopup from './components/resourcePopup.vue'
import {deleteFunction,getFunctionList} from '@/api/function/index.ts'
import {deleteFunction,getFunctionList} from '@/api/user/function/index'
const dictStore = useDictStore()
const resourcePopup = ref()
// ProTable 实例

View File

@@ -42,10 +42,10 @@
import{ ElMessage, type FormInstance,type FormItemRule } from 'element-plus'
import type { ProTableInstance } from '@/components/ProTable/interface'
import { ref,computed, Ref } from 'vue'
import { type Role } from '@/api/role/interface'
import { type Role } from '@/api/user/interface/role'
import {dialogSmall} from '@/utils/elementBind'
import { useDictStore } from '@/stores/modules/dict'
import {addRole,editRole,} from '@/api/role/role'
import {addRole,editRole} from '@/api/user/role'
const dictStore = useDictStore()
// 定义弹出组件元信息

View File

@@ -32,11 +32,11 @@
import{ ElMessage, ElTree, type FormInstance,type FormItemRule } from 'element-plus'
import type { ProTableInstance } from '@/components/ProTable/interface'
import { ref,computed, type Ref, nextTick } from 'vue'
import { Role } from '@/api/role/interface'
import { Role } from '@/api/user/interface/role'
import {dialogMiddle,dialogSmall} from '@/utils/elementBind'
import { useDictStore } from '@/stores/modules/dict'
import { type Function } from '@/api/function/interface'
import {getRoleFunction,assignFunction} from '@/api/role/role'
import { type Function } from '@/api/user/function/interface'
import {getRoleFunction,assignFunction} from '@/api/user/role/index'
// 保存数据
const treeRef = ref<InstanceType<typeof ElTree>>()

View File

@@ -28,18 +28,17 @@
</template>
<script setup lang='tsx' name='useRole'>
import { type Role } from '@/api/role/interface'
import { type Function } from '@/api/function/interface'
import { type Role } from '@/api/user/interface/role'
import { type Function } from '@/api/user/interface/function'
import { useHandleData } from '@/hooks/useHandleData'
import ProTable from '@/components/ProTable/index.vue'
import type{ ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
import { CirclePlus, Delete, EditPen, Share, Download, Upload, View, Refresh } from '@element-plus/icons-vue'
import {getRoleList,deleteRole,getFunctionList} from '@/api/role/role'
import {getRoleList,deleteRole,getFunctionList} from '@/api/user/role/index'
import RolePopup from './components/rolePopup.vue'
import RoleResourcePopup from './components/roleResourcePopup.vue'
import { onMounted, reactive, ref } from 'vue'
import {useDictStore} from '@/stores/modules/dict'
import { fa } from 'element-plus/es/locale/index.mjs'
const rolePopup = ref()
const roleResourcePopup = ref()
const dictStore = useDictStore()

View File

@@ -36,7 +36,7 @@
import {updatePassWord} from '@/api/user/user'
// 使用 dayjs 库格式化
import dayjs from 'dayjs';
import { type User } from '@/api/user/interface';
import { type User } from '@/api/user/interface/user';
// 定义弹出组件元信息
const dialogFormRef = ref()

View File

@@ -56,9 +56,9 @@
} from '@/api/user/user'
// 使用 dayjs 库格式化
import dayjs from 'dayjs';
import { type User } from '@/api/user/interface';
import { type User } from '@/api/user/interface/user';
import { useDictStore } from '@/stores/modules/dict'
import { type Role } from '@/api/role/interface';
import { type Role } from '@/api/user/interface/role';
const dictStore = useDictStore()
// 定义弹出组件元信息
const dialogFormRef = ref()

View File

@@ -31,7 +31,7 @@
<script setup lang='tsx' name='useRole'>
import TimeControl from '@/components/TimeControl/index.vue'
import { type User } from '@/api/user/interface'
import { type User } from '@/api/user/interface/user'
import { useHandleData } from '@/hooks/useHandleData'
import ProTable from '@/components/ProTable/index.vue'
import UserPopup from './components/userPopup.vue'
@@ -42,7 +42,7 @@
import { useDictStore } from '@/stores/modules/dict'
import {getUserList, deleteUser,getRoleList} from '@/api/user/user'
import { onMounted, reactive, ref } from 'vue'
import { type Role } from '@/api/role/interface'
import { type Role } from '@/api/user/interface/role'
const roleList = ref<Role.RoleBO[]>([])
const dictStore = useDictStore()
const userPopup = ref()

View File

@@ -42,16 +42,14 @@
</template>
<script lang="ts" setup>
import { FormInstance,FormItemRule } from 'element-plus'
import { ProTableInstance } from '@/components/ProTable/interface'
import type { FormInstance,FormItemRule } from 'element-plus'
import { ref,computed } from 'vue'
import { Role } from '@/api/role/interface'
import {dialogSmall} from '@/utils/elementBind'
import { useDictStore } from '@/stores/modules/dict'
import {
addRole,
editRole,
} from '@/api/role/role'
} from '@/api/user/role/index'
const dictStore = useDictStore()

View File

@@ -151,7 +151,7 @@
<script setup lang="tsx" name="useProTable">
import { useRouter } from "vue-router";
import type { Device } from '@/api/device/interface'
import type { Device } from '@/api/device/interface/device'
import { useHandleData } from "@/hooks/useHandleData";
import { ElMessage, ElMessageBox, ElLoading} from "element-plus";
import ProTable from "@/components/ProTable/index.vue";
@@ -160,9 +160,10 @@ import {
Search,View,EditPen
} from "@element-plus/icons-vue";
import { getPlanList } from "@/api/plan/planList";
import deviceDataList from '@/api/device/deviceData'
import deviceDataList from '@/api/device/device/deviceData'
import { log } from "console";
import { isVisible } from "element-plus/es/utils";
import { reactive, ref } from "vue";
const router = useRouter();
const value1 = ref("");
const value2 = ref("");

View File

@@ -21,10 +21,10 @@
<script setup lang='tsx' name='useProTable'>
// 根据实际路径调整
import TimeControl from '@/components/TimeControl/index.vue'
import { type Sys_Log_Audit } from '@/api/log/interface'
import { type Sys_Log_Audit } from '@/api/system/interface/log'
import ProTable from '@/components/ProTable/index.vue'
import { Upload ,DataAnalysis} from '@element-plus/icons-vue'
import logDataList from '@/api/log/logData'
import logDataList from '@/api/system/log/logData'
import type { ColumnProps, ProTableInstance } from '@/components/ProTable/interface'
import { reactive,ref,watch } from 'vue'
import { useDictStore } from '@/stores/modules/dict'

View File

@@ -56,7 +56,8 @@
import { useRouter } from 'vue-router'
import { HOME_URL } from '@/config'
import { getTimeState } from '@/utils'
import { type Dict, Login } from '@/api/interface'
import { type Dict } from '@/api/interface'
import { type Login } from '@/api/user/interface/user'
import { ElNotification } from 'element-plus'
import { getDictList, loginApi } from '@/api/user/login'
import { useUserStore } from '@/stores/modules/user'

View File

@@ -230,17 +230,17 @@
import IPAddress from '@/components/IpAddress/index.vue'
import { dialogBig } from '@/utils/elementBind'
import { type Device } from '@/api/device/interface'
import { type Device } from '@/api/device/interface/device'
import { ElMessage, type FormItemRule } from 'element-plus'
import { addPqDev, updatePqDev } from '@/api/device/device.ts'
import { addPqDev, updatePqDev } from '@/api/device/device'
import { computed, reactive, type Ref, ref } from 'vue'
import { useDictStore } from '@/stores/modules/dict'
import { CirclePlus, Delete, EditPen } from '@element-plus/icons-vue'
// 使用 dayjs 库格式化
import dayjs from 'dayjs'
import { getPqMonList } from '@/api/monitor/monitor.ts'
import { getPqMonList } from '@/api/device/monitor'
import { type ColumnProps } from '@/components/ProTable/interface'
import { type Monitor } from '@/api/monitor/interface'
import { type Monitor } from '@/api/device/interface/monitor'
const MonIsShow = ref(false)
const DevIsShow = ref(false)

View File

@@ -30,7 +30,7 @@
<script setup lang='tsx' name='useRole'>
import TimeControl from '@/components/TimeControl/index.vue'
import { type Device } from '@/api/device/interface'
import { type Device } from '@/api/device/interface/device.ts'
import { useHandleData } from '@/hooks/useHandleData'
import { useDownload } from '@/hooks/useDownload'
import ProTable from '@/components/ProTable/index.vue'
@@ -39,7 +39,7 @@ import { type ProTableInstance, type ColumnProps } from '@/components/ProTable/i
import DevicePopup from '@/views/machine/device/components/devicePopup.vue'
import { CirclePlus, Delete, EditPen, Download, Upload } from '@element-plus/icons-vue'
import { useDictStore } from '@/stores/modules/dict'
import { getPqDevList, deletePqDev, exportPqDev, downloadTemplate, importPqDev } from '@/api/device/device.ts'
import { getPqDevList, deletePqDev, exportPqDev, downloadTemplate, importPqDev } from '@/api/device/device/index.ts'
import { ElMessageBox } from 'element-plus'
import { reactive, ref } from 'vue'

View File

@@ -14,8 +14,8 @@
import { defineProps, defineEmits, reactive,watch,ref,computed } from 'vue';
import { dialogBig} from '@/utils/elementBind'
import type { ColumnProps } from '@/components/ProTable/interface'
import type { ErrorSystem } from '@/api/error/interface'
import errorDataList from '@/api/error/errorData'
import type { ErrorSystem } from '@/api/device/interface/error'
import errorDataList from '@/api/device/error/errorData'
import type { TableColumnCtx } from 'element-plus'
const errorData = errorDataList.errordetail

View File

@@ -45,9 +45,9 @@
import ProTable from '@/components/ProTable/index.vue'
import type { ColumnProps } from '@/components/ProTable/interface'
import { CirclePlus, Delete,EditPen,View} from '@element-plus/icons-vue'
import errorDataList from '@/api/error/errorData'
import errorDataList from '@/api/device/error/errorData'
import { reactive,ref } from 'vue'
import type { ErrorSystem } from '@/api/error/interface'
import type { ErrorSystem } from '@/api/device/interface/error'
import ErrorSystemDialog from "@/views/machine/errorSystem/components/ErrorSystemDialog.vue"; // 导入子组件
import ErrorStandardDialog from "@/views/machine/errorSystem/components/ErrorStandardDialog.vue"; // 导入子组件
import { useDictStore } from '@/stores/modules/dict'

View File

@@ -29,7 +29,7 @@
</template>
<script setup lang='tsx' name='useRole'>
import { TestScript } from '@/api/testScript/interface'
import { TestScript } from '@/api/device/interface/testScript'
import { useHandleData } from '@/hooks/useHandleData'
import { useDownload } from '@/hooks/useDownload'
import { useAuthButtons } from '@/hooks/useAuthButtons'
@@ -38,11 +38,11 @@ import ImportExcel from '@/components/ImportExcel/index.vue'
import { ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
import { CirclePlus, Delete, EditPen, Share, Download, Upload, View, Refresh } from '@element-plus/icons-vue'
import testScriptDataList from '@/api/testScript/testScriptData'
import testScriptDataList from '@/api/device/testScript/testScriptData'
import { useDictStore } from '@/stores/modules/dict'
import {
getTestScriptList,
} from '@/api/testScript/testScript'
} from '@/api/device/testScript/testScript'
const dictStore = useDictStore()

View File

@@ -29,7 +29,7 @@
</template>
<script setup lang='tsx' name='useRole'>
import { TestSource } from '@/api/testSource/interface'
import { TestSource } from '@/api/device/interface/testSource'
import { useHandleData } from '@/hooks/useHandleData'
import { useDownload } from '@/hooks/useDownload'
import { useAuthButtons } from '@/hooks/useAuthButtons'
@@ -38,11 +38,11 @@
import { ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
import { CirclePlus, Delete, EditPen, Share, Download, Upload, View, Refresh } from '@element-plus/icons-vue'
import testSourceDataList from '@/api/testSource/testSourceData'
import testSourceDataList from '@/api/device/testSource/testSourceData'
import { useDictStore } from '@/stores/modules/dict'
import {
getTestSourceList,
} from '@/api/testSource/testSource'
} from '@/api/device/testSource/testSource'
const dictStore = useDictStore()

View File

@@ -54,7 +54,7 @@
import {
getRoleList,
deleteRole,
} from '@/api/role/role'
} from '@/api/user/role/index'
import { deleteUser } from '@/api/user/user'
const dialogVisible = ref(false)

View File

@@ -44,10 +44,10 @@
<script setup lang='tsx'>
import { Delete, View ,Upload,Download} from '@element-plus/icons-vue'
import { reactive,ref } from 'vue'
import type { Device } from '@/api/device/interface'
import type { Device } from '@/api/device/interface/device.ts'
import ProTable from '@/components/ProTable/index.vue'
import { type ProTableInstance, type ColumnProps } from '@/components/ProTable/interface'
import deviceDataList from '@/api/device/deviceData'
import deviceDataList from '@/api/device/device/deviceData.ts'
import DeviceSelectOpen from '@/views/plan/planList/components/devSelectPopup.vue'
import { useViewSize } from '@/hooks/useViewSize'

View File

@@ -25,7 +25,7 @@
</template>
<script setup lang='tsx' name='useRole'>
import { Device } from '@/api/device/interface'
import { Device } from '@/api/device/interface/device.ts';
import { useHandleData } from '@/hooks/useHandleData'
import { useDownload } from '@/hooks/useDownload'
import { useAuthButtons } from '@/hooks/useAuthButtons'
@@ -34,11 +34,11 @@
import { ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
import { CirclePlus, Delete, EditPen, Share, Download, Upload, View, Refresh } from '@element-plus/icons-vue'
import deviceDataList from '@/api/device/deviceData'
import deviceDataList from '@/api/device/device/deviceData'
import { useDictStore } from '@/stores/modules/dict'
import {
getPqDevList,
} from '@/api/device/device'
} from '@/api/device/device/index.ts'
const dictStore = useDictStore()

View File

@@ -37,10 +37,10 @@
<script setup lang='tsx'>
import { Delete, View ,Upload,Download} from '@element-plus/icons-vue'
import { reactive,ref } from 'vue'
import type { TestSource } from '@/api/testSource/interface'
import type { TestSource } from '@/api/device/interface/testSource'
import ProTable from '@/components/ProTable/index.vue'
import { type ProTableInstance, type ColumnProps } from '@/components/ProTable/interface'
import sourceDataList from '@/api/testSource/testSourceData'
import sourceDataList from '@/api/device/testSource/testSourceData'
import SourceSelectOpen from '@/views/plan/planList/components/sourceSelectPopup.vue'
import { useDictStore } from '@/stores/modules/dict'

View File

@@ -25,7 +25,7 @@
</template>
<script setup lang='tsx' name='useRole'>
import { TestSource } from '@/api/testSource/interface'
import { TestSource } from '@/api/device/interface/testSource'
import { useHandleData } from '@/hooks/useHandleData'
import { useDownload } from '@/hooks/useDownload'
import { useAuthButtons } from '@/hooks/useAuthButtons'
@@ -34,11 +34,11 @@
import { ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
import { CirclePlus, Delete, EditPen, Share, Download, Upload, View, Refresh } from '@element-plus/icons-vue'
import testSourceDataList from '@/api/testSource/testSourceData'
import testSourceDataList from '@/api/device/testSource/testSourceData'
import { useDictStore } from '@/stores/modules/dict'
import {
getTestSourceList,
} from '@/api/testSource/testSource'
} from '@/api/device/testSource/index'
const dictStore = useDictStore()
const dialogVisible = ref(false)