Эх сурвалжийг харах

reactor:来电人身份类型调整;

zhangchong 9 сар өмнө
parent
commit
eaf3bf72c7

+ 3 - 3
.env.development

@@ -3,11 +3,11 @@ VITE_MODE_NAME=development
 # 防止部署多套系统到同一域名不同目录时,变量共用的问题 设置不同的前缀
 VITE_STORAGE_NAME=dev
 # 基础请求地址
-VITE_API_URL=http://110.188.24.28:50100
+VITE_API_URL=http://110.188.24.28:50300
 # 数据共享平台请求地址
 VITE_DATASHARE_API_YRL=http://ds.12345lm.cn
 # socket API
-VITE_API_SOCKET_URL=http://110.188.24.28:50100/hubs/hotline
+VITE_API_SOCKET_URL=http://110.188.24.28:50300/hubs/hotline
 # 上传 API
 VITE_API_UPLOAD_URL=http://110.188.24.28:50120
 # 文件上传地址前缀
@@ -25,4 +25,4 @@ VITE_JTHS_API_URL=http://118.121.58.161:19021
 # 捷通华声AppKey
 VITE_JTHS_APPKEY=MTAwMDAx
 # 当前地州市
-VITE_CURRENT_CITY=yibin
+VITE_CURRENT_CITY=zigong

+ 55 - 14
src/layout/navBars/breadcrumb/zgTel.vue

@@ -36,20 +36,21 @@
 				<template v-else> <span class="color-info flex flex-center-center">请签入</span> </template>
 			</template>
 		</el-popover>
-
-		<el-button type="primary" @click="onEvent('signOut')" v-if="m_bLogin">签出</el-button>
-		<el-button type="primary" @click="onEvent('signIn')" v-else>签入</el-button>
-		<el-button class="default-button" @click="onEvent('busy')" v-if="!m_bTelBusy && m_bLogin">示忙</el-button>
-		<el-button class="default-button" @click="onEvent('idle')" v-if="m_bTelBusy && m_bLogin">示闲</el-button>
-		<el-button class="default-button" @click="onEvent('hangup')" v-if="m_bCallConnect || m_isRing">挂机</el-button>
-		<el-button class="default-button" @click="onEvent('callOut')" v-if="m_bLogin && !m_isRing">呼出</el-button>
-		<el-button class="default-button" @click="onEvent('hold')" v-if="!m_IsHold && m_bCallConnect">保持</el-button>
-		<el-button class="default-button" @click="onEvent('reHold')" v-if="m_IsHold && m_bCallConnect">恢复</el-button>
-		<el-button class="default-button" @click="onEvent('consult')" v-if="m_bCallConnect">咨询</el-button>
-		<el-button class="default-button" @click="onEvent('transferMz')" v-if="m_bCallConnect">盲转</el-button>
-		<el-button class="default-button" @click="onEvent('transfer')" v-if="m_bCallConnect">转接</el-button>
-		<el-button class="default-button" @click="onEvent('conference')" v-if="m_bCallConnect">三方会议</el-button>
-		<el-button class="default-button" @click="onEvent('evaluate')" v-if="m_bCallConnect">评价</el-button>
+    <div class="btn-container">
+      <el-button type="primary" @click="onEvent('signOut')" v-if="m_bLogin">签出</el-button>
+      <el-button type="primary" @click="onEvent('signIn')" v-else>签入</el-button>
+      <el-button class="default-button" @click="onEvent('busy')" v-if="!m_bTelBusy && m_bLogin">示忙</el-button>
+      <el-button class="default-button" @click="onEvent('idle')" v-if="m_bTelBusy && m_bLogin">示闲</el-button>
+      <el-button class="default-button" @click="onEvent('hangup')" v-if="m_bCallConnect || m_isRing">挂机</el-button>
+      <el-button class="default-button" @click="onEvent('callOut')" v-if="m_bLogin && !m_isRing">呼出</el-button>
+      <el-button class="default-button" @click="onEvent('hold')" v-if="!m_IsHold && m_bCallConnect">保持</el-button>
+      <el-button class="default-button" @click="onEvent('reHold')" v-if="m_IsHold && m_bCallConnect">恢复</el-button>
+      <el-button class="default-button" @click="onEvent('consult')" v-if="m_bCallConnect">咨询</el-button>
+      <el-button class="default-button" @click="onEvent('transferMz')" v-if="m_bCallConnect">盲转</el-button>
+      <el-button class="default-button" @click="onEvent('transfer')" v-if="m_bCallConnect">转接</el-button>
+      <el-button class="default-button" @click="onEvent('conference')" v-if="m_bCallConnect">三方会议</el-button>
+      <el-button class="default-button" @click="onEvent('evaluate')" v-if="m_bCallConnect">评价</el-button>
+    </div>
 	</div>
 
 	<!-- 签入弹窗 -->
@@ -1880,5 +1881,45 @@ onMounted(async () => {
 			transform: rotate(180deg);
 		}
 	}
+  // 按钮列表
+  .btn-container {
+    display: flex;
+    justify-content: space-between;
+    width: calc(100% - 100px);
+    height: 100%;
+    border-right: 1px solid var(--el-border-color);
+    border-left: 1px solid var(--el-border-color);
+    overflow: hidden;
+    .item {
+      text-align: center;
+      cursor: pointer;
+      width: 100%;
+      user-select: none;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      //border-right: 1px solid var(--el-border-color);
+      .icon {
+        color: var(--el-color-primary);
+      }
+      &.disabled {
+        cursor: not-allowed;
+        overflow: hidden;
+        .icon {
+          color: #cccccc;
+        }
+      }
+    }
+
+    .active {
+      &:hover {
+        color: var(--hotline-color-white);
+        background-color: var(--el-color-primary);
+        .icon {
+          color: var(--hotline-color-white);
+        }
+      }
+    }
+  }
 }
 </style>

+ 8 - 1
src/theme/element.scss

@@ -370,8 +370,15 @@
 }
 /* Select 选择器默认宽度
 ------------------------------- */
-.el-select {
+/*.el-select {
 	--el-select-width: 220px;
+}*/
+.el-form--inline {
+	.el-form-item {
+		& > .el-input, .el-cascader, .el-select, .el-date-editor, .el-autocomplete {
+			width: 240px;
+		}
+	}
 }
 // hover颜色样式加深
 .el-cascader-node:not(.is-disabled):focus,

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

@@ -473,7 +473,7 @@ const selectable = (row: any) => {
 };
 // 表格配置项
 const columns = ref<any[]>([
-	{ type: 'selection', fixed: 'left', minWidth: 40, selectable: selectable, align: 'center' },
+	{ type: 'selection', minWidth: 40, selectable: selectable, align: 'center' },
 	{ prop: 'expiredStatusText', label: '超期状态', align: 'center', minWidth: 80 },
 	{ prop: 'no', label: '工单编码', minWidth: 140 },
 	{ prop: 'isProvinceText', label: '省/市工单', minWidth: 90 },

+ 4 - 4
src/views/todo/center/index.vue

@@ -50,7 +50,7 @@
 					<transition name="el-zoom-in-top">
 						<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" v-show="!searchCol">
 							<el-form-item label="办理节点" prop="StepName">
-								<el-select v-model="state.queryParams.StepName" placeholder="请选择办理节点" clearable class="w100" @change="handleQuery">
+								<el-select v-model="state.queryParams.StepName" placeholder="请选择办理节点" clearable @change="handleQuery">
 									<el-option v-for="item in state.stepNamesOptions" :value="item" :key="item" :label="item" />
 								</el-select>
 							</el-form-item>
@@ -66,7 +66,7 @@
 					<transition name="el-zoom-in-top" v-show="!searchCol">
 						<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6">
 							<el-form-item label="是否紧急" prop="IsUrgent">
-								<el-select v-model="state.queryParams.IsUrgent" placeholder="请选择是否紧急" clearable class="w100" @change="handleQuery">
+								<el-select v-model="state.queryParams.IsUrgent" placeholder="请选择是否紧急" clearable @change="handleQuery">
 									<el-option :value="true" label="紧急" />
 									<el-option :value="false" label="不紧急" />
 								</el-select>
@@ -83,7 +83,7 @@
 					<transition name="el-zoom-in-top">
 						<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" v-show="!searchCol">
 							<el-form-item label="工单状态" prop="Status">
-								<el-select v-model="state.queryParams.Status" placeholder="请选择工单状态" clearable class="w100" @change="handleQuery">
+								<el-select v-model="state.queryParams.Status" placeholder="请选择工单状态" clearable @change="handleQuery">
 									<el-option v-for="item in state.orderStatusOptions" :value="item.key" :key="item.key" :label="item.value" />
 								</el-select>
 							</el-form-item>
@@ -99,7 +99,7 @@
 					<transition name="el-zoom-in-top">
 						<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" v-show="!searchCol">
 							<el-form-item label="超期状态" prop="ExpiredStatus">
-								<el-select v-model="state.queryParams.ExpiredStatus" placeholder="请选择超期状态" clearable class="w100" @change="handleQuery">
+								<el-select v-model="state.queryParams.ExpiredStatus" placeholder="请选择超期状态" clearable @change="handleQuery">
 									<el-option v-for="item in state.expiredStatusOptions" :value="item.key" :key="item.key" :label="item.value" />
 								</el-select>
 							</el-form-item>

+ 4 - 4
src/views/todo/order/index.vue

@@ -36,7 +36,7 @@
           <transition name="el-zoom-in-top">
 					<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" v-show="!searchCol">
 						<el-form-item label="是否省工单" prop="IsProvince">
-							<el-select v-model="state.queryParams.IsProvince" placeholder="请选择是否省工单" @change="handleQuery" class="w100">
+							<el-select v-model="state.queryParams.IsProvince" placeholder="请选择是否省工单" @change="handleQuery">
 								<el-option label="是" value="true" />
 								<el-option label="否" value="false" />
 							</el-select>
@@ -46,7 +46,7 @@
 					<transition name="el-zoom-in-top">
 						<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" v-show="!searchCol">
 							<el-form-item label="是否会签" prop="IsCounterSign">
-								<el-select v-model="state.queryParams.IsCounterSign" placeholder="请选择是否会签" @change="handleQuery" class="w100">
+								<el-select v-model="state.queryParams.IsCounterSign" placeholder="请选择是否会签" @change="handleQuery">
 									<el-option label="是" value="true" />
 									<el-option label="否" value="" />
 								</el-select>
@@ -56,7 +56,7 @@
           <transition name="el-zoom-in-top" v-show="!searchCol">
             <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6">
               <el-form-item label="是否紧急" prop="IsUrgent">
-                <el-select v-model="state.queryParams.IsUrgent" placeholder="请选择是否紧急" clearable class="w100" @change="handleQuery">
+                <el-select v-model="state.queryParams.IsUrgent" placeholder="请选择是否紧急" clearable @change="handleQuery">
                   <el-option :value="true" label="紧急" />
                   <el-option :value="false" label="不紧急" />
                 </el-select>
@@ -66,7 +66,7 @@
 					<transition name="el-zoom-in-top">
 						<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" v-show="!searchCol">
 							<el-form-item label="超期状态" prop="ExpiredOrAlmostOverdue">
-								<el-select v-model="state.queryParams.ExpiredOrAlmostOverdue" placeholder="请选择超期状态" @change="handleQuery" class="w100">
+								<el-select v-model="state.queryParams.ExpiredOrAlmostOverdue" placeholder="请选择超期状态" @change="handleQuery">
 									<el-option label="已超期" value="true" />
 									<el-option label="即将超期" value="false" />
 								</el-select>

+ 3 - 3
src/views/todo/seats/index.vue

@@ -36,7 +36,7 @@
 					<transition name="el-zoom-in-top">
 						<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" v-show="!searchCol">
 							<el-form-item label="是否会签" prop="IsCounterSign">
-								<el-select v-model="state.queryParams.IsCounterSign" placeholder="请选择是否会签" @change="handleQuery" class="w100">
+								<el-select v-model="state.queryParams.IsCounterSign" placeholder="请选择是否会签" @change="handleQuery">
 									<el-option label="是" value="true" />
 									<el-option label="否" value="false" />
 								</el-select>
@@ -46,7 +46,7 @@
 					<transition name="el-zoom-in-top" v-show="!searchCol">
 						<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6">
 							<el-form-item label="是否紧急" prop="IsUrgent">
-								<el-select v-model="state.queryParams.IsUrgent" placeholder="请选择是否紧急" clearable class="w100" @change="handleQuery">
+								<el-select v-model="state.queryParams.IsUrgent" placeholder="请选择是否紧急" clearable @change="handleQuery">
 									<el-option :value="true" label="紧急" />
 									<el-option :value="false" label="不紧急" />
 								</el-select>
@@ -56,7 +56,7 @@
 					<transition name="el-zoom-in-top">
 						<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" v-show="!searchCol">
 							<el-form-item label="是否省工单" prop="IsProvince">
-								<el-select v-model="state.queryParams.IsProvince" placeholder="请选择是否省工单" @change="handleQuery" class="w100">
+								<el-select v-model="state.queryParams.IsProvince" placeholder="请选择是否省工单" @change="handleQuery">
 									<el-option label="是" value="true" />
 									<el-option label="否" value="false" />
 								</el-select>