From dba391650643e216dce5590187206eee0242ac99 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期五, 12 八月 2022 12:27:52 +0800
Subject: [PATCH] lct
---
src/views/intellectInspect/inspectTaskManage/inspectTask/index.vue | 94 ++++++
src/views/safeKnowledge/sfjs/index.vue | 40 ++
.idea/shelf/Uncommitted_changes_before_Update_at_2022_8_11_19_22_[Default_Changelist]/companyLogo.png | 0
src/layout/navBars/breadcrumb/user.vue | 172 +++++-----
src/views/safeKnowledge/df/index.vue | 40 ++
src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue | 53 ++
src/api/intellectInspectSystem/inspectTask/index.ts | 7
.idea/shelf/Uncommitted_changes_before_Update_at_2022_8_11_19_22__Default_Changelist_.xml | 9
src/views/safeKnowledge/bmgz/index.vue | 40 ++
src/assets/companyLogo.png | 0
.env.development | 12
src/views/safeKnowledge/inner/index.vue | 40 ++
src/views/loginPage/loginPage.vue | 2
src/views/safeKnowledge/law/index.vue | 40 ++
src/views/safeKnowledge/xzfg/index.vue | 39 ++
.idea/shelf/Uncommitted_changes_before_Update_at_2022_8_11_19_22_[Default_Changelist]/shelved.patch | 233 +++++++++++++++
src/views/safeKnowledge/internationalRules/index.vue | 40 ++
17 files changed, 758 insertions(+), 103 deletions(-)
diff --git a/.env.development b/.env.development
index de61f1c..ba35269 100644
--- a/.env.development
+++ b/.env.development
@@ -3,15 +3,21 @@
#VITE_API_URL = 'http://192.168.0.35:8008'
#李宇飞接口地址
-#VITE_API_URL = 'http://192.168.0.29:8008'
+
+VITE_API_URL = 'http://192.168.0.29:8008'
#黄振接口地址
-VITE_API_URL = 'http://192.168.0.69:8008'
+
+#VITE_API_URL = 'http://192.168.0.69:8008'
#戚会山接口地址
+
#VITE_API_URL = 'http://192.168.0.52:8011/safeplatform'
#本地测试接口地址
+
#VITE_API_URL_OUT = 'http://192.168.0.52:8011/safeplatform-out'
#本地外包测试接口地址
+
#VITE_API_URL = 'http://121.239.169.27:16006/safeplatform'
#线上正式环境接口地址
-VITE_API_URL_OUT = 'http://121.239.169.27:16006/safeplatform-out'
+
+#VITE_API_URL_OUT = 'http://121.239.169.27:16006/safeplatform-out'
#线上正式环境外包接口地址
diff --git "a/.idea/shelf/Uncommitted_changes_before_Update_at_2022_8_11_19_22_\133Default_Changelist\135/companyLogo.png" "b/.idea/shelf/Uncommitted_changes_before_Update_at_2022_8_11_19_22_\133Default_Changelist\135/companyLogo.png"
new file mode 100644
index 0000000..0f9f2d1
--- /dev/null
+++ "b/.idea/shelf/Uncommitted_changes_before_Update_at_2022_8_11_19_22_\133Default_Changelist\135/companyLogo.png"
Binary files differ
diff --git "a/.idea/shelf/Uncommitted_changes_before_Update_at_2022_8_11_19_22_\133Default_Changelist\135/shelved.patch" "b/.idea/shelf/Uncommitted_changes_before_Update_at_2022_8_11_19_22_\133Default_Changelist\135/shelved.patch"
new file mode 100644
index 0000000..7be0f81
--- /dev/null
+++ "b/.idea/shelf/Uncommitted_changes_before_Update_at_2022_8_11_19_22_\133Default_Changelist\135/shelved.patch"
@@ -0,0 +1,233 @@
+Index: src/layout/navBars/breadcrumb/user.vue
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+><template>\r\n <div class=\"layout-navbars-breadcrumb-user pr15\" :style=\"{ flex: layoutUserFlexNum }\">\r\n <div class=\"logo\">\r\n <img src=\"../../../assets/menu/companyLogo.jpg\" />\r\n <span style=\"font-size: 16px; color: #333; font-weight: bolder\"> | {{ systemName }}</span>\r\n </div>\r\n <div style=\"display: flex;align-items:center;padding-right: 5px\">\r\n <div @click=\"backToMenu()\" class=\"backBtn\">返回首页</div>\r\n <el-dropdown :show-timeout=\"70\" :hide-timeout=\"50\" trigger=\"click\" @command=\"onComponentSizeChange\">\r\n <div class=\"layout-navbars-breadcrumb-user-icon\">\r\n <i class=\"iconfont icon-ziti\" :title=\"$t('message.user.title0')\"></i>\r\n </div>\r\n <template #dropdown>\r\n <el-dropdown-menu>\r\n <el-dropdown-item command=\"large\" :disabled=\"disabledSize === 'large'\">{{ $t('message.user.dropdownLarge') }}</el-dropdown-item>\r\n <el-dropdown-item command=\"default\" :disabled=\"disabledSize === 'default'\">{{ $t('message.user.dropdownDefault') }}</el-dropdown-item>\r\n <el-dropdown-item command=\"small\" :disabled=\"disabledSize === 'small'\">{{ $t('message.user.dropdownSmall') }}</el-dropdown-item>\r\n </el-dropdown-menu>\r\n </template>\r\n </el-dropdown>\r\n<!-- <el-dropdown :show-timeout=\"70\" :hide-timeout=\"50\" trigger=\"click\" @command=\"onLanguageChange\">-->\r\n<!-- <div class=\"layout-navbars-breadcrumb-user-icon\">-->\r\n<!-- <i class=\"iconfont\" :class=\"disabledI18n === 'en' ? 'icon-fuhao-yingwen' : 'icon-fuhao-zhongwen'\" :title=\"$t('message.user.title1')\"></i>-->\r\n<!-- </div>-->\r\n<!-- <template #dropdown>-->\r\n<!-- <el-dropdown-menu>-->\r\n<!-- <el-dropdown-item command=\"zh-cn\" :disabled=\"disabledI18n === 'zh-cn'\">简体中文</el-dropdown-item>-->\r\n<!-- <el-dropdown-item command=\"en\" :disabled=\"disabledI18n === 'en'\">English</el-dropdown-item>-->\r\n<!-- <el-dropdown-item command=\"zh-tw\" :disabled=\"disabledI18n === 'zh-tw'\">繁體中文</el-dropdown-item>-->\r\n<!-- </el-dropdown-menu>-->\r\n<!-- </template>-->\r\n<!-- </el-dropdown>-->\r\n<!-- <div class=\"layout-navbars-breadcrumb-user-icon\" @click=\"onSearchClick\">-->\r\n<!-- <el-icon :title=\"$t('message.user.title2')\">-->\r\n<!-- <ele-Search />-->\r\n<!-- </el-icon>-->\r\n<!-- </div>-->\r\n <!-- <div class=\"layout-navbars-breadcrumb-user-icon\" @click=\"onLayoutSetingClick\">-->\r\n <!-- <i class=\"icon-skin iconfont\" :title=\"$t('message.user.title3')\"></i>-->\r\n <!-- </div>-->\r\n <!-- <div class=\"layout-navbars-breadcrumb-user-icon\">-->\r\n <!-- <el-popover placement=\"bottom\" trigger=\"click\" transition=\"el-zoom-in-top\" :width=\"300\" :persistent=\"false\">-->\r\n <!-- <template #reference>-->\r\n <!-- <el-badge :is-dot=\"true\">-->\r\n <!-- <el-icon :title=\"$t('message.user.title4')\">-->\r\n <!-- <ele-Bell />-->\r\n <!-- </el-icon>-->\r\n <!-- </el-badge>-->\r\n <!-- </template>-->\r\n <!-- <template #default>-->\r\n <!-- <UserNews />-->\r\n <!-- </template>-->\r\n <!-- </el-popover>-->\r\n <!-- </div>-->\r\n <div class=\"layout-navbars-breadcrumb-user-icon mr10\" @click=\"onScreenfullClick\">\r\n <i class=\"iconfont\" :title=\"isScreenfull ? $t('message.user.title6') : $t('message.user.title5')\" :class=\"!isScreenfull ? 'icon-fullscreen' : 'icon-tuichuquanping'\"></i>\r\n </div>\r\n <el-dropdown :show-timeout=\"70\" :hide-timeout=\"50\" @command=\"onHandleCommandClick\">\r\n <span class=\"layout-navbars-breadcrumb-user-link\">\r\n <img :src=\"userInfos.photo\" class=\"layout-navbars-breadcrumb-user-link-photo mr5\" />\r\n {{ userInfos.userName }}\r\n <el-icon class=\"el-icon--right\">\r\n <ele-ArrowDown />\r\n </el-icon>\r\n </span>\r\n <template #dropdown>\r\n <el-dropdown-menu>\r\n <el-dropdown-item command=\"/homeMenu\">{{ $t('message.user.dropdown1') }}</el-dropdown-item>\r\n <!-- <el-dropdown-item command=\"wareHouse\">{{ $t('message.user.dropdown6') }}</el-dropdown-item>-->\r\n<!-- <el-dropdown-item command=\"/personal\">{{ $t('message.user.dropdown2') }}</el-dropdown-item>-->\r\n <!--\t\t\t\t\t<el-dropdown-item command=\"/404\">{{ $t('message.user.dropdown3') }}</el-dropdown-item>-->\r\n <!--\t\t\t\t\t<el-dropdown-item command=\"/401\">{{ $t('message.user.dropdown4') }}</el-dropdown-item>-->\r\n <el-dropdown-item divided command=\"logOut\">{{ $t('message.user.dropdown5') }}</el-dropdown-item>\r\n </el-dropdown-menu>\r\n </template>\r\n </el-dropdown>\r\n <Search ref=\"searchRef\" />\r\n </div>\r\n </div>\r\n</template>\r\n\r\n<script lang=\"ts\">\r\nimport { ref, getCurrentInstance, computed, reactive, toRefs, onMounted, defineComponent } from 'vue';\r\nimport { useRouter } from 'vue-router';\r\nimport { ElMessageBox, ElMessage } from 'element-plus';\r\nimport screenfull from 'screenfull';\r\nimport { useI18n } from 'vue-i18n';\r\nimport { storeToRefs } from 'pinia';\r\nimport { useUserInfo } from '/@/stores/userInfo';\r\nimport { useThemeConfig } from '/@/stores/themeConfig';\r\nimport other from '/@/utils/other';\r\nimport { Session, Local } from '/@/utils/storage';\r\nimport UserNews from '/@/layout/navBars/breadcrumb/userNews.vue';\r\nimport Search from '/@/layout/navBars/breadcrumb/search.vue';\r\nimport { useLoginApi } from '/@/api/login';\r\nimport { useMenuApi } from '/@/api/systemManage/menu/index';\r\n\r\nconst menuApi = useMenuApi();\r\nimport { backEndComponent, getBackEndControlRoutes, initBackEndControlRoutes, setAddRoute, setFilterMenuAndCacheTagsViewRoutes } from '../../../router/backEnd';\r\nimport { NextLoading } from '/@/utils/loading';\r\nimport { useRequestOldRoutes } from '/@/stores/requestOldRoutes';\r\nimport { dynamicRoutes } from '/@/router/route';\r\n\r\nexport default defineComponent({\r\n name: 'layoutBreadcrumbUser',\r\n components: { UserNews, Search },\r\n setup() {\r\n const { t } = useI18n();\r\n const { proxy } = <any>getCurrentInstance();\r\n const router = useRouter();\r\n const stores = useUserInfo();\r\n const storesThemeConfig = useThemeConfig();\r\n const { userInfos } = storeToRefs(stores);\r\n const { themeConfig } = storeToRefs(storesThemeConfig);\r\n const searchRef = ref();\r\n const state = reactive({\r\n isScreenfull: false,\r\n disabledI18n: 'zh-cn',\r\n disabledSize: 'large',\r\n systemName: ''\r\n });\r\n // 设置分割样式\r\n const layoutUserFlexNum = computed(() => {\r\n let num: string | number = '';\r\n const { layout, isClassicSplitMenu } = themeConfig.value;\r\n const layoutArr: string[] = ['defaults', 'columns'];\r\n if (layoutArr.includes(layout) || (layout === 'classic' && !isClassicSplitMenu)) num = '1';\r\n else num = '';\r\n return num;\r\n });\r\n // 全屏点击时\r\n const onScreenfullClick = () => {\r\n if (!screenfull.isEnabled) {\r\n ElMessage.warning('暂不不支持全屏');\r\n return false;\r\n }\r\n screenfull.toggle();\r\n screenfull.on('change', () => {\r\n if (screenfull.isFullscreen) state.isScreenfull = true;\r\n else state.isScreenfull = false;\r\n });\r\n };\r\n // 布局配置 icon 点击时\r\n const onLayoutSetingClick = () => {\r\n proxy.mittBus.emit('openSetingsDrawer');\r\n };\r\n // 下拉菜单点击时\r\n const onHandleCommandClick = (path: string) => {\r\n if (path === 'logOut') {\r\n ElMessageBox({\r\n closeOnClickModal: false,\r\n closeOnPressEscape: false,\r\n title: t('message.user.logOutTitle'),\r\n message: t('message.user.logOutMessage'),\r\n showCancelButton: true,\r\n confirmButtonText: t('message.user.logOutConfirm'),\r\n cancelButtonText: t('message.user.logOutCancel'),\r\n buttonSize: 'default',\r\n beforeClose: (action, instance, done) => {\r\n if (action === 'confirm') {\r\n instance.confirmButtonLoading = true;\r\n instance.confirmButtonText = t('message.user.logOutExit');\r\n setTimeout(() => {\r\n done();\r\n setTimeout(() => {\r\n instance.confirmButtonLoading = false;\r\n }, 300);\r\n }, 700);\r\n } else {\r\n done();\r\n }\r\n }\r\n })\r\n .then(async () => {\r\n let res = await useLoginApi().signOut();\r\n if (res.data.code === '200') {\r\n Session.clear(); // 清除缓存/token等\r\n // 使用 reload 时，不需要调用 resetRoute() 重置路由\r\n window.location.reload();\r\n } else {\r\n ElMessage({\r\n type: 'warning',\r\n message: res.data.msg\r\n });\r\n }\r\n })\r\n .catch(() => {});\r\n } else if (path === 'wareHouse') {\r\n window.open('https://gitee.com/lyt-top/vue-next-admin');\r\n } else {\r\n router.push(path);\r\n }\r\n };\r\n // 菜单搜索点击\r\n const onSearchClick = () => {\r\n searchRef.value.openSearch();\r\n };\r\n // 组件大小改变\r\n const onComponentSizeChange = (size: string) => {\r\n Local.remove('themeConfig');\r\n themeConfig.value.globalComponentSize = size;\r\n Local.set('themeConfig', themeConfig.value);\r\n initComponentSize();\r\n window.location.reload();\r\n };\r\n // 语言切换\r\n const onLanguageChange = (lang: string) => {\r\n Local.remove('themeConfig');\r\n themeConfig.value.globalI18n = lang;\r\n Local.set('themeConfig', themeConfig.value);\r\n proxy.$i18n.locale = lang;\r\n initI18n();\r\n other.useTitle();\r\n };\r\n // 设置 element plus 组件的国际化\r\n const setI18nConfig = (locale: string) => {\r\n proxy.mittBus.emit('getI18nConfig', proxy.$i18n.messages[locale]);\r\n };\r\n // 初始化言语国际化\r\n const initI18n = () => {\r\n switch (Local.get('themeConfig').globalI18n) {\r\n case 'zh-cn':\r\n state.disabledI18n = 'zh-cn';\r\n setI18nConfig('zh-cn');\r\n break;\r\n case 'en':\r\n state.disabledI18n = 'en';\r\n setI18nConfig('en');\r\n break;\r\n case 'zh-tw':\r\n state.disabledI18n = 'zh-tw';\r\n setI18nConfig('zh-tw');\r\n break;\r\n }\r\n };\r\n // 初始化全局组件大小\r\n const initComponentSize = () => {\r\n switch (Local.get('themeConfig').globalComponentSize) {\r\n case 'large':\r\n state.disabledSize = 'large';\r\n break;\r\n case 'default':\r\n state.disabledSize = 'default';\r\n break;\r\n case 'small':\r\n state.disabledSize = 'small';\r\n break;\r\n }\r\n };\r\n\r\n const getSysName = async()=>{\r\n if (window.nextLoading === undefined) NextLoading.start();\r\n if (!Session.get('token')) return false;\r\n const res = await menuApi.getMenuAdmin(Session.get('projectId') === null ? '' : Session.get('projectId'));\r\n if(res.data.code === '200'){\r\n state.systemName = res.data.data[1].project.projectName;\r\n console.log(state.systemName)\r\n }else{\r\n console.log('有问题')\r\n }\r\n }\r\n const backToMenu=()=>{\r\n router.push({ path: 'homeMenu' })\r\n }\r\n // 页面加载时\r\n onMounted(() => {\r\n if (Local.get('themeConfig')) {\r\n initI18n();\r\n initComponentSize();\r\n }\r\n getSysName()\r\n });\r\n return {\r\n userInfos,\r\n backToMenu,\r\n onLayoutSetingClick,\r\n onHandleCommandClick,\r\n onScreenfullClick,\r\n onSearchClick,\r\n onComponentSizeChange,\r\n onLanguageChange,\r\n searchRef,\r\n layoutUserFlexNum,\r\n ...toRefs(state)\r\n };\r\n }\r\n});\r\n</script>\r\n\r\n<style scoped lang=\"scss\">\r\n.layout-navbars-breadcrumb-user {\r\n display: flex;\r\n align-items: center;\r\n justify-content: space-between;\r\n\r\n .logo{\r\n height: 50px;\r\n padding: 5px 10px;\r\n display: flex;\r\n align-items: center;\r\n overflow: hidden;\r\n box-sizing: border-box;\r\n img{\r\n height: 100%;\r\n }\r\n }\r\n &-link {\r\n height: 100%;\r\n display: flex;\r\n align-items: center;\r\n white-space: nowrap;\r\n &-photo {\r\n width: 25px;\r\n height: 25px;\r\n border-radius: 100%;\r\n }\r\n }\r\n &-icon {\r\n padding: 0 10px;\r\n cursor: pointer;\r\n color: var(--next-bg-topBarColor);\r\n height: 50px;\r\n line-height: 50px;\r\n display: flex;\r\n align-items: center;\r\n &:hover {\r\n background: var(--next-color-user-hover);\r\n i {\r\n display: inline-block;\r\n animation: logoAnimation 0.3s ease-in-out;\r\n }\r\n }\r\n }\r\n ::v-deep(.el-dropdown) {\r\n color: var(--next-bg-topBarColor);\r\n }\r\n ::v-deep(.el-badge) {\r\n height: 40px;\r\n line-height: 40px;\r\n display: flex;\r\n align-items: center;\r\n }\r\n ::v-deep(.el-badge__content.is-fixed) {\r\n top: 12px;\r\n }\r\n .backBtn{\r\n font-size: 16px;\r\n cursor: pointer;\r\n margin-right: 20px;\r\n\r\n &:hover{\r\n color: #409eff;\r\n font-weight: bolder;\r\n }\r\n }\r\n}\r\n</style>\r\n
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/src/layout/navBars/breadcrumb/user.vue b/src/layout/navBars/breadcrumb/user.vue
+--- a/src/layout/navBars/breadcrumb/user.vue (revision b37d9a1f4f39fb04f48a63d11d759c673e5f4d6a)
++++ b/src/layout/navBars/breadcrumb/user.vue (date 1660216734138)
+@@ -1,80 +1,80 @@
+ <template>
+ <div class="layout-navbars-breadcrumb-user pr15" :style="{ flex: layoutUserFlexNum }">
+ <div class="logo">
+- <img src="../../../assets/menu/companyLogo.jpg" />
++ <img src="../../../assets/menu/companyLogo.png" />
+ <span style="font-size: 16px; color: #333; font-weight: bolder"> | {{ systemName }}</span>
+ </div>
+- <div style="display: flex;align-items:center;padding-right: 5px">
+- <div @click="backToMenu()" class="backBtn">返回首页</div>
+- <el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onComponentSizeChange">
+- <div class="layout-navbars-breadcrumb-user-icon">
+- <i class="iconfont icon-ziti" :title="$t('message.user.title0')"></i>
+- </div>
+- <template #dropdown>
+- <el-dropdown-menu>
+- <el-dropdown-item command="large" :disabled="disabledSize === 'large'">{{ $t('message.user.dropdownLarge') }}</el-dropdown-item>
+- <el-dropdown-item command="default" :disabled="disabledSize === 'default'">{{ $t('message.user.dropdownDefault') }}</el-dropdown-item>
+- <el-dropdown-item command="small" :disabled="disabledSize === 'small'">{{ $t('message.user.dropdownSmall') }}</el-dropdown-item>
+- </el-dropdown-menu>
+- </template>
+- </el-dropdown>
+-<!-- <el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onLanguageChange">-->
+-<!-- <div class="layout-navbars-breadcrumb-user-icon">-->
+-<!-- <i class="iconfont" :class="disabledI18n === 'en' ? 'icon-fuhao-yingwen' : 'icon-fuhao-zhongwen'" :title="$t('message.user.title1')"></i>-->
+-<!-- </div>-->
+-<!-- <template #dropdown>-->
+-<!-- <el-dropdown-menu>-->
+-<!-- <el-dropdown-item command="zh-cn" :disabled="disabledI18n === 'zh-cn'">简体中文</el-dropdown-item>-->
+-<!-- <el-dropdown-item command="en" :disabled="disabledI18n === 'en'">English</el-dropdown-item>-->
+-<!-- <el-dropdown-item command="zh-tw" :disabled="disabledI18n === 'zh-tw'">繁體中文</el-dropdown-item>-->
+-<!-- </el-dropdown-menu>-->
+-<!-- </template>-->
+-<!-- </el-dropdown>-->
+-<!-- <div class="layout-navbars-breadcrumb-user-icon" @click="onSearchClick">-->
+-<!-- <el-icon :title="$t('message.user.title2')">-->
+-<!-- <ele-Search />-->
+-<!-- </el-icon>-->
+-<!-- </div>-->
+- <!-- <div class="layout-navbars-breadcrumb-user-icon" @click="onLayoutSetingClick">-->
+- <!-- <i class="icon-skin iconfont" :title="$t('message.user.title3')"></i>-->
+- <!-- </div>-->
+- <!-- <div class="layout-navbars-breadcrumb-user-icon">-->
+- <!-- <el-popover placement="bottom" trigger="click" transition="el-zoom-in-top" :width="300" :persistent="false">-->
+- <!-- <template #reference>-->
+- <!-- <el-badge :is-dot="true">-->
+- <!-- <el-icon :title="$t('message.user.title4')">-->
+- <!-- <ele-Bell />-->
+- <!-- </el-icon>-->
+- <!-- </el-badge>-->
+- <!-- </template>-->
+- <!-- <template #default>-->
+- <!-- <UserNews />-->
+- <!-- </template>-->
+- <!-- </el-popover>-->
+- <!-- </div>-->
+- <div class="layout-navbars-breadcrumb-user-icon mr10" @click="onScreenfullClick">
+- <i class="iconfont" :title="isScreenfull ? $t('message.user.title6') : $t('message.user.title5')" :class="!isScreenfull ? 'icon-fullscreen' : 'icon-tuichuquanping'"></i>
+- </div>
+- <el-dropdown :show-timeout="70" :hide-timeout="50" @command="onHandleCommandClick">
+- <span class="layout-navbars-breadcrumb-user-link">
+- <img :src="userInfos.photo" class="layout-navbars-breadcrumb-user-link-photo mr5" />
+- {{ userInfos.userName }}
+- <el-icon class="el-icon--right">
+- <ele-ArrowDown />
+- </el-icon>
+- </span>
+- <template #dropdown>
+- <el-dropdown-menu>
+- <el-dropdown-item command="/homeMenu">{{ $t('message.user.dropdown1') }}</el-dropdown-item>
+- <!-- <el-dropdown-item command="wareHouse">{{ $t('message.user.dropdown6') }}</el-dropdown-item>-->
+-<!-- <el-dropdown-item command="/personal">{{ $t('message.user.dropdown2') }}</el-dropdown-item>-->
+- <!-- <el-dropdown-item command="/404">{{ $t('message.user.dropdown3') }}</el-dropdown-item>-->
+- <!-- <el-dropdown-item command="/401">{{ $t('message.user.dropdown4') }}</el-dropdown-item>-->
+- <el-dropdown-item divided command="logOut">{{ $t('message.user.dropdown5') }}</el-dropdown-item>
+- </el-dropdown-menu>
+- </template>
+- </el-dropdown>
+- <Search ref="searchRef" />
++ <div style="display: flex; align-items: center; padding-right: 5px">
++ <div @click="backToMenu()" class="backBtn">返回首页</div>
++ <el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onComponentSizeChange">
++ <div class="layout-navbars-breadcrumb-user-icon">
++ <i class="iconfont icon-ziti" :title="$t('message.user.title0')"></i>
++ </div>
++ <template #dropdown>
++ <el-dropdown-menu>
++ <el-dropdown-item command="large" :disabled="disabledSize === 'large'">{{ $t('message.user.dropdownLarge') }}</el-dropdown-item>
++ <el-dropdown-item command="default" :disabled="disabledSize === 'default'">{{ $t('message.user.dropdownDefault') }}</el-dropdown-item>
++ <el-dropdown-item command="small" :disabled="disabledSize === 'small'">{{ $t('message.user.dropdownSmall') }}</el-dropdown-item>
++ </el-dropdown-menu>
++ </template>
++ </el-dropdown>
++ <!-- <el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onLanguageChange">-->
++ <!-- <div class="layout-navbars-breadcrumb-user-icon">-->
++ <!-- <i class="iconfont" :class="disabledI18n === 'en' ? 'icon-fuhao-yingwen' : 'icon-fuhao-zhongwen'" :title="$t('message.user.title1')"></i>-->
++ <!-- </div>-->
++ <!-- <template #dropdown>-->
++ <!-- <el-dropdown-menu>-->
++ <!-- <el-dropdown-item command="zh-cn" :disabled="disabledI18n === 'zh-cn'">简体中文</el-dropdown-item>-->
++ <!-- <el-dropdown-item command="en" :disabled="disabledI18n === 'en'">English</el-dropdown-item>-->
++ <!-- <el-dropdown-item command="zh-tw" :disabled="disabledI18n === 'zh-tw'">繁體中文</el-dropdown-item>-->
++ <!-- </el-dropdown-menu>-->
++ <!-- </template>-->
++ <!-- </el-dropdown>-->
++ <!-- <div class="layout-navbars-breadcrumb-user-icon" @click="onSearchClick">-->
++ <!-- <el-icon :title="$t('message.user.title2')">-->
++ <!-- <ele-Search />-->
++ <!-- </el-icon>-->
++ <!-- </div>-->
++ <!-- <div class="layout-navbars-breadcrumb-user-icon" @click="onLayoutSetingClick">-->
++ <!-- <i class="icon-skin iconfont" :title="$t('message.user.title3')"></i>-->
++ <!-- </div>-->
++ <!-- <div class="layout-navbars-breadcrumb-user-icon">-->
++ <!-- <el-popover placement="bottom" trigger="click" transition="el-zoom-in-top" :width="300" :persistent="false">-->
++ <!-- <template #reference>-->
++ <!-- <el-badge :is-dot="true">-->
++ <!-- <el-icon :title="$t('message.user.title4')">-->
++ <!-- <ele-Bell />-->
++ <!-- </el-icon>-->
++ <!-- </el-badge>-->
++ <!-- </template>-->
++ <!-- <template #default>-->
++ <!-- <UserNews />-->
++ <!-- </template>-->
++ <!-- </el-popover>-->
++ <!-- </div>-->
++ <div class="layout-navbars-breadcrumb-user-icon mr10" @click="onScreenfullClick">
++ <i class="iconfont" :title="isScreenfull ? $t('message.user.title6') : $t('message.user.title5')" :class="!isScreenfull ? 'icon-fullscreen' : 'icon-tuichuquanping'"></i>
++ </div>
++ <el-dropdown :show-timeout="70" :hide-timeout="50" @command="onHandleCommandClick">
++ <span class="layout-navbars-breadcrumb-user-link">
++ <img :src="userInfos.photo" class="layout-navbars-breadcrumb-user-link-photo mr5" />
++ {{ userInfos.userName }}
++ <el-icon class="el-icon--right">
++ <ele-ArrowDown />
++ </el-icon>
++ </span>
++ <template #dropdown>
++ <el-dropdown-menu>
++ <el-dropdown-item command="/homeMenu">{{ $t('message.user.dropdown1') }}</el-dropdown-item>
++ <!-- <el-dropdown-item command="wareHouse">{{ $t('message.user.dropdown6') }}</el-dropdown-item>-->
++ <!-- <el-dropdown-item command="/personal">{{ $t('message.user.dropdown2') }}</el-dropdown-item>-->
++ <!-- <el-dropdown-item command="/404">{{ $t('message.user.dropdown3') }}</el-dropdown-item>-->
++ <!-- <el-dropdown-item command="/401">{{ $t('message.user.dropdown4') }}</el-dropdown-item>-->
++ <el-dropdown-item divided command="logOut">{{ $t('message.user.dropdown5') }}</el-dropdown-item>
++ </el-dropdown-menu>
++ </template>
++ </el-dropdown>
++ <Search ref="searchRef" />
+ </div>
+ </div>
+ </template>
+@@ -248,27 +248,27 @@
+ }
+ };
+
+- const getSysName = async()=>{
++ const getSysName = async () => {
+ if (window.nextLoading === undefined) NextLoading.start();
+ if (!Session.get('token')) return false;
+ const res = await menuApi.getMenuAdmin(Session.get('projectId') === null ? '' : Session.get('projectId'));
+- if(res.data.code === '200'){
++ if (res.data.code === '200') {
+ state.systemName = res.data.data[1].project.projectName;
+- console.log(state.systemName)
+- }else{
+- console.log('有问题')
++ console.log(state.systemName);
++ } else {
++ console.log('有问题');
+ }
+- }
+- const backToMenu=()=>{
+- router.push({ path: 'homeMenu' })
+- }
++ };
++ const backToMenu = () => {
++ router.push({ path: 'homeMenu' });
++ };
+ // 页面加载时
+ onMounted(() => {
+ if (Local.get('themeConfig')) {
+ initI18n();
+ initComponentSize();
+ }
+- getSysName()
++ getSysName();
+ });
+ return {
+ userInfos,
+@@ -293,14 +293,14 @@
+ align-items: center;
+ justify-content: space-between;
+
+- .logo{
++ .logo {
+ height: 50px;
+ padding: 5px 10px;
+ display: flex;
+ align-items: center;
+ overflow: hidden;
+ box-sizing: border-box;
+- img{
++ img {
+ height: 100%;
+ }
+ }
+@@ -343,12 +343,12 @@
+ ::v-deep(.el-badge__content.is-fixed) {
+ top: 12px;
+ }
+- .backBtn{
++ .backBtn {
+ font-size: 16px;
+ cursor: pointer;
+ margin-right: 20px;
+
+- &:hover{
++ &:hover {
+ color: #409eff;
+ font-weight: bolder;
+ }
diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_2022_8_11_19_22__Default_Changelist_.xml b/.idea/shelf/Uncommitted_changes_before_Update_at_2022_8_11_19_22__Default_Changelist_.xml
new file mode 100644
index 0000000..1478e29
--- /dev/null
+++ b/.idea/shelf/Uncommitted_changes_before_Update_at_2022_8_11_19_22__Default_Changelist_.xml
@@ -0,0 +1,9 @@
+<changelist name="Uncommitted_changes_before_Update_at_2022_8_11_19_22_[Default_Changelist]" date="1660217002849" recycled="true" deleted="true">
+ <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_8_11_19_22_[Default_Changelist]/shelved.patch" />
+ <option name="DESCRIPTION" value="Uncommitted changes before Update at 2022/8/11 19:22 [Default Changelist]" />
+ <binary>
+ <option name="BEFORE_PATH" />
+ <option name="AFTER_PATH" value="src/assets/companyLogo.png" />
+ <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_8_11_19_22_[Default_Changelist]/companyLogo.png" />
+ </binary>
+</changelist>
\ No newline at end of file
diff --git a/src/api/intellectInspectSystem/inspectTask/index.ts b/src/api/intellectInspectSystem/inspectTask/index.ts
index 2c36d91..683bdd8 100644
--- a/src/api/intellectInspectSystem/inspectTask/index.ts
+++ b/src/api/intellectInspectSystem/inspectTask/index.ts
@@ -71,6 +71,13 @@
url: import.meta.env.VITE_API_URL + `/safeCheckQuotaType/select/listQuotaType`,
method: 'get'
});
+ },
+ openOrCloseInspectTask: (data: object) => {
+ return request({
+ url: import.meta.env.VITE_API_URL + `/SafeCheckTaskUnit/update/updateTaskUnitStatusById`,
+ method: 'post',
+ data: data
+ });
}
};
}
diff --git a/src/assets/companyLogo.png b/src/assets/companyLogo.png
new file mode 100644
index 0000000..0f9f2d1
--- /dev/null
+++ b/src/assets/companyLogo.png
Binary files differ
diff --git a/src/layout/navBars/breadcrumb/user.vue b/src/layout/navBars/breadcrumb/user.vue
index 685df1d..4b78003 100644
--- a/src/layout/navBars/breadcrumb/user.vue
+++ b/src/layout/navBars/breadcrumb/user.vue
@@ -1,80 +1,80 @@
<template>
<div class="layout-navbars-breadcrumb-user pr15" :style="{ flex: layoutUserFlexNum }">
<div class="logo">
- <img src="src/assets/menu/companyLogo.png">
- <span style="font-size: 22px;color: #409eff;font-weight: bolder;border-left: 2px solid #409eff;padding-left: 10px">{{systemName}}</span>
+ <img src="../../../assets/menu/companyLogo.png" />
+ <span style="font-size: 22px; color: #409eff; font-weight: bolder; border-left: 2px solid #409eff; padding-left: 10px">{{ systemName }}</span>
</div>
- <div style="display: flex;align-items:center;padding-right: 5px">
- <div @click="backToMenu()" class="backBtn">返回首页</div>
- <el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onComponentSizeChange">
- <div class="layout-navbars-breadcrumb-user-icon">
- <i class="iconfont icon-ziti" :title="$t('message.user.title0')"></i>
+ <div style="display: flex; align-items: center; padding-right: 5px">
+ <div @click="backToMenu()" class="backBtn">返回首页</div>
+ <el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onComponentSizeChange">
+ <div class="layout-navbars-breadcrumb-user-icon">
+ <i class="iconfont icon-ziti" :title="$t('message.user.title0')"></i>
+ </div>
+ <template #dropdown>
+ <el-dropdown-menu>
+ <el-dropdown-item command="large" :disabled="disabledSize === 'large'">{{ $t('message.user.dropdownLarge') }}</el-dropdown-item>
+ <el-dropdown-item command="default" :disabled="disabledSize === 'default'">{{ $t('message.user.dropdownDefault') }}</el-dropdown-item>
+ <el-dropdown-item command="small" :disabled="disabledSize === 'small'">{{ $t('message.user.dropdownSmall') }}</el-dropdown-item>
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
+ <!-- <el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onLanguageChange">-->
+ <!-- <div class="layout-navbars-breadcrumb-user-icon">-->
+ <!-- <i class="iconfont" :class="disabledI18n === 'en' ? 'icon-fuhao-yingwen' : 'icon-fuhao-zhongwen'" :title="$t('message.user.title1')"></i>-->
+ <!-- </div>-->
+ <!-- <template #dropdown>-->
+ <!-- <el-dropdown-menu>-->
+ <!-- <el-dropdown-item command="zh-cn" :disabled="disabledI18n === 'zh-cn'">简体中文</el-dropdown-item>-->
+ <!-- <el-dropdown-item command="en" :disabled="disabledI18n === 'en'">English</el-dropdown-item>-->
+ <!-- <el-dropdown-item command="zh-tw" :disabled="disabledI18n === 'zh-tw'">繁體中文</el-dropdown-item>-->
+ <!-- </el-dropdown-menu>-->
+ <!-- </template>-->
+ <!-- </el-dropdown>-->
+ <!-- <div class="layout-navbars-breadcrumb-user-icon" @click="onSearchClick">-->
+ <!-- <el-icon :title="$t('message.user.title2')">-->
+ <!-- <ele-Search />-->
+ <!-- </el-icon>-->
+ <!-- </div>-->
+ <!-- <div class="layout-navbars-breadcrumb-user-icon" @click="onLayoutSetingClick">-->
+ <!-- <i class="icon-skin iconfont" :title="$t('message.user.title3')"></i>-->
+ <!-- </div>-->
+ <!-- <div class="layout-navbars-breadcrumb-user-icon">-->
+ <!-- <el-popover placement="bottom" trigger="click" transition="el-zoom-in-top" :width="300" :persistent="false">-->
+ <!-- <template #reference>-->
+ <!-- <el-badge :is-dot="true">-->
+ <!-- <el-icon :title="$t('message.user.title4')">-->
+ <!-- <ele-Bell />-->
+ <!-- </el-icon>-->
+ <!-- </el-badge>-->
+ <!-- </template>-->
+ <!-- <template #default>-->
+ <!-- <UserNews />-->
+ <!-- </template>-->
+ <!-- </el-popover>-->
+ <!-- </div>-->
+ <div class="layout-navbars-breadcrumb-user-icon mr10" @click="onScreenfullClick">
+ <i class="iconfont" :title="isScreenfull ? $t('message.user.title6') : $t('message.user.title5')" :class="!isScreenfull ? 'icon-fullscreen' : 'icon-tuichuquanping'"></i>
</div>
- <template #dropdown>
- <el-dropdown-menu>
- <el-dropdown-item command="large" :disabled="disabledSize === 'large'">{{ $t('message.user.dropdownLarge') }}</el-dropdown-item>
- <el-dropdown-item command="default" :disabled="disabledSize === 'default'">{{ $t('message.user.dropdownDefault') }}</el-dropdown-item>
- <el-dropdown-item command="small" :disabled="disabledSize === 'small'">{{ $t('message.user.dropdownSmall') }}</el-dropdown-item>
- </el-dropdown-menu>
- </template>
- </el-dropdown>
-<!-- <el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onLanguageChange">-->
-<!-- <div class="layout-navbars-breadcrumb-user-icon">-->
-<!-- <i class="iconfont" :class="disabledI18n === 'en' ? 'icon-fuhao-yingwen' : 'icon-fuhao-zhongwen'" :title="$t('message.user.title1')"></i>-->
-<!-- </div>-->
-<!-- <template #dropdown>-->
-<!-- <el-dropdown-menu>-->
-<!-- <el-dropdown-item command="zh-cn" :disabled="disabledI18n === 'zh-cn'">简体中文</el-dropdown-item>-->
-<!-- <el-dropdown-item command="en" :disabled="disabledI18n === 'en'">English</el-dropdown-item>-->
-<!-- <el-dropdown-item command="zh-tw" :disabled="disabledI18n === 'zh-tw'">繁體中文</el-dropdown-item>-->
-<!-- </el-dropdown-menu>-->
-<!-- </template>-->
-<!-- </el-dropdown>-->
-<!-- <div class="layout-navbars-breadcrumb-user-icon" @click="onSearchClick">-->
-<!-- <el-icon :title="$t('message.user.title2')">-->
-<!-- <ele-Search />-->
-<!-- </el-icon>-->
-<!-- </div>-->
- <!-- <div class="layout-navbars-breadcrumb-user-icon" @click="onLayoutSetingClick">-->
- <!-- <i class="icon-skin iconfont" :title="$t('message.user.title3')"></i>-->
- <!-- </div>-->
- <!-- <div class="layout-navbars-breadcrumb-user-icon">-->
- <!-- <el-popover placement="bottom" trigger="click" transition="el-zoom-in-top" :width="300" :persistent="false">-->
- <!-- <template #reference>-->
- <!-- <el-badge :is-dot="true">-->
- <!-- <el-icon :title="$t('message.user.title4')">-->
- <!-- <ele-Bell />-->
- <!-- </el-icon>-->
- <!-- </el-badge>-->
- <!-- </template>-->
- <!-- <template #default>-->
- <!-- <UserNews />-->
- <!-- </template>-->
- <!-- </el-popover>-->
- <!-- </div>-->
- <div class="layout-navbars-breadcrumb-user-icon mr10" @click="onScreenfullClick">
- <i class="iconfont" :title="isScreenfull ? $t('message.user.title6') : $t('message.user.title5')" :class="!isScreenfull ? 'icon-fullscreen' : 'icon-tuichuquanping'"></i>
- </div>
- <el-dropdown :show-timeout="70" :hide-timeout="50" @command="onHandleCommandClick">
- <span class="layout-navbars-breadcrumb-user-link">
- <img :src="userInfos.photo" class="layout-navbars-breadcrumb-user-link-photo mr5" />
- {{ userInfos.userName }}
- <el-icon class="el-icon--right">
- <ele-ArrowDown />
- </el-icon>
- </span>
- <template #dropdown>
- <el-dropdown-menu>
- <el-dropdown-item command="/homeMenu">{{ $t('message.user.dropdown1') }}</el-dropdown-item>
- <!-- <el-dropdown-item command="wareHouse">{{ $t('message.user.dropdown6') }}</el-dropdown-item>-->
-<!-- <el-dropdown-item command="/personal">{{ $t('message.user.dropdown2') }}</el-dropdown-item>-->
- <!-- <el-dropdown-item command="/404">{{ $t('message.user.dropdown3') }}</el-dropdown-item>-->
- <!-- <el-dropdown-item command="/401">{{ $t('message.user.dropdown4') }}</el-dropdown-item>-->
- <el-dropdown-item divided command="logOut">{{ $t('message.user.dropdown5') }}</el-dropdown-item>
- </el-dropdown-menu>
- </template>
- </el-dropdown>
- <Search ref="searchRef" />
+ <el-dropdown :show-timeout="70" :hide-timeout="50" @command="onHandleCommandClick">
+ <span class="layout-navbars-breadcrumb-user-link">
+ <img :src="userInfos.photo" class="layout-navbars-breadcrumb-user-link-photo mr5" />
+ {{ userInfos.userName }}
+ <el-icon class="el-icon--right">
+ <ele-ArrowDown />
+ </el-icon>
+ </span>
+ <template #dropdown>
+ <el-dropdown-menu>
+ <el-dropdown-item command="/homeMenu">{{ $t('message.user.dropdown1') }}</el-dropdown-item>
+ <!-- <el-dropdown-item command="wareHouse">{{ $t('message.user.dropdown6') }}</el-dropdown-item>-->
+ <!-- <el-dropdown-item command="/personal">{{ $t('message.user.dropdown2') }}</el-dropdown-item>-->
+ <!-- <el-dropdown-item command="/404">{{ $t('message.user.dropdown3') }}</el-dropdown-item>-->
+ <!-- <el-dropdown-item command="/401">{{ $t('message.user.dropdown4') }}</el-dropdown-item>-->
+ <el-dropdown-item divided command="logOut">{{ $t('message.user.dropdown5') }}</el-dropdown-item>
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
+ <Search ref="searchRef" />
</div>
</div>
</template>
@@ -248,27 +248,27 @@
}
};
- const getSysName = async()=>{
+ const getSysName = async () => {
if (window.nextLoading === undefined) NextLoading.start();
if (!Session.get('token')) return false;
const res = await menuApi.getMenuAdmin(Session.get('projectId') === null ? '' : Session.get('projectId'));
- if(res.data.code === '200'){
+ if (res.data.code === '200') {
state.systemName = res.data.data[1].project.projectName;
- console.log(state.systemName)
- }else{
- console.log('有问题')
+ console.log(state.systemName);
+ } else {
+ console.log('有问题');
}
- }
- const backToMenu=()=>{
- router.push({ path: 'homeMenu' })
- }
+ };
+ const backToMenu = () => {
+ router.push({ path: 'homeMenu' });
+ };
// 页面加载时
onMounted(() => {
if (Local.get('themeConfig')) {
initI18n();
initComponentSize();
}
- getSysName()
+ getSysName();
});
return {
userInfos,
@@ -293,14 +293,14 @@
align-items: center;
justify-content: space-between;
- .logo{
+ .logo {
height: 50px;
padding: 5px 10px;
display: flex;
align-items: center;
overflow: hidden;
box-sizing: border-box;
- img{
+ img {
height: 100%;
}
}
@@ -343,12 +343,12 @@
::v-deep(.el-badge__content.is-fixed) {
top: 12px;
}
- .backBtn{
+ .backBtn {
font-size: 16px;
cursor: pointer;
margin-right: 20px;
- &:hover{
+ &:hover {
color: #409eff;
font-weight: bolder;
}
diff --git a/src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue b/src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue
index fcbddcf..8d6e281 100644
--- a/src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue
+++ b/src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue
@@ -77,22 +77,44 @@
<div class="stepCard">
<el-card class="box-card">
<template #header>
- <div class="card-header">
- <div>{{ item.pointId }}</div>
+ <div class="card-header" v-for="i in inspectPointAllList">
+ <div v-if="i.id == item.pointId">
+ <span>{{ i.code }}</span>
+ </div>
</div>
</template>
- <div class="text item">
- 所属设备区域：<span>{{ item.regionId }}</span>
+ <div class="text item" v-for="i in regionNameList">
+ <div v-if="i.id == item.regionId">
+ 所属设备区域：<span>{{ i.region }}</span>
+ </div>
</div>
- <div class="text item">
- 关联RFID：<span>{{ item.rfidId }}</span>
+ <!-- <div class="text item">-->
+ <!-- 所属设备区域：<span>{{ item.regionId }}</span>-->
+ <!-- </div>-->
+ <div class="text item" v-for="i in RFIDList">
+ <div v-if="i.id == item.rfidId">
+ 所属设备区域：<span>{{ i.rfidName }}</span>
+ </div>
</div>
- <div class="text item">
- 巡检指标：<span>{{ item.quotaId }}</span>
+ <!-- <div class="text item">-->
+ <!-- 关联RFID：<span>{{ item.rfidId }}</span>-->
+ <!-- </div>-->
+ <div class="text item" v-for="i in quotaList">
+ <div v-if="i.id == item.quotaId">
+ 所属设备区域：<span>{{ i.type }}</span>
+ </div>
</div>
- <div class="text item">
- 数据填报类型：<span>{{ item.dataReportType }}</span>
+ <!-- <div class="text item">-->
+ <!-- 巡检指标：<span>{{ item.quotaId }}</span>-->
+ <!-- </div>-->
+ <div class="text item" v-for="i in dataReportTypeList">
+ <div v-if="i.id == item.dataReportType">
+ 所属设备区域：<span>{{ i.name }}</span>
+ </div>
</div>
+ <!-- <div class="text item">-->
+ <!-- 数据填报类型：<span>{{ item.dataReportType }}</span>-->
+ <!-- </div>-->
<div class="text item">
数据参考值：<span>{{ item.firstReferenceValue ? item.firstReferenceValue : item.secondReferenceValue ? item.secondReferenceValue : item.thirdReferenceValue }}</span>
</div>
@@ -215,12 +237,16 @@
classGroup: Array<classGroup>;
quotaList: Array<quota>;
inspectPointAllList: Array<inspectPointAllState>;
+ regionNameList: Array<inspectPointAllState>;
+ RFIDList: Array<inspectPointAllState>;
}
interface inspectPointAllState {
id: number;
code: string;
regionId: number;
rfidId: number;
+ rfidName: string;
+ region: string;
}
interface classGroup {
depId: number;
@@ -317,6 +343,8 @@
classGroup: [],
quotaList: [],
inspectPointAllList: [],
+ regionNameList: [],
+ RFIDList: [],
dataReportTypeList: [
{ id: 1, name: '选择' },
{ id: 2, name: '填空' },
@@ -365,7 +393,10 @@
}
};
- const showInspectTaskDialog = (type: string, value: { id: number; uuid: string }, workTypeList: [], department: [], timeType: [], classGroupList: [], quotaList: [], inspectPointAllList: []) => {
+ const showInspectTaskDialog = (type: string, value: { id: number; uuid: string }, workTypeList: [], department: [], timeType: [], classGroupList: [], quotaList: [], inspectPointAllList: [], regionNameList: [], RFIDList: []) => {
+ debugger;
+ data.regionNameList = regionNameList;
+ data.RFIDList = RFIDList;
data.quotaList = JSON.parse(JSON.stringify(quotaList));
data.timeList = JSON.parse(JSON.stringify(timeType));
data.inspectPointAllList = JSON.parse(JSON.stringify(inspectPointAllList));
diff --git a/src/views/intellectInspect/inspectTaskManage/inspectTask/index.vue b/src/views/intellectInspect/inspectTaskManage/inspectTask/index.vue
index 2158c0c..9dc80c7 100644
--- a/src/views/intellectInspect/inspectTaskManage/inspectTask/index.vue
+++ b/src/views/intellectInspect/inspectTaskManage/inspectTask/index.vue
@@ -85,8 +85,10 @@
<template #default="scope">
<el-button link type="primary" size="small" :icon="View" @click="openInspectTaskDialog('查看', scope.row)">查看</el-button>
<el-button link type="primary" size="small" :icon="Edit" @click="openInspectTaskDialog('修改', scope.row)">修改</el-button>
- <el-switch v-model="scope.row.status" inline-prompt active-text="开" inactive-text="关" active-value="开启" inactive-value="关闭" style="margin: 0 10px" />
<el-button link type="danger" size="small" :icon="Delete" @click="deleteInspectTask(scope.$index)">删除</el-button>
+ <div @click="changeStatus(scope.row)">
+ <el-switch v-model="scope.row.taskUnitStatus" inline-prompt active-text="开" inactive-text="关" :active-value="1" :inactive-value="2" style="margin: 0 10px" />
+ </div>
</template>
</el-table-column>
</el-table>
@@ -103,12 +105,14 @@
<script lang="ts">
import { toRefs, reactive, ref, onMounted } from 'vue';
import { Edit, View, Plus, Delete, Refresh, Search, Download } from '@element-plus/icons-vue';
-import { ElTable, ElMessage } from 'element-plus';
+import { ElTable, ElMessage, ElMessageBox } from 'element-plus';
import { inspectTaskApi } from '/@/api/intellectInspectSystem/inspectTask';
import inspectTaskDialog from './components/inspectTaskDialog.vue';
import { departmentApi } from '/@/api/systemManage/department';
import { teamManageApi } from '/@/api/systemManage/personShiftManage/teamManage';
import { inspectPointApi } from '/@/api/intellectInspectSystem/inspectPointManage';
+import { facilityAreaApi } from '/@/api/intellectInspectSystem/facilityAreaManage';
+import { RFIDApi } from '/@/api/intellectInspectSystem/RFID';
let global: any = {
homeChartOne: null,
homeChartTwo: null,
@@ -137,6 +141,8 @@
departmentList: [];
classGroupList: Array<classGroup>;
inspectPointAllList: [];
+ regionNameList: [];
+ RFIDList: [];
timeType: Array<type>;
}
interface type {
@@ -176,6 +182,8 @@
departmentList: [],
classGroupList: [],
inspectPointAllList: [],
+ regionNameList: [],
+ RFIDList: [],
timeType: [
{ id: 1, name: '分' },
{ id: 2, name: '小时' },
@@ -238,6 +246,32 @@
}
};
+ //获取所有设施区域名称
+ const initFacilityAreaType = async () => {
+ let res = await facilityAreaApi().getAllFacilityAreaList();
+ if (res.data.code === '200') {
+ state.regionNameList = JSON.parse(JSON.stringify(res.data.data));
+ } else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
+ };
+
+ //获取所有RFID名称
+ const initRFIDList = async () => {
+ let res = await RFIDApi().getAllRFIDList();
+ if (res.data.code === '200') {
+ state.RFIDList = JSON.parse(JSON.stringify(res.data.data));
+ } else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
+ };
+
//获取班组
const getClassGroupData = async () => {
let res = await teamManageApi().getRecord({ depIp: null, groupName: null, containGroupMemberEnable: null });
@@ -251,8 +285,59 @@
}
};
+ const changeStatus = async (value: { taskUnitStatus: number; id: number }) => {
+ if (value.taskUnitStatus === 2) {
+ ElMessageBox.confirm(`此操作将关闭该巡检任务”，是否继续?`, '提示', {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning'
+ })
+ .then(async () => {
+ let res = await inspectTaskApi().openOrCloseInspectTask({ id: value.id, taskUnitStatus: 2 });
+ if (res.data.code === '200') {
+ ElMessage({
+ type: 'success',
+ duration: 2000,
+ message: '关闭成功'
+ });
+ } else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
+ })
+ .catch((error) => {
+ debugger;
+ });
+ } else {
+ ElMessageBox.confirm(`此操作将开启该巡检任务”，是否继续?`, '提示', {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning'
+ })
+ .then(async () => {
+ let res = await inspectTaskApi().openOrCloseInspectTask({ id: value.id, taskUnitStatus: 1 });
+ if (res.data.code === '200') {
+ ElMessage({
+ type: 'success',
+ duration: 2000,
+ message: '开启成功'
+ });
+ } else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
+ })
+ .catch((error) => {});
+ }
+ await getInspectionTask();
+ };
+
const openInspectTaskDialog = (type: string, value: {}) => {
- inspectTaskDialogRef.value.showInspectTaskDialog(type, value, state.workTypeList, state.departmentList, state.timeType, state.classGroupList, state.quotaList, state.inspectPointAllList);
+ inspectTaskDialogRef.value.showInspectTaskDialog(type, value, state.workTypeList, state.departmentList, state.timeType, state.classGroupList, state.quotaList, state.inspectPointAllList, state.regionNameList, state.RFIDList);
};
const parseNumber = (value: number, type: string) => {
@@ -296,6 +381,8 @@
getDepartmentData();
getClassGroupData();
getInspectTaskPoint();
+ initFacilityAreaType();
+ initRFIDList();
});
return {
@@ -305,6 +392,7 @@
Refresh,
Plus,
reset,
+ changeStatus,
parseNumber,
getInspectionTask,
onHandleSizeChange,
diff --git a/src/views/loginPage/loginPage.vue b/src/views/loginPage/loginPage.vue
index b285c23..b1a6932 100644
--- a/src/views/loginPage/loginPage.vue
+++ b/src/views/loginPage/loginPage.vue
@@ -108,6 +108,8 @@
.rights {
font-size: 16px;
color: #fff;
+ position: absolute;
+ bottom: 30px;
}
.loginContent {
width: 100%;
diff --git a/src/views/safeKnowledge/bmgz/index.vue b/src/views/safeKnowledge/bmgz/index.vue
new file mode 100644
index 0000000..f74c241
--- /dev/null
+++ b/src/views/safeKnowledge/bmgz/index.vue
@@ -0,0 +1,40 @@
+<template>
+ <div class="home-container">
+ <iframe src="http://39.104.85.193/bmgz"></iframe>
+ </div>
+</template>
+
+<script>
+export default {
+ name: 'safeKnowledgeSys',
+ props: {
+
+ },
+ data(){
+ return{
+
+ }
+ },
+ created() {
+
+ },
+ methods:{
+
+ }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped lang="scss">
+ .home-container{
+ height: calc(100vh - 114px);
+ box-sizing: border-box;
+ overflow: hidden;
+
+ iframe{
+ width: 100%;
+ height: 100%;
+ border: none;
+ }
+ }
+</style>
diff --git a/src/views/safeKnowledge/df/index.vue b/src/views/safeKnowledge/df/index.vue
new file mode 100644
index 0000000..38e4824
--- /dev/null
+++ b/src/views/safeKnowledge/df/index.vue
@@ -0,0 +1,40 @@
+<template>
+ <div class="home-container">
+ <iframe src="http://39.104.85.193/df"></iframe>
+ </div>
+</template>
+
+<script>
+export default {
+ name: 'safeKnowledgeSys',
+ props: {
+
+ },
+ data(){
+ return{
+
+ }
+ },
+ created() {
+
+ },
+ methods:{
+
+ }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped lang="scss">
+ .home-container{
+ height: calc(100vh - 114px);
+ box-sizing: border-box;
+ overflow: hidden;
+
+ iframe{
+ width: 100%;
+ height: 100%;
+ border: none;
+ }
+ }
+</style>
diff --git a/src/views/safeKnowledge/inner/index.vue b/src/views/safeKnowledge/inner/index.vue
new file mode 100644
index 0000000..97b9588
--- /dev/null
+++ b/src/views/safeKnowledge/inner/index.vue
@@ -0,0 +1,40 @@
+<template>
+ <div class="home-container">
+ <iframe src="http://39.104.85.193/inner"></iframe>
+ </div>
+</template>
+
+<script>
+export default {
+ name: 'safeKnowledgeSys',
+ props: {
+
+ },
+ data(){
+ return{
+
+ }
+ },
+ created() {
+
+ },
+ methods:{
+
+ }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped lang="scss">
+ .home-container{
+ height: calc(100vh - 114px);
+ box-sizing: border-box;
+ overflow: hidden;
+
+ iframe{
+ width: 100%;
+ height: 100%;
+ border: none;
+ }
+ }
+</style>
diff --git a/src/views/safeKnowledge/internationalRules/index.vue b/src/views/safeKnowledge/internationalRules/index.vue
new file mode 100644
index 0000000..2c88f1e
--- /dev/null
+++ b/src/views/safeKnowledge/internationalRules/index.vue
@@ -0,0 +1,40 @@
+<template>
+ <div class="home-container">
+ <iframe src="http://39.104.85.193/law"></iframe>
+ </div>
+</template>
+
+<script>
+export default {
+ name: 'safeKnowledgeSys',
+ props: {
+
+ },
+ data(){
+ return{
+
+ }
+ },
+ created() {
+
+ },
+ methods:{
+
+ }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped lang="scss">
+ .home-container{
+ height: calc(100vh - 114px);
+ box-sizing: border-box;
+ overflow: hidden;
+
+ iframe{
+ width: 100%;
+ height: 100%;
+ border: none;
+ }
+ }
+</style>
diff --git a/src/views/safeKnowledge/law/index.vue b/src/views/safeKnowledge/law/index.vue
new file mode 100644
index 0000000..8f4fa8f
--- /dev/null
+++ b/src/views/safeKnowledge/law/index.vue
@@ -0,0 +1,40 @@
+<template>
+ <div class="home-container">
+ <iframe src="http://39.104.85.193/gong"></iframe>
+ </div>
+</template>
+
+<script>
+export default {
+ name: 'safeKnowledgeSys',
+ props: {
+
+ },
+ data(){
+ return{
+
+ }
+ },
+ created() {
+
+ },
+ methods:{
+
+ }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped lang="scss">
+ .home-container{
+ height: calc(100vh - 114px);
+ box-sizing: border-box;
+ overflow: hidden;
+
+ iframe{
+ width: 100%;
+ height: 100%;
+ border: none;
+ }
+ }
+</style>
diff --git a/src/views/safeKnowledge/sfjs/index.vue b/src/views/safeKnowledge/sfjs/index.vue
new file mode 100644
index 0000000..3682dcc
--- /dev/null
+++ b/src/views/safeKnowledge/sfjs/index.vue
@@ -0,0 +1,40 @@
+<template>
+ <div class="home-container">
+ <iframe src="http://39.104.85.193/laws"></iframe>
+ </div>
+</template>
+
+<script>
+export default {
+ name: 'safeKnowledgeSys',
+ props: {
+
+ },
+ data(){
+ return{
+
+ }
+ },
+ created() {
+
+ },
+ methods:{
+
+ }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped lang="scss">
+ .home-container{
+ height: calc(100vh - 114px);
+ box-sizing: border-box;
+ overflow: hidden;
+
+ iframe{
+ width: 100%;
+ height: 100%;
+ border: none;
+ }
+ }
+</style>
diff --git a/src/views/safeKnowledge/xzfg/index.vue b/src/views/safeKnowledge/xzfg/index.vue
new file mode 100644
index 0000000..a50d44c
--- /dev/null
+++ b/src/views/safeKnowledge/xzfg/index.vue
@@ -0,0 +1,39 @@
+<template>
+ <div class="home-container">
+ <iframe src="http://39.104.85.193/xzfg"></iframe>
+ </div>
+</template>
+
+<script>
+export default {
+ name: 'safeKnowledgeSys',
+ props: {
+
+ },
+ data(){
+ return{
+
+ }
+ },
+ created() {
+
+ },
+ methods:{
+
+ }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped lang="scss">
+ .home-container{
+ height: calc(100vh - 114px);
+ box-sizing: border-box;
+ overflow: hidden;
+
+ iframe{
+ width: 100%;
+ height: 100%;
+ }
+ }
+</style>
--
Gitblit v1.9.2