Merge branch 'master' of https://gitee.com/beiwu/cmanager

src/api/tenant/policy.js

@@ -102,5 +102,5 @@ export const transferDept =
 
 /*导入人才库*/
 export const upload = () => {
-  return `/api/jobslink-api/label/tenant/import-label?isCovered=1`
+  return `/api/jobslink-api/label/group/import?isCovered=1`
 }

src/views/tenant/main/policy/index.vue

@@ -53,8 +53,8 @@
         <!--搜索栏-->
         <el-form size="small" label-position="right" :inline="true" style="padding-left: 10px; padding-right: 10px">
           <el-row :span="24">
-            <el-form-item label="姓名:">
+            <el-form-item label="标签名:">
-              <el-input v-model="query.name" placeholder="姓名" clearable></el-input>
+              <el-input v-model="query.name" placeholder="标签名" clearable></el-input>
             </el-form-item>
             <el-form-item label="服务类型:">
               <el-select v-model="query.stype" placeholder="服务类型" style="width: 100%" filterable clearable>
@@ -110,8 +110,9 @@
               删除</el-button>
           </template>
           <template slot="name" slot-scope="{row}">
-            <span v-if="row.status == 1">{{ row.name }}</span>
+            <span>{{ row.name }}</span>
-            <span v-else>{{ row.name }}（<span style="color: red;">未实名</span>）</span>
+            <!-- <span v-if="row.status == 1">{{ row.name }}</span> -->
+            <!-- <span v-else>{{ row.name }}（<span style="color: red;">未实名</span>）</span> -->
 
           </template>
           <!--/自定义按钮-->
@@ -306,7 +307,7 @@ export default {
         dialogClickModal: false,
         column: [
           {
-            label: "姓名",
+            label: "标签名",
             prop: "name",
             // search: true,
             span: 24,
@@ -314,7 +315,7 @@ export default {
               {
                 required: true,
                 whitespace: true,
-                message: "请输入姓名",
+                message: "请输入标签名",
                 trigger: "blur",
               },
             ],

vue.config.js

@@ -24,8 +24,8 @@ module.exports = {
     proxy: {
       "/api": {
         // target: 'http://127.0.0.1:8000', // 本地服务接口地址
-        target: "http://39.98.184.58:8000",  // 阿里云后台地址
+        // target: "http://39.98.184.58:8000",  // 阿里云后台地址
-        // target: "http://192.168.0.105:8000",  // 本地
+        target: "http://192.168.3.111:8000",  // 本地
         ws: true,
         changeOrigin: true,
         pathRewrite: {