修改

src/components/OP/Tourguide.vue

@@ -274,49 +274,49 @@ export default {
                 console.log(res)
                 if(res.data.code==200){
                     that.tableData=res.data.data
-                    that.tableData.forEach(item=>{
-                        if(item.cnName==null){
-                            item.cnName = ''
-                        } 
-                        if(item.companyId==null){
-                            item.companyId = ''
-                        } 
-                        if(item.companyName==null){
-                            item.companyName = ''
-                        } 
-                        if(item.depId==null){
-                            item.depId = ''
-                        } 
-                        if(item.depName==null){
-                            item.depName = ''
-                        } 
-                        if(item.email==null){
-                            item.email = ''
-                        } 
-                        if(item.ext==null){
-                            item.ext = ''
-                        } 
-                        if(item.id==null){
-                            item.id = ''
-                        } 
-                        if(item.jobName==null){
-                            item.jobName = ''
-                        } 
-                        if(item.jobPostId==null){
-                            item.jobPostId = ''
-                        } 
-                        if(item.number==null){
-                            item.number = ''
-                        } 
-                        if(item.phone==null){
-                            item.phone = ''
-                        } 
-                        if(item.urgentPhone==null){
-                            item.urgentPhone = ''
-                        }
-                    })
-                    that.tableDatas=that.tableData;
-                    console.log(that.tableDatas)
+                    // that.tableData.forEach(item=>{
+                    //     if(item.cnName==null){
+                    //         item.cnName = ''
+                    //     } 
+                    //     if(item.companyId==null){
+                    //         item.companyId = ''
+                    //     } 
+                    //     if(item.companyName==null){
+                    //         item.companyName = ''
+                    //     } 
+                    //     if(item.depId==null){
+                    //         item.depId = ''
+                    //     } 
+                    //     if(item.depName==null){
+                    //         item.depName = ''
+                    //     } 
+                    //     if(item.email==null){
+                    //         item.email = ''
+                    //     } 
+                    //     if(item.ext==null){
+                    //         item.ext = ''
+                    //     } 
+                    //     if(item.id==null){
+                    //         item.id = ''
+                    //     } 
+                    //     if(item.jobName==null){
+                    //         item.jobName = ''
+                    //     } 
+                    //     if(item.jobPostId==null){
+                    //         item.jobPostId = ''
+                    //     } 
+                    //     if(item.number==null){
+                    //         item.number = ''
+                    //     } 
+                    //     if(item.phone==null){
+                    //         item.phone = ''
+                    //     } 
+                    //     if(item.urgentPhone==null){
+                    //         item.urgentPhone = ''
+                    //     }
+                    // })
+                    // that.tableDatas=that.tableData;
+                    // console.log(that.tableDatas)
                 }
             })
         }

src/components/Resource/CarData.vue

@@ -43,7 +43,7 @@
             </template>
             <div class="block">
                 <el-pagination align='center' @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                    :current-page="currentPage" :page-sizes="[10, 15, 20]" :page-size="pageSize"
+                    :current-page="currentPage" :page-sizes="[10,12, 15, 20]" :page-size="pageSize"
                     layout="total, sizes, prev, pager, next" :total="tableDatas.length">
                 </el-pagination>
             </div>
