ソースを参照

移除日志提交,对接知识管理

zhangchong 2 年 前
コミット
800be4468b
32 ファイル変更93 行追加123 行削除
  1. 3 2
      src/api/knowledge/type.ts
  2. 2 8
      src/components/LogicFlow/PropertySetting/summary.vue
  3. 4 10
      src/components/LogicFlow/PropertySetting/task.vue
  4. 4 20
      src/main.ts
  5. 0 5
      src/utils/appConfig.ts
  6. 0 0
      src/utils/exceptionless.js
  7. 0 10
      src/utils/request.ts
  8. 2 2
      src/views/business/order/index.vue
  9. 0 0
      src/views/device/trunks/component/trunksAdd.vue
  10. 0 0
      src/views/device/trunks/component/trunksEdit.vue
  11. 3 3
      src/views/device/trunks/index.vue
  12. 4 4
      src/views/knowledge/apply/component/Detail.vue
  13. 3 1
      src/views/knowledge/apply/index.vue
  14. 3 3
      src/views/knowledge/apply/my/component/ApplyDetail.vue
  15. 5 3
      src/views/knowledge/apply/my/component/EditApply.vue
  16. 3 3
      src/views/knowledge/apply/my/index.vue
  17. 1 2
      src/views/knowledge/config/standard/index.vue
  18. 5 4
      src/views/knowledge/config/type/index.vue
  19. 1 1
      src/views/knowledge/knowledge/component/addKnowledge.vue
  20. 1 1
      src/views/knowledge/knowledge/component/editKnowledge.vue
  21. 4 2
      src/views/knowledge/knowledge/delApply/index.vue
  22. 6 4
      src/views/knowledge/knowledge/draft/index.vue
  23. 21 15
      src/views/knowledge/knowledge/index.vue
  24. 1 1
      src/views/knowledge/process/index.vue
  25. 2 2
      src/views/system/config/timeLimit/component/Add.vue
  26. 2 2
      src/views/system/config/timeLimit/component/Edit.vue
  27. 3 3
      src/views/system/config/timeLimit/index.vue
  28. 1 1
      src/views/system/menu/index.vue
  29. 1 1
      src/views/system/organize/index.vue
  30. 3 3
      src/views/system/parameter/index.vue
  31. 0 1
      src/views/tels/telsLog/component/operationRecord.vue
  32. 5 6
      src/views/tels/telsLog/index.vue

+ 3 - 2
src/api/knowledge/type.ts

@@ -9,13 +9,14 @@
 import request from '/@/utils/request';
 /**
  * @description: 知识管理类型树形
- * @param 
+ * @param {object} params 如果传入参数 IsEnable 表示查询已启用
  * @return {*}
  */
