inl-ui 0.0.8-rc.21 → 0.0.8-rc.24

package/dist/index.js

@@ -11,7 +11,7 @@ import moment from 'moment';
 import { Chart } from '@antv/g2';
 import { createStore } from 'vuex';
 
-var version = "0.0.8-rc.20";
+var version = "0.0.8-rc.24";
 
 const config = {
   prefix: "inl"
@@ -6934,11 +6934,21 @@ function useTableList(getData, listProp) {
     refresh();
   };
 
+  const pageSize = ref(10);
+
+  const hanldePageSizeChange = size => {
+    currPage.value = 1;
+    pageSize.value = size;
+    refresh();
+  };
+
   return {
     isLoading,
     tableList,
     currPage,
     handlePageChange,
+    pageSize,
+    hanldePageSizeChange,
     total,
     refresh
   };
@@ -7480,7 +7490,7 @@ const UpdateUserDialog = defineComponent({
 
     const modalTitle = computed(() => {
       if (props.mode === "add") return "新建用户";else if (props.mode === "edit") return "编辑用户";
-      return "查看用户";
+      return "用户详情";
     });
     /* 是否查看模式 */
 
@@ -7582,9 +7592,9 @@ const UpdateUserDialog = defineComponent({
               "onUpdate:value": $event => form.value.userName = $event
             }, null)]
           }), createVNode(resolveComponent("a-form-item"), {
-            "name": "employeeName",
+            "name": "employeeId",
             "label": "员工姓名",
-            "help": !isView.value && "中英文均可，最长14个英文或者7个汉字"
+            "help": props.mode === "add" && "中英文均可，最长14个英文或者7个汉字"
           }, {
             default: () => [isView.value ? createVNode(resolveComponent("a-button"), {
               "type": "link",
@@ -7616,6 +7626,7 @@ const UpdateUserDialog = defineComponent({
             }]
           }, {
             default: () => [createVNode(resolveComponent("a-input-password"), {
+              "placeholder": "输入密码",
               "value": form.value.passWord,
               "onUpdate:value": $event => form.value.passWord = $event
             }, null)]
@@ -7636,8 +7647,8 @@ const UpdateUserDialog = defineComponent({
             }, null)]
           })]) : // 查看和编辑用户 展示重置密码
           createVNode(resolveComponent("a-form-item"), {
-            "name": "passWord",
-            "label": "密码重置"
+            "required": true,
+            "label": "密码"
           }, {
             default: () => [createVNode("span", null, [createTextVNode("\u25CF\u25CF\u25CF\u25CF\u25CF\u25CF\u25CF\u25CF")]), props.mode === "edit" && createVNode(resolveComponent("a-button"), {
               "type": "link",
@@ -7793,11 +7804,13 @@ const UserManager = defineComponent({
       isLoading,
       refresh,
       tableList,
-      total
+      total,
+      pageSize,
+      hanldePageSizeChange
     } = useTableList(() => api$c.getUserList(urlMap.list)({
       keyWord: formState.value.userName,
       pageNum: currPage.value,
-      pageSize: 10
+      pageSize: pageSize.value
     }), "userJsons");
     refresh();
 
@@ -7920,10 +7933,14 @@ const UserManager = defineComponent({
       "rowKey": "userId",
       "loading": isLoading.value,
       "pagination": {
-        pageSize: 10,
+        pageSize: pageSize.value,
         current: currPage.value,
+        showSizeChanger: true,
+        showQuickJumper: true,
+        showTotal: total => `共${total}条`,
+        total: total.value,
         "onUpdate:current": handlePageChange,
-        total: total.value
+        "onUpdate:pageSize": hanldePageSizeChange
       }
     }, {
       employeeName: ({
@@ -8337,11 +8354,13 @@ const RoleManager = defineComponent({
       tableList,
       total,
       currPage,
-      handlePageChange
+      handlePageChange,
+      pageSize,
+      hanldePageSizeChange
     } = useTableList(() => api$b.getRoleListByPager(urlMap.list)({
       keyword: filter.value.keyword,
       pageNum: currPage.value,
-      pageSize: 10
+      pageSize: pageSize.value
     }), "roleList");
     refresh();
     /* 控制启用 */
@@ -8450,9 +8469,13 @@ const RoleManager = defineComponent({
       default: () => [createVNode(PlusOutlined, null, null), createTextVNode("\u65B0\u5EFA\u89D2\u8272")]
     })])]), createVNode(resolveComponent("a-table"), {
       "pagination": {
-        pageSize: 10,
+        pageSize: pageSize.value,
         current: currPage.value,
+        showSizeChanger: true,
+        showQuickJumper: true,
+        showTotal: total => `共${total}条`,
         "onUpdate:current": handlePageChange,
+        "onUpdate:pageSize": hanldePageSizeChange,
         total: total.value
       },
       "loading": isLoading.value,
@@ -9692,7 +9715,7 @@ const api$9 = {
    * 新增岗位信息
    */
   insertPostRecord: url => data => {
-    return instance$d.post(url ?? "/jobPost/modify", data);
+    return instance$d.post(url ?? "/jobPost/add", data);
   },
 
   /**
@@ -9951,10 +9974,12 @@ const PostManager = defineComponent({
       handlePageChange,
       isLoading,
       refresh,
-      tableList
+      tableList,
+      pageSize,
+      hanldePageSizeChange
     } = useTableList(() => api$9.getPostList(urlMap.list)({
       pageNum: currPage.value,
-      pageSize: 10,
+      pageSize: pageSize.value,
       keyword: form.value.keyWord
     }), "jobPostList");
     refresh();
@@ -10038,8 +10063,14 @@ const PostManager = defineComponent({
       "dataSource": tableList.value,
       "columns": column$2,
       "pagination": {
-        total: total.value,
-        onChange: handlePageChange
+        pageSize: pageSize.value,
+        current: currPage.value,
+        showSizeChanger: true,
+        showQuickJumper: true,
+        showTotal: total => `共${total}条`,
+        "onUpdate:current": handlePageChange,
+        "onUpdate:pageSize": hanldePageSizeChange,
+        total: total.value
       }
     }, {
       valid: ({
@@ -10387,7 +10418,7 @@ const UpdatePostDialog = defineComponent({
               "rules": getRequiredRule("班组班长")
             }, {
               default: () => [isView.value ? createVNode("span", null, [props.record.leaderName]) : createVNode(SearchSelect, {
-                "getUrl": urlMap.empList,
+                "getUrl": urlMap.empList ?? "/employee/all/summary",
                 "extParams": {
                   departmentId: form.value.depId
                 },
@@ -10485,10 +10516,12 @@ const TeamManager = defineComponent({
       handlePageChange,
       isLoading,
       refresh,
-      tableList
+      tableList,
+      pageSize,
+      hanldePageSizeChange
     } = useTableList(() => api$8.getTeamListByPage(urlMap.list)({
       pageNum: currPage.value,
-      pageSize: 10,
+      pageSize: pageSize.value,
       keyword: form.value.keyWord
     }), "workgroupList");
     refresh();
@@ -10564,8 +10597,14 @@ const TeamManager = defineComponent({
       "dataSource": tableList.value,
       "columns": column$1,
       "pagination": {
+        pageSize: pageSize.value,
+        current: currPage.value,
+        showSizeChanger: true,
+        showQuickJumper: true,
+        showTotal: total => `共${total}条`,
         total: total.value,
-        onChange: handlePageChange
+        "onUpdate:current": handlePageChange,
+        "onUpdate:pageSize": hanldePageSizeChange
       }
     }, {
       valid: ({
@@ -11089,7 +11128,9 @@ const EmployeeTable = defineComponent({
       refresh,
       currPage,
       handlePageChange,
-      total
+      total,
+      pageSize,
+      hanldePageSizeChange
     } = useTableList(() => {
       if (props.depId) {
         // 选煤厂不加部门id  查全部
@@ -11098,7 +11139,7 @@ const EmployeeTable = defineComponent({
           departmentId: depId,
           keyword: keyword.value,
           pageNum: currPage.value,
-          pageSize: 10
+          pageSize: pageSize.value
         });
       }
 
@@ -11168,9 +11209,13 @@ const EmployeeTable = defineComponent({
       "columns": columns$4,
       "dataSource": tableList.value,
       "pagination": {
-        pageSize: 10,
+        pageSize: pageSize.value,
         current: currPage.value,
+        showSizeChanger: true,
+        showQuickJumper: true,
+        showTotal: total => `共${total}条`,
         "onUpdate:current": handlePageChange,
+        "onUpdate:pageSize": hanldePageSizeChange,
         total: total.value
       }
     }, {
@@ -11697,16 +11742,16 @@ const api$6 = {
 
 const column = [{
   title: "日志时间",
-  dataIndex: "createTime",
-  key: "createTime"
+  dataIndex: "createDt",
+  key: "createDt"
 }, {
   title: "系统名称",
-  dataIndex: "systemType",
-  key: "systemType"
+  dataIndex: "softSysName",
+  key: "softSysName"
 }, {
   title: "模块名称",
-  dataIndex: "moduleType",
-  key: "moduleType"
+  dataIndex: "moduleName",
+  key: "moduleName"
 }, {
   title: "日志类型",
   dataIndex: "recordType",
@@ -11717,12 +11762,12 @@ const column = [{
   key: "operateType"
 }, {
   title: "日志内容",
-  dataIndex: "contentText",
-  key: "contentText"
+  dataIndex: "content",
+  key: "content"
 }, {
   title: "操作人",
-  dataIndex: "userName",
-  key: "userName"
+  dataIndex: "createUser",
+  key: "createUser"
 }, {
   title: "操作",
   dataIndex: "action",
@@ -11814,10 +11859,12 @@ const LogManager = defineComponent({
       refresh,
       tableList,
       handlePageChange,
-      total
+      total,
+      pageSize,
+      hanldePageSizeChange
     } = useTableList(() => api$6.getList(urlMap.list)({ ...formState,
-      pageNum: currPage.value - 1,
-      pageSize: 10
+      pageNum: currPage.value,
+      pageSize: pageSize.value
     }), "logList");
     refresh(); // 重置表单
 
@@ -11838,15 +11885,7 @@ const LogManager = defineComponent({
       refresh();
     };
 
-    const info = ref({
-      userName: null,
-      systemType: "",
-      moduleType: null,
-      recordType: "",
-      operateType: null,
-      contentText: "",
-      createTime: ""
-    });
+    const info = ref({});
     return () => createVNode("div", {
       "class": "logManager"
     }, [createVNode(resolveComponent("a-form"), {
@@ -11932,7 +11971,7 @@ const LogManager = defineComponent({
                 }))]
               }), createVNode("span", {
                 "style": {
-                  lineHeight: '32px'
+                  lineHeight: "32px"
                 }
               }, [createTextVNode("-")]), createVNode(resolveComponent("a-form-item"), {
                 "name": "recordType"
@@ -12008,8 +12047,14 @@ const LogManager = defineComponent({
       "dataSource": tableList.value,
       "columns": column,
       "pagination": {
+        pageSize: pageSize.value,
+        current: currPage.value,
+        showSizeChanger: true,
+        showQuickJumper: true,
+        showTotal: total => `共${total}条`,
         total: total.value,
-        onChange: handlePageChange
+        "onUpdate:current": handlePageChange,
+        "onUpdate:pageSize": hanldePageSizeChange
       },
       "loading": isLoading.value
     }, {
@@ -12041,21 +12086,21 @@ const LogManager = defineComponent({
         }, {
           default: () => [createVNode("div", {
             "class": "label"
-          }, [createTextVNode("\u65E5\u5FD7\u65F6\u95F4:")]), createVNode("div", null, [info.value.createTime])]
+          }, [createTextVNode("\u65E5\u5FD7\u65F6\u95F4:")]), createVNode("div", null, [info.value.createDt])]
         }), createVNode(resolveComponent("a-col"), {
           "span": span,
           "class": "col"
         }, {
           default: () => [createVNode("div", {
             "class": "label"
-          }, [createTextVNode("\u7CFB\u7EDF\u540D\u79F0:")]), createVNode("div", null, [info.value.systemType])]
+          }, [createTextVNode("\u7CFB\u7EDF\u540D\u79F0:")]), createVNode("div", null, [info.value.softSysName])]
         }), createVNode(resolveComponent("a-col"), {
           "span": span,
           "class": "col"
         }, {
           default: () => [createVNode("div", {
             "class": "label"
-          }, [createTextVNode("\u6A21\u5757\u540D\u79F0:")]), createVNode("div", null, [info.value.moduleType])]
+          }, [createTextVNode("\u6A21\u5757\u540D\u79F0:")]), createVNode("div", null, [info.value.moduleName])]
         }), createVNode(resolveComponent("a-col"), {
           "span": span,
           "class": "col"
@@ -12076,14 +12121,14 @@ const LogManager = defineComponent({
         }, {
           default: () => [createVNode("div", {
             "class": "label"
-          }, [createTextVNode("\u64CD\u4F5C\u4EBA:")]), createVNode("div", null, [info.value.userName])]
+          }, [createTextVNode("\u64CD\u4F5C\u4EBA:")]), createVNode("div", null, [info.value.createUser])]
         }), createVNode(resolveComponent("a-col"), {
           "span": span,
           "class": "col"
         }, {
           default: () => [createVNode("div", {
             "class": "label"
-          }, [createTextVNode("\u65E5\u5FD7\u5185\u5BB9:")]), createVNode("div", null, [info.value.contentText])]
+          }, [createTextVNode("\u65E5\u5FD7\u5185\u5BB9:")]), createVNode("div", null, [info.value.content])]
         })]
       })]
     })]);
@@ -13189,6 +13234,7 @@ var loginBox = defineComponent({
     });
     const serverName = inject("serverName");
     const prefix = inject("prefix");
+    const isClould = inject("isClould");
     const instance = getInstance({
       serverName,
       prefix
@@ -13291,7 +13337,7 @@ var loginBox = defineComponent({
         "class": "login_slider",
         "closable": false,
         "footer": null,
-        "width": "460px",
+        "width": "480px",
         "visible": visible.value,
         "onUpdate:visible": $event => visible.value = $event
       }, {
@@ -13368,8 +13414,12 @@ var loginBox = defineComponent({
     const loginspinning = ref(false);
 
     const subminBtnClick = () => {
-      loginspinning.value = true;
-      getImg();
+      if (isClould) {
+        loginspinning.value = true;
+        getImg();
+      } else {
+        toSunmit();
+      }
     };
 
     const renderForm = () => {
@@ -13490,6 +13540,10 @@ const Login = defineComponent({
       default: "comlite/v1/",
       type: String
     },
+    isClould: {
+      default: false,
+      type: Boolean
+    },
     prefix: {
       default: "",
       type: String
@@ -13521,6 +13575,7 @@ const Login = defineComponent({
     const router = useRouter(); // 将相关数据注入到所有子组件中
 
     provide("status", prop.status);
+    provide("isClould", prop.isClould);
     provide("corpLogo", prop.titleLogo);
     provide("ms", prop.ms);
     provide("productLogo", prop.loginMainImg);
@@ -29616,7 +29671,7 @@ const com$9 = defineComponent({
       eventTypeList: [],
       algorithmTypeList: []
     });
-    const createTime = ref();
+    const createTime = ref(dayjs());
     const time = ref([dayjs(new Date()).subtract(1, "week").format("YYYY-MM-DD"), dayjs(new Date()).format("YYYY-MM-DD")]); // 表格数据
 
     const getData = async () => {
@@ -29794,7 +29849,7 @@ const com$9 = defineComponent({
     };
 
     return () => {
-      let _slot, _slot2, _slot3, _slot4, _slot5, _slot6, _slot7;
+      let _slot, _slot2, _slot3, _slot4, _slot5, _slot6;
 
       return createVNode("div", {
         "class": "event"
@@ -29979,16 +30034,10 @@ const com$9 = defineComponent({
             "label": "报警类型",
             "name": "data"
           }, {
-            default: () => [createVNode(resolveComponent("a-select"), {
+            default: () => [createVNode(resolveComponent("a-input"), {
               "value": data.param.data,
               "onUpdate:value": $event => data.param.data = $event
-            }, _isSlot$c(_slot6 = data.alarmType.map(item => createVNode(resolveComponent("a-select-option"), {
-              "value": item.value
-            }, {
-              default: () => [item.label]
-            }))) ? _slot6 : {
-              default: () => [_slot6]
-            })]
+            }, null), createTextVNode("0:\u6D88\u8B66 1:\u62A5\u8B66 2:\u9884\u8B66")]
           }), createVNode(resolveComponent("a-form-item"), {
             "label": "创建时间"
           }, {
@@ -30030,8 +30079,8 @@ const com$9 = defineComponent({
         default: () => [createVNode(resolveComponent("a-form"), null, {
           default: () => [createVNode(resolveComponent("a-form-item"), {
             "label": "时间"
-          }, _isSlot$c(_slot7 = timestampToTime(data.param.createDt)) ? _slot7 : {
-            default: () => [_slot7]
+          }, _isSlot$c(_slot6 = timestampToTime(data.param.createDt)) ? _slot6 : {
+            default: () => [_slot6]
           }), createVNode(resolveComponent("a-form-item"), {
             "label": "相机名称"
           }, {
@@ -31550,13 +31599,13 @@ var CheckDialog = defineComponent({
         dataIndex: "uuid",
         key: "uuid",
         customRender: param => {
-          return createVNode(resolveComponent("a-button"), {
+          return param.record.info.length ? createVNode(resolveComponent("a-button"), {
             "onClick": () => {
               repair(param.text);
             }
           }, {
             default: () => [createTextVNode("\u8FDC\u7A0B\u4FEE\u590D")]
-          });
+          }) : "";
         }
       }],
       loading: false
@@ -33513,10 +33562,11 @@ const com$2 = defineComponent({
       "pagination": false
     }, {
       bodyCell: ({
+        text,
         column,
         record
       }) => {
-        let resDom = "";
+        let resDom = text;
 
         if (column.key === "action") {
           resDom = createVNode("a", {
@@ -34489,8 +34539,7 @@ var AlarmDetail = defineComponent({
       props.onClose?.();
     };
 
-    const alarmDetail = ref(cloneDeep(props.record));
-    console.log(alarmDetail); // 获取视频
+    const alarmDetail = ref(cloneDeep(props.record)); // 获取视频
 
     const videoBaseUrl = ref("");
 
@@ -34517,6 +34566,7 @@ var AlarmDetail = defineComponent({
     } // 图表
 
 
+    const chartData = ref([]);
     const chartRef = ref();
     const chartIns = ref();
 
@@ -34542,7 +34592,7 @@ var AlarmDetail = defineComponent({
           animation: "scale-in-x"
         }
       });
-      const chartData = alarmDetail.value.alarmLifecycleList.map(item => {
+      chartData.value = alarmDetail.value.alarmLifecycleList.filter(item => item.endTime).map(item => {
         let level;
 
         switch (item.alarmLevel) {
@@ -34568,7 +34618,7 @@ var AlarmDetail = defineComponent({
           range: [item.startTime, item.endTime]
         };
       });
-      chartIns.value.data(chartData);
+      chartIns.value.data(chartData.value);
       chartIns.value.render();
     };
 
@@ -34597,15 +34647,13 @@ var AlarmDetail = defineComponent({
 
       return createVNode("div", {
         "class": "alarmDetail"
-      }, [createVNode(resolveComponent("a-breadcrumb"), null, {
-        default: () => [createVNode(resolveComponent("a-breadcrumb-item"), null, {
-          default: () => [createVNode("a", {
-            "onClick": back
-          }, [createTextVNode("\u62A5\u8B66\u8BB0\u5F55")])]
-        }), createVNode(resolveComponent("a-breadcrumb-item"), null, {
-          default: () => [createTextVNode("\u62A5\u8B66\u8BE6\u60C5")]
-        })]
-      }), createVNode(resolveComponent("a-descriptions"), {
+      }, [createVNode(resolveComponent("a-page-header"), {
+        "style": {
+          padding: 0
+        },
+        "title": "报警详情",
+        "onBack": back
+      }, null), createVNode(resolveComponent("a-descriptions"), {
         "labelStyle": {
           width: "100px",
           textAlign: "right"
@@ -34677,7 +34725,7 @@ var AlarmDetail = defineComponent({
         }), createVNode(resolveComponent("a-descriptions-item"), {
           "label": "报警生命周期"
         }, {
-          default: () => [alarmDetail.value.alarmLifecycleList && alarmDetail.value.alarmLifecycleList.length ? createVNode("div", {
+          default: () => [chartData.value.length ? createVNode("div", {
             "ref": chartRef
           }, null) : createVNode(resolveComponent("a-empty"), {
             "description": "暂无生命周期"