diff --git a/src/api/system/user.js b/src/api/system/user.js
index c8a8101..a109f4a 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -2,7 +2,8 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params, deptId) => {
   return request({
-    url: '/api/blade-user/page',
+    // url: '/api/blade-user/page',
+    url: '/api/blade-system/user/page',
     method: 'get',
     params: {
       ...params,
@@ -25,7 +26,8 @@ export const remove = (ids) => {
 
 export const add = (row) => {
   return request({
-    url: '/api/blade-user/submit',
+    // url: '/api/blade-user/submit',
+    url: '/api/blade-system/user/submit',
     method: 'post',
     data: row
   })
diff --git a/src/assets/svg/person.svg b/src/assets/svg/person.svg
new file mode 100644
index 0000000..c811693
--- /dev/null
+++ b/src/assets/svg/person.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="styles__StyledSVGIconPathComponent-sc-4n1c4t-0 hjeiHV svg-icon-path-icon fill" viewBox="0 0 448 512" width="33" height="33">
+    <defs></defs>
+    <g fill='rgb(58, 98, 215)'>
+        <path d="M224 256c70.7 0 128-57.3 128-128S294.7 0 224 0 96 57.3 96 128s57.3 128 128 128zm89.6 32h-16.7c-22.2 10.2-46.9 16-72.9 16s-50.6-5.8-72.9-16h-16.7C60.2 288 0 348.2 0 422.4V464c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48v-41.6c0-74.2-60.2-134.4-134.4-134.4z"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/config/website.js b/src/config/website.js
index 4c08ac9..0c2ef14 100644
--- a/src/config/website.js
+++ b/src/config/website.js
@@ -5,7 +5,7 @@ export default {
   title: "",
   logo: "S",
   key: "saber", //配置主键,目前用于存储
-  indexTitle: "Saber Admin",
+  indexTitle: "科研医疗建筑运维平台",
   clientId: "saber", // 客户端id
   clientSecret: "saber_secret", // 客户端密钥
   tenantMode: true, // 是否开启租户模式
diff --git a/src/option/user/info.js b/src/option/user/info.js
index d2fcbe0..baa10ae 100644
--- a/src/option/user/info.js
+++ b/src/option/user/info.js
@@ -22,50 +22,73 @@ export default {
         span: 12,
         row: true,
         prop: 'avatar'
-      }, {
-        label: '姓名',
+      },
+      {
+        label: '背景图管理',
+        type: 'upload',
+        listType: 'picture-img',
+        propsHttp: {
+          res: 'data',
+          url: 'link',
+        },
+        canvasOption: {
+          text: ' ',
+          ratio: 0.1
+        },
+        action: '/api/blade-resource/oss/endpoint/put-file',
+        tip: '只能上传jpg/png背景图，且只能上传一张',
         span: 12,
         row: true,
-        prop: 'realName'
-      }, {
-        label: '用户名',
+        prop: 'avatar'
+      },
+      {
+        label: '负责人姓名',
         span: 12,
         row: true,
-        prop: 'name'
-      }, {
+        prop: 'realName'
+      },
+      //  {
+      //   label: '用户名',
+      //   span: 12,
+      //   row: true,
+      //   prop: 'name'
+      // }, 
+      {
         label: '手机号',
         span: 12,
         row: true,
         prop: 'phone'
-      }, {
-        label: '邮箱',
-        prop: 'email',
-        span: 12,
-        row: true,
-      }]
+      }, 
+      // {
+      //   label: '邮箱',
+      //   prop: 'email',
+      //   span: 12,
+      //   row: true,
+      // }
+    ]
     },
-    {
-      label: '修改密码',
-      prop: 'password',
-      column: [{
-        label: '原密码',
-        span: 12,
-        row: true,
-        type: 'password',
-        prop: 'oldPassword'
-      }, {
-        label: '新密码',
-        span: 12,
-        row: true,
-        type: 'password',
-        prop: 'newPassword'
-      }, {
-        label: '确认密码',
-        span: 12,
-        row: true,
-        type: 'password',
-        prop: 'newPassword1'
-      }]
-    }
+    // {
+    //   label: '修改密码',
+    //   prop: 'password',
+    //   column: [{
+    //     label: '原密码',
+    //     span: 12,
+    //     row: true,
+    //     type: 'password',
+    //     prop: 'oldPassword'
+    //   }, {
+    //     label: '新密码',
+    //     span: 12,
+    //     row: true,
+    //     type: 'password',
+    //     prop: 'newPassword'
+    //   }, {
+    //     label: '确认密码',
+    //     span: 12,
+    //     row: true,
+    //     type: 'password',
+    //     prop: 'newPassword1'
+    //   }]
+    // }
   ],
 }
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index f92f525..6e2b941 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -130,6 +130,7 @@ const user = {
       return new Promise((resolve, reject) => {
         getUserInfo().then((res) => {
           const data = res.data.data;
+          console.log('data==============>',data)
           commit('SET_ROLES', data.roles);
           resolve(data);
         }).catch(err => {
diff --git a/src/views/businessManagement/inspection/plan.vue b/src/views/businessManagement/inspection/plan.vue
new file mode 100644
index 0000000..3052e0d
--- /dev/null
+++ b/src/views/businessManagement/inspection/plan.vue
@@ -0,0 +1,412 @@
+<template>
+    <basic-container style="max-height: 800px; overflow: hidden">
+      <avue-crud
+        :option="option"
+        :table-loading="loading"
+        :data="data"
+        :page.sync="page"
+        ref="crud"
+        v-model="form"
+        :permission="permissionList"
+        :before-open="beforeOpen"
+        :before-close="beforeClose"
+        @search-change="searchChange"
+        @search-reset="searchReset"
+        @current-change="currentChange"
+        @size-change="sizeChange"
+        @refresh-change="refreshChange"
+        @on-load="onLoad"
+      >
+        <template slot-scope="{ row }" slot="deviceStatus">
+          <el-tag
+            size="small"
+            :type="
+              row.deviceStatus == 0
+                ? 'warning'
+                : row.deviceStatus == 1
+                ? ''
+                : ''
+            "
+          >
+            {{
+              row.deviceStatus == 0
+                ? "待确认"
+                : row.deviceStatus == 1
+                ? "已确认"
+                : ""
+            }}
+          </el-tag>
+        </template>
+        <template slot-scope="{ row }" slot="runingStatus">
+          <el-tag
+            size="small"
+            :type="
+              row.runingStatus == 0
+                ? 'info'
+                : row.runingStatus == 1
+                ? 'success'
+                : row.runingStatus == 2
+                ? 'danger'
+                : ''
+            "
+          >
+            {{
+              row.runingStatus == 0
+                ? "关机"
+                : row.runingStatus == 1
+                ? "运行中"
+                : row.runingStatus == 2 
+                ? '报警中'
+                : ""
+            }}
+          </el-tag>
+        </template>
+        <template slot-scope="scope" slot="menuLeft">
+          <el-button
+            size="small"
+            @click="handleAdd"
+            >新增</el-button
+          >
+          <el-button
+            type="primary"
+            size="small"
+            @click="addOperation"
+            >需求提报</el-button
+          >
+        </template>
+        <template slot-scope="{ row }" slot="menu">
+          <el-button @click="handleView(row)">查看</el-button>
+          <el-button @click="handleEdit(row)">编辑</el-button>
+          <el-button @click="handleDelete(row)">停用</el-button>
+        </template>
+      </avue-crud>
+      <el-dialog
+        :title="dialogTitle"
+        :visible.sync="dialogVisible"
+        :append-to-body="true"
+        width="50%"
+      >
+        <div style="height: 500px; overflow: auto">
+          <el-form ref="form" :model="addForm" :rules="addRules" label-width="120px"  label-position="left">
+            <div>
+              <div
+                style="
+                  color: #101010;
+                  font-size: 20px;
+                  font-weight: 550;
+                  margin-bottom: 20px;
+                "
+              >
+                基本信息
+              </div>
+              <el-form-item label="设备编号" prop="deviceNo">
+                <el-input placeholder="请输入设备编号" v-model="addForm.deviceNo"></el-input>
+              </el-form-item>
+              <el-form-item label="设备名称" prop="deviceName">
+                <el-input placeholder="请输入设备名称" v-model="addForm.deviceName"></el-input>
+              </el-form-item>
+              <el-form-item label="型号" prop="deviceModel">
+                <el-input placeholder="请输入型号" v-model="addForm.deviceModel"></el-input>
+              </el-form-item>
+              <el-form-item label="设备位置" prop="devicePosition">
+                <el-input placeholder="请输入设备位置" v-model="addForm.devicePosition"></el-input>
+              </el-form-item>
+              <el-form-item  label="设备类型" prop="deviceType">
+                <el-select style="width:100%;" placeholder="请选择设备类型" v-model="addForm.deviceType">
+                  <el-option v-for="item in typeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="供应商" prop="supplier">
+                <el-input placeholder="请输入供应商" v-model="addForm.supplier"></el-input>
+              </el-form-item>
+              <el-form-item label="生产时间" prop="productTime">
+                <el-date-picker
+                  style="width:100%;"
+                  v-model="addForm.productTime"
+                  type="date"
+                  placeholder="请选择生产时间">
+                </el-date-picker>
+              </el-form-item>
+            </div>
+            <div>
+              <div
+                style="
+                  color: #101010;
+                  font-size: 20px;
+                  font-weight: 550;
+                  margin-bottom: 20px;
+                "
+              >
+                附件
+              </div>
+              <el-form-item label="附件名称" prop="fileName">
+                <el-input placeholder="请输入附件名称" v-model="addForm.fileName"></el-input>
+              </el-form-item>
+              <el-form-item label="附件上传">
+                  <!--  :limit="3" -->
+                <el-upload
+                  class="upload-demo"
+                  action="https://jsonplaceholder.typicode.com/posts/"
+                  :on-success="handleSuccess"
+                  :on-remove="handleRemove"
+                  multiple
+                  accept=".jpeg,.jpg,.png,.pdf"
+                  :on-exceed="handleExceed"
+                  :file-list="fileList">
+                  <el-button size="small" type="primary">点击上传</el-button>
+                  <div slot="tip" class="el-upload__tip">支持上传jpeg、jpg、pdf文件，且不超过10M</div>
+                </el-upload>
+              </el-form-item>
+            </div>
+          </el-form>
+        </div>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="handleClose">关 闭</el-button>
+          <el-button @click="handleSave">保 存</el-button>
+          <el-button type="primary" @click="handleConfirm">确 定</el-button>
+        </span>
+      </el-dialog>
+    </basic-container>
+  </template>
+  
+  <script>
+  export default {
+    data(){
+      return{
+        option: {
+          height: "auto",
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          dialogType: "dialog",
+          dialogClickModal: false,
+          addBtn: false,
+          viewBtn: false,
+          editBtn: false,
+          delBtn: false,
+          searchShowBtn: false,
+          refreshBtn: false,
+          columnBtn: false,
+          menuWidth: 300,
+          column: [
+            {
+              label: "巡检单号",
+              labelWidth: 120,
+              prop: "inspectionNo",
+              overHidden: true,
+            },
+            {
+              label: "单位名称",
+              labelWidth: 120,
+              prop: "unitName",
+              search: true,
+              overHidden: true,
+            },
+            {
+              label: "巡检项目名称",
+              labelWidth: 120,
+              prop: "inspectionName",
+              overHidden: true,
+            },
+            {
+              label: "项目地址",
+              labelWidth: 120,
+              prop: "projectAddr",
+              overHidden: true,
+            },
+            {
+              label: "班组",
+              labelWidth: 120,
+              prop: "team",
+              overHidden: true,
+            },
+            {
+              label: "巡检计划开始时间",
+              labelWidth: 120,
+              prop: "startTime",
+              overHidden: true,
+            },
+            {
+              label: "巡检周期",
+              labelWidth: 120,
+              prop: "cycle",
+              slot: true,
+            },
+            {
+              label: "下次巡检日期",
+              labelWidth: 120,
+              prop: "nextDate",
+            },
+            {
+              label: "状态",
+              labelWidth: 120,
+              prop: "status",
+              slot: true,
+              formslot: true,
+            },
+          ],
+        },
+        data: [],
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0,
+        },
+        dialogTitle:'设备新增',
+        dialogVisible:false,
+        addForm:{},
+        addRules:{
+          deviceNo:{required:true,message:'请输入设备编号',trigger:'blur'},
+          deviceName:{required:true,message:'请输入设备名称',trigger:'blur'},
+          deviceModel:{required:true,message:'请输入型号',trigger:'blur'},
+          devicePosition:{required:true,message:'请输入设备位置',trigger:'blur'},
+          deviceType:{required:true,message:'请选择设备类型',trigger:'blur'},
+          supplier:{required:true,message:'请输入供应商',trigger:'blur'},
+          productTime:{required:true,message:'请选择生产时间',trigger:'blur'},
+          fileName:{required:true,message:'请输入附件名称',trigger:'blur'},
+        },
+        typeList:[
+          {label:'类型一',value:'001'},
+          {label:'类型二',value:'002'},
+          {label:'类型三',value:'003'},
+        ],
+        fileList:[],
+        requestVisible:false,
+        requestForm:{}
+      }
+    },
+    mounted(){},
+    methods:{
+      beforeOpen(done, type) {
+        done();
+      },
+      beforeClose(done) {
+        done();
+      },
+      searchReset(params, done) {
+        //   params.releaseTimeRange = dateFormat(new Date(), 'yyyy-MM-dd');
+        this.query = params;
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      addOperation(val){
+        console.log('val================>',val && val.deviceNo)
+        if(val && val.deviceNo){
+          this.requestForm = {
+            errPosition:val.devicePosition,
+            deviceName:val.deviceName,
+            errType:val.deviceType
+          }
+          this.requestVisible = true
+        }else{
+          this.requestVisible = true
+        }
+      },
+      closeRequest(){
+        this.requestVisible = false
+      },
+      // 点击新增按钮
+      handleAdd(){
+        this.dialogTitle = '设备新增'
+        this.addForm = {}
+        this.fileList = []
+        this.$refs['form'].resetFields()
+        this.dialogVisible = true
+      },
+      // 点击编辑按钮
+      handleEdit(row){
+        this.addForm = row
+        this.fileList = row.fileList
+        this.dialogTitle = '设备编辑'
+        this.dialogVisible = true
+      },
+      // 点击删除按钮
+      handleDelete(row){
+        this.$confirm('请确认是否删除该设备?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.$message({
+              type: 'success',
+              message: '删除成功!'
+            });
+          }).catch(() => {
+            // this.$message({
+            //   type: 'info',
+            //   message: '已取消删除'
+            // });          
+          });
+      },
+      // 点击新增弹窗关闭按钮
+      handleClose(){
+        this.dialogVisible = false
+        this.addForm = {}
+      },
+      // 点击新增弹窗保存按钮
+      handleSave(){
+        this.$refs['form'].validate((valid) => {
+          if(valid){
+            if(this.fileList.length == 0){
+              this.$message.error('请至少上传一个附件')
+            }else{
+  
+            }
+          }
+        })
+      },
+      // 附件上传成功
+      handleSuccess(response, file, fileList){
+        console.log('response------------------>',response)
+        console.log('file------------------>',file)
+        console.log('fileList------------------>',fileList)
+        this.fileList = []
+        fileList.map(item =>{
+          this.fileList.push({name:item.name})
+        })
+        console.log('fileList------------------>',this.fileList)
+      },
+      // 附件删除
+      handleRemove(file, fileList){
+        this.fileList = []
+        fileList.map(item =>{
+          this.fileList.push({name:item.name})
+        })
+      },
+      onLoad(page, params = {}) {
+        this.data = [
+          {
+            inspectionNo:'WX-20240820-01',
+            unitName:'济南安池实验室',
+            inspectionName:'实验室设备巡检',
+            projectAddr:'济南市钢城区',
+            deviceType:'通风与空调及净化系统',
+            supplier:'山东烁今',
+            productTime:'2024/8/20',
+            deviceStatus:0, //设备状态 0-待确认 1-已确认
+            runingStatus:1, //运行状态 0-关机 1-运行中 2-报警中
+            fileName:'图纸',
+            fileList:[
+              {name: 'food.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}, 
+              {name: 'food2.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}
+            ]
+          },
+        ];
+        this.page.total = this.data.length
+        this.loading = false;
+      },
+    }
+  }
+  </script>
+  
+  <style>
+  
+  </style>
\ No newline at end of file
diff --git a/src/views/businessManagement/ordinary.vue b/src/views/businessManagement/ordinary.vue
new file mode 100644
index 0000000..b6a1589
--- /dev/null
+++ b/src/views/businessManagement/ordinary.vue
@@ -0,0 +1,1214 @@
+<template>
+  <basic-container style="max-height: 800px; overflow: hidden">
+    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" v-model="form"
+      :permission="permissionList" :before-open="beforeOpen" :before-close="beforeClose" @search-change="searchChange"
+      @search-reset="searchReset" @current-change="currentChange" @size-change="sizeChange"
+      @refresh-change="refreshChange" @selection-change="selectSection">
+      <template slot="addTimeSearch">
+        <el-date-picker v-model="form.addtimeRange" type="daterange" range-separator="至" start-placeholder="提报开始日期"
+          end-placeholder="提报结束日期">
+        </el-date-picker>
+      </template>
+      <template slot-scope="{ row }" slot="requireStatus">
+        <!-- requireStatus 客服角色下1839536982874193922： 状态 0-客服待接单 1,2，3-待维修 4-维修完成 5-已完成
+          维修负责人1839537055389515777：1-待接单 2,3-待维修 4-维修完成 5-已完成   维修人：2-待确认 3-待维修 4-维修完成 5-已完成  领导：4-待审批 5-已完成
+        -->
+        <el-tag size="small" 
+          :type="row.requireStatus == 0 ? 'success'
+          : role_id == '1839536982874193922' && (row.requireStatus == 1  || row.requireStatus == 2 || row.requireStatus == 3) ? 'warning'
+          : role_id == '1839537055389515777' && (row.requireStatus == 1) ? 'success'
+          : role_id == '1839537055389515777' && (row.requireStatus == 2 || row.requireStatus == 3) ? 'warning'
+          : role_id == '1839552581620793346' && row.requireStatus == 2 ? 'success'
+          : role_id == '1839552581620793346' && row.requireStatus == 3 ? 'warning'
+          : role_id == '1839600115013713921' && row.requireStatus == 4 ? 'warning'
+          : row.requireStatus == 4 ? ''
+          : row.requireStatus == 1 ? 'warning'
+          : row.requireStatus == 5 ? 'info' : ''
+          ">
+          {{
+            row.requireStatus == 0 ? "待接单"
+            : role_id == '1839536982874193922' && (row.requireStatus == 1  || row.requireStatus == 2 || row.requireStatus == 3 ) ? '待维修'
+            : role_id == '1839537055389515777' && (row.requireStatus == 1) ? "待接单"
+            : role_id == '1839537055389515777' && (row.requireStatus == 2 ||row.requireStatus == 3) ? '待维修'
+            : role_id == '1839552581620793346' && row.requireStatus == 2 ? '待确认'
+            : role_id == '1839552581620793346' && row.requireStatus == 3 ? '待维修'
+            : role_id == '1839600115013713921' && row.requireStatus == 4 ? '待审批'
+            : role_id == '' && row.requireStatus == 3 ? '待审批'
+            : row.requireStatus == 4 ? '维修完成'
+            : row.requireStatus == 5 ? '已完成' : ''
+          }}
+        </el-tag>
+      </template>
+      <template slot-scope="scope" slot="menuLeft">
+        <el-button type="primary" size="small" @click="handleAccept" v-show="role_id != '1839600115013713921'">{{ role_id
+          == '1839552581620793346' ? '接单确认' : '接单'}}</el-button>
+        <el-button type="primary" size="small" @click="handleApproval"
+          v-show="role_id == '1839600115013713921'">审批</el-button>
+      </template>
+      <template slot-scope="{ row }" slot="menu">
+        <el-button @click="handleView(row)">查看</el-button>
+        <el-button @click="handleRepair(row)" :disabled="row.requireStatus != 3"
+          v-show="role_id == '1839552581620793346'">维修</el-button>
+        <el-button v-show="role_id != '1839600115013713921'" :disabled="(row.requireStatus != 0 && role_id == '1839536982874193922') || (row.requireStatus != 1 && role_id == '1839537055389515777') || (row.requireStatus != 2 && role_id == '1839552581620793346')"
+          @click="handleEdit(row)">接单</el-button>
+        <el-button v-show="role_id == '1839600115013713921'" :disabled="row.requireStatus != 4"
+          @click="handleApproval(row)">审批</el-button>
+      </template>
+    </avue-crud>
+    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" :append-to-body="true" width="50%">
+      <div style="height: 500px; overflow: auto">
+        <el-form ref="form" :model="addForm" :rules="addRules" label-width="120px" label-position="left">
+          <div>
+            <div style="
+                  color: #101010;
+                  font-size: 20px;
+                  font-weight: 550;
+                  margin-bottom: 20px;
+                ">
+              提报信息
+            </div>
+            <el-form-item label="需求单号" prop="requireNum">
+              <el-input style="width:99%;" placeholder="请输入需求单号" v-model="addForm.requireNum"></el-input>
+            </el-form-item>
+            <el-form-item label="提报单位" prop="unitName">
+              <el-input style="width:99%;" placeholder="请输入提报单位" v-model="addForm.unitName"></el-input>
+            </el-form-item>
+          </div>
+          <div>
+            <div style="
+                  color: #101010;
+                  font-size: 20px;
+                  font-weight: 550;
+                  margin-bottom: 20px;
+                ">
+              派单信息
+            </div>
+            <el-form-item label="维修班组" prop="repairTeam">
+              <el-select style="width:99%;" placeholder="请选择维修班组" v-model="addForm.repairTeam">
+                <el-option v-for="item in repairList" :key="item.value" :value="item.value"
+                  :label="item.label"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="派单时间" prop="dispatchTime">
+              <el-date-picker style="width:99%;" v-model="addForm.dispatchTime" type="datetime" placeholder="请选择派单时间">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="计划完成时间" prop="finishTime">
+              <el-date-picker style="width:99%;" v-model="addForm.finishTime" type="date" placeholder="请选择计划完成时间">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="维修人员" prop="repairPerson"
+              v-show="role_id == '1839537055389515777' || role_id == '1839552581620793346'">
+              <el-select placeholder="请选择维修人员" style="width:99%;" v-model="addForm.repairPerson">
+                <el-option v-for="item in repairPersonList" :key="item.label" :label="item.label"
+                  :value="item.value"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="备注" prop="remark" v-show="role_id == '1839552581620793346'">
+              <el-input placeholder="请输入备注" type="textarea"></el-input>
+            </el-form-item>
+          </div>
+        </el-form>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="handleClose">取 消</el-button>
+        <el-button type="primary" @click="handleConfirm">{{ role_id == '1839537055389515777' ? '提 交' : role_id ==
+          '1839536982874193922' ? '确 定 派 单' : role_id == '1839552581620793346' ? '确 认' : ''}}</el-button>
+      </span>
+    </el-dialog>
+    <el-dialog title="工单详情" :visible.sync="repairVisible" :append-to-body="true" width="50%">
+      <el-form ref="repairForm" v-model="repairForm" :rules="repairRules" label-position="left" label-width="135px"
+        style="height:500px;overflow: auto;">
+        <div>
+          <div style="
+                    color: #101010;
+                    font-size: 20px;
+                    font-weight: 550;
+                    margin-bottom: 20px;
+                ">
+            故障信息
+          </div>
+          <el-form-item label="填报人" prop="addPerson">
+            <el-input placeholder="请输入填报人" readonly v-model="repairForm.addPerson"></el-input>
+          </el-form-item>
+          <el-form-item label="填报人电话" prop="addPersonPhone">
+            <el-input placeholder="请输入填报人电话" readonly v-model="repairForm.addPersonPhone"></el-input>
+          </el-form-item>
+          <el-form-item label="故障位置" prop="errorPosition">
+            <el-input placeholder="请输入故障位置" readonly v-model="repairForm.errorPosition"></el-input>
+          </el-form-item>
+          <el-form-item label="设备名称" prop="deviceName">
+            <el-select placeholder="请选择设备名称" disabled v-model="repairForm.deviceName" style="width: 100%">
+              <el-option v-for="item in deviceList" :key="item.value" :value="item.value"
+                :label="item.label"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="故障专业类型" prop="errorType">
+            <el-select placeholder="请选择故障专业类型" disabled v-model="repairForm.errorType" style="width: 100%">
+              <el-option v-for="item in errorList" :key="item.value" :value="item.value"
+                :label="item.label"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="故障现象描述" prop="errorDescribe">
+            <el-input placeholder="请输入故障现象描述" readonly type="textarea" v-model="repairForm.errorDescribe"></el-input>
+          </el-form-item>
+          <el-form-item label="故障视频">
+            <video :src="repairForm.errorVideo" style="width: 148px; height: 148px" controls></video>
+          </el-form-item>
+          <el-form-item label="故障图片">
+            <img v-for="item in repairForm.errorImg" :key="item" :src="item" alt=""
+              style="width: 148px; height: 148px;margin-right:10px;">
+          </el-form-item>
+          <el-form-item label="提报时间">
+            <el-date-picker v-model="repairForm.addTime" type="datetime" style="width:100%;" disabled
+              placeholder="选择日期时间">
+            </el-date-picker>
+          </el-form-item>
+        </div>
+        <div>
+          <div style="color: #101010;font-size: 20px;font-weight: 550;margin-bottom: 20px;">处理情况</div>
+          <el-form-item label="接单时间" prop="orderTime">
+            <el-date-picker v-model="repairForm.orderTime" type="datetime" disabled style="width:100%;"
+              placeholder="请选择接单时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="计划完成时间">
+            <el-date-picker v-model="repairForm.finishTime" type="date" disabled style="width:100%;"
+              placeholder="请选择计划完成时间">
+            </el-date-picker>
+          </el-form-item>
+        </div>
+        <div
+          v-show="(repairForm.requireStatus == 5 || repairForm.requireStatus == 4) || role_id != '1839536982874193922'">
+          <div style="color: #101010;font-size: 20px;font-weight: 550;margin-bottom: 20px;">维修详情</div>
+          <el-form-item label="填报人" prop="maintainPerson">
+            <el-input placeholder="请输入填报人"
+              :readonly="role_id == '1839600115013713921' || ( repairForm.requireStatus == 5 || repairForm.requireStatus == 4) || dialogType == 'view'"
+              v-model="repairForm.maintainPerson"></el-input>
+          </el-form-item>
+          <el-form-item label="设备名称" prop="maintainDevice">
+            <el-select placeholder="请选择设备名称"
+              :disabled="role_id == '1839600115013713921' || ( repairForm.requireStatus == 5 || repairForm.requireStatus == 4)  || dialogType == 'view'"
+              v-model="repairForm.maintainDevice" style="width: 100%">
+              <el-option v-for="item in deviceList" :key="item.value" :value="item.value"
+                :label="item.label"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="故障原因" prop="errorReason">
+            <el-input placeholder="请输入故障原因"
+              :readonly="role_id == '1839600115013713921' || ( repairForm.requireStatus == 5 || repairForm.requireStatus == 4)  || dialogType == 'view'"
+              type="textarea" v-model="repairForm.errorReason"></el-input>
+          </el-form-item>
+          <el-form-item label="处理方法" prop="dealMethod">
+            <el-input placeholder="请输入处理方法"
+              :readonly="role_id == '1839600115013713921' || ( repairForm.requireStatus == 5 || repairForm.requireStatus == 4)  || dialogType == 'view'"
+              type="textarea" v-model="repairForm.dealMethod"></el-input>
+          </el-form-item>
+          <el-form-item label="是否需要申领物料" prop="isMaterials">
+            <el-select placeholder="请选择是否需要申领物料" style="width:100%;"
+              :disabled="role_id == '1839600115013713921' || ( repairForm.requireStatus == 5 || repairForm.requireStatus == 4)  || dialogType == 'view'"
+              v-model="repairForm.isMaterials">
+              <el-option label="是" value="1"></el-option>
+              <el-option label="否" value="2"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="维修材料"
+            v-if="(repairForm.isMaterials == 1 && dialogType != 'view' && role_id != '1839600115013713921' && role_id != '1839536982874193922' && role_id != '1839537055389515777')">
+            <el-table :data="tableData" border style="width: 100%">
+              <el-table-column width="50" align="center">
+                <template slot="header" slot-scope="scope">
+                  <div @click="addColumn()"
+                    style="width:30px;height: 30px;background: #409eff;border-radius: 50%;cursor: pointer;display: flex;align-items: center;justify-content: center;">
+                    <i style="color:#fff;font-size: 20px;" class="el-icon-plus"></i></div>
+                </template>
+                <template slot-scope="scope">
+                  <div @click="deleteColumn(scope.row, scope.$index)"
+                    style="width:30px;height: 30px;background: #f56c6c;border-radius: 50%;cursor: pointer;display: flex;align-items: center;justify-content: center;">
+                    <i style="color:#fff;font-size: 20px;" class="el-icon-delete"></i></div>
+                </template>
+              </el-table-column>
+              <el-table-column prop="productType" align="center" label="物品大类">
+                <template slot-scope="scope">
+                  <el-select v-model="scope.row.productType" placeholder="请选择物品大类">
+                    <el-option label="大类一" value="1"></el-option>
+                    <el-option label="大类二" value="2"></el-option>
+                    <el-option label="大类三" value="3"></el-option>
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column prop="productName" align="center" label="物料名称">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.productName" placeholder="请输入物料名称"></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column prop="specs" align="center" label="规格">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.specs" placeholder="请输入规格"></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column prop="model" align="center" label="型号">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.model" placeholder="请输入型号"></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column prop="number" align="center" label="数量">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.number" placeholder="请输入数量"></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column prop="unit" align="center" label="单位">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.unit" placeholder="请输入单位"></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column prop="price" align="center" label="价格">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.price" placeholder="请输入价格"></el-input>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-form-item>
+          <el-form-item label="维修材料"
+            v-if="(dialogType == 'view' && repairForm.isMaterials == 1 && (repairForm.requireStatus == 4 || repairForm.requireStatus == 5))">
+            <el-table :data="tableData" border style="width: 100%">
+              <el-table-column prop="productType" align="center" label="物品大类"></el-table-column>
+              <el-table-column prop="productName" align="center" label="物料名称"></el-table-column>
+              <el-table-column prop="specs" align="center" label="规格"></el-table-column>
+              <el-table-column prop="model" align="center" label="型号"></el-table-column>
+              <el-table-column prop="number" align="center" label="数量"></el-table-column>
+              <el-table-column prop="unit" align="center" label="单位"></el-table-column>
+              <el-table-column prop="price" align="center" label="价格"></el-table-column>
+            </el-table>
+          </el-form-item>
+        </div>
+        <div v-show="(role_id == '1839600115013713921' && dialogType != 'view') || repairForm.requireStatus == 5">
+          <div style="color: #101010;font-size: 20px;font-weight: 550;margin-bottom: 20px;">审批结果</div>
+          <el-form-item label="审批结果" prop="approvalResult">
+            <el-select :disabled="repairForm.requireStatus == 5 || dialogType == 'view' " v-model="repairForm.approvalResult" placeholder="请选择审批结果" style="width: 99%;">
+              <el-option label="是" value="1"></el-option>
+              <el-option label="否" value="2"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="审批人" prop="approvalPerson">
+            <el-input :readonly="repairForm.requireStatus == 5 || dialogType == 'view'" placeholder="请输入审批人" v-model="repairForm.approvalPerson"></el-input>
+          </el-form-item>
+          <el-form-item label="审批时间" prop="approvalTime">
+            <el-date-picker :disabled="repairForm.requireStatus == 5 || dialogType == 'view'" style="width:99%" v-model="repairForm.approvalTime" type="datetime" placeholder="请选择审批时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="备注" prop="approvalRemark">
+            <el-input :readonly="repairForm.requireStatus == 5 || dialogType == 'view'" type="textarea" placeholder="请输入备注" v-model="repairForm.approvalRemark"></el-input>
+          </el-form-item>
+        </div>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button v-show="dialogType != 'view'" @click="handleSaveRepair">保 存</el-button>
+        <el-button v-show="dialogType != 'view'" type="primary" @click="handleConfirm">提 交</el-button>
+        <el-button v-show="dialogType == 'view'" @click="handleCloseDetail">关闭</el-button>
+      </span>
+    </el-dialog>
+  </basic-container>
+</template>
+
+<script>
+import { dateFormat } from '../../util/date'
+import { mapGetters } from "vuex";
+import requestSub from '../components/requestSub.vue'
+import { nextTick } from 'vue';
+export default {
+  components: {
+    requestSub
+  },
+  data() {
+    return {
+      option: {
+        height: "auto",
+        calcHeight: 30,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        border: true,
+        index: true,
+        dialogType: "dialog",
+        dialogClickModal: false,
+        addBtn: false,
+        viewBtn: false,
+        editBtn: false,
+        delBtn: false,
+        searchShowBtn: false,
+        refreshBtn: false,
+        columnBtn: false,
+        selection: true,
+        menuWidth: 300,
+        column: [
+          {
+            label: "提报时间",
+            prop: "addtimeRange",
+            search: true,
+            hide: true
+          },
+          {
+            label: "需求单号",
+            labelWidth: 120,
+            prop: "requireNum",
+            overHidden: true,
+          },
+          {
+            label: "提报单位",
+            labelWidth: 120,
+            prop: "unitName",
+            search: true,
+            overHidden: true,
+          },
+          {
+            label: "设备名称",
+            labelWidth: 120,
+            prop: "deviceName",
+            overHidden: true,
+          },
+          {
+            label: "故障位置",
+            labelWidth: 120,
+            prop: "errorPosition",
+            type: "select",
+            overHidden: true,
+            // hide: true,
+            // viewDisplay: false,
+            // dicUrl: '/api/blade-system/dict-biz/get-hc-project',
+            props: {
+              label: "dictValue",
+              value: "dictValue",
+            },
+          },
+          {
+            label: "故障专业类型",
+            labelWidth: 120,
+            prop: "errorType",
+            overHidden: true,
+            type: "select",
+            searchLabelWidth: 100,
+            search: true,
+            viewDisplay: false,
+            // dicUrl: '/api/blade-system/dict-biz/get-hc-project',
+            props: {
+              label: "dictValue",
+              value: "dictValue",
+            },
+          },
+          {
+            label: "故障专业描述",
+            labelWidth: 120,
+            prop: "errorDescribe",
+            overHidden: true,
+          },
+          {
+            label: "提报时间",
+            labelWidth: 120,
+            prop: "addTime",
+            overHidden: true,
+          },
+          {
+            label: "状态",
+            labelWidth: 120,
+            prop: "requireStatus",
+            slot: true,
+            formslot: true,
+          },
+          {
+            label: "完成时间",
+            labelWidth: 120,
+            prop: "overTime",
+          },
+          {
+            label: "审批时间",
+            labelWidth: 120,
+            prop: "approvalTime",
+            hide: true,
+          },
+        ],
+      },
+      form: {},
+      data: [],
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      dialogTitle: '工单',
+      dialogVisible: false,
+      addForm: {},
+      addRules: {
+        repairTeam: { required: true, message: '请选择维修班组', trigger: 'blur' },
+        dispatchTime: { required: true, message: '请选择派单时间', trigger: 'blur' },
+        finishTime: { required: true, message: '计划完成时间', trigger: 'blur' },
+      },
+      typeList: [
+        { label: '类型一', value: '001' },
+        { label: '类型二', value: '002' },
+        { label: '类型三', value: '003' },
+      ],
+      fileList: [],
+      requestVisible: false,
+      requestForm: {},
+      selectList: [],
+      repairList: [
+        { label: '班组1', value: '001' },
+        { label: '班组2', value: '002' },
+        { label: '班组3', value: '003' },
+        { label: '班组4', value: '004' },
+      ],
+      repairPersonList: [
+        { label: '人员1', value: '001' },
+        { label: '人员2', value: '002' },
+        { label: '人员3', value: '003' },
+        { label: '人员4', value: '004' },
+      ],
+      role_id: '',
+      repairVisible: false,
+      repairForm: {
+        tableData: []
+      },
+      repairRules: {},
+      tableData: [],
+      dialogType: 'approve'
+    }
+  },
+  computed: {
+    ...mapGetters(["userInfo", "permission"]),
+  },
+  mounted() {
+    this.role_id = this.userInfo.role_id
+    console.log('role_id------------->', this.role_id)
+    this.option.column.find(item => item.prop == 'overTime').hide = false
+    this.option.column.find(item => item.prop == 'approvalTime').hide = true
+    if (this.role_id == '1839536982874193922') {
+      this.onLoad()
+      this.addRules = {
+        repairTeam: { required: true, message: '请选择维修班组', trigger: 'blur' },
+        dispatchTime: { required: true, message: '请选择派单时间', trigger: 'blur' },
+        finishTime: { required: true, message: '计划完成时间', trigger: 'blur' },
+      }
+    } else if (this.role_id == '1839537055389515777' || this.role_id == '1839552581620793346') {
+      this.onLoad()
+      this.addRules = {
+        repairTeam: { required: true, message: '请选择维修班组', trigger: 'blur' },
+        dispatchTime: { required: true, message: '请选择派单时间', trigger: 'blur' },
+        finishTime: { required: true, message: '请选择计划完成时间', trigger: 'blur' },
+        repairPerson: { required: true, message: '请选择维修人员', trigger: 'blur' },
+      }
+    } else if (this.role_id == '1839600115013713921') {
+      this.onLoad()
+      this.option.column.find(item => item.prop == 'overTime').hide = true
+      this.option.column.find(item => item.prop == 'approvalTime').hide = false
+    }
+  },
+  methods: {
+    // 查看弹窗
+    handleView(row) {
+      this.dialogType = 'view'
+      this.repairVisible = true
+      this.repairForm = row
+      this.tableData = this.repairForm.tableData
+    },
+    handleRepair(row){
+      this.repairForm = row
+      this.repairVisible = true
+    },
+    handleCloseDetail() {
+      this.repairForm = {}
+      this.tableData = []
+      this.repairVisible = false
+    },
+    addColumn() {
+      let arr = JSON.parse(JSON.stringify(this.tableData))
+      arr.push({ productType: '', productName: '', specs: '', model: '', number: '', unit: '', price: '' })
+      this.tableData = arr
+    },
+    deleteColumn(row, index) {
+      console.log('row----------->', row)
+      console.log('index----------->', index)
+      this.tableData.splice(index, 1);
+    },
+    beforeOpen(done, type) {
+      done();
+    },
+    beforeClose(done) {
+      done();
+    },
+    searchReset(params, done) {
+      //   params.releaseTimeRange = dateFormat(new Date(), 'yyyy-MM-dd');
+      this.query = params;
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    handleAccept(val) {
+      if (this.selectList.length == 0) {
+        this.$message.warning('请选择一条数据')
+      } else if (this.selectList.length > 1) {
+        this.$message.warning('只能选择一条数据')
+      } else if (this.selectList[0].requireStatus != 0) {
+        this.$message.warning('只能选择状态为待接单的数据')
+      } else {
+        this.dialogTitle = '工单'
+        this.dialogVisible = true
+      }
+    },
+    handleApproval(row) {
+      this.dialogType = 'approval'
+      if (row.id) {
+        this.repairVisible = true
+        this.repairForm = row
+        this.tableData = this.repairForm.tableData
+      } else if (this.selectList.length == 0) {
+        this.$message.warning('请选择一条数据')
+      } else if (this.selectList.length > 1) {
+        this.$message.warning('只能选择一条数据')
+      } else if (this.selectList[0].approvalStatus != 0) {
+        this.$message.warning('只能选择状态为待审批的数据')
+      } else {
+        this.repairForm = this.selectList[0]
+        this.tableData = this.repairForm.tableData
+        this.repairVisible = true
+      }
+    },
+    handleSaveRepair() {
+      // this.$refs['repairForm'].validate(valid =>{
+      // if(valid){
+      console.log('repairForm-------------->', this.repairForm)
+      console.log('tableData------------->', this.tableData)
+      if (this.repairForm.isMaterials == '1') {
+        if (this.tableData.length == 0) {
+          this.$message.error('请至少填写一条维修材料信息')
+        }
+      }
+      //     }
+      // })
+    },
+    closeRequest() {
+      this.requestVisible = false
+    },
+    // 点击编辑按钮
+    handleEdit(row) {
+      this.addForm = row
+      this.fileList = row.fileList
+      this.dialogTitle = '设备编辑'
+      this.dialogVisible = true
+    },
+    // 点击删除按钮
+    handleDelete(row) {
+      this.$confirm('请确认是否删除该设备?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$message({
+          type: 'success',
+          message: '删除成功!'
+        });
+      }).catch(() => {
+        // this.$message({
+        //   type: 'info',
+        //   message: '已取消删除'
+        // });          
+      });
+    },
+    // 点击新增弹窗关闭按钮
+    handleClose() {
+      this.dialogVisible = false
+      this.$refs['form'].resetFields()
+      this.addForm = {}
+    },
+    //   点击确定派单按钮
+    handleConfirm() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          console.log('1111111111111')
+        }
+      })
+    },
+    // 点击新增弹窗保存按钮
+    handleSave() {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          if (this.fileList.length == 0) {
+            this.$message.error('请至少上传一个附件')
+          } else {
+
+          }
+        }
+      })
+    },
+    // 附件上传成功
+    handleSuccess(response, file, fileList) {
+      console.log('response------------------>', response)
+      console.log('file------------------>', file)
+      console.log('fileList------------------>', fileList)
+      this.fileList = []
+      fileList.map(item => {
+        this.fileList.push({ name: item.name })
+      })
+      console.log('fileList------------------>', this.fileList)
+    },
+    // 附件删除
+    handleRemove(file, fileList) {
+      this.fileList = []
+      fileList.map(item => {
+        this.fileList.push({ name: item.name })
+      })
+    },
+    selectSection(selection) {
+      this.selectList = selection
+    },
+    onLoad(page, params = {}) {
+      console.log('role------------------>', this.role_id)
+      if(this.role_id == '1839536982874193922'){ //客服人员
+        this.data = [
+          {
+            id: '1001',
+            requireNum: 'WX-20240820-01',
+            unitName: '山东安池实验室',
+            deviceName: '通风柜',
+            errorPosition: '一楼102室',
+            errorType: '通风与空调及净化系统',
+            errorDescribe: '通风柜无风，不通风',
+            addTime: '2024/8/20 08:56:23',
+            requireStatus: 0, //状态 0-客服待接单 1,2,3-待维修 4-维修完成 5-已完成
+            overTime: '',
+            addPerson: '张三',
+            addPersonPhone: '13201211123',
+            errorVideo: '',
+            errorImg: [],
+            orderTime: '',
+            finishTime: '',
+            maintainPerson: '',
+            maintainDevice: '',
+            errorReason: '',
+            dealMethod: '',
+            isMaterials: '',
+            approvalStatus: '',
+            tableData: []
+          },
+          {
+            id: '1002',
+            requireNum: 'WX-20240820-02',
+            unitName: '山东安池实验室',
+            deviceName: '通风柜',
+            errorPosition: '一楼103室',
+            errorType: '通风与空调及净化系统',
+            errorDescribe: '通风柜无风，不通风',
+            addTime: '2024/8/20 08:56:23',
+            requireStatus: 1, //状态 0-待接单 1-待维修 2-维修完成 3-已完成
+            overTime: '',
+            addPerson: '王五',
+            addPersonPhone: '13201211123',
+            errorVideo: '',
+            errorImg: [],
+            orderTime: '2024/08/21 12:00:00',
+            finishTime: '2024/08/25',
+            maintainPerson: '',
+            maintainDevice: '',
+            errorReason: '',
+            dealMethod: '',
+            isMaterials: '',
+            approvalStatus: '',
+            tableData: []
+          },
+          {
+            id: '1002',
+            requireNum: 'WX-20240820-02',
+            unitName: '山东安池实验室',
+            deviceName: '通风柜',
+            errorPosition: '一楼103室',
+            errorType: '通风与空调及净化系统',
+            errorDescribe: '通风柜无风，不通风',
+            addTime: '2024/8/20 08:56:23',
+            requireStatus: 2, //状态 0-待接单 1-待维修 2-维修完成 3-已完成
+            overTime: '',
+            addPerson: '王五',
+            addPersonPhone: '13201211123',
+            errorVideo: '',
+            errorImg: [],
+            orderTime: '2024/08/21 12:00:00',
+            finishTime: '2024/08/25',
+            maintainPerson: '',
+            maintainDevice: '',
+            errorReason: '',
+            dealMethod: '',
+            isMaterials: '',
+            approvalStatus: '',
+            tableData: []
+          },
+          {
+            id: '1004',
+            requireNum: 'WX-20240820-03',
+            unitName: '山东安池实验室',
+            deviceName: '通风柜',
+            errorPosition: '一楼101室',
+            errorType: '通风与空调及净化系统',
+            errorDescribe: '通风柜无风，不通风',
+            addTime: '2024/8/20 08:56:23',
+            requireStatus: 3, //状态 0-待接单 1-待维修 2-维修完成 3-已完成
+            overTime: '2024/08/22 09:23:32',
+            addPerson: '张三',
+            addPersonPhone: '13201211123',
+            errorVideo: '',
+            errorImg: [],
+            orderTime: '2024/08/25 12:11:25',
+            finishTime: '2024/08/30 15:00:00',
+            maintainPerson: '李四',
+            maintainDevice: '通风柜',
+            errorReason: '通风柜不通风',
+            dealMethod: '设置通风柜通风',
+            isMaterials: '1',
+            approvalStatus: 1,
+            approvalTime: '2024/09/22 12:35:23',
+            tableData: [
+              { productType: '耗材', productName: '材料1', specs: '', model: '', number: 5, unit: '盒', price: '20' },
+              { productType: '耗材', productName: '材料2', specs: '', model: '', number: 5, unit: '盒', price: '20' },
+              { productType: '耗材', productName: '材料3', specs: '', model: '', number: 20, unit: '个', price: '10' },
+            ]
+          },
+          {
+            id: '1004',
+            requireNum: 'WX-20240820-03',
+            unitName: '山东安池实验室',
+            deviceName: '通风柜',
+            errorPosition: '一楼101室',
+            errorType: '通风与空调及净化系统',
+            errorDescribe: '通风柜无风，不通风',
+            addTime: '2024/8/20 08:56:23',
+            requireStatus: 4, //状态 0-待接单 1-待维修 2-维修完成 3-已完成
+            overTime: '2024/08/22 09:23:32',
+            addPerson: '张三',
+            addPersonPhone: '13201211123',
+            errorVideo: '',
+            errorImg: [],
+            orderTime: '2024/08/25 12:11:25',
+            finishTime: '2024/08/30 15:00:00',
+            maintainPerson: '李四',
+            maintainDevice: '通风柜',
+            errorReason: '通风柜不通风',
+            dealMethod: '设置通风柜通风',
+            isMaterials: '1',
+            approvalStatus: 1,
+            approvalTime: '2024/09/22 12:35:23',
+            tableData: [
+              { productType: '耗材', productName: '材料1', specs: '', model: '', number: 5, unit: '盒', price: '20' },
+              { productType: '耗材', productName: '材料2', specs: '', model: '', number: 5, unit: '盒', price: '20' },
+              { productType: '耗材', productName: '材料3', specs: '', model: '', number: 20, unit: '个', price: '10' },
+            ],
+            approvalResult:'1',
+            approvalPerson:'领导一',
+            approvalTime:'2024/09/10 15:00:03',
+            approvalRemark:''
+          },
+          {
+            id: '1004',
+            requireNum: 'WX-20240820-03',
+            unitName: '山东安池实验室',
+            deviceName: '通风柜',
+            errorPosition: '一楼101室',
+            errorType: '通风与空调及净化系统',
+            errorDescribe: '通风柜无风，不通风',
+            addTime: '2024/8/20 08:56:23',
+            requireStatus: 5, //状态 0-待接单 1-待维修 2-维修完成 3-已完成
+            overTime: '2024/08/22 09:23:32',
+            addPerson: '张三',
+            addPersonPhone: '13201211123',
+            errorVideo: '',
+            errorImg: [],
+            orderTime: '2024/08/25 12:11:25',
+            finishTime: '2024/08/30 15:00:00',
+            maintainPerson: '李四',
+            maintainDevice: '通风柜',
+            errorReason: '通风柜不通风',
+            dealMethod: '设置通风柜通风',
+            isMaterials: '1',
+            approvalStatus: 1,
+            approvalTime: '2024/09/22 12:35:23',
+            tableData: [
+              { productType: '耗材', productName: '材料1', specs: '', model: '', number: 5, unit: '盒', price: '20' },
+              { productType: '耗材', productName: '材料2', specs: '', model: '', number: 5, unit: '盒', price: '20' },
+              { productType: '耗材', productName: '材料3', specs: '', model: '', number: 20, unit: '个', price: '10' },
+            ],
+            approvalResult:'1',
+            approvalPerson:'领导一',
+            approvalTime:'2024/09/10 15:00:03',
+            approvalRemark:''
+          },
+        ];
+      }else if(this.role_id == '1839537055389515777'){
+        this.data = [
+          {
+            id: '1002',
+            requireNum: 'WX-20240820-02',
+            unitName: '山东安池实验室',
+            deviceName: '通风柜',
+            errorPosition: '一楼103室',
+            errorType: '通风与空调及净化系统',
+            errorDescribe: '通风柜无风，不通风',
+            addTime: '2024/8/20 08:56:23',
+            requireStatus: 1, //状态 0-待接单 1-待维修 2-维修完成 3-已完成
+            overTime: '',
+            addPerson: '王五',
+            addPersonPhone: '13201211123',
+            errorVideo: '',
+            errorImg: [],
+            orderTime: '2024/08/21 12:00:00',
+            finishTime: '2024/08/25',
+            maintainPerson: '',
+            maintainDevice: '',
+            errorReason: '',
+            dealMethod: '',
+            isMaterials: '',
+            approvalStatus: '',
+            tableData: []
+          },
+          {
+            id: '1002',
+            requireNum: 'WX-20240820-02',
+            unitName: '山东安池实验室',
+            deviceName: '通风柜',
+            errorPosition: '一楼103室',
+            errorType: '通风与空调及净化系统',
+            errorDescribe: '通风柜无风，不通风',
+            addTime: '2024/8/20 08:56:23',
+            requireStatus: 2, //状态 0-待接单 1-待维修 2-维修完成 3-已完成
+            overTime: '',
+            addPerson: '王五',
+            addPersonPhone: '13201211123',
+            errorVideo: '',
+            errorImg: [],
+            orderTime: '2024/08/21 12:00:00',
+            finishTime: '2024/08/25',
+            maintainPerson: '',
+            maintainDevice: '',
+            errorReason: '',
+            dealMethod: '',
+            isMaterials: '',
+            approvalStatus: '',
+            tableData: []
+          },
+          {
+            id: '1004',
+            requireNum: 'WX-20240820-03',
+            unitName: '山东安池实验室',
+            deviceName: '通风柜',
+            errorPosition: '一楼101室',
+            errorType: '通风与空调及净化系统',
+            errorDescribe: '通风柜无风，不通风',
+            addTime: '2024/8/20 08:56:23',
+            requireStatus: 3, //状态 0-待接单 1-待维修 2-维修完成 3-已完成
+            overTime: '2024/08/22 09:23:32',
+            addPerson: '张三',
+            addPersonPhone: '13201211123',
+            errorVideo: '',
+            errorImg: [],
+            orderTime: '2024/08/25 12:11:25',
+            finishTime: '2024/08/30 15:00:00',
+            maintainPerson: '',
+            maintainDevice: '',
+            errorReason: '',
+            dealMethod: '',
+            isMaterials: '',
+            approvalStatus: '',
+            approvalTime: '',
+            tableData: []
+          },
+          {
+            id: '1004',
+            requireNum: 'WX-20240820-03',
+            unitName: '山东安池实验室',
+            deviceName: '通风柜',
+            errorPosition: '一楼101室',
+            errorType: '通风与空调及净化系统',
+            errorDescribe: '通风柜无风，不通风',
+            addTime: '2024/8/20 08:56:23',
+            requireStatus: 4, //状态 0-待接单 1-待维修 2-维修完成 3-已完成
+            overTime: '2024/08/22 09:23:32',
+            addPerson: '张三',
+            addPersonPhone: '13201211123',
+            errorVideo: '',
+            errorImg: [],
+            orderTime: '2024/08/25 12:11:25',
+            finishTime: '2024/08/30 15:00:00',
+            maintainPerson: '李四',
+            maintainDevice: '通风柜',
+            errorReason: '通风柜不通风',
+            dealMethod: '设置通风柜通风',
+            isMaterials: '1',
+            approvalStatus: 1,
+            approvalTime: '2024/09/22 12:35:23',
+            tableData: [
+              { productType: '耗材', productName: '材料1', specs: '', model: '', number: 5, unit: '盒', price: '20' },
+              { productType: '耗材', productName: '材料2', specs: '', model: '', number: 5, unit: '盒', price: '20' },
+              { productType: '耗材', productName: '材料3', specs: '', model: '', number: 20, unit: '个', price: '10' },
+            ],
+            approvalResult:'1',
+            approvalPerson:'领导一',
+            approvalTime:'2024/09/10 15:00:03',
+            approvalRemark:''
+          },
+          {
+            id: '1004',
+            requireNum: 'WX-20240820-03',
+            unitName: '山东安池实验室',
+            deviceName: '通风柜',
+            errorPosition: '一楼101室',
+            errorType: '通风与空调及净化系统',
+            errorDescribe: '通风柜无风，不通风',
+            addTime: '2024/8/20 08:56:23',
+            requireStatus: 5, //状态 0-待接单 1-待维修 2-维修完成 3-已完成
+            overTime: '2024/08/22 09:23:32',
+            addPerson: '张三',
+            addPersonPhone: '13201211123',
+            errorVideo: '',
+            errorImg: [],
+            orderTime: '2024/08/25 12:11:25',
+            finishTime: '2024/08/30 15:00:00',
+            maintainPerson: '李四',
+            maintainDevice: '通风柜',
+            errorReason: '通风柜不通风',
+            dealMethod: '设置通风柜通风',
+            isMaterials: '1',
+            approvalStatus: 1,
+            approvalTime: '2024/09/22 12:35:23',
+            tableData: [
+              { productType: '耗材', productName: '材料1', specs: '', model: '', number: 5, unit: '盒', price: '20' },
+              { productType: '耗材', productName: '材料2', specs: '', model: '', number: 5, unit: '盒', price: '20' },
+              { productType: '耗材', productName: '材料3', specs: '', model: '', number: 20, unit: '个', price: '10' },
+            ],
+            approvalResult:'1',
+            approvalPerson:'领导一',
+            approvalTime:'2024/09/10 15:00:03',
+            approvalRemark:''
+          },
+        ]
+      }else if(this.role_id == '1839552581620793346'){
+        this.data = [
+          {
+            id: '1002',
+            requireNum: 'WX-20240820-02',
+            unitName: '山东安池实验室',
+            deviceName: '通风柜',
+            errorPosition: '一楼103室',
+            errorType: '通风与空调及净化系统',
+            errorDescribe: '通风柜无风，不通风',
+            addTime: '2024/8/20 08:56:23',
+            requireStatus: 2, //状态 0-待接单 1-待维修 2-维修完成 3-已完成
+            overTime: '',
+            addPerson: '王五',
+            addPersonPhone: '13201211123',
+            errorVideo: '',
+            errorImg: [],
+            orderTime: '2024/08/21 12:00:00',
+            finishTime: '2024/08/25',
+            maintainPerson: '',
+            maintainDevice: '',
+            errorReason: '',
+            dealMethod: '',
+            isMaterials: '',
+            approvalStatus: '',
+            tableData: []
+          },
+          {
+            id: '1002',
+            requireNum: 'WX-20240820-02',
+            unitName: '山东安池实验室',
+            deviceName: '通风柜',
+            errorPosition: '一楼103室',
+            errorType: '通风与空调及净化系统',
+            errorDescribe: '通风柜无风，不通风',
+            addTime: '2024/8/20 08:56:23',
+            requireStatus: 3, //状态 0-待接单 1-待维修 2-维修完成 3-已完成
+            overTime: '',
+            addPerson: '王五',
+            addPersonPhone: '13201211123',
+            errorVideo: '',
+            errorImg: [],
+            orderTime: '2024/08/21 12:00:00',
+            finishTime: '2024/08/25',
+            maintainPerson: '',
+            maintainDevice: '',
+            errorReason: '',
+            dealMethod: '',
+            isMaterials: '',
+            approvalStatus: '',
+            tableData: []
+          },
+          {
+            id: '1004',
+            requireNum: 'WX-20240820-03',
+            unitName: '山东安池实验室',
+            deviceName: '通风柜',
+            errorPosition: '一楼101室',
+            errorType: '通风与空调及净化系统',
+            errorDescribe: '通风柜无风，不通风',
+            addTime: '2024/8/20 08:56:23',
+            requireStatus: 4, //状态 0-待接单 1-待维修 2-维修完成 3-已完成
+            overTime: '2024/08/22 09:23:32',
+            addPerson: '张三',
+            addPersonPhone: '13201211123',
+            errorVideo: '',
+            errorImg: [],
+            orderTime: '2024/08/25 12:11:25',
+            finishTime: '2024/08/30 15:00:00',
+            maintainPerson: '李四',
+            maintainDevice: '通风柜',
+            errorReason: '通风柜不通风',
+            dealMethod: '设置通风柜通风',
+            isMaterials: '1',
+            approvalStatus: 1,
+            approvalTime: '2024/09/22 12:35:23',
+            tableData: [
+              { productType: '耗材', productName: '材料1', specs: '', model: '', number: 5, unit: '盒', price: '20' },
+              { productType: '耗材', productName: '材料2', specs: '', model: '', number: 5, unit: '盒', price: '20' },
+              { productType: '耗材', productName: '材料3', specs: '', model: '', number: 20, unit: '个', price: '10' },
+            ]
+          },
+          {
+            id: '1004',
+            requireNum: 'WX-20240820-03',
+            unitName: '山东安池实验室',
+            deviceName: '通风柜',
+            errorPosition: '一楼101室',
+            errorType: '通风与空调及净化系统',
+            errorDescribe: '通风柜无风，不通风',
+            addTime: '2024/8/20 08:56:23',
+            requireStatus: 5, //状态 0-待接单 1-待维修 2-维修完成 3-已完成
+            overTime: '2024/08/22 09:23:32',
+            addPerson: '张三',
+            addPersonPhone: '13201211123',
+            errorVideo: '',
+            errorImg: [],
+            orderTime: '2024/08/25 12:11:25',
+            finishTime: '2024/08/30 15:00:00',
+            maintainPerson: '李四',
+            maintainDevice: '通风柜',
+            errorReason: '通风柜不通风',
+            dealMethod: '设置通风柜通风',
+            isMaterials: '1',
+            approvalStatus: 1,
+            approvalTime: '2024/09/22 12:35:23',
+            tableData: [
+              { productType: '耗材', productName: '材料1', specs: '', model: '', number: 5, unit: '盒', price: '20' },
+              { productType: '耗材', productName: '材料2', specs: '', model: '', number: 5, unit: '盒', price: '20' },
+              { productType: '耗材', productName: '材料3', specs: '', model: '', number: 20, unit: '个', price: '10' },
+            ],
+            approvalResult:'1',
+            approvalPerson:'领导一',
+            approvalTime:'2024/09/10 15:00:03',
+            approvalRemark:''
+          },
+        ]
+      }else if(this.role_id == '1839600115013713921'){
+        this.data = [
+          {
+            id: '1004',
+            requireNum: 'WX-20240820-03',
+            unitName: '山东安池实验室',
+            deviceName: '通风柜',
+            errorPosition: '一楼101室',
+            errorType: '通风与空调及净化系统',
+            errorDescribe: '通风柜无风，不通风',
+            addTime: '2024/8/20 08:56:23',
+            requireStatus: 4, //状态 0-待接单 1-待维修 2-维修完成 3-已完成
+            overTime: '2024/08/22 09:23:32',
+            addPerson: '张三',
+            addPersonPhone: '13201211123',
+            errorVideo: '',
+            errorImg: [],
+            orderTime: '2024/08/25 12:11:25',
+            finishTime: '2024/08/30 15:00:00',
+            maintainPerson: '李四',
+            maintainDevice: '通风柜',
+            errorReason: '通风柜不通风',
+            dealMethod: '设置通风柜通风',
+            isMaterials: '1',
+            approvalStatus: 1,
+            approvalTime: '',
+            tableData: [
+              { productType: '耗材', productName: '材料1', specs: '', model: '', number: 5, unit: '盒', price: '20' },
+              { productType: '耗材', productName: '材料2', specs: '', model: '', number: 5, unit: '盒', price: '20' },
+              { productType: '耗材', productName: '材料3', specs: '', model: '', number: 20, unit: '个', price: '10' },
+            ]
+          },
+          {
+            id: '1004',
+            requireNum: 'WX-20240820-03',
+            unitName: '山东安池实验室',
+            deviceName: '通风柜',
+            errorPosition: '一楼101室',
+            errorType: '通风与空调及净化系统',
+            errorDescribe: '通风柜无风，不通风',
+            addTime: '2024/8/20 08:56:23',
+            requireStatus: 4, //状态 0-待接单 1-待维修 2-维修完成 3-已完成
+            overTime: '2024/08/22 09:23:32',
+            addPerson: '张三',
+            addPersonPhone: '13201211123',
+            errorVideo: '',
+            errorImg: [],
+            orderTime: '2024/08/25 12:11:25',
+            finishTime: '2024/08/30 15:00:00',
+            maintainPerson: '李四',
+            maintainDevice: '通风柜',
+            errorReason: '通风柜不通风',
+            dealMethod: '设置通风柜通风',
+            isMaterials: '1',
+            approvalStatus: 1,
+            approvalTime: '',
+            tableData: [
+              { productType: '耗材', productName: '材料1', specs: '', model: '', number: 5, unit: '盒', price: '20' },
+              { productType: '耗材', productName: '材料2', specs: '', model: '', number: 5, unit: '盒', price: '20' },
+              { productType: '耗材', productName: '材料3', specs: '', model: '', number: 20, unit: '个', price: '10' },
+            ]
+          },
+          {
+            id: '1004',
+            requireNum: 'WX-20240820-03',
+            unitName: '山东安池实验室',
+            deviceName: '通风柜',
+            errorPosition: '一楼101室',
+            errorType: '通风与空调及净化系统',
+            errorDescribe: '通风柜无风，不通风',
+            addTime: '2024/8/20 08:56:23',
+            requireStatus: 5, //状态 0-待接单 1-待维修 2-维修完成 3-已完成
+            overTime: '2024/08/22 09:23:32',
+            addPerson: '张三',
+            addPersonPhone: '13201211123',
+            errorVideo: '',
+            errorImg: [],
+            orderTime: '2024/08/25 12:11:25',
+            finishTime: '2024/08/30 15:00:00',
+            maintainPerson: '李四',
+            maintainDevice: '通风柜',
+            errorReason: '通风柜不通风',
+            dealMethod: '设置通风柜通风',
+            isMaterials: '1',
+            approvalStatus: 1,
+            approvalTime: '2024/09/22 12:35:23',
+            tableData: [
+              { productType: '耗材', productName: '材料1', specs: '', model: '', number: 5, unit: '盒', price: '20' },
+              { productType: '耗材', productName: '材料2', specs: '', model: '', number: 5, unit: '盒', price: '20' },
+              { productType: '耗材', productName: '材料3', specs: '', model: '', number: 20, unit: '个', price: '10' },
+            ],
+            approvalResult:'1',
+            approvalPerson:'领导一',
+            approvalTime:'2024/09/10 15:00:03',
+            approvalRemark:''
+          },
+        ];
+        this.page.total = this.data.length
+        this.loading = false;
+      }
+    },
+  }
+}
+</script>
+
+<style></style>
\ No newline at end of file
diff --git a/src/views/components/requestSub.vue b/src/views/components/requestSub.vue
new file mode 100644
index 0000000..2906e5e
--- /dev/null
+++ b/src/views/components/requestSub.vue
@@ -0,0 +1,401 @@
+<template>
+    <div>
+        <!-- 需求提报页面 -->
+        <div v-for="(item, index) in addForm" :key="item">
+          <div
+            style="
+              width: 98%;
+              height: 30px;
+              line-height: 30px;
+              padding-left: 5px;
+              border-left: 5px solid #000;
+              font-size: 18px;
+              font-weight: 550;
+              color: #000;
+              margin: 0px 0 20px;
+            "
+            v-show="addForm.length > 1"
+          >
+            填报{{ index + 1 }}
+          </div>
+          <avue-form :option="item.formOption" :model="item.form">
+            <template slot-scope="{size}" slot="menuForm">
+                <el-button @click="handleAdd" v-show="title == '需求填报'">新 增</el-button>
+                <el-button @click="handleCancel">取 消</el-button>
+                <el-button @click="handleSave" v-show="title == '需求填报'">保 存</el-button>
+                <el-button type="primary" @click="handleConfirm">提 交</el-button>
+            </template>
+          </avue-form>
+        </div>
+    </div>
+</template>
+
+<script>
+let action = "https://api.avuejs.com/imgupload";
+export default {
+    name:'requestSub',
+    props:{
+        title:String,
+        form:Object,
+    },
+    data(){
+        return{
+            addForm: [
+                {
+                    form: {
+                        errPosition: "",
+                        deviceName: "",
+                        errType: "",
+                        errDescirb: "描述",
+                        errorVideo: "",
+                        errorImgs: [],
+                    },
+                    formOption: {
+                        emptyBtn: false,
+                        submitBtn: false,
+                        menuPosition:'right',
+                        column: [
+                        {
+                            label: "故障位置",
+                            labelWidth: 120,
+                            prop: "errPosition",
+                            type: "input",
+                            span: 24,
+                        },
+                        {
+                            label: "设备名称",
+                            labelWidth: 120,
+                            span: 24,
+                            prop: "deviceName",
+                            type: "select",
+                            dicData: [
+                            {
+                                label: "名称1",
+                                value: 0,
+                            },
+                            {
+                                label: "名称2",
+                                value: 1,
+                            },
+                            ],
+                        },
+                        {
+                            label: "故障专业类型",
+                            labelWidth: 120,
+                            span: 24,
+                            prop: "errType",
+                            type: "select",
+                            dicData: [
+                            {
+                                label: "类型1",
+                                value: 0,
+                            },
+                            {
+                                label: "类型2",
+                                value: 1,
+                            },
+                            ],
+                        },
+                        {
+                            label: "故障现象描述",
+                            labelWidth: 120,
+                            span: 24,
+                            prop: "errDescirb",
+                            type: "textarea",
+                            minRows: 3,
+                            maxRows: 5,
+                        },
+                        {
+                            label: "故障视频",
+                            labelWidth: 120,
+                            prop: "errorVideo",
+                            type: "upload",
+                            propsHttp: {
+                            res: "data",
+                            url: "url",
+                            name: "name",
+                            home: "https://www.w3school.com.cn",
+                            },
+                            fileType: "video", //img/video/audio
+                            listType: "picture-img",
+                            span: 24,
+                            action: action,
+                        },
+                        {
+                            label: "照片墙",
+                            labelWidth: 120,
+                            span: 24,
+                            prop: "imgUrl",
+                            listType: "picture-card",
+                            type: "upload",
+                            fileType: "img", //img/video/audio
+                            action: action,
+                        },
+                        ],
+                    },
+                },
+            ],
+        }
+    },
+    mounted(){
+        console.log('11111111111111111',this.form)
+        if((this.title == '编辑' && JSON.stringify(this.form) != '{}') || JSON.stringify(this.form) != '{}'){
+            for(let key in this.form){
+                this.addForm[0].formOption.column.map(item =>{
+                    if(key == item.prop){
+                        item.value = this.form[key]
+                    }
+                })
+            }
+            console.log('addForm---------------->',this.addForm)
+        }
+    },
+    watch:{
+        form(newVal,oldVal){
+            console.log('newVal---------------------')
+            let arr = JSON.parse(JSON.stringify(this.addForm))
+            if((this.title == '编辑' && JSON.stringify(newVal) != '{}' || JSON.stringify(this.form) != '{}')){
+                for(let key in newVal){
+                    arr[0].formOption.column.map(item =>{
+                        if(key == item.prop){
+                            item.value = newVal[key]
+                        }
+                    })
+                }
+                this.addForm = arr
+                console.log('addForm---------------->',this.addForm)
+            }
+        }
+    },
+
+    methods:{
+        // 点击新增按钮
+        handleAdd() {
+            let emptyPos = this.addForm.find((item) => item.form.errPosition == "");
+            let emptyDevice = this.addForm.find((item) => item.form.deviceName == "");
+            let emptyType = this.addForm.find((item) => item.form.errType == "");
+            let emptyDes = this.addForm.find((item) => item.form.errDescirb == "");
+            let emptyVideo = this.addForm.find((item) => item.form.errorVideo == "");
+            let emptyImg = this.addForm.find(
+                (item) => item.form.errorImgs.length == 0
+            );
+            if (
+                emptyPos ||
+                emptyDevice ||
+                emptyType ||
+                emptyDes ||
+                emptyVideo ||
+                emptyImg
+            ) {
+                this.$message.error("需求填报时各内容均不可为空，请填写完全");
+            } else {
+                this.addForm.push({
+                form: {
+                    errPosition: "",
+                    deviceName: "",
+                    errType: "",
+                    errDescirb: "",
+                    errorVideo: "",
+                    errorImgs: [],
+                },
+                formOption: {
+                    emptyBtn: false,
+                    submitBtn: false,
+                    menuPosition:'right',
+                    column: [
+                    {
+                        label: "故障位置",
+                        labelWidth: 120,
+                        prop: "errPosition",
+                        type: "input",
+                        span: 24,
+                    },
+                    {
+                        label: "设备名称",
+                        labelWidth: 120,
+                        span: 24,
+                        prop: "deviceName",
+                        type: "select",
+                        dicData: [
+                        {
+                            label: "名称1",
+                            value: 0,
+                        },
+                        {
+                            label: "名称2",
+                            value: 1,
+                        },
+                        ],
+                    },
+                    {
+                        label: "故障专业类型",
+                        labelWidth: 120,
+                        span: 24,
+                        prop: "errType",
+                        type: "select",
+                        dicData: [
+                        {
+                            label: "类型1",
+                            value: 0,
+                        },
+                        {
+                            label: "类型2",
+                            value: 1,
+                        },
+                        ],
+                    },
+                    {
+                        label: "故障现象描述",
+                        labelWidth: 120,
+                        span: 24,
+                        prop: "errDescirb",
+                        type: "textarea",
+                        minRows: 3,
+                        maxRows: 5,
+                    },
+                    {
+                        label: "故障视频",
+                        labelWidth: 120,
+                        prop: "errorVideo",
+                        type: "upload",
+                        propsHttp: {
+                        res: "data",
+                        url: "url",
+                        name: "name",
+                        home: "https://www.w3school.com.cn",
+                        },
+                        fileType: "video", //img/video/audio
+                        listType: "picture-img",
+                        span: 24,
+                        action: action,
+                    },
+                    {
+                        label: "照片墙",
+                        labelWidth: 120,
+                        span: 24,
+                        prop: "imgUrl",
+                        listType: "picture-card",
+                        type: "upload",
+                        fileType: "img", //img/video/audio
+                        action: action,
+                    },
+                    ],
+                },
+                });
+            }
+        },
+        // 点击取消按钮
+        handleCancel() {
+            this.dialogVisible = false;
+            this.addForm = [
+                {
+                form: {
+                    errPosition: "",
+                    deviceName: "",
+                    errType: "",
+                    errDescirb: "",
+                    errorVideo: "",
+                    errorImgs: [],
+                },
+                formOption: {
+                    emptyBtn: false,
+                    submitBtn: false,
+                    menuPosition:'right',
+                    column: [
+                    {
+                        label: "故障位置",
+                        labelWidth: 120,
+                        prop: "errPosition",
+                        type: "input",
+                        span: 24,
+                    },
+                    {
+                        label: "设备名称",
+                        labelWidth: 120,
+                        span: 24,
+                        prop: "deviceName",
+                        type: "select",
+                        dicData: [
+                        {
+                            label: "名称1",
+                            value: 0,
+                        },
+                        {
+                            label: "名称2",
+                            value: 1,
+                        },
+                        ],
+                    },
+                    {
+                        label: "故障专业类型",
+                        labelWidth: 120,
+                        span: 24,
+                        prop: "errType",
+                        type: "select",
+                        dicData: [
+                        {
+                            label: "类型1",
+                            value: 0,
+                        },
+                        {
+                            label: "类型2",
+                            value: 1,
+                        },
+                        ],
+                    },
+                    {
+                        label: "故障现象描述",
+                        labelWidth: 120,
+                        span: 24,
+                        prop: "errDescirb",
+                        type: "textarea",
+                        minRows: 3,
+                        maxRows: 5,
+                    },
+                    {
+                        label: "故障视频",
+                        labelWidth: 120,
+                        prop: "errorVideo",
+                        type: "upload",
+                        propsHttp: {
+                        res: "data",
+                        url: "url",
+                        name: "name",
+                        home: "https://www.w3school.com.cn",
+                        },
+                        fileType: "video", //img/video/audio
+                        listType: "picture-img",
+                        span: 24,
+                        action: action,
+                    },
+                    {
+                        label: "照片墙",
+                        labelWidth: 120,
+                        span: 24,
+                        prop: "imgUrl",
+                        listType: "picture-card",
+                        type: "upload",
+                        fileType: "img", //img/video/audio
+                        action: action,
+                    },
+                    ],
+                },
+                },
+            ];
+            this.$emit('close')
+        },
+        // 点击保存按钮
+        handleSave() {
+            this.$emit('close')
+        },
+        // 点击确定按钮
+        handleConfirm() {
+            this.$emit('close')
+        },
+    }
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/src/views/dataManagement/index.vue b/src/views/dataManagement/index.vue
new file mode 100644
index 0000000..33dfbcc
--- /dev/null
+++ b/src/views/dataManagement/index.vue
@@ -0,0 +1,142 @@
+<template>
+    <basic-container style="max-height: 800px; overflow: hidden">
+        <div style="height: 760px;">
+            <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+                <el-tab-pane label="图纸" name="drawing">
+                    <el-upload
+                        action="#"
+                        list-type="picture-card"
+                        :auto-upload="false"
+                    >
+                        <i slot="default" class="el-icon-plus"></i>
+                        <div slot="file" slot-scope="{file}">
+                            <img
+                                class="el-upload-list__item-thumbnail"
+                                :src="file.url" alt=""
+                            >
+                            <div class="el-upload-list__item-actions" style="display: flex;flex-direction: column;">
+                                <div style="margin-top: 35%;margin-bottom: 15%;">
+                                    <span
+                                        class="el-upload-list__item-preview"
+                                        @click="handlePictureCardPreview(file)"
+                                    >
+                                        <i class="el-icon-zoom-in"></i>
+                                    </span>
+                                    <!-- <span
+                                        v-if="!disabled"
+                                        class="el-upload-list__item-delete"
+                                        @click="handleDownload(file)"
+                                    >
+                                        <i class="el-icon-download"></i>
+                                    </span> -->
+                                    <span
+                                        v-if="!disabled"
+                                        class="el-upload-list__item-delete"
+                                        @click="handleRemove(file)"
+                                    >
+                                        <i class="el-icon-delete"></i>
+                                    </span>
+                                </div>
+                                <span>文件名称</span>
+                            </div>
+                        </div>
+                    </el-upload>
+                </el-tab-pane>
+                <el-tab-pane label="技术资料" name="techData">
+                    <el-upload
+                        action="#"
+                        list-type="picture-card"
+                        :auto-upload="false"
+                    >
+                        <i slot="default" class="el-icon-plus"></i>
+                        <div slot="file" slot-scope="{file}">
+                            <img
+                                class="el-upload-list__item-thumbnail"
+                                :src="file.url" alt=""
+                            >
+                            <div class="el-upload-list__item-actions" style="display: flex;flex-direction: column;">
+                                <div style="margin-top: 35%;margin-bottom: 15%;">
+                                    <span
+                                        class="el-upload-list__item-preview"
+                                        @click="handlePictureCardPreview(file)"
+                                    >
+                                        <i class="el-icon-zoom-in"></i>
+                                    </span>
+                                    <!-- <span
+                                        v-if="!disabled"
+                                        class="el-upload-list__item-delete"
+                                        @click="handleDownload(file)"
+                                    >
+                                        <i class="el-icon-download"></i>
+                                    </span> -->
+                                    <span
+                                        v-if="!disabled"
+                                        class="el-upload-list__item-delete"
+                                        @click="handleRemove(file)"
+                                    >
+                                        <i class="el-icon-delete"></i>
+                                    </span>
+                                </div>
+                                <span>文件名称</span>
+                            </div>
+                        </div>
+                    </el-upload>
+                </el-tab-pane>
+            </el-tabs>
+        </div>
+        <el-dialog :visible.sync="dialogVisible" :append-to-body="true">
+            <img width="100%" :src="dialogImageUrl" alt="">
+        </el-dialog>
+    </basic-container>
+</template>
+
+<script>
+export default {
+    data(){
+        return{
+            activeName:'drawing',
+            drawList:[
+                {name:'资料一',url:'',},
+                {name:'资料二',url:'',},
+                {name:'资料三',url:'',},
+                {name:'资料四',url:'',},
+            ],
+            dialogVisible:false,
+            dialogImageUrl:''
+        }
+    },
+    mounted(){
+
+    },
+    methods:{
+        handleClick(tab, event) {
+            console.log(tab, event);
+        },
+        handlePictureCardPreview(file){
+            this.dialogImageUrl = file.url;
+            this.dialogVisible = true;
+        },
+        handleRemove(file) {
+            console.log(file);
+        },
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+
+.draw_box{
+    width: 100%;
+    max-height: 700px;
+    overflow: auto;
+    background: red;
+    display: flex;
+
+    .draw_item{
+        width: 100px;
+        height: 150px;
+        background: green;
+    }
+}
+
+</style>
\ No newline at end of file
diff --git a/src/views/device/deviceSystem.vue b/src/views/device/deviceSystem.vue
new file mode 100644
index 0000000..2211a05
--- /dev/null
+++ b/src/views/device/deviceSystem.vue
@@ -0,0 +1,484 @@
+<template>
+  <basic-container style="max-height: 800px; overflow: hidden">
+    <avue-crud
+      :option="option"
+      :table-loading="loading"
+      :data="data"
+      :page.sync="page"
+      ref="crud"
+      v-model="form"
+      :permission="permissionList"
+      :before-open="beforeOpen"
+      :before-close="beforeClose"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+      <template slot-scope="{ row }" slot="deviceStatus">
+        <el-tag
+          size="small"
+          :type="
+            row.deviceStatus == 0
+              ? 'warning'
+              : row.deviceStatus == 1
+              ? ''
+              : ''
+          "
+        >
+          {{
+            row.deviceStatus == 0
+              ? "待确认"
+              : row.deviceStatus == 1
+              ? "已确认"
+              : ""
+          }}
+        </el-tag>
+      </template>
+      <template slot-scope="{ row }" slot="runingStatus">
+        <el-tag
+          size="small"
+          :type="
+            row.runingStatus == 0
+              ? 'info'
+              : row.runingStatus == 1
+              ? 'success'
+              : row.runingStatus == 2
+              ? 'danger'
+              : ''
+          "
+        >
+          {{
+            row.runingStatus == 0
+              ? "关机"
+              : row.runingStatus == 1
+              ? "运行中"
+              : row.runingStatus == 2 
+              ? '报警中'
+              : ""
+          }}
+        </el-tag>
+      </template>
+      <template slot-scope="scope" slot="menuLeft">
+        <el-button
+          size="small"
+          @click="handleAdd"
+          >新增</el-button
+        >
+        <el-button
+          type="primary"
+          size="small"
+          @click="addOperation"
+          >需求提报</el-button
+        >
+      </template>
+      <template slot-scope="{ row }" slot="menu">
+        <el-button @click="handleView(row)">查看</el-button>
+        <el-button @click="handleEdit(row)">编辑</el-button>
+        <el-button @click="addOperation(row)">需求提报</el-button>
+        <el-button @click="handleDelete(row)">删除</el-button>
+      </template>
+    </avue-crud>
+    <el-dialog
+      :title="dialogTitle"
+      :visible.sync="dialogVisible"
+      :append-to-body="true"
+      width="50%"
+    >
+      <div style="height: 500px; overflow: auto">
+        <el-form ref="form" :model="addForm" :rules="addRules" label-width="120px"  label-position="left">
+          <div>
+            <div
+              style="
+                color: #101010;
+                font-size: 20px;
+                font-weight: 550;
+                margin-bottom: 20px;
+              "
+            >
+              基本信息
+            </div>
+            <el-form-item label="设备编号" prop="deviceNo">
+              <el-input placeholder="请输入设备编号" v-model="addForm.deviceNo"></el-input>
+            </el-form-item>
+            <el-form-item label="设备名称" prop="deviceName">
+              <el-input placeholder="请输入设备名称" v-model="addForm.deviceName"></el-input>
+            </el-form-item>
+            <el-form-item label="型号" prop="deviceModel">
+              <el-input placeholder="请输入型号" v-model="addForm.deviceModel"></el-input>
+            </el-form-item>
+            <el-form-item label="设备位置" prop="devicePosition">
+              <el-input placeholder="请输入设备位置" v-model="addForm.devicePosition"></el-input>
+            </el-form-item>
+            <el-form-item  label="设备类型" prop="deviceType">
+              <el-select style="width:100%;" placeholder="请选择设备类型" v-model="addForm.deviceType">
+                <el-option v-for="item in typeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="供应商" prop="supplier">
+              <el-input placeholder="请输入供应商" v-model="addForm.supplier"></el-input>
+            </el-form-item>
+            <el-form-item label="生产时间" prop="productTime">
+              <el-date-picker
+                style="width:100%;"
+                v-model="addForm.productTime"
+                type="date"
+                placeholder="请选择生产时间">
+              </el-date-picker>
+            </el-form-item>
+          </div>
+          <div>
+            <div
+              style="
+                color: #101010;
+                font-size: 20px;
+                font-weight: 550;
+                margin-bottom: 20px;
+              "
+            >
+              附件
+            </div>
+            <el-form-item label="附件名称" prop="fileName">
+              <el-input placeholder="请输入附件名称" v-model="addForm.fileName"></el-input>
+            </el-form-item>
+            <el-form-item label="附件上传">
+                <!--  :limit="3" -->
+              <el-upload
+                class="upload-demo"
+                action="https://jsonplaceholder.typicode.com/posts/"
+                :on-success="handleSuccess"
+                :on-remove="handleRemove"
+                multiple
+                accept=".jpeg,.jpg,.png,.pdf"
+                :on-exceed="handleExceed"
+                :file-list="fileList">
+                <el-button size="small" type="primary">点击上传</el-button>
+                <div slot="tip" class="el-upload__tip">支持上传jpeg、jpg、pdf文件，且不超过10M</div>
+              </el-upload>
+            </el-form-item>
+          </div>
+        </el-form>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="handleClose">关 闭</el-button>
+        <el-button @click="handleSave">保 存</el-button>
+        <el-button type="primary" @click="handleConfirm">确 定</el-button>
+      </span>
+    </el-dialog>
+    <el-dialog
+      title="需求填报"
+      :visible.sync="requestVisible"
+      :append-to-body="true"
+      width="50%"
+    >
+      <div style="height: 500px; overflow: auto">
+        <requestSub @close="closeRequest" title="需求填报" :form="requestForm"></requestSub>
+      </div>
+    </el-dialog>
+  </basic-container>
+</template>
+
+<script>
+import {dateFormat} from '../../util/date'
+import requestSub from '../components/requestSub.vue'
+export default {
+  components:{
+    requestSub
+  },
+  data(){
+    return{
+      option: {
+        height: "auto",
+        calcHeight: 30,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        border: true,
+        index: true,
+        dialogType: "dialog",
+        dialogClickModal: false,
+        addBtn: false,
+        viewBtn: false,
+        editBtn: false,
+        delBtn: false,
+        searchShowBtn: false,
+        refreshBtn: false,
+        columnBtn: false,
+        menuWidth: 400,
+        column: [
+          {
+            label: "设备编号",
+            labelWidth: 120,
+            prop: "deviceNo",
+            overHidden: true,
+          },
+          {
+            label: "设备名称",
+            labelWidth: 120,
+            prop: "deviceName",
+            search: true,
+            overHidden: true,
+          },
+          {
+            label: "型号",
+            labelWidth: 120,
+            prop: "deviceModel",
+            overHidden: true,
+          },
+          {
+            label: "设备位置",
+            labelWidth: 120,
+            prop: "devicePosition",
+            type: "select",
+            overHidden: true,
+            // hide: true,
+            search: true,
+            // viewDisplay: false,
+            // dicUrl: '/api/blade-system/dict-biz/get-hc-project',
+            props: {
+              label: "dictValue",
+              value: "dictValue",
+            },
+          },
+          {
+            label: "设备类型",
+            labelWidth: 120,
+            prop: "deviceType",
+            overHidden: true,
+            type: "select",
+            searchLabelWidth: 100,
+            search: true,
+            viewDisplay: false,
+            // dicUrl: '/api/blade-system/dict-biz/get-hc-project',
+            props: {
+              label: "dictValue",
+              value: "dictValue",
+            },
+          },
+          {
+            label: "供应商",
+            labelWidth: 120,
+            prop: "supplier",
+            overHidden: true,
+          },
+          {
+            label: "生产时间",
+            labelWidth: 120,
+            prop: "productTime",
+            slot: true,
+          },
+          {
+            label: "设备状态",
+            labelWidth: 120,
+            prop: "deviceStatus",
+            slot: true,
+            formslot: true,
+          },
+          {
+            label: "运行状态",
+            labelWidth: 120,
+            prop: "runingStatus",
+            slot: true,
+            formslot: true,
+          },
+          {
+            label: "附件",
+            labelWidth: 120,
+            prop: "fileName",
+            slot: true,
+          },
+        ],
+      },
+      data: [],
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      dialogTitle:'设备新增',
+      dialogVisible:false,
+      addForm:{},
+      addRules:{
+        deviceNo:{required:true,message:'请输入设备编号',trigger:'blur'},
+        deviceName:{required:true,message:'请输入设备名称',trigger:'blur'},
+        deviceModel:{required:true,message:'请输入型号',trigger:'blur'},
+        devicePosition:{required:true,message:'请输入设备位置',trigger:'blur'},
+        deviceType:{required:true,message:'请选择设备类型',trigger:'blur'},
+        supplier:{required:true,message:'请输入供应商',trigger:'blur'},
+        productTime:{required:true,message:'请选择生产时间',trigger:'blur'},
+        fileName:{required:true,message:'请输入附件名称',trigger:'blur'},
+      },
+      typeList:[
+        {label:'类型一',value:'001'},
+        {label:'类型二',value:'002'},
+        {label:'类型三',value:'003'},
+      ],
+      fileList:[],
+      requestVisible:false,
+      requestForm:{}
+    }
+  },
+  mounted(){},
+  methods:{
+    beforeOpen(done, type) {
+      done();
+    },
+    beforeClose(done) {
+      done();
+    },
+    searchReset(params, done) {
+      //   params.releaseTimeRange = dateFormat(new Date(), 'yyyy-MM-dd');
+      this.query = params;
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    addOperation(val){
+      console.log('val================>',val && val.deviceNo)
+      if(val && val.deviceNo){
+        this.requestForm = {
+          errPosition:val.devicePosition,
+          deviceName:val.deviceName,
+          errType:val.deviceType
+        }
+        this.requestVisible = true
+      }else{
+        this.requestVisible = true
+      }
+    },
+    closeRequest(){
+      this.requestVisible = false
+    },
+    // 点击新增按钮
+    handleAdd(){
+      this.dialogTitle = '设备新增'
+      this.addForm = {}
+      this.fileList = []
+      this.$refs['form'].resetFields()
+      this.dialogVisible = true
+    },
+    // 点击编辑按钮
+    handleEdit(row){
+      this.addForm = row
+      this.fileList = row.fileList
+      this.dialogTitle = '设备编辑'
+      this.dialogVisible = true
+    },
+    // 点击删除按钮
+    handleDelete(row){
+      this.$confirm('请确认是否删除该设备?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$message({
+            type: 'success',
+            message: '删除成功!'
+          });
+        }).catch(() => {
+          // this.$message({
+          //   type: 'info',
+          //   message: '已取消删除'
+          // });          
+        });
+    },
+    // 点击新增弹窗关闭按钮
+    handleClose(){
+      this.dialogVisible = false
+      this.addForm = {}
+    },
+    // 点击新增弹窗保存按钮
+    handleSave(){
+      this.$refs['form'].validate((valid) => {
+        if(valid){
+          if(this.fileList.length == 0){
+            this.$message.error('请至少上传一个附件')
+          }else{
+
+          }
+        }
+      })
+    },
+    // 附件上传成功
+    handleSuccess(response, file, fileList){
+      console.log('response------------------>',response)
+      console.log('file------------------>',file)
+      console.log('fileList------------------>',fileList)
+      this.fileList = []
+      fileList.map(item =>{
+        this.fileList.push({name:item.name})
+      })
+      console.log('fileList------------------>',this.fileList)
+    },
+    // 附件删除
+    handleRemove(file, fileList){
+      this.fileList = []
+      fileList.map(item =>{
+        this.fileList.push({name:item.name})
+      })
+    },
+    onLoad(page, params = {}) {
+      this.data = [
+        {
+          deviceNo:'WX-20240820-01',
+          deviceName:'通风柜',
+          deviceModel:'MDP-456',
+          devicePosition:'一楼102室',
+          deviceType:'通风与空调及净化系统',
+          supplier:'山东烁今',
+          productTime:'2024/8/20',
+          deviceStatus:0, //设备状态 0-待确认 1-已确认
+          runingStatus:1, //运行状态 0-关机 1-运行中 2-报警中
+          fileName:'图纸',
+          fileList:[
+            {name: 'food.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}, 
+            {name: 'food2.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}
+          ]
+        },
+        {
+          deviceNo:'WX-20240820-02',
+          deviceName:'通风柜',
+          deviceModel:'MDP-455',
+          devicePosition:'一楼103室',
+          deviceType:'通风与空调及净化系统',
+          supplier:'山东烁今',
+          productTime:'2024/8/20',
+          deviceStatus:1, //设备状态 0-待确认 1-已确认
+          runingStatus:2, //运行状态 0-关机 1-运行中 2-报警中
+          fileName:'图纸',
+          fileList:[
+            {name: 'food.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}, 
+          ]
+        },
+        {
+          deviceNo:'WX-20240820-03',
+          deviceName:'通风柜',
+          deviceModel:'MDP-454',
+          devicePosition:'一楼101室',
+          deviceType:'通风与空调及净化系统',
+          supplier:'山东烁今',
+          productTime:'2024/8/20',
+          deviceStatus:1, //设备状态 0-待确认 1-已确认
+          runingStatus:0, //运行状态 0-关机 1-运行中 2-报警中
+          fileName:'图纸',
+          fileList:[
+            {name: 'food2.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}
+          ]
+        },
+      ];
+      this.page.total = this.data.length
+      this.loading = false;
+    },
+  }
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/src/views/devide/device.vue b/src/views/devide/device.vue
deleted file mode 100644
index c8f1502..0000000
--- a/src/views/devide/device.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-<template>
-  <div>设备管理</div>
-</template>
-
-<script>
-export default {
-
-}
-</script>
-
-<style>
-
-</style>
\ No newline at end of file
diff --git a/src/views/feedback/index.vue b/src/views/feedback/index.vue
new file mode 100644
index 0000000..92b293e
--- /dev/null
+++ b/src/views/feedback/index.vue
@@ -0,0 +1,97 @@
+<template>
+    <basic-container style="max-height: 800px; overflow: hidden">
+        <div class="container">
+            <div class="title_box">
+                <div>意见反馈</div>
+                <!-- <div>X</div> -->
+            </div>
+            <div style="width:550px;height:650px;">
+                <el-form ref="form" :model="form" :rules="rules" label-width="120px"  label-position="left">
+                    <el-form-item label="具体意见内容" prop="content">
+                        <el-input placeholder="请输入具体意见内容" type="textarea" v-model="form.content"></el-input>
+                    </el-form-item>
+                    <el-form-item label="联系电话" prop="phoneNumber">
+                        <el-input placeholder="请输入联系电话" v-model="form.phoneNumber"></el-input>
+                    </el-form-item>
+                </el-form>
+            </div>
+            <div class="btn_box">
+                <!-- <el-button>关闭</el-button> -->
+                <el-button style="margin:0px 10px 0px 20px;;" @click="handleSave">保存</el-button>
+                <el-button type="primary" @click="handleSubmit">提交</el-button>
+            </div>
+        </div>
+    </basic-container>
+</template>
+
+<script>
+import { mapGetters } from "vuex";
+export default {
+    data(){
+        return{
+            form:{
+                content:'',
+                phoneNumber:''
+            },
+            rules:{
+                content:{required:true,message:'请输入具体意见内容',trigger:'blur'},
+                phoneNumber:[
+                    {required:true,message:'请输入联系电话',trigger:'blur'},
+                    {pattern:/^1[3-9][0-9]{9}$|^15[0-9]{2}[0-9]{8}$|^17[0-9]{2}[0-9]{7}$|^18[0-9]{3}[0-9]{6}$/,message:'请输入正确的手机号格式'}
+                ]
+            }
+        }
+    },
+    computed: {
+        ...mapGetters(["userInfo", "permission", "systemTime"]),
+    },
+    mounted(){
+        console.log('userInfo==============>',this.userInfo)
+        this.form = {
+            content:'',
+            phoneNumber:this.userInfo.user_id
+        }
+    },
+    methods:{
+        handleSave(){
+            this.$refs['form'].validate((valid) =>{
+                if(valid){
+
+                }
+            })
+        },
+        handleSubmit(){
+            this.$refs['form'].validate((valid) =>{
+                if(valid){
+                    
+                }
+            })
+        },
+    },
+}
+</script>
+
+<style lang="scss" scoped>
+.container{
+    width: 99%;
+    height: 800px;
+    margin:  0 auto;
+
+    .title_box{
+        width: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        font-size: 20px;
+        color: #101010;
+        font-weight: 550;
+        margin-bottom: 30px;
+    }
+    .btn_box{
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
+}
+
+</style>
\ No newline at end of file
diff --git a/src/views/labManagement/inspectionManagement.vue b/src/views/labManagement/inspectionManagement.vue
new file mode 100644
index 0000000..ade9f09
--- /dev/null
+++ b/src/views/labManagement/inspectionManagement.vue
@@ -0,0 +1,434 @@
+<template>
+	<el-row>
+		<el-col :span="5">
+			<div class="box">
+				<el-scrollbar>
+					<basic-container>
+						<avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick" />
+					</basic-container>
+				</el-scrollbar>
+			</div>
+		</el-col>
+		<el-col :span="19">
+			<basic-container>
+				<avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud"
+					v-model="form" :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate" @row-save="rowSave"
+					:before-open="beforeOpen" :page.sync="page" @search-change="searchChange" @search-reset="searchReset"
+					@selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
+					@refresh-change="refreshChange" @on-load="onLoad">
+					<template slot-scope="scope" slot="menuLeft">
+						<el-button type="primary" size="small" @click="handleAdd">新建</el-button>
+					</template>
+					<template slot-scope="{ row }" slot="menu">
+						<el-button @click="$refs.crud.rowView(row,index)">查看</el-button>
+						<el-button @click="$refs.crud.rowEdit(row,index)">编辑</el-button>
+						<el-button @click="handleImport(row)">导入</el-button>
+					</template>
+				</avue-crud>
+				<el-dialog title="新增" :visible.sync="dialogVisible" :append-to-body="true" width="70%">
+					<el-form ref="form" :model="addForm" :rules="addRules" label-width="120px" label-position="left" style="height: 500px;overflow: auto;">
+						<div>
+							<div style="color: #101010;font-size: 20px;font-weight: 550;margin-bottom: 20px;">基本信息</div>
+							<el-form-item label="单位名称" prop="unitName">
+								<el-select style="width:98%" placeholder="请选择单位名称" v-model="addForm.unitName">
+									<el-option label="安池实验室" value="1"></el-option>
+									<el-option label="畜牧局实验室" value="2"></el-option>
+								</el-select>
+							</el-form-item>
+						</div>
+						<div>
+							<div style="color: #101010;font-size: 20px;font-weight: 550;margin-bottom: 20px;">巡检内容</div>
+							<el-form-item label="巡检主要内容" prop="content">
+								<el-input style="width: 98%;" type="textarea" v-model="addForm.content" placeholder="请输入巡检主要内容"></el-input>
+							</el-form-item>
+							<el-form-item label="楼层">
+								<div style="display: flex;">
+									<div v-for="item in floorArr" :key="item.value" 
+									style="padding: 0px 15px;border: 1px solid #bbbbbb; height: 30px;display: flex;align-items: center;justify-content: center;margin-right: 10px;border-radius: 3px;cursor: pointer;"
+									:style="{background:item.value == activeFloor ? '#3a62d7' : '',color:item.value == activeFloor ? '#fff' : '',borderColor:item.value == activeFloor ? '#3a62d7' : '#bbb'}">
+										{{ item.name }}
+									</div>
+								</div>
+							</el-form-item>
+							<el-form-item label="房间">
+								<div style="display: flex;">
+									<div v-for="item in roomArr" :key="item.value" 
+									style="padding: 0px 15px;border: 1px solid #bbbbbb; height: 30px;display: flex;align-items: center;justify-content: center;margin-right: 10px;border-radius: 3px;cursor: pointer;"
+									:style="{background:item.value == activeRoom ? '#3a62d7' : '',color:item.value == activeRoom ? '#fff' : '',borderColor:item.value == activeRoom ? '#3a62d7' : '#bbb'}">
+										{{ item.name }}
+									</div>
+								</div>
+							</el-form-item>
+							<el-form-item label="巡检配置">
+								<el-table :data="tableData" border style="width: 100%" >
+									<el-table-column width="50" align="center" >
+										<template slot="header" slot-scope="scope">
+											<div @click="addColumn()"
+												style="width:30px;height: 30px;background: #409eff;border-radius: 50%;cursor: pointer;display: flex;align-items: center;justify-content: center;">
+												<i style="color:#fff;font-size: 20px;" class="el-icon-plus"></i></div>
+										</template>
+										<template slot-scope="scope">
+											<div @click="deleteColumn(scope.row, scope.$index)"
+												style="width:30px;height: 30px;background: #f56c6c;border-radius: 50%;cursor: pointer;display: flex;align-items: center;justify-content: center;">
+												<i style="color:#fff;font-size: 20px;" class="el-icon-delete"></i></div>
+										</template>
+									</el-table-column>
+									<el-table-column prop="majorName" align="center" label="专业名称">
+										<template slot-scope="scope">
+											<el-select placeholder="请选择专业名称" v-model="scope.row.majorName">
+												<el-option label="水系统" value="001"></el-option>
+												<el-option label="电气系统" value="002"></el-option>
+												<el-option label="风机" value="003"></el-option>
+											</el-select>
+										</template>
+									</el-table-column>
+									<el-table-column prop="inspectionCon" align="center" label="巡检内容">
+										<template slot-scope="scope">
+											<el-input placeholder="请输入巡检内容" v-model="scope.row.inspectionCon"></el-input>
+										</template>
+									</el-table-column>
+									<el-table-column prop="techRequire" align="center" label="工艺要求">
+										<template slot-scope="scope">
+											<el-select placeholder="请选择专业名称" v-model="scope.row.techRequire">
+												<el-option label="工艺要求1" value="001"></el-option>
+												<el-option label="工艺要求2" value="002"></el-option>
+												<el-option label="工艺要求3" value="003"></el-option>
+											</el-select>
+										</template>
+									</el-table-column>
+									<el-table-column prop="cycle" align="center" label="巡检周期">
+										<template slot-scope="scope">
+											<el-select placeholder="请选择巡检周期" v-model="scope.row.cycle"></el-select>
+										</template>
+									</el-table-column>
+									<el-table-column prop="startTime" align="center" label="开始时间">
+										<template slot-scope="scope">
+											<el-date-picker
+												style="width: 100%;"
+												v-model="scope.row.startTime"
+												type="date"
+												placeholder="请选择开始时间">
+											</el-date-picker>
+										</template>
+									</el-table-column>
+								</el-table>
+							</el-form-item>
+						</div>
+					</el-form>
+					<span slot="footer" class="dialog-footer">
+						<el-button  @click="handleCancel">取 消</el-button>
+						<el-button 	@click="handleSave">保 存</el-button>
+						<el-button  type="primary"  @click="handleConfirm">提 交</el-button>
+					</span>
+				</el-dialog>
+			</basic-container>
+		</el-col>
+	</el-row>
+</template>
+
+<script>
+export default {
+	data() {
+		const validatePass = (rule, value, callback) => {
+			if (value === '') {
+				callback(new Error('请输入密码'));
+			} else {
+				callback();
+			}
+		};
+		const validatePass2 = (rule, value, callback) => {
+			if (value === '') {
+				callback(new Error('请再次输入密码'));
+			} else if (value !== this.form.password) {
+				callback(new Error('两次输入密码不一致!'));
+			} else {
+				callback();
+			}
+		};
+		return {
+			form: {},
+			search: {},
+			roleBox: false,
+			excelBox: false,
+			platformBox: false,
+			initFlag: true,
+			selectionList: [],
+			query: {},
+			loading: true,
+			platformLoading: false,
+			page: {
+				pageSize: 10,
+				currentPage: 1,
+				total: 0
+			},
+			platformPage: {
+				pageSize: 10,
+				currentPage: 1,
+				total: 0
+			},
+			init: {
+				roleTree: [],
+				deptTree: [],
+			},
+			props: {
+				label: "title",
+				value: "key"
+			},
+			roleGrantList: [],
+			roleTreeObj: [],
+			treeDeptId: '',
+			treeData: [
+				{
+					hasChildren: true,
+					id: "1123598813738675201",
+					key: "1123598813738675201",
+					parentId: "0",
+					title: "山东区",
+					children: [
+						{
+							hasChildren: true,
+							id: "1123598813738675202",
+							key: "1123598813738675202",
+							parentId: "1123598813738675202",
+							title: "安池实验室",
+							value: "1123598813738675202",
+							children: [
+								{
+									hasChildren: false,
+									id: "1123598813738675204",
+									key: "1123598813738675204",
+									parentId: "1123598813738675204",
+									title: "三楼",
+									value: "1123598813738675204",
+								},
+								{
+									hasChildren: false,
+									id: "1123598813738675205",
+									key: "1123598813738675205",
+									parentId: "1123598813738675205",
+									title: "四楼",
+									value: "1123598813738675205",
+								}
+							]
+						},
+						{
+							hasChildren: true,
+							id: "1123598813738675203",
+							key: "1123598813738675203",
+							parentId: "1123598813738675203",
+							title: "畜牧局实验室",
+							value: "1123598813738675203",
+						}
+					]
+				}
+			],
+			treeOption: {
+				nodeKey: 'id',
+				// lazy: true,
+				// treeLoad: function (node, resolve) {
+				//   const parentId = (node.level === 0) ? 0 : node.data.id;
+				//   getDeptLazyTree(parentId).then(res => {
+				//     resolve(res.data.data.map(item => {
+				//       return {
+				//         ...item,
+				//         leaf: !item.hasChildren
+				//       }
+				//     }))
+				//   });
+				// },
+				addBtn: false,
+				menu: false,
+				size: 'small',
+				props: {
+					labelText: '标题',
+					label: 'title',
+					value: 'value',
+					children: 'children'
+				}
+			},
+			option: {
+				height: 'auto',
+				calcHeight: 80,
+				tip: false,
+				searchShow: true,
+				searchMenuSpan: 6,
+				border: true,
+				index: true,
+				selection: true,
+				addBtn: false,
+        viewBtn: false,
+        editBtn: false,
+        delBtn: false,
+				dialogType: 'dialog',
+				dialogClickModal: false,
+				searchShowBtn: false,
+				refreshBtn: false,
+				columnBtn: false,
+				menuWidth: 300,
+				column: [
+					{
+						label: "单位名称",
+						labelWidth: 120,
+						prop: "unitName",
+						search: true,
+						overHidden:true,
+					},
+					{
+						label: "楼层",
+						labelWidth: 120,
+						prop: "floor",
+						overHidden:true,
+					},
+					{
+						label: "房间名称",
+						labelWidth: 120,
+						prop: "roomName",
+						overHidden:true,
+					},
+					{
+						label: "包含专业/设备",
+						labelWidth: 120,
+						prop: "major",
+						labelWidth: 120,
+						overHidden:true,
+					},
+					{
+						label: "备注",
+						labelWidth: 120,
+						overHidden:true,
+						prop: "remark",
+					},
+				],
+			},
+			data: [],
+			dialogVisible:false,
+			addForm:{},
+			addRules:{},
+			floorArr:[
+				{name:'三层',value:'001'},
+				{name:'四层',value:'002'},
+			],
+			activeFloor:'001',
+			roomArr:[
+				{name:'种子常规检测1',value:'001'},
+				{name:'PCR室',value:'002'},
+				{name:'种子常规检测2',value:'003'},
+			],
+			activeRoom:'001',
+			tableData:[
+				{majorName:'水系统',inspectionCon:'1、水量水压满足用水要求',techRequire:'工艺要求1'},
+				{majorName:'水系统',inspectionCon:'1、水量水压满足用水要求',techRequire:'工艺要求2'},
+				{majorName:'水系统',inspectionCon:'1、水量水压满足用水要求',techRequire:'工艺要求2'},
+				{majorName:'电气系统',inspectionCon:'1、水量水压满足用水要求',techRequire:'工艺要求3'},
+				{majorName:'电气系统',inspectionCon:'1、水量水压满足用水要求',techRequire:'工艺要求3'},
+			]
+		};
+	},
+	mounted() {
+		this.tableData = this.mergeTableRow(this.tableData,['majorName'])
+		console.log('tableData--------------->',this.tableData)
+	},
+	methods: {
+		objectSpanMethod({ row, column, rowIndex, columnIndex }){
+			// console.log('row--------------->',row)
+			// console.log('column--------------->',column)
+			// console.log('rowIndex--------------->',rowIndex)
+			// console.log('columnIndex--------------->',columnIndex)
+			const span = column['property'] + '-span'
+			if(row[span]){
+					return row[span]
+			}
+
+		},
+		/**
+ * 方法一
+ *  table合并行通用 */
+		mergeTableRow(data, merge) {
+			if (!merge || merge.length === 0) {
+				return data
+			}
+			merge.forEach((m) => {
+				const mList = {}
+				data = data.map((v, index) => {
+					const rowVal = v[m]
+					if (mList[rowVal] && mList[rowVal].newIndex === index) {
+						mList[rowVal]['num']++
+						mList[rowVal]['newIndex']++
+						data[mList[rowVal]['index']][m + '-span'].rowspan++
+						v[m + '-span'] = {
+							rowspan: 0,
+							colspan: 0
+						}
+					} else {
+						mList[rowVal] = { num: 1, index: index, newIndex: index + 1 }
+						v[m + '-span'] = {
+							rowspan: 1,
+							colspan: 1
+						}
+					}
+					return v
+				})
+			})
+			return data
+		},
+		addColumn() {
+      let arr = JSON.parse(JSON.stringify(this.tableData))
+      arr.push({ majorName: '', inspectionCon: '', techRequire: '' })
+      this.tableData = arr
+    },
+		deleteColumn(row, index) {
+      this.tableData.splice(index, 1);
+			// this.tableData = this.mergeTableRow(this.tableData,['majorName'])
+    },
+		handleAdd(){
+      this.dialogVisible = true
+    },
+    handleCancel(){
+      this.dialogVisible = false
+    },
+		nodeClick(data) {
+			this.treeDeptId = data.id;
+			this.page.currentPage = 1;
+			this.onLoad(this.page);
+		},
+		currentChange(currentPage) {
+			this.page.currentPage = currentPage;
+		},
+		sizeChange(pageSize) {
+			this.page.pageSize = pageSize;
+		},
+		refreshChange() {
+			this.onLoad(this.page, this.query);
+		},
+		onLoad(page, params = {}) {
+			this.loading = true;
+			this.data = [
+				{unitName:'安池实验室',floor:'3楼',roomName:'大型仪器室',major:'水系统、电气系统、通风与空调及净化系统、家具及配套设施',remark:''},
+				{unitName:'安池实验室',floor:'3楼',roomName:'PCR室',major:'水系统、电气系统、通风与空调及净化系统、家具及配套设施',remark:''},
+			]
+			this.loading = false
+			// getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
+			// 	const data = res.data.data;
+			// 	this.page.total = data.total;
+			// 	this.data = data.records;
+			// 	this.loading = false;
+			// 	this.selectionClear();
+			// });
+		},
+	}
+};
+</script>
+
+<style>
+.box {
+	height: 800px;
+}
+
+.el-scrollbar {
+	height: 100%;
+}
+
+.box .el-scrollbar__wrap {
+	overflow: scroll;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/operation/hand.vue b/src/views/operation/hand.vue
index 45e6ece..39247e5 100644
--- a/src/views/operation/hand.vue
+++ b/src/views/operation/hand.vue
@@ -92,7 +92,6 @@
       <template slot-scope="scope" slot="menuLeft">
         <el-button
           type="primary"
-          icon="el-icon-plus"
           size="small"
           @click="addOperation"
           >需求提报</el-button
@@ -111,36 +110,8 @@
       width="50%"
     >
       <div style="height: 500px; overflow: auto">
-        <div v-for="(item, index) in addForm" :key="item">
-          <div
-            style="
-              width: 98%;
-              height: 30px;
-              line-height: 30px;
-              padding-left: 5px;
-              border-left: 5px solid #000;
-              font-size: 18px;
-              font-weight: 550;
-              color: #000;
-              margin: 0px 0 20px;
-            "
-            v-show="addForm.length > 1"
-          >
-            填报{{ index + 1 }}
-          </div>
-          <avue-form :option="item.formOption" :model="item.form"></avue-form>
-        </div>
+        <requestSub @close="closeRequest" :title="dialogTitle" :form="requestForm"></requestSub>
       </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="handleAdd" v-show="dialogTitle == '需求填报'"
-          >新 增</el-button
-        >
-        <el-button @click="handleCancel">取 消</el-button>
-        <el-button @click="handleSave" v-show="dialogTitle == '需求填报'"
-          >保 存</el-button
-        >
-        <el-button type="primary" @click="handleConfirm">确 定</el-button>
-      </span>
     </el-dialog>
     <el-dialog
       :title="detailTitle"
@@ -251,7 +222,7 @@
             >
               处理情况
             </div>
-            <el-form-item label="接单时间时间">
+            <el-form-item label="接单时间">
               <el-date-picker
                 v-model="detailForm.orderTime"
                 type="datetime"
@@ -460,112 +431,22 @@
 <script>
 import { mapGetters } from "vuex";
 import { dateFormat } from "../../util/date";
+import requestSub from '../components/requestSub.vue'
 let action = "https://api.avuejs.com/imgupload";
 
 export default {
+  components:{
+    requestSub,
+  },
   data() {
     return {
       showPrint: false,
       dialogTitle: "需求填报",
       dialogVisible: false,
       detailTitle: "需求详情",
-      detailVisible: true,
+      detailVisible: false,
       uploadUrl: "",
       form: {},
-      addForm: [
-        {
-          form: {
-            errPosition: "",
-            deviceName: "",
-            errType: "",
-            errDescirb: "",
-            errorVideo: "",
-            errorImgs: [],
-          },
-          formOption: {
-            emptyBtn: false,
-            submitBtn: false,
-            column: [
-              {
-                label: "故障位置",
-                labelWidth: 120,
-                prop: "errPosition",
-                type: "input",
-                span: 24,
-              },
-              {
-                label: "设备名称",
-                labelWidth: 120,
-                span: 24,
-                prop: "deviceName",
-                type: "select",
-                dicData: [
-                  {
-                    label: "名称1",
-                    value: 0,
-                  },
-                  {
-                    label: "名称2",
-                    value: 1,
-                  },
-                ],
-              },
-              {
-                label: "故障专业类型",
-                labelWidth: 120,
-                span: 24,
-                prop: "errType",
-                type: "select",
-                dicData: [
-                  {
-                    label: "类型1",
-                    value: 0,
-                  },
-                  {
-                    label: "类型2",
-                    value: 1,
-                  },
-                ],
-              },
-              {
-                label: "故障现象描述",
-                labelWidth: 120,
-                span: 24,
-                prop: "errDescirb",
-                type: "textarea",
-                minRows: 3,
-                maxRows: 5,
-              },
-              {
-                label: "故障视频",
-                labelWidth: 120,
-                prop: "errorVideo",
-                type: "upload",
-                propsHttp: {
-                  res: "data",
-                  url: "url",
-                  name: "name",
-                  home: "https://www.w3school.com.cn",
-                },
-                fileType: "video", //img/video/audio
-                listType: "picture-img",
-                span: 24,
-                action: action,
-              },
-              {
-                label: "照片墙",
-                labelWidth: 120,
-                span: 24,
-                prop: "imgUrl",
-                listType: "picture-card",
-                type: "upload",
-                fileType: "img", //img/video/audio
-                action: action,
-              },
-            ],
-          },
-        },
-      ],
       query: {},
       loading: true,
       parentId: 0,
@@ -803,7 +684,8 @@ export default {
       isQuality:0,
       isSafe:0,
       isTime:0,
-      nameImg:''
+      nameImg:'',
+      requestForm:{}
     };
   },
   directives: {
@@ -827,100 +709,6 @@ export default {
     // 需求提报
     addOperation() {
       this.dialogTitle = "需求填报";
-      this.addForm = [
-        {
-          form: {
-            errPosition: "",
-            deviceName: "",
-            errType: "",
-            errDescirb: "",
-            errorVideo: "",
-            errorImgs: [],
-          },
-          formOption: {
-            emptyBtn: false,
-            submitBtn: false,
-            column: [
-              {
-                label: "故障位置",
-                labelWidth: 120,
-                prop: "errPosition",
-                type: "input",
-                span: 24,
-              },
-              {
-                label: "设备名称",
-                labelWidth: 120,
-                span: 24,
-                prop: "deviceName",
-                type: "select",
-                dicData: [
-                  {
-                    label: "名称1",
-                    value: 0,
-                  },
-                  {
-                    label: "名称2",
-                    value: 1,
-                  },
-                ],
-              },
-              {
-                label: "故障专业类型",
-                labelWidth: 120,
-                span: 24,
-                prop: "errType",
-                type: "select",
-                dicData: [
-                  {
-                    label: "类型1",
-                    value: 0,
-                  },
-                  {
-                    label: "类型2",
-                    value: 1,
-                  },
-                ],
-              },
-              {
-                label: "故障现象描述",
-                labelWidth: 120,
-                span: 24,
-                prop: "errDescirb",
-                type: "textarea",
-                minRows: 3,
-                maxRows: 5,
-              },
-              {
-                label: "故障视频",
-                labelWidth: 120,
-                prop: "errorVideo",
-                type: "upload",
-                propsHttp: {
-                  res: "data",
-                  url: "url",
-                  name: "name",
-                  home: "https://www.w3school.com.cn",
-                },
-                fileType: "video", //img/video/audio
-                listType: "picture-img",
-                span: 24,
-                action: action,
-              },
-              {
-                label: "照片墙",
-                labelWidth: 120,
-                span: 24,
-                prop: "imgUrl",
-                listType: "picture-card",
-                type: "upload",
-                fileType: "img", //img/video/audio
-                action: action,
-              },
-            ],
-          },
-        },
-      ];
       this.dialogVisible = true;
     },
     // 视频上传成功
@@ -930,322 +718,20 @@ export default {
       console.log("fileList--------------->", fileList);
       console.log("item--------------->", item);
     },
-    // 点击新增按钮
-    handleAdd() {
-      console.log("addForm --------------->", this.addForm);
-      let emptyPos = this.addForm.find((item) => item.form.errPosition == "");
-      let emptyDevice = this.addForm.find((item) => item.form.deviceName == "");
-      let emptyType = this.addForm.find((item) => item.form.errType == "");
-      let emptyDes = this.addForm.find((item) => item.form.errDescirb == "");
-      let emptyVideo = this.addForm.find((item) => item.form.errorVideo == "");
-      let emptyImg = this.addForm.find(
-        (item) => item.form.errorImgs.length == 0
-      );
-      if (
-        emptyPos ||
-        emptyDevice ||
-        emptyType ||
-        emptyDes ||
-        emptyVideo ||
-        emptyImg
-      ) {
-        this.$message.error("需求填报时各内容均不可为空，请填写完全");
-      } else {
-        this.addForm.push({
-          form: {
-            errPosition: "",
-            deviceName: "",
-            errType: "",
-            errDescirb: "",
-            errorVideo: "",
-            errorImgs: [],
-          },
-          formOption: {
-            emptyBtn: false,
-            submitBtn: false,
-            column: [
-              {
-                label: "故障位置",
-                labelWidth: 120,
-                prop: "errPosition",
-                type: "input",
-                span: 24,
-              },
-              {
-                label: "设备名称",
-                labelWidth: 120,
-                span: 24,
-                prop: "deviceName",
-                type: "select",
-                dicData: [
-                  {
-                    label: "名称1",
-                    value: 0,
-                  },
-                  {
-                    label: "名称2",
-                    value: 1,
-                  },
-                ],
-              },
-              {
-                label: "故障专业类型",
-                labelWidth: 120,
-                span: 24,
-                prop: "errType",
-                type: "select",
-                dicData: [
-                  {
-                    label: "类型1",
-                    value: 0,
-                  },
-                  {
-                    label: "类型2",
-                    value: 1,
-                  },
-                ],
-              },
-              {
-                label: "故障现象描述",
-                labelWidth: 120,
-                span: 24,
-                prop: "errDescirb",
-                type: "textarea",
-                minRows: 3,
-                maxRows: 5,
-              },
-              {
-                label: "故障视频",
-                labelWidth: 120,
-                prop: "errorVideo",
-                type: "upload",
-                propsHttp: {
-                  res: "data",
-                  url: "url",
-                  name: "name",
-                  home: "https://www.w3school.com.cn",
-                },
-                fileType: "video", //img/video/audio
-                listType: "picture-img",
-                span: 24,
-                action: action,
-              },
-              {
-                label: "照片墙",
-                labelWidth: 120,
-                span: 24,
-                prop: "imgUrl",
-                listType: "picture-card",
-                type: "upload",
-                fileType: "img", //img/video/audio
-                action: action,
-              },
-            ],
-          },
-        });
-      }
-    },
     // 点击关闭按钮
     handleClose(){
       this.detailForm = {}
       this.detailVisible = false
     },
-    // 点击取消按钮
-    handleCancel() {
-      this.dialogVisible = false;
-      this.addForm = [
-        {
-          form: {
-            errPosition: "",
-            deviceName: "",
-            errType: "",
-            errDescirb: "",
-            errorVideo: "",
-            errorImgs: [],
-          },
-          formOption: {
-            emptyBtn: false,
-            submitBtn: false,
-            column: [
-              {
-                label: "故障位置",
-                labelWidth: 120,
-                prop: "errPosition",
-                type: "input",
-                span: 24,
-              },
-              {
-                label: "设备名称",
-                labelWidth: 120,
-                span: 24,
-                prop: "deviceName",
-                type: "select",
-                dicData: [
-                  {
-                    label: "名称1",
-                    value: 0,
-                  },
-                  {
-                    label: "名称2",
-                    value: 1,
-                  },
-                ],
-              },
-              {
-                label: "故障专业类型",
-                labelWidth: 120,
-                span: 24,
-                prop: "errType",
-                type: "select",
-                dicData: [
-                  {
-                    label: "类型1",
-                    value: 0,
-                  },
-                  {
-                    label: "类型2",
-                    value: 1,
-                  },
-                ],
-              },
-              {
-                label: "故障现象描述",
-                labelWidth: 120,
-                span: 24,
-                prop: "errDescirb",
-                type: "textarea",
-                minRows: 3,
-                maxRows: 5,
-              },
-              {
-                label: "故障视频",
-                labelWidth: 120,
-                prop: "errorVideo",
-                type: "upload",
-                propsHttp: {
-                  res: "data",
-                  url: "url",
-                  name: "name",
-                  home: "https://www.w3school.com.cn",
-                },
-                fileType: "video", //img/video/audio
-                listType: "picture-img",
-                span: 24,
-                action: action,
-              },
-              {
-                label: "照片墙",
-                labelWidth: 120,
-                span: 24,
-                prop: "imgUrl",
-                listType: "picture-card",
-                type: "upload",
-                fileType: "img", //img/video/audio
-                action: action,
-              },
-            ],
-          },
-        },
-      ];
+    // 需求填报子组件关闭父组件弹窗触发
+    closeRequest(){
+      this.dialogVisible = false
     },
     // 点击编辑按钮
     handleEdit(row) {
-      console.log("row--------------------->", row);
       this.dialogTitle = "编辑";
-      this.addForm = [
-        {
-          form: {
-            errPosition: "",
-            deviceName: "",
-            errType: "",
-            errDescirb: "",
-            errorVideo: "",
-            errorImgs: [],
-          },
-          formOption: {
-            emptyBtn: false,
-            submitBtn: false,
-            column: [
-              {
-                label: "故障位置",
-                labelWidth: 120,
-                prop: "errPosition",
-                type: "input",
-                span: 24,
-              },
-              {
-                label: "设备名称",
-                labelWidth: 120,
-                span: 24,
-                prop: "deviceName",
-                type: "select",
-                dicData: [
-                  {
-                    label: "名称1",
-                    value: 0,
-                  },
-                  {
-                    label: "名称2",
-                    value: 1,
-                  },
-                ],
-              },
-              {
-                label: "故障专业类型",
-                labelWidth: 120,
-                span: 24,
-                prop: "errType",
-                type: "select",
-                dicData: [
-                  {
-                    label: "类型1",
-                    value: 0,
-                  },
-                  {
-                    label: "类型2",
-                    value: 1,
-                  },
-                ],
-              },
-              {
-                label: "故障现象描述",
-                labelWidth: 120,
-                span: 24,
-                prop: "errDescirb",
-                type: "textarea",
-                minRows: 3,
-                maxRows: 5,
-              },
-              {
-                label: "故障视频",
-                labelWidth: 120,
-                prop: "errorVideo",
-                type: "upload",
-                propsHttp: {
-                  res: "data",
-                  url: "url",
-                  name: "name",
-                  home: "https://www.w3school.com.cn",
-                },
-                fileType: "video", //img/video/audio
-                listType: "picture-img",
-                span: 24,
-                action: action,
-              },
-              {
-                label: "照片墙",
-                labelWidth: 120,
-                span: 24,
-                prop: "imgUrl",
-                listType: "picture-card",
-                type: "upload",
-                fileType: "img", //img/video/audio
-                action: action,
-              },
-            ],
-          },
-        },
-      ];
+      this.requestForm = row;
+      console.log('form--------------->',this.requestForm)
       this.dialogVisible = true;
     },
 
@@ -1267,17 +753,13 @@ export default {
     clickTimeNo(){
       this.isTime = 2
     },
-
     confirmName(){
       this.nameImg = this.$refs.sign.submit(80, 50);
     },
-
     clearName(){
      this.$refs.sign.clear()
      this.nameImg = ''
     },
-    
-
     // 点击行内的评价并签字按钮
     handleEvaluate(row){
       this.rowStatus = row.operationStatus
@@ -1285,30 +767,20 @@ export default {
       this.detailForm = row
       this.isEvalute = true
     },
-
     // 查看
     handleView(row){
       this.rowStatus = row.operationStatus 
       this.detailVisible = true
       this.detailForm = row
     },
-
-    // 点击保存按钮
-    handleSave() {
-      this.dialogVisible = false;
-    },
-    // 点击确定按钮
-    handleConfirm() {
-      this.dialogVisible = false;
-    },
     beforeOpen(done, type) {
       done();
     },
+
     beforeClose(done) {
       done();
     },
     searchReset(params, done) {
-      //   params.releaseTimeRange = dateFormat(new Date(), 'yyyy-MM-dd');
       this.query = params;
       this.onLoad(this.page);
     },
@@ -1337,7 +809,7 @@ export default {
           addPersonPhone:'13325412312',
           operationNo: "WX-20240820-01",
           deviceName: "通风柜",
-          errPosition: "一楼102室",
+          errPosition: "一楼101室",
           errType: "暖通自控",
           errDescirb: "通风柜无风，不通风",
           operationDate: "2024-02-15",
@@ -1381,14 +853,14 @@ export default {
           addPersonPhone:'13325412312',
           operationNo: "WX-20240820-01",
           deviceName: "通风柜",
-          errPosition: "一楼102室",
+          errPosition: "一楼103室",
           errType: "暖通自控",
           errDescirb: "通风柜无风，不通风",
           operationDate: "2024-02-15",
           operationStatus: 3,
           finishDate: "2024-02-26",
           addTime:'2024-02-15 16:00:05',
-          errorVideo: "https://api.avuejs.com/imgview/主动管控页面.mp4",
+          errorVideo: "https://api.avuejs.com/imgview/QQ2024926-14427.mp4",
           errorImg: [],
           orderTime:'2024-02-18 15:32:10',
           maintainPerson:'李四',
diff --git a/src/views/systemRecords/editRecords.vue b/src/views/systemRecords/editRecords.vue
new file mode 100644
index 0000000..00c8cca
--- /dev/null
+++ b/src/views/systemRecords/editRecords.vue
@@ -0,0 +1,184 @@
+<template>
+    <basic-container style="max-height: 800px; overflow: hidden">
+        <el-form :inline="true" v-model="form">
+            <el-row>
+                <el-col :span="6">
+                    <el-form-item label="时间：">
+                        <el-date-picker
+                            size="small"
+                            style="width: 315px;"
+                            v-model="form.timeRange"
+                            type="daterange"
+                            range-separator="至"
+                            start-placeholder="开始日期"
+                            end-placeholder="结束日期">
+                        </el-date-picker>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                    <el-form-item label="角色：">
+                        <el-select style="width: 315px;" size="small" placeholder="请选择角色" v-model="form.role">
+                            <el-option v-for="item in roleList" :key="item.label" :label="item.label" :value="item.value"></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                    <el-form-item label="人员：">
+                        <el-select style="width: 315px;" size="small" placeholder="请选择人员" v-model="form.person">
+                            <el-option v-for="item in personList" :key="item.label" :label="item.label" :value="item.value"></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                    <el-form-item>
+                        <el-button type="primary" size="small" @click="onSubmit" icon="el-icon-search">搜索</el-button>
+                        <el-button  size="small" icon="el-icon-delete" @click="onSubmit">重置</el-button>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+        </el-form>
+        <div class="record_box">
+                <div class="record_item" v-for="item in recordList" :key="item.month" style="margin-bottom: 30px;">
+                    <div class="month_tit">{{ item.month }}</div>
+                    <div v-for="(item1,index) in item.arr" :key="item1.time" class="bottom_box">
+                        <div class="month_item">
+                            <div class="line" :class="index == item.arr.length - 1 ? 'last' : ''"></div>
+                            <div class="con_box">
+                                <div class="line_box"></div>
+                                <div class="time_box">{{item1.time}}</div>
+                                <div class="person_con">{{item1.content}}</div>
+                            </div>
+                        </div>
+                    </div>
+            </div>
+           
+        </div>
+    </basic-container>
+</template>
+
+<script>
+export default {
+    data(){
+        return{
+            form:{},
+            roleList:[
+                {label:'角色一',value:'001'},
+                {label:'角色二',value:'002'},
+                {label:'角色三',value:'003'},
+            ],
+            personList:[
+                {label:'人员一',value:'001'},
+                {label:'人员二',value:'002'},
+                {label:'人员三',value:'003'},
+            ],
+            recordList:[
+                {
+                    month:'2024年8月',
+                    arr:[
+                        {time:'20日 15:30:58',content:'质量部张三登录成功'},
+                        {time:'17日 15:30:58',content:'质量部张三登录成功'},
+                        {time:'16日 15:30:58',content:'质量部张三登录成功'},
+                        {time:'12日 15:30:58',content:'质量部张三登录成功'},
+                        {time:'10日 15:30:58',content:'质量部张三登录成功'},
+                        {time:'8日 15:30:58',content:'质量部张三登录成功'},
+                        {time:'7日 15:30:58',content:'质量部张三登录成功'},
+                        {time:'5日 15:30:58',content:'质量部张三登录成功'},
+                        {time:'2日 15:30:58',content:'质量部张三登录成功'},
+                    ]
+                },
+                {
+                    month:'2024年7月',
+                    arr:[
+                        {time:'20日 15:30:58',content:'质量部张三登录成功'},
+                        {time:'17日 15:30:58',content:'质量部张三登录成功'},
+                        {time:'16日 15:30:58',content:'质量部张三登录成功'},
+                        {time:'12日 15:30:58',content:'质量部张三登录成功'},
+                        {time:'10日 15:30:58',content:'质量部张三登录成功'},
+                        {time:'8日 15:30:58',content:'质量部张三登录成功'},
+                    ]
+                },
+            ]
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped>
+
+/deep/ .el-card{
+    box-shadow: none;
+    background: transparent;
+
+    .record_box{
+        width: 100%;
+        height: 615px;
+        background: #fff;
+        overflow: auto;
+        padding: 40px;
+        .record_item{
+            .month_tit{
+                color: rgba(108,108,108,1);
+                font-size: 16px;
+                font-family: SourceHanSansSC;
+                font-weight: 700;
+                line-height: 30px;
+                margin-bottom: 20px;
+            }
+
+            .bottom_box{
+                .month_item{
+                    display: flex;
+                    padding-bottom: 20px;
+                    position: relative;
+                    z-index: 100;
+
+                    .line{
+                        height: 35px;
+                        width: 2px;
+                        background: rgb(239, 239, 239);
+                        position: absolute;
+                        left: 4px;
+                        top: 10px;
+                        z-index: 10;
+
+                        &.last{
+                            background: transparent;
+                        }
+                    }
+
+                    .con_box{
+                        display: flex;
+                        height: 21px;
+                        align-items: center;
+
+                        .line_box{
+                            width: 10px;
+                            height: 10px;
+                            background: #3a62d7;
+                            border-radius: 50%;
+                            position: relative;
+                            z-index: 100;
+                        }
+
+                        .time_box{
+                            color: rgba(154,154,154,1);
+                            font-size: 14px;
+                            font-family: SourceHanSansSC;
+                            margin: 0 15px;
+                            width: 100px;
+                        }
+
+                        .person_con{
+                            color: rgba(0,0,0,1);
+                            font-size: 14px;
+                            font-family: SourceHanSansSC;
+                            margin-left: 30px;
+                        }
+                    }
+                }
+            }
+        }   
+    }
+}
+
+</style>
\ No newline at end of file
diff --git a/src/views/systemRecords/loginRecords.vue b/src/views/systemRecords/loginRecords.vue
new file mode 100644
index 0000000..00c8cca
--- /dev/null
+++ b/src/views/systemRecords/loginRecords.vue
@@ -0,0 +1,184 @@
+<template>
+    <basic-container style="max-height: 800px; overflow: hidden">
+        <el-form :inline="true" v-model="form">
+            <el-row>
+                <el-col :span="6">
+                    <el-form-item label="时间：">
+                        <el-date-picker
+                            size="small"
+                            style="width: 315px;"
+                            v-model="form.timeRange"
+                            type="daterange"
+                            range-separator="至"
+                            start-placeholder="开始日期"
+                            end-placeholder="结束日期">
+                        </el-date-picker>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                    <el-form-item label="角色：">
+                        <el-select style="width: 315px;" size="small" placeholder="请选择角色" v-model="form.role">
+                            <el-option v-for="item in roleList" :key="item.label" :label="item.label" :value="item.value"></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                    <el-form-item label="人员：">
+                        <el-select style="width: 315px;" size="small" placeholder="请选择人员" v-model="form.person">
+                            <el-option v-for="item in personList" :key="item.label" :label="item.label" :value="item.value"></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                    <el-form-item>
+                        <el-button type="primary" size="small" @click="onSubmit" icon="el-icon-search">搜索</el-button>
+                        <el-button  size="small" icon="el-icon-delete" @click="onSubmit">重置</el-button>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+        </el-form>
+        <div class="record_box">
+                <div class="record_item" v-for="item in recordList" :key="item.month" style="margin-bottom: 30px;">
+                    <div class="month_tit">{{ item.month }}</div>
+                    <div v-for="(item1,index) in item.arr" :key="item1.time" class="bottom_box">
+                        <div class="month_item">
+                            <div class="line" :class="index == item.arr.length - 1 ? 'last' : ''"></div>
+                            <div class="con_box">
+                                <div class="line_box"></div>
+                                <div class="time_box">{{item1.time}}</div>
+                                <div class="person_con">{{item1.content}}</div>
+                            </div>
+                        </div>
+                    </div>
+            </div>
+           
+        </div>
+    </basic-container>
+</template>
+
+<script>
+export default {
+    data(){
+        return{
+            form:{},
+            roleList:[
+                {label:'角色一',value:'001'},
+                {label:'角色二',value:'002'},
+                {label:'角色三',value:'003'},
+            ],
+            personList:[
+                {label:'人员一',value:'001'},
+                {label:'人员二',value:'002'},
+                {label:'人员三',value:'003'},
+            ],
+            recordList:[
+                {
+                    month:'2024年8月',
+                    arr:[
+                        {time:'20日 15:30:58',content:'质量部张三登录成功'},
+                        {time:'17日 15:30:58',content:'质量部张三登录成功'},
+                        {time:'16日 15:30:58',content:'质量部张三登录成功'},
+                        {time:'12日 15:30:58',content:'质量部张三登录成功'},
+                        {time:'10日 15:30:58',content:'质量部张三登录成功'},
+                        {time:'8日 15:30:58',content:'质量部张三登录成功'},
+                        {time:'7日 15:30:58',content:'质量部张三登录成功'},
+                        {time:'5日 15:30:58',content:'质量部张三登录成功'},
+                        {time:'2日 15:30:58',content:'质量部张三登录成功'},
+                    ]
+                },
+                {
+                    month:'2024年7月',
+                    arr:[
+                        {time:'20日 15:30:58',content:'质量部张三登录成功'},
+                        {time:'17日 15:30:58',content:'质量部张三登录成功'},
+                        {time:'16日 15:30:58',content:'质量部张三登录成功'},
+                        {time:'12日 15:30:58',content:'质量部张三登录成功'},
+                        {time:'10日 15:30:58',content:'质量部张三登录成功'},
+                        {time:'8日 15:30:58',content:'质量部张三登录成功'},
+                    ]
+                },
+            ]
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped>
+
+/deep/ .el-card{
+    box-shadow: none;
+    background: transparent;
+
+    .record_box{
+        width: 100%;
+        height: 615px;
+        background: #fff;
+        overflow: auto;
+        padding: 40px;
+        .record_item{
+            .month_tit{
+                color: rgba(108,108,108,1);
+                font-size: 16px;
+                font-family: SourceHanSansSC;
+                font-weight: 700;
+                line-height: 30px;
+                margin-bottom: 20px;
+            }
+
+            .bottom_box{
+                .month_item{
+                    display: flex;
+                    padding-bottom: 20px;
+                    position: relative;
+                    z-index: 100;
+
+                    .line{
+                        height: 35px;
+                        width: 2px;
+                        background: rgb(239, 239, 239);
+                        position: absolute;
+                        left: 4px;
+                        top: 10px;
+                        z-index: 10;
+
+                        &.last{
+                            background: transparent;
+                        }
+                    }
+
+                    .con_box{
+                        display: flex;
+                        height: 21px;
+                        align-items: center;
+
+                        .line_box{
+                            width: 10px;
+                            height: 10px;
+                            background: #3a62d7;
+                            border-radius: 50%;
+                            position: relative;
+                            z-index: 100;
+                        }
+
+                        .time_box{
+                            color: rgba(154,154,154,1);
+                            font-size: 14px;
+                            font-family: SourceHanSansSC;
+                            margin: 0 15px;
+                            width: 100px;
+                        }
+
+                        .person_con{
+                            color: rgba(0,0,0,1);
+                            font-size: 14px;
+                            font-family: SourceHanSansSC;
+                            margin-left: 30px;
+                        }
+                    }
+                }
+            }
+        }   
+    }
+}
+
+</style>
\ No newline at end of file
diff --git a/src/views/workbench/index.vue b/src/views/workbench/index.vue
index 9db5b8f..8250be5 100644
--- a/src/views/workbench/index.vue
+++ b/src/views/workbench/index.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="container">
+    <!-- 用户 -->
     <div style="width:100%;height:100%;" v-if="role_id == '1123598816738675200'">
       <div class="top_box">
           <div class="top_left">
@@ -114,7 +115,8 @@
         </div>
       </div>
     </div>
-    <div style="width:100%;height:100%;" v-if="role_id == '1123598816738675201'">
+    <!-- 客服/维修负责人 -->
+    <div style="width:100%;height:100%;" v-if="role_id == '1839536982874193922' || role_id == '1839537055389515777'">
       <div class="left_box">
         <div class="map_box">
           <Map style="width:100%;height:100%;"></Map>
@@ -125,8 +127,8 @@
             <div class="bench_item" v-for="item in benchList" :key="item.title">
               <img style="width: 32px;height: 32px;" :src="item.img" alt="">
               <div style="margin:5px 0;color:#101010;">{{item.title}}</div>
-              <div  style="margin:12px 0;color:#6c6c6c;font-size:14px;">{{item.mainName}}<span style="margin:0px 10px;font-size:22px;color:#000;">{{item.num}}</span>{{item.mainName == '巡检签约' ? '家' : '件'}}</div>
-              <div style="color:#6c6c6c;font-size:14px;">{{item.subName}}<span style="margin:0px 10px;font-size:22px;color:#000;">{{item.num1}}</span>件</div>
+              <div  style="margin:12px 0;color:#6c6c6c;font-size:14px;">{{item.mainName}}<span style="margin:0px 10px;font-size:22px;color:#000;">{{item.num}}</span>{{item.mainName == '巡检签约' ? '家' : item.title == '维修人员' ? '人' : '件'}}</div>
+              <div style="color:#6c6c6c;font-size:14px;">{{item.subName}}<span style="margin:0px 10px;font-size:22px;color:#000;">{{item.num1}}</span>{{item.title == '维修人员' ? '人' : '件'}}</div>
             </div>
             
           </div>
@@ -150,8 +152,8 @@
           <div class="bottom_tit">实验室巡检</div>
           <div class="bottom_con">
             <div class="static_box">
-              <div class="static_top">
-                <div>各单位提报统计</div>
+              <div class="static_top" >
+                <div>{{role_id == '1839536982874193922' ? '各单位提报统计' : '各班组提报统计'}}</div>
                 <div>选择时间：
                   <el-date-picker
                     v-model="staticPieTime"
@@ -348,7 +350,8 @@ export default {
         {name:'安池实验室-实验室设备巡检5',time:'2024/8/30'},
       ],
       calssOption:{},
-      alarmOption:{}
+      alarmOption:{},
+      xData:[]
     }
   },
   computed:{
@@ -373,7 +376,64 @@ export default {
           "waitTime": 1000, // 单步运动停止的时间(默认值1000ms)
         }
       })
-    }else if(this.role_id == '1123598816738675201'){
+    }else if(this.role_id == '1839536982874193922' || this.role_id == '1839537055389515777'){
+      if(this.role_id == '1839536982874193922'){
+        this.benchList = [
+          {
+            img:require('@/assets/svg/task.svg'),
+            title:'我的任务',
+            mainName:'今日待办',
+            num:'5',
+            subName:'今日已办',
+            num1:10
+          },
+          {
+            img:require('@/assets/svg/over.svg'),
+            title:'维修已办结',
+            mainName:'本月',
+            num:16,
+            subName:'本年',
+            num1:129
+          },
+          {
+            img:require('@/assets/svg/plan.svg'),
+            title:'巡检计划',
+            mainName:'巡检签约',
+            num:22,
+            subName:'巡检',
+            num1:159
+          }
+        ]
+        this.xData = ["安池","畜牧局","柯盛",'烁今','合作人']
+      }else{
+        this.benchList = [
+          {
+            img:require('@/assets/svg/task.svg'),
+            title:'我的任务',
+            mainName:'今日待办',
+            num:'5',
+            subName:'今日已办',
+            num1:10
+          },
+          {
+            img:require('@/assets/svg/over.svg'),
+            title:'维修已办结',
+            mainName:'本月',
+            num:16,
+            subName:'本年',
+            num1:129
+          },
+          {
+            img:require('@/assets/svg/person.svg'),
+            title:'维修人员',
+            mainName:'在岗',
+            num:22,
+            subName:'总计',
+            num1:159
+          }
+        ]
+        this.xData = ["班组1","班组2","班组3",'班组4','班组5']
+      }
       nextTick(() =>{
         this.creatUnitEcharts() 
         this.createProblemEcharts()   
@@ -504,7 +564,7 @@ export default {
           data:['数量'],
         },
         xAxis: {
-          data: ["安池","畜牧局","柯盛",'烁今','合作人']
+          data: this.xData,
         },
         grid:{
           top:'20%',
diff --git a/src/views/workbench/map.vue b/src/views/workbench/map.vue
index 6282c0c..386e6b4 100644
--- a/src/views/workbench/map.vue
+++ b/src/views/workbench/map.vue
@@ -16,6 +16,8 @@ export default {
                 itemStyle: { color: "red" },
             }],
             data : [
+                {name:'海淀aaa',value:21},
+                {name:'软件创新园',value:30},
      {name: '海门', value: 69},
      {name: '鄂尔多斯', value: 12},
      {name: '招远', value: 12},
@@ -208,6 +210,8 @@ export default {
      {name: '大庆', value: 279}
             ],
             geoCoordMap : {
+                '海淀aaa':[116.30787799999993, 40.05702706489032],
+                '软件创新园':[120.49149829538277,36.15297000628537],
                 '海门':[121.15,31.89],
                 '鄂尔多斯':[109.781327,39.608266],
                 '招远':[120.38,37.35],