-export const treelist = () => {
+export const treelist = (params?:object) => {
 	return request({
 		url: '/api/v1/KnowledgeCommon/treelist',
 		method: 'get',
+		params
 	});
 };
 /**

+ 2 - 8
src/components/LogicFlow/PropertySetting/summary.vue

@@ -284,15 +284,9 @@ onMounted(async () => {
 			label: item.value,
 		}));
 		if (handlerTypeOptions.value.length) itemName.value = handlerTypeOptions.value[form.handlerType].label;
-	} else if (form.handlerType === 3) {
+	} else if ([3].includes(form.handlerType)) {
 		if (handlerTypeOptions.value.length) itemName.value = handlerTypeOptions.value[form.handlerType].label;
-		usetList.value = JSON.parse(form.handlerClassifies).map((item: any) => {
-			return {
-				label: item.name,
-				value: item.id,
-			};
-		});
-	} else if (form.handlerType === 4) {
+	} else if ([4].includes(form.handlerType)) {
 		getcanuseorgFn();
 	}
 	nodesOptions.value = form.nodes ?? [];

+ 4 - 10
src/components/LogicFlow/PropertySetting/task.vue

@@ -89,7 +89,7 @@
 			</el-form-item>
 			<el-form-item label="会签结束节点" prop="CountersignEndCode" v-if="form.CountersignEndCode">
 				<el-select v-model="form.CountersignEndCode" class="w100" disabled>
-					<el-option v-for="item in nodesOptions" :key="item.id" :label="item.text.value" :value="item.id"  />
+					<el-option v-for="item in nodesOptions" :key="item.id" :label="item.text.value" :value="item.id" />
 				</el-select>
 			</el-form-item>
 		</el-form>
@@ -232,7 +232,7 @@ onMounted(async () => {
 			remoteMethod(i.name.split('-')[0]);
 		}
 	}
-	if ([0,1,2].includes(form.handlerType)) {
+	if ([0, 1, 2].includes(form.handlerType)) {
 		const res: any = await getSelectList(form.handlerType);
 		selectList.value = res.result ?? [];
 		selectList.value = selectList.value.map((item: any) => ({
@@ -240,15 +240,9 @@ onMounted(async () => {
 			label: item.value,
 		}));
 		if (handlerTypeOptions.value.length) itemName.value = handlerTypeOptions.value[form.handlerType].label;
-	} else if (form.handlerType === 3) {
+	} else if ([3].includes(form.handlerType)) {
 		if (handlerTypeOptions.value.length) itemName.value = handlerTypeOptions.value[form.handlerType].label;
-		usetList.value = JSON.parse(form.handlerClassifies).map((item: any) => {
-			return {
-				label: item.name,
-				value: item.id,
-			};
-		});
-	} else if (form.handlerType === 4) {
+	} else if ([4].includes(form.handlerType)) {
 		getcanuseorgFn();
 	}
 	nodesOptions.value = form.summarynodes ?? [];

+ 4 - 20
src/main.ts

@@ -15,35 +15,19 @@ import Pagination from '/@/components/Pagination/index.vue';
 // 空组件
 import Empty from '/@/components/Empty/index.vue';
 
-// 组织架构组件
-// import vue3TreeOrg from 'vue3-tree-org';
-// import "vue3-tree-org/lib/vue3-tree-org.css";
 // 图片预览
 import 'viewerjs/dist/viewer.css';
 import VueViewer from 'v-viewer';
 
-//exception log
-// import { Exceptionless } from "@exceptionless/browser";
-import { Exceptionless } from "/@/utils/exceptionless.js";
-//  全局配置
-import appConfig from "/@/utils/appConfig";
-
 const app = createApp(App);
 
 // 自定义指令和svg组件
 directive(app);
 other.elSvg(app);
-if (appConfig.sendLog) {
-    Exceptionless.startup((c: any) => { // 初始化日志系统
-        c.apiKey = appConfig.logKey
-        c.serverUrl = appConfig.logServerUrl
-    });
-}
-app.config.errorHandler = async (err: any, instance: any, info: any) => {
-    // 向追踪服务报告错误
-    if (appConfig.clientLog) console.log('globalError: ', err, instance, info);
-    if (appConfig.sendLog) await Exceptionless.submitException(<Error>err);
-}
+// app.config.errorHandler = async (err: any, instance: any, info: any) => {
+//     // 错误日志
+//     if (appConfig.clientLog) console.log('globalError: ', err, instance, info);
+// }
 // 全局组件挂载
 app.component('Pagination', Pagination)
 app.component('Empty', Empty);

+ 0 - 5
src/utils/appConfig.ts

@@ -3,8 +3,6 @@ interface AppConfigState{
     identityUrl:string,// 身份认证服务地址
     socketUrl:string,// signalr请求地址
     logKey?:string,// 日志发送key
-    logServerUrl:string,// 日志发送地址
-    sendLog:boolean,// 是否开启错误日志提交
     clientLog:boolean,// 客户端(浏览器是否开启错误打印)
 }
 let appConfig:AppConfigState;
@@ -14,8 +12,6 @@ const commonConfig:AppConfigState = {
     apiUrl: 'http://hotline.fw.com',
     identityUrl: 'http://identity.fengwo.com',
     socketUrl: 'http://192.168.100.223:50110/hubs/callcenter',
-    logServerUrl: 'http://log.fw.com',
-    sendLog: true,
     clientLog: true,
 }
 
@@ -24,7 +20,6 @@ switch (import.meta.env.VITE_MODE_NAME) {
         appConfig = {
             ...commonConfig,
             logKey: 'BrXoFNY0kBtPAHtIegYX1dQdKWhtyyMMLfcF03L9',
-            sendLog: false,
         }
         break;
     case 'test': // 测试环境

ファイルの差分が大きいため隠しています
+ 0 - 0
src/utils/exceptionless.js


+ 0 - 10
src/utils/request.ts

@@ -2,11 +2,8 @@ import axios, { AxiosInstance, AxiosResponse, AxiosError, AxiosRequestConfig } f
 import { ElMessage, ElMessageBox, ElLoading, LoadingOptionsResolved } from 'element-plus';
 import { Session, Local } from '/@/utils/storage';
 import router from "/@/router/index"
-//exception log
-import { Exceptionless } from "/@/utils/exceptionless.js";
 // 全局配置
 import appConfig from "/@/utils/appConfig";
-// const appConfigStore = useAppConfig().getAppInfo();
 // 重复请求队列
 const pendingMap = new Map();
 // loading
@@ -51,10 +48,6 @@ export default function myAxios(axiosConfig: any, customOptions?: any, loadingOp
 			return config;
 		},
 		async (error: AxiosError) => {
-			// 对请求错误做些什么
-			let errorText = `${error.message},errUrl:${error.request.responseURL}`;
-			// 向追踪服务报告错误
-			if (appConfig.sendLog) await Exceptionless.submitException(new Error(errorText));
 			return Promise.reject(error);
 		}
 	);
@@ -78,9 +71,6 @@ export default function myAxios(axiosConfig: any, customOptions?: any, loadingOp
 			error.config && removePending(error.config);
 			custom_options.loading && closeLoading(custom_options); // 关闭loading
 			custom_options.error_message_show && httpErrorStatusHandle(error); // 处理错误状态码
-			let errorText = `${error.message},errUrl:${error.request.responseURL}`;
-			// 向追踪服务报告错误
-			if (appConfig.sendLog) await Exceptionless.submitException(new Error(errorText));
 			return Promise.reject(error); // 错误继续返回给到具体页面
 		}
 	);

+ 2 - 2
src/views/business/order/index.vue

@@ -393,14 +393,14 @@ const closeSearch = () => {
 const timeStartChangeCr = (val: string[]) => {
 	if (val) {
 		state.queryParams.CreationTimeStart = val[0];
-		state.queryParams.CreationTimeEnd = val[0];
+		state.queryParams.CreationTimeEnd = val[1];
 	}
 };
 // 过期时间
 const timeStartChangeEx = (val: string[]) => {
 	if (val) {
 		state.queryParams.ExpiredTimeStart = val[0];
-		state.queryParams.ExpiredTimeStart = val[0];
+		state.queryParams.ExpiredTimeStart = val[1];
 	}
 };
 // 获取查询条件基础信息

+ 0 - 0
src/views/device/trunks/component/add.vue → src/views/device/trunks/component/trunksAdd.vue


+ 0 - 0
src/views/device/trunks/component/edit.vue → src/views/device/trunks/component/trunksEdit.vue


+ 3 - 3
src/views/device/trunks/index.vue

@@ -82,8 +82,8 @@ import table2excel from 'js-table2excel';
 import { getList, removetrunk } from '/@/api/device/trunks';
 
 // 引入组件
-const AddTrunks = defineAsyncComponent(() => import('/@/views/device/trunks/component/add.vue'));
-const EditTrunks = defineAsyncComponent(() => import('/@/views/device/trunks/component/edit.vue'));
+const AddTrunks = defineAsyncComponent(() => import('/@/views/device/trunks/component/trunksAdd.vue'));
+const EditTrunks = defineAsyncComponent(() => import('/@/views/device/trunks/component/trunksEdit.vue'));
 
 // 定义接口来定义对象的类型
 interface TelsState {
@@ -124,7 +124,7 @@ const updateTrunks = (row: any) => {
 // 删除路线
 const ivrConfigure = (row: any) => {
 	ElMessageBox.confirm(`此操作将永久删除线路:【${row.trunkId}】, 是否继续?`, '提示', {
-		confirmButtonText: '删除',
+		confirmButtonText: '确定',
 		cancelButtonText: '取消',
 		type: 'warning',
 		draggable: true,

+ 4 - 4
src/views/knowledge/apply/component/Detail.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="knowledge-apply-add-container">
-		<el-dialog title="发起申请" v-model="state.isShowDialog" width="700px" draggable>
+		<el-dialog title="发起申请" v-model="state.isShowDialog" draggable>
 			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="100px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
@@ -25,7 +25,7 @@
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" v-if="state.ruleForm.expiredTime">
 						<el-form-item label="截止时间">
-							{{ formatDate(state.info.expiredTime, 'YYYY-mm-dd HH:MM:SS') }}
+							{{ formatDate(state.ruleForm.expiredTime, 'YYYY-mm-dd HH:MM:SS') }}
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
@@ -48,12 +48,12 @@
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" v-if="state.ruleForm.handleTime">
 						<el-form-item label="处理完成时间">
-							{{ formatDate(state.info.handleTime, 'YYYY-mm-dd HH:MM:SS') }}
+							{{ formatDate(state.ruleForm.handleTime, 'YYYY-mm-dd HH:MM:SS') }}
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" v-if="state.ruleForm.returnTime">
 						<el-form-item label="退回时间">
-							{{ formatDate(state.info.returnTime, 'YYYY-mm-dd HH:MM:SS') }}
+							{{ formatDate(state.ruleForm.returnTime, 'YYYY-mm-dd HH:MM:SS') }}
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" v-if="state.ruleForm.opinion">

+ 3 - 1
src/views/knowledge/apply/index.vue

@@ -196,7 +196,7 @@ const HandleRef = ref();
 // 创建时间
 const tiemChange = (val: string[]) => {
 	state.queryParams.StartTime = val[0];
-	state.queryParams.EndTime = val[0];
+	state.queryParams.EndTime = val[1];
 };
 /** 获取用户列表 */
 const getList = () => {
@@ -221,6 +221,8 @@ const handleSelectionChange = (val: any) => {
 const resetQuery = throttle((formEl: FormInstance | undefined) => {
 	if (!formEl) return;
 	formEl.resetFields();
+	state.queryParams.StartTime = '';
+	state.queryParams.EndTime = '';
 	state.queryParams.PageIndex = 1;
 	getList();
 }, 1000);

+ 3 - 3
src/views/knowledge/apply/my/component/ApplyDetail.vue

@@ -25,7 +25,7 @@
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12"  v-if="state.ruleForm.expiredTime">
 						<el-form-item label="截止时间">
-							{{ formatDate(state.info.expiredTime, 'YYYY-mm-dd HH:MM:SS') }}
+							{{ formatDate(state.ruleForm.expiredTime, 'YYYY-mm-dd HH:MM:SS') }}
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
@@ -48,12 +48,12 @@
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" v-if="state.ruleForm.handleTime">
 						<el-form-item label="处理完成时间">
-							{{ formatDate(state.info.handleTime, 'YYYY-mm-dd HH:MM:SS') }}
+							{{ formatDate(state.ruleForm.handleTime, 'YYYY-mm-dd HH:MM:SS') }}
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" v-if="state.ruleForm.returnTime">
 						<el-form-item label="退回时间">
-							{{ formatDate(state.info.returnTime, 'YYYY-mm-dd HH:MM:SS') }}
+							{{ formatDate(state.ruleForm.returnTime, 'YYYY-mm-dd HH:MM:SS') }}
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" v-if="state.ruleForm.opinion">

+ 5 - 3
src/views/knowledge/apply/my/component/EditApply.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="knowledge-apply-add-container">
+	<div class="knowledge-apply-edit-container">
 		<el-dialog title="编辑申请" v-model="state.isShowDialog" draggable>
 			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="100px">
 				<el-row :gutter="35">
@@ -140,8 +140,10 @@ watch(
 	() => state.ruleForm.knowledgeId,
 	(val) => {
 		const item = state.knowledgeOptions.find((v: any) => v.id === val);
-		state.ruleForm.department = item.department;
-		state.ruleForm.departmentId = item.departmentId;
+		if (item) {
+			state.ruleForm.department = item.department;
+			state.ruleForm.departmentId = item.departmentId;
+		}
 	}
 );
 // 新增

+ 3 - 3
src/views/knowledge/apply/my/index.vue

@@ -110,8 +110,8 @@
 			<pagination :total="state.total" v-model:page="state.queryParams.PageIndex" v-model:limit="state.queryParams.PageSize" @pagination="getList" />
 		</el-card>
 		<AddApply ref="AddRef" @updateList="getList" />
-		<ApplyDetail ref="EditRef" @updateList="getList" />
-		<EditApply ref="DetailRef" />
+		<ApplyDetail ref="DetailRef" />
+		<EditApply ref="EditRef"  @updateList="getList"/>
 	</div>
 </template>
 
@@ -200,7 +200,7 @@ const DetailRef = ref();
 const tiemChange = (val: string[]) => {
 	if (val) {
 		state.queryParams.StartTime = val[0];
-		state.queryParams.EndTime = val[0];
+		state.queryParams.EndTime = val[1];
 	}
 };
 /** 获取用户列表 */

+ 1 - 2
src/views/knowledge/config/standard/index.vue

@@ -93,6 +93,5 @@ onMounted(() => {
 </script>
 
 <style scoped lang="scss">
-.knowledge-standard-container {
-}
+
 </style>

+ 5 - 4
src/views/knowledge/config/type/index.vue

@@ -19,6 +19,7 @@
 			<!-- 表格 -->
 			<el-table class="table" :data="state.tableData" row-key="id" default-expand-all v-loading="state.loading" :tree-props="{ children: 'child' }" ref="tableRef">
 				<el-table-column prop="name" label="类型名称" />
+				<el-table-column prop="sort" label="排序" width="150" />
 				<el-table-column prop="isEnable" label="状态" width="150" align="center">
 					<template #default="{ row }">
 						<el-tag v-if="row.isEnable" type="success">
@@ -85,7 +86,7 @@ const onOpenEdit = (row: any) => {
 // 禁用·
 const onDisabled = (row: any) => {
 	ElMessageBox.confirm(`是否要停用该类型?`, '提示', {
-		confirmButtonText: '删除',
+		confirmButtonText: '确定',
 		cancelButtonText: '取消',
 		type: 'warning',
 	})
@@ -100,7 +101,7 @@ const onDisabled = (row: any) => {
 // 启用
 const onEnable = (row: any) => {
 	ElMessageBox.confirm(`是否要启用该类型?`, '提示', {
-		confirmButtonText: '删除',
+		confirmButtonText: '确定',
 		cancelButtonText: '取消',
 		type: 'warning',
 	})
@@ -116,7 +117,7 @@ const onEnable = (row: any) => {
 // 删除当前行
 const onDelete = (row: any) => {
 	ElMessageBox.confirm(`是否确认删除该类型?删除后不可恢复`, '提示', {
-		confirmButtonText: '删除',
+		confirmButtonText: '确定',
 		cancelButtonText: '取消',
 		type: 'warning',
 	})
@@ -130,7 +131,7 @@ const onDelete = (row: any) => {
 };
 const undercarriage = (row: any) => {
 	ElMessageBox.confirm(`确定要停用并下架相关知识?`, '提示', {
-		confirmButtonText: '删除',
+		confirmButtonText: '确定',
 		cancelButtonText: '取消',
 		type: 'warning',
 	})

+ 1 - 1
src/views/knowledge/knowledge/component/addKnowledge.vue

@@ -298,7 +298,7 @@ const getKnowledgeType = async () => {
 	state.loading = true;
 	try {
 		const res: any = await Promise.all([
-			treelist(),
+			treelist({IsEnable:1}),
 			KnowledgeGetknowledge({ PageIndex: 1, PageSize: 99 }),
 			KnowledgeAddapply({ PageIndex: 1, PageSize: 99 }),
 		]);

+ 1 - 1
src/views/knowledge/knowledge/component/editKnowledge.vue

@@ -307,7 +307,7 @@ const getKnowledgeType = async () => {
 	state.loading = true;
 	try {
 		const res: any = await Promise.all([
-			treelist(),
+			treelist({IsEnable:1}),
 			KnowledgeGetknowledge({ PageIndex: 1, PageSize: 99 }),
 			KnowledgeAddapply({ PageIndex: 1, PageSize: 99 }),
 		]);

+ 4 - 2
src/views/knowledge/knowledge/delApply/index.vue

@@ -161,14 +161,14 @@ const processRecordRef = ref();
 // 创建时间
 const tiemChange = (val: string[]) => {
 	state.queryParams.StartTime = val[0];
-	state.queryParams.EndTime = val[0];
+	state.queryParams.EndTime = val[1];
 };
 /** 获取知识库删除列表 */
 const getList = () => {
 	state.loading = true;
 	let request = JSON.parse(JSON.stringify(state.queryParams));
 	Reflect.deleteProperty(request, 'crTime'); // 删除无用的参数
-	KnowledgeDeletelist(Reflect)
+	KnowledgeDeletelist(request)
 		.then((response: any) => {
 			state.tableList = response?.result.items ?? [];
 			state.total = response?.result.total;
@@ -186,6 +186,8 @@ const handleSelectionChange = (val: any) => {
 const resetQuery = throttle((formEl: FormInstance | undefined) => {
 	if (!formEl) return;
 	formEl.resetFields();
+	state.queryParams.StartTime = '';
+	state.queryParams.EndTime = '';
 	getList();
 }, 1000);
 // 切换tab 查询列表

+ 6 - 4
src/views/knowledge/knowledge/draft/index.vue

@@ -55,9 +55,9 @@
 				<el-table-column type="selection" width="55" :reserve-selection="true" />
 				<el-table-column prop="title" label="标题" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="knowledgeTypeName" label="类型" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="lastModificationTime" label="创建时间" show-overflow-tooltip width="170">
+				<el-table-column prop="creationTime" label="创建时间" show-overflow-tooltip width="170">
 					<template #default="scope">
-						<span>{{ formatDate(scope.row.lastModificationTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
+						<span>{{ formatDate(scope.row.creationTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="操作" width="120" fixed="right" align="center">
@@ -158,7 +158,7 @@ const ruleFormRef = ref<FormInstance>();
 // 创建时间
 const tiemChange = (val: string[]) => {
 	state.queryParams.StartTime = val[0];
-	state.queryParams.EndTime = val[0];
+	state.queryParams.EndTime = val[1];
 };
 /** 获取草稿箱列表 */
 const getList = () => {
@@ -183,6 +183,8 @@ const handleSelectionChange = (val: any) => {
 const resetQuery = throttle((formEl: FormInstance | undefined) => {
 	if (!formEl) return;
 	formEl.resetFields();
+	state.queryParams.StartTime = '';
+	state.queryParams.EndTime = '';
 	getList();
 }, 1000);
 // 修改知识
@@ -233,7 +235,7 @@ const onImportTable = () => {
 const getKnowledgeType = async () => {
 	state.loading = true;
 	try {
-		const res: any = await treelist();
+		const res: any = await treelist({IsEnable:1});
 		state.typeData = res.result ?? [];
 		state.loading = false;
 	} catch (error) {

+ 21 - 15
src/views/knowledge/knowledge/index.vue

@@ -239,7 +239,7 @@
 		<!-- 预览 -->
 		<Preview ref="previewRef" />
 		<!-- 审核记录 -->
-		<ProcessRecord ref="processRecordRef"/>
+		<ProcessRecord ref="processRecordRef" />
 		<!-- 流程组件 -->
 		<Process ref="processRef" @onSubmitProcess="onSubmitProcess" />
 	</div>
@@ -252,8 +252,8 @@ import { useRouter } from 'vue-router';
 import type { FormInstance } from 'element-plus';
 import table2excel from 'js-table2excel';
 import { formatDate } from '/@/utils/formatTime';
-import { throttle,commonEeum } from '/@/utils/tools';
-import { KnowledgePaged,KnowledgeRevoke,KnowledgeOffshelf,KnowledgeOntheshelf} from '/@/api/knowledge';
+import { throttle, commonEeum } from '/@/utils/tools';
+import { KnowledgePaged, KnowledgeRevoke, KnowledgeOffshelf, KnowledgeOntheshelf } from '/@/api/knowledge';
 import { getOrgList } from '/@/api/system/organize';
 import { treelist } from '/@/api/knowledge/type';
 import { hotspottype } from '/@/api/business/order';
@@ -364,7 +364,7 @@ const handleClick = () => {
 const timeStartChangeCr = (val: string[]) => {
 	if (val) {
 		state.queryParams.CreationStartTime = val[0];
-		state.queryParams.CreationEndTime = val[0];
+		state.queryParams.CreationEndTime = val[1];
 		getList();
 	} else {
 		state.queryParams.CreationStartTime = '';
@@ -376,7 +376,7 @@ const timeStartChangeCr = (val: string[]) => {
 const timeStartChangeSj = (val: string[]) => {
 	if (val) {
 		state.queryParams.StartOnShelfTime = val[0];
-		state.queryParams.EndOnShelfTime = val[0];
+		state.queryParams.EndOnShelfTime = val[1];
 		getList();
 	} else {
 		state.queryParams.StartOnShelfTime = '';
@@ -388,7 +388,7 @@ const timeStartChangeSj = (val: string[]) => {
 const timeStartChangeXj = (val: string[]) => {
 	if (val) {
 		state.queryParams.StartOffShelfTime = val[0];
-		state.queryParams.EndOffShelfTime = val[0];
+		state.queryParams.EndOffShelfTime = val[1];
 		getList();
 	} else {
 		state.queryParams.StartOffShelfTime = '';
@@ -405,7 +405,7 @@ const handleQuery = throttle(() => {
 const getOrgListApi = async () => {
 	state.loading = true;
 	try {
-		const res: any = await Promise.all([getOrgList(), treelist()]);
+		const res: any = await Promise.all([getOrgList(), treelist({IsEnable:1})]);
 		state.orgData = res[0].result ?? [];
 		state.typeData = res[1].result ?? [];
 		state.loading = false;
@@ -420,7 +420,7 @@ const getList = () => {
 	Reflect.deleteProperty(request, 'crTime'); // 删除无用的参数
 	Reflect.deleteProperty(request, 'sjTime'); // 删除无用的参数
 	Reflect.deleteProperty(request, 'xjTime'); // 删除无用的参数
-	KnowledgePaged(state.queryParams)
+	KnowledgePaged(request)
 		.then((response: any) => {
 			state.tableData = response?.result.items ?? [];
 			state.total = response?.result.total;
@@ -460,6 +460,12 @@ const resetQuery = throttle((formEl: FormInstance | undefined) => {
 	state.queryParams.CreateOrgId = '';
 	state.queryParams.HotspotId = '';
 	state.queryParams.KnowledgeTypeId = '';
+	state.queryParams.CreationStartTime = '';
+	state.queryParams.CreationEndTime = '';
+	state.queryParams.StartOffShelfTime = '';
+	state.queryParams.EndOffShelfTime = '';
+	state.queryParams.StartOnShelfTime = '';
+	state.queryParams.EndOnShelfTime = '';
 	typeRef.value?.setCurrentKey(null);
 	orgRef.value?.setCurrentKey(null);
 	hotRef.value?.setCurrentKey(null);
@@ -482,21 +488,21 @@ const onEdit = (row: any) => {
 	});
 };
 // 预览
-const onPreview = (row:any) => {
+const onPreview = (row: any) => {
 	previewRef.value.openDialog(row);
 };
 // 查看审核记录
-const onRecord = (row:any) => {
+const onRecord = (row: any) => {
 	processRecordRef.value.openDialog(row);
 };
 // 发起更新 修改申请
-const onRenew = (row:any) => {
-	processRef.value.openDialog({ id: row.workflowId, title: '更新知识', commonEeum: commonEeum.Seat, processType: 'editStart' });
+const onRenew = (row: any) => {
+	processRef.value.openDialog({ id: row.id, title: '更新知识', commonEeum: commonEeum.Seat, processType: 'editStart' });
 };
 // 发起更新成功
-const onSubmitProcess = ()=>{
+const onSubmitProcess = () => {
 	handleQuery();
-}
+};
 // 下架
 const onOffshelf = (row: any) => {
 	ElMessageBox.confirm(`是否确定要下架?知识下架后,将不会被检索到!`, '提示', {
@@ -573,7 +579,7 @@ const onRecall = (row: any) => {
 };
 // 删除知识
 const onRowDel = (row: any) => {
-	processRef.value.openDialog({ id: row.workflowId, title: '删除知识', commonEeum: commonEeum.Seat, processType: 'deleteStart' });
+	processRef.value.openDialog({ id: row.id, title: '删除知识', commonEeum: commonEeum.Seat, processType: 'deleteStart' });
 };
 // 导出表格
 const onImportTable = () => {

+ 1 - 1
src/views/knowledge/process/index.vue

@@ -64,7 +64,7 @@
 				</el-table-column>
 				<el-table-column prop="toNo" label="审核时间" show-overflow-tooltip width="170">
 					<template #default="{row}">
-						<span>{{ formatDate(row.creationTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
+						<span>{{ formatDate(row.handleTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="操作" width="200" fixed="right" align="center">

+ 2 - 2
src/views/system/config/timeLimit/component/Add.vue

@@ -513,7 +513,7 @@ const handleAdd = () => {
 // 删除
 const handleDelete = (row: any, index: number) => {
 	ElMessageBox.confirm(`确定要删除?`, '提示', {
-		confirmButtonText: '删除',
+		confirmButtonText: '确定',
 		cancelButtonText: '取消',
 		type: 'warning',
 		draggable: true,
@@ -591,7 +591,7 @@ const combinatioAadd = () => {
 // 删除组合
 const combinationDelete = (row: any, index: number) => {
 	ElMessageBox.confirm(`确定要删除?`, '提示', {
-		confirmButtonText: '删除',
+		confirmButtonText: '确定',
 		cancelButtonText: '取消',
 		type: 'warning',
 		draggable: true,

+ 2 - 2
src/views/system/config/timeLimit/component/Edit.vue

@@ -610,7 +610,7 @@ const handleAdd = () => {
 // 删除
 const handleDelete = (row: any, index: number) => {
 	ElMessageBox.confirm(`确定要删除?`, '提示', {
-		confirmButtonText: '删除',
+		confirmButtonText: '确定',
 		cancelButtonText: '取消',
 		type: 'warning',
 		draggable: true,
@@ -688,7 +688,7 @@ const combinatioAadd = () => {
 // 删除组合
 const combinationDelete = (row: any, index: number) => {
 	ElMessageBox.confirm(`确定要删除?`, '提示', {
-		confirmButtonText: '删除',
+		confirmButtonText: '确定',
 		cancelButtonText: '取消',
 		type: 'warning',
 		draggable: true,

+ 3 - 3
src/views/system/config/timeLimit/index.vue

@@ -91,7 +91,7 @@ const updateTimeLimit = (row: any) => {
 // 删除时限
 const deleteTimeLimit = (row: any) => {
 	ElMessageBox.confirm(`此操作将永久删除时限:【${row.timeLimitName}】, 是否继续?`, '提示', {
-		confirmButtonText: '删除',
+		confirmButtonText: '确定',
 		cancelButtonText: '取消',
 		type: 'warning',
 		draggable: true,
@@ -108,7 +108,7 @@ const deleteTimeLimit = (row: any) => {
 // 启用时限
 const enableTimeLimit = (row: any) => {
 	ElMessageBox.confirm(`此操作将启用:【${row.timeLimitName}】, 是否继续?`, '提示', {
-		confirmButtonText: '删除',
+		confirmButtonText: '确定',
 		cancelButtonText: '取消',
 		type: 'warning',
 		draggable: true,
@@ -125,7 +125,7 @@ const enableTimeLimit = (row: any) => {
 // 禁用时限
 const disableTimeLimit = (row: any) => {
 	ElMessageBox.confirm(`此操作将禁用:【${row.timeLimitName}】, 是否继续?`, '提示', {
-		confirmButtonText: '删除',
+		confirmButtonText: '确定',
 		cancelButtonText: '取消',
 		type: 'warning',
 		draggable: true,

+ 1 - 1
src/views/system/menu/index.vue

@@ -232,7 +232,7 @@ const getAllIds = (arr: any) => {
 // 删除当前行
 const onTabelRowDel = (row: any) => {
 	ElMessageBox.confirm(`此操作将永久删除菜单:${row.pageName}, 是否继续?`, '提示', {
-		confirmButtonText: '删除',
+		confirmButtonText: '确定',
 		cancelButtonText: '取消',
 		type: 'warning',
 		draggable: true,

+ 1 - 1
src/views/system/organize/index.vue

@@ -140,7 +140,7 @@ const getAllIds = (arr: any) => {
 // 删除当前行
 // const onTabelRowDel = (row: any) => {
 // 	ElMessageBox.confirm(`此操作将永久删除部门结构:${row.orgName}, 是否继续?`, '提示', {
-// 		confirmButtonText: '删除',
+// 		confirmButtonText: '确定',
 // 		cancelButtonText: '取消',
 // 		type: 'warning',
 // 	}).then(() => {

+ 3 - 3
src/views/system/parameter/index.vue

@@ -58,7 +58,7 @@
 								<template v-else-if="item.valueType === 7">
 									<el-date-picker
 										v-model="item.settingValue"
-										value-format="YYYY-MM-DD"
+										value-format="YYYY-MM-DD[T]HH:mm:ss.sss[Z]"
 										type="date"
 										:placeholder="'请选择' + item.settingName"
 										@change="changeVal($event, item.id)"
@@ -69,7 +69,7 @@
 									<div>
 										<el-date-picker
 											v-model="item.settingValue"
-											value-format="YYYY-MM-DD"
+											value-format="YYYY-MM-DD[T]HH:mm:ss.sss[Z]"
 											type="daterange"
 											:placeholder="'请选择' + item.settingName"
 											@change="changeVal($event, item.id)"
@@ -108,7 +108,7 @@
 										action=""
 										:show-file-list="false"
 										:on-success="handleAvatarSuccess"
-										:http-request="(file) => uploadImg(file, item.id)"
+										:http-request="(file:any) => uploadImg(file, item.id)"
 										:before-upload="beforeAvatarUpload"
 									>
 										<img v-if="imageUrl" :src="imageUrl" class="avatar" />

+ 0 - 1
src/views/tels/telsLog/component/detail.vue → src/views/tels/telsLog/component/operationRecord.vue

@@ -51,7 +51,6 @@
 
 <script lang="ts" setup name="operationRecord">
 import { reactive } from 'vue';
-import { ElMessage } from 'element-plus';
 import { formatDate } from '/@/utils/formatTime';
 import table2excel from 'js-table2excel';
 

+ 5 - 6
src/views/tels/telsLog/index.vue

@@ -52,20 +52,19 @@
 			<pagination :total="total" v-model:page="queryParams.PageIndex" v-model:limit="queryParams.PageSize" @pagination="getList" />
 		</el-card>
 
-		<Detail ref="DetailRef" />
+		<OperationRecord ref="operationRecordRef" />
 	</div>
 </template>
 
-<script lang="ts" setup name="balckList">
+<script lang="ts" setup name="telsLog">
 import { defineAsyncComponent, ref, reactive, toRefs, onMounted } from 'vue';
-import { ElMessage } from 'element-plus';
 import type { FormInstance } from 'element-plus';
 import { formatDate } from '/@/utils/formatTime';
 import { blacklistPaged } from '/@/api/tels/blacklist';
 import { throttle } from '/@/utils/tools';
 import table2excel from 'js-table2excel';
 // 引入组件
-const Detail = defineAsyncComponent(() => import('/@/views/tels/telsLog/component/detail.vue'));
+const OperationRecord = defineAsyncComponent(() => import('/@/views/tels/telsLog/component/operationRecord.vue'));
 
 // 定义接口来定义对象的类型
 interface QueryState {
@@ -93,7 +92,7 @@ const state = reactive<QueryState>({
 	multipleSelection: [],
 });
 const ruleFormRef = ref<FormInstance>();
-const DetailRef = ref();
+const operationRecordRef = ref();
 const { queryParams, loading, total, tableData } = toRefs(state);
 /** 搜索按钮操作 节流操作 */
 const handleQuery = throttle(() => {
@@ -134,7 +133,7 @@ const onImportTable = () => {
 };
 // 查看坐席话务明细
 const onDetail = (row: any) => {
-	DetailRef.value.openDialog(row);
+	operationRecordRef.value.openDialog(row);
 };
 onMounted(() => {
 	getList();

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません