Merge branch 'master' of https://git.xoado.com/yaohui/xoadoPlatform

src/port/set-request.js

@@ -12,6 +12,7 @@ const targetBaseUrl = process.env.VUE_APP_BASE_API5
 const targetBaseUrl1 = process.env.VUE_APP_BASE_API6
 const targetBaseUrl2 = process.env.VUE_APP_BASE_API7
 const targetBaseUrl5 = process.env.VUE_APP_BASE_API15
+const targetBaseUrl6 = process.env.VUE_APP_BASE_API16
     /* 获取车型列表 */
 export function getXoadodAllCarTYpeList(data = {}) {
     const url = targetBaseUrl2 + '/carType'
@@ -1154,3 +1155,14 @@ export function complaintUpdate(data) {
     const url = targetBaseUrl5 + `/complaint/label`
     return put(url, data)
 }
+
+/* 投诉原因---修改 */
+export function voicePage() {
+	const url = process.env.VUE_APP_BASE_API6 + `/dispatchconfig/driver/mesconf`
+	return get(url)
+}
+/* 投诉原因---修改 */
+export function PutvoicePage(data) {
+	const url = process.env.VUE_APP_BASE_API6 + `/dispatchconfig/driver/mesconf`
+	return put(url, data)
+}

src/router/index.js

 import Vue from 'vue'
 import VueRouter from 'vue-router'
 import Layout from '@/layout'
-import { routerMode } from '@/config/index'
+import {routerMode} from '@/config/index'
 import store from '@/store/index'
 
 Vue.use(VueRouter)
@@ -15,7 +15,7 @@ export const currencyRoutes = [{
 	component: () =>
 		import ( /* webpackChunkName: "login" */ '@/views/login/index.vue'),
 	hidden: true
-    },
+},
 	{
 		path: '/Real',
 		component: () =>
@@ -98,10 +98,10 @@ export const routes = [{
 			name: 'DepartmentInformation',
 			component: () =>
 				import ('@/views/DepartmentInformation/index.vue'),
-                meta: { title: '部门管理', icon: 'el-icon-user-solid' }
+			meta: {title: '部门管理', icon: 'el-icon-user-solid'}
 		},
 	]
-    },
+},
 	{
 		path: '/configure',
 		name: 'configure',
@@ -116,21 +116,21 @@ export const routes = [{
 			name: 'Enclosure',
 			component: () =>
 				import ('@/views/configure/enclosure.vue'),
-                meta: { title: '围栏管理', icon: 'el-icon-aim' }
+			meta: {title: '围栏管理', icon: 'el-icon-aim'}
 		},
 			{
 				path: 'site',
 				name: 'Site',
 				component: () =>
 					import ('@/views/configure/site.vue'),
-                meta: { title: '站点管理', icon: 'el-icon-s-home' }
+				meta: {title: '站点管理', icon: 'el-icon-s-home'}
 			},
 			{
 				path: 'CarModel',
 				name: 'CarModel',
 				component: () =>
 					import ('@/views/configure/CarModel.vue'),
-                meta: { title: '车型管理', icon: 'el-icon-s-data' }
+				meta: {title: '车型管理', icon: 'el-icon-s-data'}
 			},
 		]
 	},