@@ -74,7 +74,7 @@ export default {
             tableDatas: [],
             tableData: [],
             currentPage: 1, // 当前页码
-            pageSize: 15,// 每页的数据条数
+            pageSize: 12,// 每页的数据条数
             input: '',
             token: '',
             userId: 0,
@@ -96,7 +96,7 @@ export default {
         },
         carData() {
             this.loading = true
-            var url = "http://localhost:5256/api/Resource/QuerCarData"
+            var url = "/api/Resource/QuerCarData"
             var that = this
             this.$axios({
                 method: 'post',
@@ -175,7 +175,7 @@ export default {
             console.log(item);
         },
         del(index, row) {
-            var url = "http://localhost:5256/api/Resource/DelCarData"
+            var url = "/api/Resource/DelCarData"
             var that = this
             this.$axios({
                 method: 'post',
@@ -208,7 +208,6 @@ export default {
         }
     },
     mounted() {
-        debugger
         this.token = JSON.parse(localStorage.getItem('userinif')).token;
         this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId
         this.carData();

src/components/Resource/CarDataEdit.vue

@@ -1,5 +1,5 @@
 <template>
-    <div v-loading="loading" element-loading-text="跳转中...">
+    <div class="car-edit" v-loading="loading" element-loading-text="跳转中...">
         <div class="communal-title">
             <div>修改车公司资料</div>
         </div>
@@ -66,113 +66,85 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-                <el-row>
-                    <el-col :span="23">
-                        <el-form-item label="其他信息" prop="OtherInfo">
-                            <el-input type="textarea" :rows="3" placeholder="请输入内容" v-model="upData.OtherInfo"
-                                style="width: 80%;"></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="6">
-                        <el-form-item label="有相关的车辆资质" prop="QualificationScore" label-width="130px">
-                            <template>
-                                <el-radio v-model="upData.QualificationScore" label="A"
-                                    style="margin-right: 10px">A</el-radio>
-                                <el-radio v-model="upData.QualificationScore" label="B"
-                                    style="margin-right: 10px">B</el-radio>
-                                <el-radio v-model="upData.QualificationScore" label="C"
-                                    style="margin-right: 10px">C</el-radio>
-                            </template>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="9">
-                        <el-form-item label="车辆2-4年新，VIP及以上需要2年新" prop="CarAgeScore" label-width="260px">
-                            <template>
-                                <el-radio v-model="upData.CarAgeScore" label="A" style="margin-right: 10px">A</el-radio>
-                                <el-radio v-model="upData.CarAgeScore" label="B" style="margin-right: 10px">B</el-radio>
-                                <el-radio v-model="upData.CarAgeScore" label="C" style="margin-right: 10px">C</el-radio>
-                            </template>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="9">
-                        <el-form-item label="车身干净，无文字图片等" prop="CleanImgScore" label-width="170px">
-                            <template>
-                                <el-radio v-model="upData.CleanImgScore" label="A" style="margin-right: 10px">A</el-radio>
-                                <el-radio v-model="upData.CleanImgScore" label="B" style="margin-right: 10px">B</el-radio>
-                                <el-radio v-model="upData.CleanImgScore" label="C" style="margin-right: 10px">C</el-radio>
-                            </template>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="6">
-                        <el-form-item label="车内整洁、无异味" prop="SmellScore" label-width="130px">
-                            <template>
-                                <el-radio v-model="upData.SmellScore" label="A" style="margin-right: 10px">A</el-radio>
-                                <el-radio v-model="upData.SmellScore" label="B" style="margin-right: 10px">B</el-radio>
-                                <el-radio v-model="upData.SmellScore" label="C" style="margin-right: 10px">C</el-radio>
-                            </template>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="9">
-                        <el-form-item label="提前备水，纸巾等" prop="WaterPaperScore" label-width="260px">
-                            <template>
-                                <el-radio v-model="upData.WaterPaperScore" label="A" style="margin-right: 10px">A</el-radio>
-                                <el-radio v-model="upData.WaterPaperScore" label="B" style="margin-right: 10px">B</el-radio>
-                                <el-radio v-model="upData.WaterPaperScore" label="C" style="margin-right: 10px">C</el-radio>
-                            </template>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="9">
-                        <el-form-item label="车辆配置高（皮座椅等）" prop="HardwareScore" label-width="170px">
-                            <template>
-                                <el-radio v-model="upData.HardwareScore" label="A" style="margin-right: 10px">A</el-radio>
-                                <el-radio v-model="upData.HardwareScore" label="B" style="margin-right: 10px">B</el-radio>
-                                <el-radio v-model="upData.HardwareScore" label="C" style="margin-right: 10px">C</el-radio>
-                            </template>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="6">
-                        <el-form-item label="时间概念强" prop="TimeScore" label-width="130px">
-                            <template>
-                                <el-radio v-model="upData.TimeScore" label="A" style="margin-right: 10px">A</el-radio>
-                                <el-radio v-model="upData.TimeScore" label="B" style="margin-right: 10px">B</el-radio>
-                                <el-radio v-model="upData.TimeScore" label="C" style="margin-right: 10px">C</el-radio>
-                            </template>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="9">
-                        <el-form-item label="安全意识高" prop="SafetyScore" label-width="260px">
-                            <template>
-                                <el-radio v-model="upData.SafetyScore" label="A" style="margin-right: 10px">A</el-radio>
-                                <el-radio v-model="upData.SafetyScore" label="B" style="margin-right: 10px">B</el-radio>
-                                <el-radio v-model="upData.SafetyScore" label="C" style="margin-right: 10px">C</el-radio>
-                            </template>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="9">
-                        <el-form-item label="司机驾龄时间长，提前熟悉路线" prop="DrivingAgeScore" label-width="210px">
-                            <template>
-                                <el-radio v-model="upData.DrivingAgeScore" label="A" style="margin-right: 10px">A</el-radio>
-                                <el-radio v-model="upData.DrivingAgeScore" label="B" style="margin-right: 10px">B</el-radio>
-                                <el-radio v-model="upData.DrivingAgeScore" label="C" style="margin-right: 10px">C</el-radio>
-                            </template>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
+                <el-form-item label="其他信息" prop="OtherInfo">
+                    <el-input type="textarea" :rows="3" placeholder="请输入内容" v-model="upData.OtherInfo"
+                        ></el-input>
+                </el-form-item>
+                <div class="appraise-box">
+                    <el-form-item label="有相关的车辆资质" prop="QualificationScore" label-width="224px">
+                        <template>
+                            <el-radio v-model="upData.QualificationScore" label="A"
+                                style="margin-right: 10px">A</el-radio>
+                            <el-radio v-model="upData.QualificationScore" label="B"
+                                style="margin-right: 10px">B</el-radio>
+                            <el-radio v-model="upData.QualificationScore" label="C"
+                                style="margin-right: 10px">C</el-radio>
+                        </template>
+                    </el-form-item>
+                    <el-form-item label="车辆2-4年新，VIP及以上需要2年新" prop="CarAgeScore" label-width="260px">
+                        <template>
+                            <el-radio v-model="upData.CarAgeScore" label="A" style="margin-right: 10px">A</el-radio>
+                            <el-radio v-model="upData.CarAgeScore" label="B" style="margin-right: 10px">B</el-radio>
+                            <el-radio v-model="upData.CarAgeScore" label="C" style="margin-right: 10px">C</el-radio>
+                        </template>
+                    </el-form-item>
+                    <el-form-item label="车身干净，无文字图片等" prop="CleanImgScore" label-width="260px">
+                        <template>
+                            <el-radio v-model="upData.CleanImgScore" label="A" style="margin-right: 10px">A</el-radio>
+                            <el-radio v-model="upData.CleanImgScore" label="B" style="margin-right: 10px">B</el-radio>
+                            <el-radio v-model="upData.CleanImgScore" label="C" style="margin-right: 10px">C</el-radio>
+                        </template>
+                    </el-form-item>
+                    <el-form-item label="车内整洁、无异味" prop="SmellScore" label-width="224px">
+                        <template>
+                            <el-radio v-model="upData.SmellScore" label="A" style="margin-right: 10px">A</el-radio>
+                            <el-radio v-model="upData.SmellScore" label="B" style="margin-right: 10px">B</el-radio>
+                            <el-radio v-model="upData.SmellScore" label="C" style="margin-right: 10px">C</el-radio>
+                        </template>
+                    </el-form-item>
+                    <el-form-item label="提前备水，纸巾等" prop="WaterPaperScore" label-width="260px">
+                        <template>
+                            <el-radio v-model="upData.WaterPaperScore" label="A" style="margin-right: 10px">A</el-radio>
+                            <el-radio v-model="upData.WaterPaperScore" label="B" style="margin-right: 10px">B</el-radio>
+                            <el-radio v-model="upData.WaterPaperScore" label="C" style="margin-right: 10px">C</el-radio>
+                        </template>
+                    </el-form-item>
+                    <el-form-item label="车辆配置高（皮座椅等）" prop="HardwareScore" label-width="260px">
+                        <template>
+                            <el-radio v-model="upData.HardwareScore" label="A" style="margin-right: 10px">A</el-radio>
+                            <el-radio v-model="upData.HardwareScore" label="B" style="margin-right: 10px">B</el-radio>
+                            <el-radio v-model="upData.HardwareScore" label="C" style="margin-right: 10px">C</el-radio>
+                        </template>
+                    </el-form-item>
+                    <el-form-item label="时间概念强" prop="TimeScore" label-width="224px">
+                        <template>
+                            <el-radio v-model="upData.TimeScore" label="A" style="margin-right: 10px">A</el-radio>
+                            <el-radio v-model="upData.TimeScore" label="B" style="margin-right: 10px">B</el-radio>
+                            <el-radio v-model="upData.TimeScore" label="C" style="margin-right: 10px">C</el-radio>
+                        </template>
+                    </el-form-item>
+                    <el-form-item label="安全意识高" prop="SafetyScore" label-width="260px">
+                        <template>
+                            <el-radio v-model="upData.SafetyScore" label="A" style="margin-right: 10px">A</el-radio>
+                            <el-radio v-model="upData.SafetyScore" label="B" style="margin-right: 10px">B</el-radio>
+                            <el-radio v-model="upData.SafetyScore" label="C" style="margin-right: 10px">C</el-radio>
+                        </template>
+                    </el-form-item>
+                    <el-form-item label="司机驾龄时间长，提前熟悉路线" prop="DrivingAgeScore" label-width="260px">
+                        <template>
+                            <el-radio v-model="upData.DrivingAgeScore" label="A" style="margin-right: 10px">A</el-radio>
+                            <el-radio v-model="upData.DrivingAgeScore" label="B" style="margin-right: 10px">B</el-radio>
+                            <el-radio v-model="upData.DrivingAgeScore" label="C" style="margin-right: 10px">C</el-radio>
+                        </template>
+                    </el-form-item>
+                </div>
                 <el-form-item>
-                    <div style="margin-left: 60%;">
-                        <el-button type="primary" @click="editBtn">立即保存</el-button>
+                    <div>
+                        <el-button type="primary" @click="editBtn">保 存</el-button>
                         <router-link to='/home/CarData'>
-                            <el-button>取消</el-button>
+                            <el-button>取 消</el-button>
                         </router-link>
                     </div>
-
-
                 </el-form-item>
             </el-form>
         </template>
@@ -188,10 +160,9 @@ export default {
                 callback();
             } else
                 callback(new Error("请输入正确的手机号"));
-
-
         };
         return {
+            clientWidth:document.body.clientWidth,
             rules: {
                 UnitArea: [
                     { required: true, message: '请输入单位地区', trigger: 'blur' },
@@ -244,10 +215,15 @@ export default {
 
         }
     },
+    watch:{
+        clientWidth(newVal,oldVal){
+            console.log(newVal);//浏览器窗口变化时，打印宽度。
+        }
+    },
     methods: {
-
+        
         carData() {
-            var url = "http://localhost:5256/api/Resource/QuerCarData"
+            var url = "/api/Resource/QuerCarData"
             var that = this
             this.$axios({
                 method: 'post',
@@ -282,7 +258,7 @@ export default {
             this.upData.Remark = this.upData.OtherInfo
             that.$refs.upData.validate((valid) => {
                 if (valid) {
-                    var url = "http://localhost:5256/api/Resource/AddCarData"
+                    var url = "/api/Resource/AddCarData"
 
                     that.$axios({
                         method: 'post',
@@ -370,24 +346,29 @@ export default {
         this.CarDataEdit = JSON.parse(localStorage.getItem('CarDataEdit'));
         this.carData();
         this.editData();
+        // let that = this;
+        // window.onresize =() =>{
+        //     return (()=>{
+        //         window.clientWidth = document.body.clientWidth;
+        //         that.clientWidth = window.clientWidth;
+        //     })()
+        // }
     }
 }
 </script>
 <style>
-.communal-list {
+.car-edit{
     background-color: #fff;
-    padding: 10px;
+    padding: 20px;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
 }
-
-.communal-title {
+.car-edit .communal-title {
     display: flex;
     font-size: 17px;
     font-weight: 600;
     color: #555;
-    margin-top: 8px;
-    margin-bottom: 2px;
+    margin-bottom: 20px;
     justify-content: space-between;
     align-items: center;
 }
@@ -400,4 +381,21 @@ export default {
     margin-left: 10px;
     padding: 8px 20px;
 }
+.appraise-box{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    margin: 50px 0;
+}
+.appraise-box>div{
+    width: 30%;
+}
+@media screen and (max-width: 1700px) {
+    .appraise-box>div{
+        width: 48%;
+    }
+    .appraise-box>div el-form-item__content{
+        width: 260px!important;
+    }
+}
 </style>

src/components/home.vue

@@ -26,8 +26,9 @@
                   <img src="../assets/avatar.jpg" alt="" />
                 </div>
                 <div v-if="panduan" class="avatar-text">
-                  <div class="avatar-name">姓名: {{userinif.userInfo.cnName}} 部门: {{userinif.userInfo.depName}}</div>
+                  <div class="avatar-name">员工: {{userinif.userInfo.cnName}}</div>
                   <div class="avatar-division">职位: {{userinif.userInfo.jobName}}</div>
+                  <div>部门: {{userinif.userInfo.depName}}</div>
                 </div>
               </div>
             </div>
@@ -511,7 +512,7 @@
       text-align: left;
     }
     .avatar-text > div {
-      line-height: 28px;
+      line-height: 24px;
     }
     .avatar-img {
       width: 50px;