设施配置修改，依赖同步

package.json

@@ -48,7 +48,9 @@
     "diagram-js-minimap": "^2.0.3",
     "diagram-js-origin": "^1.3.1",
     "echarts": "^5.6.0",
+    "echarts-stat": "^1.2.0",
     "element-ui": "^2.13.2",
+    "exceljs": "^4.4.0",
     "file-saver": "^2.0.5",
     "flex.css": "^1.1.7",
     "focus-visible": "^5.1.0",
@@ -57,16 +59,19 @@
     "highlight.js": "^10.1.2",
     "hls.js": "^0.14.11",
     "hotkeys-js": "^3.8.1",
+    "html2canvas": "^1.4.1",
     "jquery": "^3.6.0",
     "js-base64": "^3.7.2",
     "js-cookie": "^2.2.1",
     "js-md5": "^0.7.3",
     "js-pinyin": "^0.1.9",
+    "jspdf": "^3.0.0",
     "less": "^3.12.2",
     "less-loader": "^7.0.1",
     "lodash": "^4.17.20",
     "long": "^4.0.0",
     "lowdb": "^1.0.0",
+    "luckyexcel": "^1.0.1",
     "mockjs": "^1.1.0",
     "normalize.css": "^8.0.1",
     "nprogress": "^0.2.0",

src/api/platform/message/innerMessage.js

@@ -131,3 +131,10 @@ export function getMyMsgList (params) {
         data: params
     })
 }
+export function getMyMsgAllList (params) {
+    return request({
+        url: MSG_URL() + '/msg/innerMessage/msgList',
+        method: 'get',
+        params
+    })
+}

src/api/platform/org/employee.js

@@ -338,3 +338,17 @@ export function removeRoleUser (params) {
         params: params
     })
 }
+
+// ===================内部培训人员============================================
+
+/**
+ * 内部培训统计
+ * @param {*} params
+ */
+export function getUserStatisticList (params) {
+    return request({
+        url: BUSINESS_BASE_URL() + '/employee/train/statistic',
+        method: 'get',
+        params
+    })
+}

src/api/platform/org/position.js

@@ -5,229 +5,240 @@ import ActionUtils from '@/utils/action'
  * 查询列表数据
  * @param {*} params
  */
