推，修改无数据的统一格式并修改表格样式问题

smart-office-manager-ui/admin/src/views/device/electron/list.vue

@@ -68,7 +68,6 @@
 </template>
 
 <script>
-<<<<<<< HEAD
 /** 表单弹出框模式需引入 */
 import drawerShow from "./drawershow";
 import table from "@/assets/mixins/table";
@@ -122,22 +121,6 @@ export default {
         "/device/exportExcel",
         {
           idList: this.selection,
-=======
-    /** 表单弹出框模式需引入 */
-    import drawerShow from "./drawershow";
-    import table from "@/assets/mixins/table";
-    export default {
-        name: "DeviceList",
-        components: {
-            drawerShow
-},
-        mixins: [table],
-        created() {
-          console.log("route",this.$route)
-          this.changePath("/device")
-          console.log("this.pageInfo.list000",this.pageInfo.list)
-          this.query = Object.assign({}, this.query, {productCode:"dzmp"});
->>>>>>> 39e6d56acbefe19665a6d0358d3730be6122fa01
         },
         { type: "excel" }
       )

smart-office-manager-ui/admin/src/views/device/meet/list.vue

@@ -68,7 +68,6 @@
 </template>
 
 <script>
-<<<<<<< HEAD
 /** 表单弹出框模式需引入 */
 import drawerShow from "./drawershow";
 import table from "@/assets/mixins/table";
@@ -122,21 +121,6 @@ export default {
         "/device/exportExcel",
         {
           idList: this.selection,
-=======
-    /** 表单弹出框模式需引入 */
-    import drawerShow from "./drawershow";
-    import table from "@/assets/mixins/table";
-    export default {
-        name: "DeviceList",
-        components: {
-            drawerShow
-},
-        mixins: [table],
-        created() {
-          console.log("route111",this.$route)
-          this.changePath("/device")
-          this.query = Object.assign({}, this.query, {productCode:"hysdzmp"});
->>>>>>> 39e6d56acbefe19665a6d0358d3730be6122fa01
         },
         { type: "excel" }
       )

smart-office-manager-ui/admin/src/views/system/menu/list.vue

@@ -164,20 +164,12 @@ export default {
           {
             prop: "parentId",
             label: "父ID",
-<<<<<<< HEAD
             formatter: (row) => (row.parentId ? row.parentId : "--"),
-=======
-            width: 160,
->>>>>>> 39e6d56acbefe19665a6d0358d3730be6122fa01
           },
           {
             prop: "url",
             label: "地址",
-<<<<<<< HEAD
             formatter: (row) => (row.url ? row.url : "--"),
-=======
-            width: 160,
->>>>>>> 39e6d56acbefe19665a6d0358d3730be6122fa01
           },
           {
             prop: "status",

smart-office-manager-ui/admin/src/views/workman/list.vue

@@ -210,7 +210,6 @@ export default {
           { type: "selection", width: 60 },
           { type: "index", label: "序号", width: 50 },
 
-<<<<<<< HEAD
           {
             label: "照片",
             prop: "photoPath",
@@ -226,75 +225,6 @@ export default {
               );
             },
           },
-=======
-        },
-        data() {
-            return {
-              loginName:null,
-              newPwd:null,
-                // 用户导入参数
-                upload: {
-                    // 是否显示弹出层（工作人员导入）
-                    open: false,
-                    // 弹出层标题（工作人员导入）
-                    title: "导入工作人员数据",
-                    // 是否禁用上传
-                    isUploading: false,
-                    // 是否更新已经存在的数据
-                    updateSupport: 0,
-                    // 上传的地址
-                    url: "/office/workman/importData",
-                },
-              user: {
-                // 是否显示弹出层（工作人员导入）
-                open: false,
-                // 弹出层标题（工作人员导入）
-                title: "修改密码",
-              },
-                isExport: false,
-                config: {
-                    search: [
-                      {
-                        name: "name",
-                        type: "text",
-                        label: "姓名",
-                        fuzzy: true
-                      },
-                      {
-                        name: "roomId",
-                        type: "select",
-                        label: "所属房间"
-                      },
-                      {
-                        name: "workStatus",
-                        type: "select",
-                        label: "工作状态"
-                      }
-                    ],
-                    columns: [
-                        {type: "selection", width: 60},
-                        {type: "index",label: "序号",width: 50},
-
-                      {width: 100,label: "照片", prop: "photoPath",formatter: (row) => {
-                          return row.photoPath != "" ? (
-                              <el-image
-                                  style="width: 70px; height: 100px"
-                                  src={row.photoPath}
-                                  preview-src-list={[row.photoPath]}
-                              ></el-image>
-                          ) : (
-                              "--"
-                          );
-                        },},
-
-                      {label: "姓名", prop: "name"},
-
-                      {label: "所属部门", prop: "deptName"},
-
-                        {label: "所属房间", prop: "roomName"},
-
-                      {label: "职位", prop: "userPost"},
->>>>>>> 39e6d56acbefe19665a6d0358d3730be6122fa01
 
           {
             label: "姓名",