修改提交

src/api/api.js

@@ -23,8 +23,8 @@ export function apiGetModel(url, params) {
 //获取菜单数据
 export function apiGetMenuData() {
     return httpRequest({
-        url: 'menu/menuList?parentId=10105', // 测试
-        // url: 'menu/menuList?parentId=6802', // 生产
+        // url: 'menu/menuList?parentId=10105', // 测试
+        url: 'menu/menuList?parentId=6802', // 生产
         method: 'post'
     })
 }

src/components/assessment/evaluationBenchmarkingIndicPage.vue

@@ -2,47 +2,49 @@
     <div class="benchmarkingIndicator">
         <div class="benchmarkingIndicatorBtn">
             <div class="collectSeach">
-                <div class="exceed">
-                    <span class="exceedSpan" style="margin-left: 10px;width: 80px">业务阶段：</span>
-                    <el-select v-model="stageIds" placeholder="请选择业务阶段">
-                        <el-option
-                        v-for="item in stageData"
-                        :key="item.id"
-                        :label="item.stageName"
-                        :value="item.id">
-                        </el-option>
-                    </el-select>
-                </div>
-                <div class="exceed">
-                    <span class="exceedSpan" style="margin-left: 10px;width: 80px">指标类型：</span>
-                    <el-select v-model="indicatorIds" placeholder="请选择指标类型">
-                        <el-option
-                        v-for="item in indicatorTypeData"
-                        :key="item.id"
-                        :label="item.typeName"
-                        :value="item.id">
-                        </el-option>
-                    </el-select>
-                </div>
-                <div class="exceed">
-                    <span class="exceedSpan" style="margin-left: 10px;width: 80px">时间类型：</span>
-                    <el-select v-model="timeStr" placeholder="请选择时间类型">
-                        <el-option
-                        v-for="item in timerData"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                        </el-option>
-                    </el-select>
-                </div>
-                <div class="exceed">
-                    <span class="exceedSpan" style="margin-left: 10px;width: 80px">选择时间：</span>
-                    <el-date-picker
-                        v-model="timeIds"
-                        type="month"
-                        value-format="YYYY-MM"
-                        placeholder="选择时间"
-                    />
+                <div style="display: flex">
+                    <div class="exceed">
+                        <span class="exceedSpan" style="margin-left: 10px;width: 50px">阶段：</span>
+                        <el-select v-model="stageIds" placeholder="请选择业务阶段">
+                            <el-option
+                            v-for="item in stageData"
+                            :key="item.id"
+                            :label="item.stageName"
+                            :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </div>
+                    <div class="exceed">
+                        <span class="exceedSpan" style="margin-left: 10px;width: 50px">指标：</span>
+                        <el-select v-model="indicatorIds" placeholder="请选择指标类型">
+                            <el-option
+                            v-for="item in indicatorTypeData"
+                            :key="item.id"
+                            :label="item.typeName"
+                            :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </div>
+                    <div class="exceed">
+                        <span class="exceedSpan" style="margin-left: 10px;width: 50px">类型：</span>
+                        <el-select v-model="timeStr" placeholder="请选择时间类型">
+                            <el-option
+                            v-for="item in timerData"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </div>
+                    <div class="exceed">
+                        <span class="exceedSpan" style="margin-left: 10px;width: 50px">时间：</span>
+                        <el-date-picker
+                            v-model="timeIds"
+                            type="month"
+                            value-format="YYYY-MM"
+                            placeholder="选择时间"
+                        />
+                    </div>
                 </div>
                 <seachs @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
                 <el-button type="info" icon="Download" size="mini" @click="handleExport" style="margin-left:30px">导出</el-button>
@@ -349,6 +351,12 @@ export default {
                         line-height: 12px;
                         margin-top: 14px;
                     }
+                    .el-date-editor{
+                        width: 50%;
+                    }
+                    .el-select{
+                        width: 60%;
+                    }
 
                     .el-input {
                         margin-right: 10px;

src/components/assessment/evaluationDeptBusinessFrom.vue

@@ -417,12 +417,14 @@ export default {
                                 display: flex;
                                 height: 20px;
                                 margin: 0 10px;
-                                width: 13%;
+                                width: 20%;
                                 img{
                                     margin-right: 5px;
                                     margin-top: 1px;
                                 }
                                 span{
+                                    display: inline-block;
+                                    width: 100%;
                                     font-size: 14px;
                                     font-family: Microsoft YaHei;
                                     font-weight: 400;

src/components/assessment/evaluationDeptBusinessPage.vue

@@ -23,7 +23,7 @@
                                 class="box-item"
                                 effect="customized"
                                 :content="scope.row.des"
-                                placement="right"
+                                placement="top"
                             >
                                 <span class="tooltipCC">{{scope.row.des}}</span>
                             </el-tooltip>

src/components/assessment/evaluationDeptStartFrom.vue

@@ -511,12 +511,14 @@ export default {
                                 display: flex;
                                 height: 20px;
                                 margin: 0 10px;
-                                width: 13%;
+                                width: 20%;
                                 img{
                                     margin-right: 5px;
                                     margin-top: 1px;
                                 }
                                 span{
+                                    display: inline-block;
+                                    width: 100%;
                                     font-size: 14px;
                                     font-family: Microsoft YaHei;
                                     font-weight: 400;

src/components/assessment/evaluationStartNewFrom.vue

@@ -533,7 +533,7 @@ export default {
                                         display: flex;
                                         height: 20px;
                                         margin: 5px 10px 0 10px;
-                                        width: 13%;
+                                        width: 5%;
                                         img{
                                             margin-right: 5px;
                                             margin-top: 1px;

src/components/assessment/monthQuarterYearFrom.vue

@@ -568,7 +568,7 @@ export default {
                                 justify-content: space-between;
                                 .headerLeft{
                                     display: flex;
-                                    width: 70%;
+                                    width: 65%;
                                     overflow-x: auto;
                                     .tagArr {
                                         height: 33px;
@@ -595,7 +595,7 @@ export default {
                                 .headerRight{
                                     display: flex;
                                     justify-content: end;
-                                    width: 30%;
+                                    width: 35%;
                                     margin-bottom: 5px;
                                     .seachFor{
                                         display: flex;
@@ -619,12 +619,14 @@ export default {
                                         display: flex;
                                         height: 20px;
                                         margin: 5px 8px 0 8px;
-                                        width: 13%;
+                                        width: 20%;
                                         img{
                                             margin-right: 5px;
                                             margin-top: 1px;
                                         }
                                         span{
+                                            display: inline-block;
+                                            width: 100%;
                                             font-size: 14px;
                                             font-family: Microsoft YaHei;
                                             font-weight: 400;

src/components/gatewaynNewPage.vue

@@ -46,12 +46,6 @@
                             </div>
                             <div class="headerNameForeTit_right">
                                 <span>得分</span>
-                                <!-- <span style="margin-left: 20px">加分事项</span>
-                                <span style="margin-left: 20px">扣分事项</span>
-                                <span style="margin-left: 20px">管理加分</span>
-                                <span style="margin-left: 20px">管理扣分</span>
-                                <span style="margin-left: 20px">高于基准</span>
-                                <span style="margin-left: 20px">低于基准</span> -->
                                 <span>加分事项</span>
                                 <span>扣分事项</span>
                                 <span>管理加分</span>
@@ -371,7 +365,7 @@
             },
             getfooterSpan() {
                 if (this.winPix === 1.25) {
-                    return 'width: 3.2vw;padding: 5px 3px 0;'
+                    return 'width: 3.4vw;padding: 5px 3px 0;'
                 }
             },
             changeYearFn(val) {
@@ -686,10 +680,10 @@
                     font-size: 12px;
                     color: #414141;
                     .headerNameTit_left{
-                        width: 73%;
+                        width: 71%;
                     }
                     .headerNameTit_right{
-                        width: 27%;
+                        width: 29%;
                     }
                 }
 

src/components/taskCenter/taskCenterDeptBusinessFrom.vue

@@ -481,12 +481,14 @@ export default {
                                 display: flex;
                                 height: 20px;
                                 margin: 0 10px;
-                                width: 13%;
+                                width: 20%;
                                 img{
                                     margin-right: 5px;
                                     margin-top: 1px;
                                 }
                                 span{
+                                    display: inline-block;
+                                    width: 100%;
                                     font-size: 14px;
                                     font-family: Microsoft YaHei;
                                     font-weight: 400;

src/components/taskCenter/taskCenterDeptStartFrom.vue

@@ -586,12 +586,14 @@ export default {
                                 display: flex;
                                 height: 20px;
                                 margin: 0 10px;
-                                width: 13%;
+                                width: 20%;
                                 img{
                                     margin-right: 5px;
                                     margin-top: 1px;
                                 }
                                 span{
+                                    display: inline-block;
+                                    width: 100%;
                                     font-size: 14px;
                                     font-family: Microsoft YaHei;
                                     font-weight: 400;

src/components/taskCenter/taskCenterEvlNewFrom.vue

@@ -641,7 +641,7 @@ export default {
                                 justify-content: space-between;
                                 .headerLeft{
                                     display: flex;
-                                    width: 70%;
+                                    width: 65%;
                                     overflow-x: auto;
                                     .tagArr {
                                         height: 33px;
@@ -668,7 +668,7 @@ export default {
                                 .headerRight{
                                     display: flex;
                                     justify-content: end;
-                                    width: 30%;
+                                    width: 35%;
                                     margin-bottom: 5px;
                                     .seachFor{
                                         display: flex;
@@ -692,12 +692,14 @@ export default {
                                         display: flex;
                                         height: 20px;
                                         margin: 5px 8px 0 8px;
-                                        width: 13%;
+                                        width: 20%;
                                         img{
                                             margin-right: 5px;
                                             margin-top: 1px;
                                         }
                                         span{
+                                            display: inline-block;
+                                            width: 100%;
                                             font-size: 14px;
                                             font-family: Microsoft YaHei;
                                             font-weight: 400;

src/components/taskCenter/taskEvaluationStart.vue

@@ -530,7 +530,7 @@ export default {
                                         display: flex;
                                         height: 20px;
                                         margin: 5px 10px 0 10px;
-                                        width: 13%;
+                                        width: 5%;
                                         img{
                                             margin-right: 5px;
                                             margin-top: 1px;

src/utils/baseUrl.js

@@ -17,8 +17,8 @@ switch (process.env.NODE_ENV) {
  
     case 'production': 
         // baseUrl.ROOT = "http://123.60.219.66:28800/"
-        baseUrl.ROOT = "http://10.65.78.23:28800/" //测试环境
-        // baseUrl.ROOT = "http://10.65.78.81:28800/"  // 正式环境
+        // baseUrl.ROOT = "http://10.65.78.23:28800/" //测试环境
+        baseUrl.ROOT = "http://10.65.78.81:28800/"  // 正式环境
         break 
 }