-export function queryPageList(params) {
-  return request({
-    url: ORG_URL() + '/position/query',
-    method: 'post',
-    data: params
-  })
+export function queryPageList (params) {
+    return request({
+        url: ORG_URL() + '/position/query',
+        method: 'post',
+        data: params
+    })
 }
 /**
  * 删除数据
  * @param {*} params
  */
-export function remove(params) {
-  return request({
-    url: ORG_URL() + '/position/remove',
-    method: 'post',
-    isLoading: true,
-    params: params
-  })
+export function remove (params) {
+    return request({
+        url: ORG_URL() + '/position/remove',
+        method: 'post',
+        isLoading: true,
+        params: params
+    })
 }
 /**
  * 保存数据
  * @param {*} params
  */
-export function save(params) {
-  return request({
-    url: ORG_URL() + '/position/save',
-    method: 'post',
-    isLoading: true,
-    data: params
-  })
+export function save (params) {
+    return request({
+        url: ORG_URL() + '/position/save',
+        method: 'post',
+        isLoading: true,
+        data: params
+    })
 }
 
 /**
  * 获取数据
  * @param {*} params
  */
-export function get(params) {
-  return request({
-    url: ORG_URL() + '/position/get',
-    method: 'get',
-    params
-  })
+export function get (params) {
+    return request({
+        url: ORG_URL() + '/position/get',
+        method: 'get',
+        params
+    })
 }
 
 /**
  * 获取数据(通过ID转换为名称)
  * @param {*} params
  */
-export function transfer(params) {
-  return request({
-    url: ORG_URL() + '/position/transfer',
-    method: 'post',
-    data: params
-  })
+export function transfer (params) {
+    return request({
+        url: ORG_URL() + '/position/transfer',
+        method: 'post',
+        data: params
+    })
 }
 
 /**
  * 通过别名获取数据
  * @param {*} params
  */
-export function getByAlias(params) {
-  return request({
-    url: ORG_URL() + '/position/getByAlias',
-    method: 'get',
-    params
-  })
+export function getByAlias (params) {
+    return request({
+        url: ORG_URL() + '/position/getByAlias',
+        method: 'get',
+        params
+    })
 }
 
 /**
  * 岗位树信息
  * @param {*} params
  */
-export function getTreeData(params) {
-  return request({
-    url: ORG_URL() + '/position/findAll',
-    params: params
-  })
+export function getTreeData (params) {
+    return request({
+        url: ORG_URL() + '/position/findAll',
+        params: params
+    })
 }
 
 /**
  * 保存移动的岗位
  * @param {*} params
  */
-export function saveMove(params) {
-  return request({
-    url: ORG_URL() + '/position/saveMove',
-    method: 'post',
-    isLoading: true,
-    params: params
-  })
+export function saveMove (params) {
+    return request({
+        url: ORG_URL() + '/position/saveMove',
+        method: 'post',
+        isLoading: true,
+        params: params
+    })
 }
 
 /**
  *  保存组织排序
  * @param {*} params
  */
-export function saveSort(params) {
-  return request({
-    url: ORG_URL() + '/position/saveSort',
-    method: 'post',
-    isLoading: true,
-    params: params
-  })
+export function saveSort (params) {
+    return request({
+        url: ORG_URL() + '/position/saveSort',
+        method: 'post',
+        isLoading: true,
+        params: params
+    })
 }
 
 /**
  * 获取岗位的组织和等级信息
  * @param {*} params
  */
-export function getOrgInfo(params) {
-  return request({
-    url: ORG_URL() + '/position/load',
-    method: 'get',
-    params: params
-  })
+export function getOrgInfo (params) {
+    return request({
+        url: ORG_URL() + '/position/load',
+        method: 'get',
+        params: params
+    })
 }
 
 /**
  * 根据条件查询有组织岗位
  * @param {*} params
  */
-export function queryWithOrg(params) {
-  return request({
-    url: ORG_URL() + '/position/queryWithOrg',
-    method: 'post',
-    data: params
-  })
+export function queryWithOrg (params) {
+    return request({
+        url: ORG_URL() + '/position/queryWithOrg',
+        method: 'post',
+        data: params
+    })
 }
 /**
  *  根据用户id查询岗位信息列表分页(带等级值、组织)
  * @param {*} params
  */
-export function queryWithOrgByIds(params) {
-  return request({
-    url: ORG_URL() + '/position/queryWithOrgByIds',
-    method: 'post',
-    data: params
-  })
+export function queryWithOrgByIds (params) {
+    return request({
+        url: ORG_URL() + '/position/queryWithOrgByIds',
+        method: 'post',
+        data: params
+    })
 }
 
 /**
  *  根据orgId查询带等级值的岗位信息
  * @param {*} params
  */
-export function queryWithLevelByOrgId(params) {
-  return request({
-    url: ORG_URL() + '/position/queryWithLevelByOrgId',
-    method: 'post',
-    data: params
-  })
+export function queryWithLevelByOrgId (params) {
+    return request({
+        url: ORG_URL() + '/position/queryWithLevelByOrgId',
+        method: 'post',
+        data: params
+    })
 }
 
 /**
  *  岗位加入组织
  * @param {*} params
  */
-export function assignOrg(params) {
-  return request({
-    url: ORG_URL() + '/position/assignOrg',
-    method: 'post',
-    isLoading: true,
-    params: params
-  })
+export function assignOrg (params) {
+    return request({
+        url: ORG_URL() + '/position/assignOrg',
+        method: 'post',
+        isLoading: true,
+        params: params
+    })
 }
 
 /**
  *  组织移除岗位
  * @param {*} params
  */
-export function removeOrg(params) {
-  return request({
-    url: ORG_URL() + '/position/removeOrg',
-    method: 'post',
-    isLoading: true,
-    params: params
-  })
+export function removeOrg (params) {
+    return request({
+        url: ORG_URL() + '/position/removeOrg',
+        method: 'post',
+        isLoading: true,
+        params: params
+    })
 }
 
 /**
  * 添加岗位角色
  * @param {*} params
  */
-export function assignRole(params) {
-  return request({
-    url: ORG_URL() + '/position/assignRole',
-    method: 'post',
-    isLoading: true,
-    params: params
-  })
+export function assignRole (params) {
+    return request({
+        url: ORG_URL() + '/position/assignRole',
+        method: 'post',
+        isLoading: true,
+        params: params
+    })
 }
 
 /**
  * 移除岗位角色
  * @param {*} params
  */
-export function removeRole(params) {
-  return request({
-    url: ORG_URL() + '/position/removeRole',
-    method: 'post',
-    isLoading: true,
-    params: params
-  })
+export function removeRole (params) {
+    return request({
+        url: ORG_URL() + '/position/removeRole',
+        method: 'post',
+        isLoading: true,
+        params: params
+    })
 }
 
 /**
  * 查询岗位信息
  * @param {*} params
  */
-export function findWithOrgByIds(params) {
-  return request({
-    url: ORG_URL() + '/position/findWithOrgByIds',
-    method: 'post',
-    params: params
-  })
+export function findWithOrgByIds (params) {
+    return request({
+        url: ORG_URL() + '/position/findWithOrgByIds',
+        method: 'post',
+        params: params
+    })
 }
 /**
  * 查询岗位树【懒加载】
  * @param {*} params
  */
-export function findTreeData(params) {
-  return request({
-    url: ORG_URL() + '/position/findTreeData',
-    method: 'post',
-    data: ActionUtils.formatParams(params)
-  })
+export function findTreeData (params) {
+    return request({
+        url: ORG_URL() + '/position/findTreeData',
+        method: 'post',
+        data: ActionUtils.formatParams(params)
+    })
+}
+/**
+ * 查询所有岗位树
+ * @param {*} params
+ */
+export function findAllPosition (params) {
+    return request({
+        url: ORG_URL() + '/position/findAllPosition',
+        method: 'post',
+        data: ActionUtils.formatParams(params)
+    })
 }

src/api/platform/system/identity.js

@@ -78,11 +78,12 @@ export function test (params) {
  */
 export function getNextIdByAlias (params) {
     return request({
-        url: SYSTEM_URL() + '/identity/getNextIdByAlias',
+        url: SYSTEM_URL() + `/identity/getNextIdByAlias`,
         method: 'get',
         params: params
     })
 }
+
 /**
  * 试剂耗材库存，出入库记录
  * @param {*} params

src/api/platform/system/jbdHome.js

@@ -1,6 +1,13 @@
+/*
+ * @Descripttion: 表单/数据模板脚本：
+ * @version: 1.0
+ * @Author: Liu_jiaYin
+ * @Date: 2023-11-17 16:40:45
+ * @LastEditors: Do not edit
+ * @LastEditTime: 2024-04-22 15:37:39
+ */
 import request from '@/utils/request'
 import { BPMN_URL, BUSINESS_BASE_URL } from '@/api/baseUrl'
-
 /* 定时任务获取 */
 export function StatisticsData (params) {
     return request({

src/api/platform/system/news.js

@@ -4,70 +4,69 @@ import { SYSTEM_URL, FORM_URL } from '@/api/baseUrl'
  * 查询列表数据
  * @param {*} params
  */
-export function queryPageList (params) {
-    return request({
-        url: SYSTEM_URL() + '/system/news/query',
-        method: 'post',
-        data: params
-    })
+export function queryPageList(params) {
+  return request({
+    url: SYSTEM_URL() + '/system/news/query',
+    method: 'post',
+    data: params
+  })
 }
 /**
  * 删除数据
  * @param {*} params
  */
-export function remove (params) {
-    return request({
-        url: SYSTEM_URL() + '/system/news/remove',
-        method: 'post',
-        isLoading: true,
-        params: params
-    })
+export function remove(params) {
+  return request({
+    url: SYSTEM_URL() + '/system/news/remove',
+    method: 'post',
+    isLoading: true,
+    params: params
+  })
 }
 /**
  * 保存数据
  * @param {*} params
  */
-export function save (params) {
-    return request({
-        url: SYSTEM_URL() + '/system/news/save',
-        method: 'post',
-        isLoading: true,
-        data: params
-    })
+export function save(params) {
+  return request({
+    url: SYSTEM_URL() + '/system/news/save',
+    method: 'post',
+    isLoading: true,
+    data: params
+  })
 }
 
 /**
  * 获取数据
  * @param {*} params
  */
-export function get (params) {
-    return request({
-        url: SYSTEM_URL() + '/system/news/get',
-        method: 'get',
-        params
-    })
+export function get(params) {
+  return request({
+    url: SYSTEM_URL() + '/system/news/get',
+    method: 'get',
+    params
+  })
 }
 
 /**
  * 推送管理评审通知
  * @param {*} params
  */
-export function manage (params) {
-    return request({
-        url: FORM_URL() + '/audit/notice/manage',
-        method: 'post',
-        data: params
-    })
+export function manage(params) {
+  return request({
+    url: FORM_URL() + '/audit/notice/manage',
+    method: 'post',
+    data: params
+  })
 }
-/**
-* 推送内审实施计划通知
-* @param {*} params
-*/
-export function internal (params) {
-    return request({
-        url: FORM_URL() + '/audit/notice/internal',
-        method: 'post',
-        data: params
-    })
+ /**
+ * 推送内审实施计划通知
+ * @param {*} params
+ */
+export function internal(params) {
+  return request({
+    url: FORM_URL() + '/audit/notice/internal',
+    method: 'post',
+    data: params
+  })
 }
-

src/views/system/fasc/defaultSettingDialog.vue

@@ -20,7 +20,7 @@
                                 <ibps-user-selector
                                     v-model="form.bian_zhi_bu_men_"
                                     size="mini"
-                                    type="position"
+                                    type="org"
                                     readonly-text="text"
                                     :disabled="false"
                                     :multiple="false"
@@ -249,6 +249,7 @@ export default {
     },
     computed: {
         monitoringpPosition () {
+            // console.log(this.jianCeGangWeiList, 'aaaaaaaa')
             return this.jianCeGangWeiList.filter(i => i.suo_shu_bu_men_ === this.form.bian_zhi_bu_men_)
         },
         labelShow () {
@@ -603,7 +604,7 @@ export default {
     .eltag{
         margin-top: 6px;
     }
-} 
+}
 .dialog-footer{
         display: flex;
         justify-content: center;

src/views/system/fasc/facilityEnvConfig.vue

@@ -48,7 +48,7 @@
                                 <span class="label">部门：</span>
                                 <ibps-user-selector
                                     v-model="search.buMen"
-                                    type="position"
+                                    type="org"
                                     readonly-text="text"
                                     :disabled="false"
                                     :multiple="false"
@@ -124,7 +124,7 @@
                         >
                             <template slot-scope="{row}">
                                 <ibps-user-selector
-                                    type="position"
+                                    type="org"
                                     :value="row.bu_men_"
                                     readonly-text="text"
                                     :disabled="true"
@@ -246,7 +246,7 @@ export default {
         }
     },
     data () {
-        const { userId, level = {}, position } = this.$store.getters || {}
+        const { userId, org } = this.$store.getters || {}
         return {
             defultdialogVisible: false,
             filter: [{
@@ -268,7 +268,6 @@ export default {
             },
             searchData: [],
             isSearch: false,
-            level: level.second || level.first,
             userId: userId,
             pageSize: 10,
             currentPage: 1,
@@ -292,10 +291,9 @@ export default {
             yearCheck: '',
             sepCheck: '',
             form: {
-                di_dian_: level.second || level.first,
                 bian_zhi_ren_: userId,
                 lei_xing_: '',
-                bian_zhi_bu_men_: position && position.split(',')[0],
+                bian_zhi_bu_men_: org.id,
                 zhou_qi_: '',
                 gang_wei_: '',
                 tiao_jian_: '',
@@ -487,8 +485,8 @@ export default {
             this.loadSelectorData()
         },
         loadSelectorData () {
-            const pos = this.$store.getters.level.second ? this.$store.getters.level.second : this.$store.getters.level.first
-            const sql = `select * from t_sbwhgwpzb where di_dian_='${pos}'`
+            console.log(this.$store.getters)
+            const sql = `select * from t_sbwhgwpzb`
             this.$common.request('sql', sql).then(res => {
                 const { data = [] } = res.variables || {}
                 this.jianCeGangWeiList = data
@@ -925,7 +923,6 @@ export default {
                 const addParams = addList.length ? {
                     tableName,
                     paramWhere: addList.map(item => ({
-                        di_dian_: this.level,
                         bian_zhi_bu_men_: item.bu_men_,
                         bian_zhi_ren_: this.userId,
                         zi_wai_deng_ming_: item.devicename1_,

src/views/system/fasc/fecDialog.vue

@@ -23,7 +23,7 @@
                                 <ibps-user-selector
                                     v-model="form.bu_men_"
                                     size="mini"
-                                    type="position"
+                                    type="org"
                                     readonly-text="text"
                                     :disabled="false"
                                     :multiple="false"