Merge branch 'master' of http://121.196.213.68:3000/caoliancun/dispacth_zhongpin into it_s

src/api/finance/oilCompanyOrderMatchTask.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 var service_name = 'xkhl-finance'
-var group_name = 'oilCompanyOrderMatchTask'
+var group_name = 'saasCompanyOrderMatchTask'
 export default {
   getByPage(page) { // 分页查询
     return request({
@@ -61,7 +61,7 @@ export default {
   },
   audit(oilCompanyOrderMatchTask) { // 任务审核
     return request({
-      url: `/${service_name}/${group_name}/audit`,
+      url: `/xkhl-site/${group_name}/audit`,
       method: 'POST',
       data: oilCompanyOrderMatchTask
     })

src/layout/components/Navbar.vue

@@ -32,7 +32,7 @@
             </div>
           </div>
         </el-tooltip>-->
-        <span class="right-menu-item hover-effect sys-name">星油能源运营管理平台</span>
+        <span class="right-menu-item hover-effect sys-name">星油能源调度管理平台</span>
 
         <el-tooltip :enterable="false" content="菜单搜索" effect="dark" placement="bottom">
           <menu-search id="header-search" class="right-menu-item hover-effect" />

src/layout/components/Sidebar/Logo.vue

@@ -17,7 +17,7 @@
             </router-link>
             <router-link v-else key="expand" class="sidebar-logo-link" to="/">
                 <img v-if="logo" :src="logo" class="sidebar-logo" />
-                <!-- <h1 class="sidebar-title">星油能源运营管理平台</h1> -->
+                <!-- <h1 class="sidebar-title">星油能源调度管理平台</h1> -->
             </router-link>
         </transition>
     </div>

src/settings.js

@@ -1,5 +1,5 @@
 module.exports = {
-  title: '星油能源运营管理平台',
+  title: '星油能源调度管理平台',
 
   /**
    * 是否显示设置

src/utils/get-page-title.js

@@ -1,6 +1,6 @@
 import defaultSettings from '@/settings'
 
-const title = defaultSettings.title || '星油能源运营管理平台'
+const title = defaultSettings.title || '星油能源调度管理平台'
 
 export default function getPageTitle(key) {
   return title

src/views/site/oilCompanySiteDiaodu/oilCompanySiteList.vue

@@ -456,12 +456,12 @@ export default {
         {
           prop: "oilProductCode",
           width: 150,
-          label: "油品/底价",
+          label: "基础个人价",
           show: true,
           render: (row, column, cell) => {
             return <div>
               <span class="colorhui">油品：</span><span>{cell}</span><br/>
-              <span class="colorhui">当前底价：</span><span>{row.currentFloorPrice}</span><i v-show={row.floorPriceIgnore==1} class="el-icon-s-check"></i>
+              <span class="colorhui">当前基础个人价：</span><span>{row.currentFloorPrice}</span><i v-show={row.floorPriceIgnore==1} class="el-icon-s-check"></i>
                   </div>
           },
         },

vue.config.js

@@ -6,7 +6,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || '星油能源运营管理平台'
+const name = defaultSettings.title || '星油能源调度管理平台'
 const port = 9528
 
 module.exports = {