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

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

@@ -39,8 +39,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>
 
             <div class="searchBtn">
@@ -303,7 +303,7 @@ export default {
         0: "未启用",
         1: "服务中",
         2: "已完成",
-        3: "关闭",
+        3: "已关闭",
       },
       direction: 'rtl',
       drawer: false,
@@ -489,7 +489,7 @@ export default {
             formslot: true,
           },
           {
-            label: "状态",
+            label: "服务状态",
             prop: "status",
             display: false,
             slot: true,
@@ -559,12 +559,16 @@ export default {
         refreshBtn: false,
         height: '100',
         column: [{
-          label: '名称',
+          label: '政策名称',
           prop: 'name'
         }, {
-          label: '内容',
+          label: '政策概述',
           prop: 'policyContent'
-        }]
+        }, {
+          label: '政策标签',
+          prop: 'labelName'
+        },
+        ]
       }
     },
     logOption() {