提交

ruoyi-ui-gongdan/src/settings.js

@@ -1,5 +1,6 @@
 module.exports = {
   // urls: `http://192.168.101.86:8077`,
+  // urls: `http://10.90.90.86:8077`,
   urls: `https://zxygd.qs163.cn`,
   // 弹出层标题
 

ruoyi-ui-gongdan/src/views/dashboard/RaddarChart.vue

@@ -69,9 +69,9 @@ export default {
           },
           indicator: [
             { name: 'Sales', max: 10000 },
-            { name: 'Administration', max: 20000 },
-            { name: 'Information Techology', max: 20000 },
-            { name: 'Customer Support', max: 20000 },
+            { name: 'Admin', max: 20000 },
+            { name: 'Information', max: 20000 },
+            { name: 'Customer', max: 20000 },
             { name: 'Development', max: 20000 },
             { name: 'Marketing', max: 20000 }
           ]
@@ -79,7 +79,7 @@ export default {
         legend: {
           left: 'center',
           bottom: '10',
-          data: ['Allocated Budget', 'Expected Spending', 'Actual Spending']
+          data: ['Allocated ', 'Expected', 'Actual']
         },
         series: [{
           type: 'radar',
@@ -96,15 +96,15 @@ export default {
           data: [
             {
               value: [5000, 7000, 12000, 11000, 15000, 14000],
-              name: 'Allocated Budget'
+              name: 'Allocated'
             },
             {
               value: [4000, 9000, 15000, 15000, 13000, 11000],
-              name: 'Expected Spending'
+              name: 'Expected '
             },
             {
               value: [5500, 11000, 12000, 15000, 12000, 12000],
-              name: 'Actual Spending'
+              name: 'Actual '
             }
           ],
           animationDuration: animationDuration

ruoyi-ui-gongdan/src/views/gongdan/gongdanzhipai/index.vue

@@ -145,10 +145,10 @@
                     							<div style="width: 40%;" class="over">暂无数据</div>
                     							<div style="width: 60%;" class="over">暂无数据接下了该客户的工单</div>
                     						</div>
-                                <el-tooltip class="item" effect="dark" :content="item.takeTime + ' '+ item.responsiblePhone +'接下了该客户的工单'" placement="top-start">
+                                <el-tooltip class="item" effect="dark" :content="item.takeTime + ' '+item.responsibleName+ item.responsiblePhone +'接下了该客户的工单'" placement="top-start">
                                 <div class="chtop flexc" v-if="item.serviceProgress !=0">
                                 	<div style="width: 40%;" class="over">{{item.takeTime}}</div>
-                                	<div style="width: 60%;" class="over">{{item.responsibleName + item.responsiblePhone}} 接下了该客户的工单</div>
+                                	<div style="width: 60%;" class="over">{{item.takeTime +item.responsibleName+ item.responsiblePhone}} 接下了该客户的工单</div>
                                 </div>
                         </el-tooltip>
                     					<div class="chstep">
@@ -296,7 +296,7 @@
         <el-row>
           <el-col :span="24" >
             <el-form-item label="选择人员" prop="responsibleName">
-                      <el-select style="width: 100%;" v-model="formz.responsibleName" placeholder="请选择选择人员">
+                      <el-select style="width: 100%;" multiple v-model="formz.responsibleName" placeholder="请选择选择人员">
                         <el-option
                         @click.native="xuanse(dict)"
                           v-for="dict in staffManageList"

ruoyi-ui-gongdan/src/views/gongdan/gongdanzhipaime/index.vue

@@ -145,12 +145,12 @@
                     							<div style="width: 40%;" class="over">暂无数据</div>
                     							<div style="width: 60%;" class="over">暂无数据接下了该客户的工单</div>
                     						</div>
-                                <el-tooltip class="item" effect="dark" :content="item.takeTime + ' '+ item.responsiblePhone +'接下了该客户的工单'" placement="top-start">
-                                <div class="chtop flexc" v-if="item.serviceProgress !=0">
-                                	<div style="width: 40%;" class="over">{{item.takeTime}}</div>
-                                	<div style="width: 60%;" class="over">{{item.responsibleName + item.responsiblePhone}} 接下了该客户的工单</div>
-                                </div>
-                        </el-tooltip>
+                               <el-tooltip class="item" effect="dark" :content="item.takeTime + ' '+item.responsibleName+ item.responsiblePhone +'接下了该客户的工单'" placement="top-start">
+                                       <div class="chtop flexc" v-if="item.serviceProgress !=0">
+                                       	<div style="width: 40%;" class="over">{{item.takeTime}}</div>
+                                       	<div style="width: 60%;" class="over">{{item.takeTime +item.responsibleName+ item.responsiblePhone}} 接下了该客户的工单</div>
+                                       </div>
+                               </el-tooltip>
                     					<div class="chstep">
                     						<div class="flexc mb8">
                     							<div class="imgs"><img :src="wicoa" class="imga"></img></div>

ruoyi-ui-gongdan/src/views/gongdan/gongdanzhipaipj/index.vue

@@ -133,12 +133,12 @@
                     							<div style="width: 40%;" class="over">暂无数据</div>
                     							<div style="width: 60%;" class="over">暂无数据接下了该客户的工单</div>
                     						</div>
-                                 <el-tooltip class="item" effect="dark" :content="item.takeTime + ' '+ item.responsiblePhone +'接下了该客户的工单'" placement="top-start">
-                                <div class="chtop flexc" v-if="item.serviceProgress !=0">
-                                	<div style="width: 40%;" class="over">{{item.takeTime}}</div>
-                                	<div style="width: 60%;" class="over">{{item.responsibleName + item.responsiblePhone}} 接下了该客户的工单</div>
-                                </div>
-                        </el-tooltip>
+                                 <el-tooltip class="item" effect="dark" :content="item.takeTime + ' '+item.responsibleName+ item.responsiblePhone +'接下了该客户的工单'" placement="top-start">
+                                         <div class="chtop flexc" v-if="item.serviceProgress !=0">
+                                         	<div style="width: 40%;" class="over">{{item.takeTime}}</div>
+                                         	<div style="width: 60%;" class="over">{{item.takeTime +item.responsibleName+ item.responsiblePhone}} 接下了该客户的工单</div>
+                                         </div>
+                                 </el-tooltip>
                     					<div class="chstep">
                     						<div class="flexc mb8">
                     							<div class="imgs"><img :src="wicoa" class="imga"></img></div>

ruoyi-ui-gongdan/src/views/index.vue

@@ -129,16 +129,13 @@
                                                 <span class="text-group_2">本月</span>
                                               </div>
                       </div>
-
                     </div>
                     <!-- <span class="text_31">件</span> -->
                     <div class="section_3 flex-row justify-between">
-
                       <div class="image-wrapper_1 flex-col">
                         <bar-chart  :chart-data="zhuzhuang" v-if='iszhu'/>
                       </div>
                     </div>
-
                   </div>
               <div class="box_3 flex-col">
                       <span class="text_12">服务动态</span>
@@ -167,16 +164,8 @@
                           <div class="text-wrapper_2" >
                                                       <span style="color: #161616;">{{fuwudong[1].record == null?'暂无数据' : fuwudong[1].record}}</span>
                                                     </div>
-
-
                           <span class="text_29" >{{fuwudong[2].createTime}}</span>
-
                         </div>
-
-
-
-
-
                         <!-- <div class="group_4 flex-col" v-if="fuweush">
                           <span class="text_13" v-if="fuwudong[0].serviceProgress == 0">{{fuwudong[0].createTime}}</span>
                           <span class="text_13" v-if="fuwudong[0].serviceProgress == 1">{{fuwudong[0].takeTime}}</span>
@@ -425,15 +414,15 @@
                   </div>
                   <div class="group_23 flex-col">
                     <div class="group_24 flex-row justify-between">
-                      <span class="text_148">admin</span>
-                      <img
+                      <span class="text_148">{{name}}</span>
+                      <!-- <img
                         class="thumbnail_26"
                         referrerpolicy="no-referrer"
                         src="../assets/images/icon_htgl_bj.png"
-                      />
+                      /> -->
                     </div>
                     <div class="text-wrapper_23 flex-col">
-                      <span class="text_149">超级管理员</span>
+                      <span class="text_149">{{rous}}</span>
                     </div>
                   </div>
                 </div>
@@ -459,7 +448,6 @@
                   <Calendar
                         v-on:choseDay="clickDay"
                         v-on:changeMonth="changeDate"
-
                       ></Calendar>
                 </div>
               </div>
@@ -869,11 +857,15 @@ export default {
         yearfuwulist:[],
         monthlist:{},
         isshue:false,
-        isyearsh:false
+        isyearsh:false,
+        rous:'',
+        name:''
     }
   },
   created() {
     this.avatar = this.$store.state.user.avatar
+    this.name = this.$store.state.user.nickName
+    this.rous = this.$store.state.user.roles[0].roleName
     console.log(this.dateFormat('YYYY年mm月dd日 HH时MM分',this.$store.state.user.loginDate))
     this.getDicts("work_order_type").then(response => {
       this.buyTypeOptions = response.data;