From 427a9a75d645c200a45d8c13d773356a48f573a8 Mon Sep 17 00:00:00 2001
From: 18500206848 <liyanspace@163.com>
Date: Fri, 22 Mar 2024 23:51:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E6=9D=A5=E4=BC=81=E4=B8=9A=E8=A7=84?=
 =?UTF-8?q?=E6=A8=A1=E7=BB=9F=E4=B8=80=E5=8F=98=E6=9B=B4=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E4=B8=BA=E4=BC=81=E4=B8=9A=E4=BF=A1=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/company/companyList.vue      | 12 ++---------
 .../tenant/mission/Table/WaitingMission.vue   | 20 ++-----------------
 vue.config.js                                 |  8 +-------
 3 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/src/views/manage/company/companyList.vue b/src/views/manage/company/companyList.vue
index 5079994..b396425 100644
--- a/src/views/manage/company/companyList.vue
+++ b/src/views/manage/company/companyList.vue
@@ -10,16 +10,8 @@
           @click.stop="handleAddUser" type="primary" :disabled="selectionList.length === 0">关联账号</el-button>
         <!-- <el-button v-if="vaildData(permission.manage_compan_companyList_config, false)" size="small"
           @click.stop="handleConfig" type="primary" :disabled="selectionList.length === 0">服务设置</el-button> -->
-        <el-button v-if="vaildData(permission.manage_compan_companyList_check, false)" size="small"
-          @click.stop="handleCheck" type="primary" :disabled="selectionList.length === 0">审核</el-button>
-      </template>
-      <template slot-scope="scope" slot="menu">
-        <el-button type="text" size="small" @click.stop="rowStop(scope.row.id)" v-if="scope.row.status == 0 &&
-          vaildData(permission.manage_compan_companyList_stop, false)
-          ">终止合作</el-button><!--只有已审核的企业才显示终止合作按钮-->
-        <el-button type="text" size="small" @click.stop="rowStart(scope.row.id)" v-if="scope.row.status === 9 &&
-          vaildData(permission.manage_compan_companyList_start, false)
-          ">合作恢复</el-button>
+        <!-- <el-button v-if="vaildData(permission.manage_compan_companyList_check, false)" size="small"
+          @click.stop="handleCheck" type="primary" :disabled="selectionList.length === 0">审核</el-button> -->
       </template>
       <template slot="cityIdForm" slot-scope="{ disabled }">
         <jl-city-cascader :disabled="disabled" v-model="form.cityId"></jl-city-cascader>
diff --git a/src/views/tenant/mission/Table/WaitingMission.vue b/src/views/tenant/mission/Table/WaitingMission.vue
index 09ab399..34b06b2 100644
--- a/src/views/tenant/mission/Table/WaitingMission.vue
+++ b/src/views/tenant/mission/Table/WaitingMission.vue
@@ -41,14 +41,6 @@
           <b>{{ row.takeOnCount }}人</b>
         </div>
       </template>
-      <template slot="toStart" slot-scope="{ row }">
-        <div>
-          <i class="el-icon-warning-outline"></i> 距任务开始剩余
-          <span style="color: #f56c6c">
-            <b>{{ row.toStart }}天</b>
-          </span>
-        </div>
-      </template>
       <!--/自定义列-->
       <!--自定义操作栏-->
       <div slot="menu" slot-scope="{ size, type, row }">
@@ -260,22 +252,14 @@ export default {
             display: false,
             width: 110,
           },
-          {
+          /* {
             label: "状态",
             prop: "status",
             // slot: true,
             dicData: missionState,
             display: false,
             // width: 200,
-          },
-          {
-            label: "提示",
-            prop: "toStart",
-            slot: true,
-            display: false,
-            width: 200,
-          },
-
+          }, */
         ],
       };
     },
diff --git a/vue.config.js b/vue.config.js
index 6dcf1b9..90ff354 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -23,13 +23,7 @@ module.exports = {
     port: 1888,
     proxy: {
       "/api": {
-        // target: 'http://10.165.0.173:8000',
-        // target: "http://39.98.184.58:8000",  // 阿里云后台地址
-        // target: "http://192.168.3.104:8000",  // 本地
-        // target: 'http://192.168.1.106:8000',
-        // target: 'http://192.168.3.173:8000',
-        target: 'http://10.165.0.173:8000',
-        // target: 'http://198.168.3.120:8000',
+        target: 'http://localhost:8000',
         ws: true,
         changeOrigin: true,
         pathRewrite: {