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

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

@@ -62,14 +62,11 @@
         <!--搜索栏-->
         <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-form-item label="身份证号:">
-              <el-select v-model="query.stype" placeholder="服务类型" style="width: 100%" filterable clearable>
+              <el-input v-model="query.idNumber" placeholder="身份证号" clearable></el-input>
-                <el-option v-for="(item, key, index) in serviceType" :key="index" :label="item.label"
-                           :value="item.value"></el-option>
-              </el-select>
             </el-form-item>
             <!-- <el-form-item label="工种:">
               <el-select v-model="query.worktypes" placeholder="工种" style="width: 100%" filterable clearable>
@@ -316,7 +313,7 @@ export default {
         dialogClickModal: false,
         column: [
           {
-            label: "标签名称",
+            label: "姓名",
             prop: "name",
             // search: true,
             span: 24,
@@ -330,6 +327,36 @@ export default {
             ],
             slot: true
           },
+          {
+            label: "身份证号",
+            prop: "idNumber",
+            // search: true,
+            span: 24,
+            rules: [
+              {
+                required: true,
+                whitespace: true,
+                message: "身份证号",
+                trigger: "blur",
+              },
+            ],
+            slot: false
+          },
+          {
+            label: "性别",
+            prop: "sex",
+            // search: true,
+            span: 24,
+            rules: [
+              {
+                required: true,
+                whitespace: true,
+                message: "身份证号",
+                trigger: "blur",
+              },
+            ],
+            slot: false
+          },
           // {
           //   label: "身份证",
           //   prop: "idNumber",
@@ -391,26 +418,26 @@ export default {
             ],
             placeholder: "请选择 分组",
           },
-          {
+          // {
-            label: "服务类型",
+          //   label: "服务类型",
-            prop: "stype",
+          //   prop: "stype",
-            type: "tree",
+          //   type: "tree",
-            span: 24,
+          //   span: 24,
-            display: true,
+          //   display: true,
-            dicData: serviceType,
+          //   dicData: serviceType,
-            props: {
+          //   props: {
-              label: "label",
+          //     label: "label",
-              value: "value",
+          //     value: "value",
-            },
+          //   },
-            rules: [
+          //   rules: [
-              {
+          //     {
-                required: true,
+          //       required: true,
-                message: "请选择服务类型",
+          //       message: "请选择服务类型",
-                trigger: "change",
+          //       trigger: "change",
-              },
+          //     },
-            ],
+          //   ],
-            placeholder: "请选择 服务类型",
+          //   placeholder: "请选择 服务类型",
-          },
+          // },
           // {
           //   label: "工种",
           //   prop: "worktypes",

src/views/workstation/workbench/index.vue

@@ -28,8 +28,8 @@ import {getMapData} from '@/api/desk/notice'
 export default {
   data() {
     return {
-      // getPageUrl: "http://10.165.0.173/largescreen/",
+      getPageUrl: "http://10.165.0.173/largescreen/",
-      getPageUrl: "http://10.165.0.54:8300/largescreen/",
+      // getPageUrl: "http://39.98.184.58/largescreen/",
       fullScreenFlag: false,
       fullScreenFlagKey: 0,
     };