@@ -148,14 +148,14 @@ export const routes = [{
 			name: 'Setting',
 			component: () =>
 				import ('@/views/platform/setting.vue'),
-                meta: { title: '品牌配置', icon: 'el-icon-aim' }
+			meta: {title: '品牌配置', icon: 'el-icon-aim'}
 		},
 			{
 				path: 'setting-info',
 				name: 'settingInfo',
 				component: () =>
 					import ('@/views/platform/components/settingInfo.vue'),
-                meta: { title: '添加品牌', icon: 'el-icon-aim' },
+				meta: {title: '添加品牌', icon: 'el-icon-aim'},
 				hidden: true
 			},
 			{
@@ -163,7 +163,7 @@ export const routes = [{
 				name: 'settingDetail',
 				component: () =>
 					import ('@/views/platform/settingDetail.vue'),
-                meta: { title: '品牌详情', icon: 'el-icon-aim' },
+				meta: {title: '品牌详情', icon: 'el-icon-aim'},
 				hidden: true
 			},
 			{
@@ -171,14 +171,14 @@ export const routes = [{
 				name: 'regionManage',
 				component: () =>
 					import ('@/views/platform/regionManage.vue'),
-                meta: { title: '运营管理', icon: 'el-icon-aim' }
+				meta: {title: '运营管理', icon: 'el-icon-aim'}
 			},
 			{
 				path: 'region-detail',
 				name: 'regionDetail',
 				component: () =>
 					import ('@/views/platform/regionDetail.vue'),
-                meta: { title: '运营管理详情', icon: 'el-icon-aim' },
+				meta: {title: '运营管理详情', icon: 'el-icon-aim'},
 				hidden: true
 			},
 			{
@@ -186,7 +186,7 @@ export const routes = [{
 				name: 'productSetup',
 				component: () =>
 					import ('@/views/platform/productSetup.vue'),
-                meta: { title: '产品详情', icon: 'el-icon-aim' },
+				meta: {title: '产品详情', icon: 'el-icon-aim'},
 				hidden: true
 			},
 		]
@@ -226,14 +226,14 @@ export const routes = [{
 				name: 'waybillIndex',
 				component: () =>
 					import ('@/views/business/waybillManagement/index.vue'),
-                meta: { icon: 'el-icon-document', title: '运单列表' }
+				meta: {icon: 'el-icon-document', title: '运单列表'}
 			},
 			{
 				path: 'waybill-Detail',
 				name: 'waybillDetail',
 				component: () =>
 					import ('@/views/business/waybillManagement/waybillDetail.vue'),
-                meta: { title: '运单详情' },
+				meta: {title: '运单详情'},
 				hidden: true
 			},
 			{
@@ -273,7 +273,7 @@ export const routes = [{
 			name: 'Transport',
 			component: () =>
 				import ('@/views/transports/transport.vue'),
-                meta: { title: '运力方管理', icon: 'el-icon-s-home' }
+			meta: {title: '运力方管理', icon: 'el-icon-s-home'}
 		},
 			{
 				path: 'transport-detail',
@@ -288,14 +288,14 @@ export const routes = [{
 				name: 'Car',
 				component: () =>
 					import ('@/views/transports/car.vue'),
-                meta: { title: '车辆管理', icon: 'el-icon-s-home' }
+				meta: {title: '车辆管理', icon: 'el-icon-s-home'}
 			},
 			{
 				path: 'car-detail',
 				name: 'carDetail',
 				component: () =>
 					import ('@/views/transports/carDetail.vue'),
-                meta: { title: '车辆详情', icon: 'el-icon-s-home' },
+				meta: {title: '车辆详情', icon: 'el-icon-s-home'},
 				hidden: true
 			},
 			{
@@ -303,14 +303,14 @@ export const routes = [{
 				name: 'Driver',
 				component: () =>
 					import ('@/views/transports/driver.vue'),
-                meta: { title: '司机管理', icon: 'el-icon-s-home' }
+				meta: {title: '司机管理', icon: 'el-icon-s-home'}
 			},
 			{
 				path: 'driver-detail',
 				name: 'driverDetail',
 				component: () =>
 					import ('@/views/transports/driverDetail.vue'),
-                meta: { title: '司机管理', icon: 'el-icon-s-home' },
+				meta: {title: '司机管理', icon: 'el-icon-s-home'},
 				hidden: true
 			},
 		]
@@ -325,27 +325,35 @@ export const routes = [{
 			title: '配置管理'
 		},
 		children: [{
-                path: 'disposition',
-                name: 'disposition',
-                component: () =>
-                    import ('@/views/disposition/disposition.vue'),
-                meta: { title: '控诉原因配置', icon: 'el-icon-s-home' }
-            },
-	        {
 				path: 'pass-rotation',
 				name: 'passRotation',
 				component: () =>
 					import ('@/views/disposition/passRotation.vue'),
-		        meta: { title: '广告位配置', icon: 'el-icon-s-home' }
+				meta: {title: '广告位配置', icon: 'el-icon-s-home'}
 			},
 			{
 				path: 'pass-detail',
 				name: 'passDetail',
 				component: () =>
 					import ('@/views/disposition/passDetail.vue'),
-		        meta: { title: '新增广告位配置', icon: 'el-icon-s-home' },
+				meta: {title: '新增广告位配置', icon: 'el-icon-s-home'},
 				hidden: true
 			},
+			{
+				path: 'disposition',
+				name: 'disposition',
+				component: () =>
+					import ('@/views/disposition/disposition.vue'),
+				meta: {title: '控诉原因配置', icon: 'el-icon-s-home'}
+			},
+			{
+				path: 'Voice',
+				name: 'Voice',
+				component: () =>
+					import ('@/views/Voice/voicePage.vue'),
+				meta: {title: '司机端语音配置', icon: 'el-icon-s-home'}
+			},
+		
 		]
 	}
 ]
@@ -372,7 +380,7 @@ export function resetRouter() {
 }
 
 // 导航守卫  验证是否登录了  没有登录跳转到登录页面
-router.beforeEach(async(to, from, next) => {
+router.beforeEach(async (to, from, next) => {
 	if (to.path === '/login') {
 		next()
 	} else {

src/views/disposition/componenets/disposition/addDialog.vue

@@ -15,7 +15,7 @@
       :model="form"
       :rules="rules"
     >
-            <el-form-item label="图标：" prop="labelImgurl">
+      <el-form-item label="图标：" prop="img">
         <el-upload
           class="avatar-uploader"
           :headers="reqHeaders"
@@ -26,11 +26,11 @@
           :on-success="photoUrlSuccess"
           :before-upload="beforeAvatarUpload"
         >
-                    <img v-if="form.labelImgurl" :src="form.labelImgurl" class="avatar"/>
+          <img v-if="form.labelImgurl" :src="form.labelImgurl" class="avatar" />
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
       </el-form-item>
-            <el-form-item label="控诉方式：" prop="complaintMode">
+      <el-form-item label="车辆类别：" prop="type">
         <el-select
           v-model="form.complaintMode"
           collapse-tags
@@ -65,8 +65,7 @@
 </template>
 
 <script>
-import {complaintUpdate, complaintAdd} from "@/port/set-request";
-
+import { complaintUpdate, complaintAdd } from "@/port/set-request";
 export default {
   name: "addDialog",
   props: ["platformList"],
@@ -91,14 +90,14 @@ export default {
       },
       rules: {
         labelImgurl: [
-                    {required: true, message: "请上传图标", trigger: "blur"},
+          { required: true, message: "请上传图标", trigger: "blur" },
         ],
         complaintMode: [
-                    {required: true, message: "请选择投诉方式", trigger: "change"},
+          { required: true, message: "请选择投诉方式", trigger: "change" },
         ],
         labelName: [
-                    {required: true, message: "请输入控诉原因", trigger: "blur"},
-                    {max: 10, message: "最多可输入五十个字"},
+          { required: true, message: "请输入控诉原因", trigger: "blur" },
+          { max: 50, message: "最多可输入五十个字" },
         ],
       },
       complaintModelist: [
@@ -113,8 +112,7 @@ export default {
       ],
     };
   },
-    created() {
-    },
+  created() {},
   methods: {
     async showDialog(row) {
       if (Object.keys(row).length > 0) {