diff --git a/src/assets/images/equipment/bg- border1.png b/src/assets/images/equipment/bg- border1.png
new file mode 100644
index 0000000..18aa20a
Binary files /dev/null and b/src/assets/images/equipment/bg- border1.png differ
diff --git a/src/assets/images/equipment/bg-body.png b/src/assets/images/equipment/bg-body.png
new file mode 100644
index 0000000..b6f1a5d
Binary files /dev/null and b/src/assets/images/equipment/bg-body.png differ
diff --git a/src/assets/images/equipment/bg-border1(1).png b/src/assets/images/equipment/bg-border1(1).png
new file mode 100644
index 0000000..475ce73
Binary files /dev/null and b/src/assets/images/equipment/bg-border1(1).png differ
diff --git a/src/assets/images/equipment/bg-border1.png b/src/assets/images/equipment/bg-border1.png
new file mode 100644
index 0000000..475ce73
Binary files /dev/null and b/src/assets/images/equipment/bg-border1.png differ
diff --git a/src/assets/images/equipment/bg-border2(1).png b/src/assets/images/equipment/bg-border2(1).png
new file mode 100644
index 0000000..72f8410
Binary files /dev/null and b/src/assets/images/equipment/bg-border2(1).png differ
diff --git a/src/assets/images/equipment/bg-border2(2).png b/src/assets/images/equipment/bg-border2(2).png
new file mode 100644
index 0000000..72f8410
Binary files /dev/null and b/src/assets/images/equipment/bg-border2(2).png differ
diff --git a/src/assets/images/equipment/bg-border2(3).png b/src/assets/images/equipment/bg-border2(3).png
new file mode 100644
index 0000000..72f8410
Binary files /dev/null and b/src/assets/images/equipment/bg-border2(3).png differ
diff --git a/src/assets/images/equipment/bg-border2.png b/src/assets/images/equipment/bg-border2.png
new file mode 100644
index 0000000..36bb579
Binary files /dev/null and b/src/assets/images/equipment/bg-border2.png differ
diff --git a/src/assets/images/equipment/bg-border3.png b/src/assets/images/equipment/bg-border3.png
new file mode 100644
index 0000000..73cc91c
Binary files /dev/null and b/src/assets/images/equipment/bg-border3.png differ
diff --git a/src/assets/images/equipment/bg-head.png b/src/assets/images/equipment/bg-head.png
new file mode 100644
index 0000000..1ada7d8
Binary files /dev/null and b/src/assets/images/equipment/bg-head.png differ
diff --git a/src/assets/images/equipment/bg-title.png b/src/assets/images/equipment/bg-title.png
new file mode 100644
index 0000000..596c670
Binary files /dev/null and b/src/assets/images/equipment/bg-title.png differ
diff --git a/src/assets/images/equipment/logo.png b/src/assets/images/equipment/logo.png
new file mode 100644
index 0000000..d7e3468
Binary files /dev/null and b/src/assets/images/equipment/logo.png differ
diff --git a/src/assets/images/equipment/number.png b/src/assets/images/equipment/number.png
new file mode 100644
index 0000000..48f70a2
Binary files /dev/null and b/src/assets/images/equipment/number.png differ
diff --git a/src/assets/images/equipment/矩形备份 30(1).png b/src/assets/images/equipment/矩形备份 30(1).png
new file mode 100644
index 0000000..bdf2adc
Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30(1).png differ
diff --git a/src/assets/images/equipment/矩形备份 30(10).png b/src/assets/images/equipment/矩形备份 30(10).png
new file mode 100644
index 0000000..253dcc6
Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30(10).png differ
diff --git a/src/assets/images/equipment/矩形备份 30(11).png b/src/assets/images/equipment/矩形备份 30(11).png
new file mode 100644
index 0000000..bdf2adc
Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30(11).png differ
diff --git a/src/assets/images/equipment/矩形备份 30(12).png b/src/assets/images/equipment/矩形备份 30(12).png
new file mode 100644
index 0000000..253dcc6
Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30(12).png differ
diff --git a/src/assets/images/equipment/矩形备份 30(13).png b/src/assets/images/equipment/矩形备份 30(13).png
new file mode 100644
index 0000000..253dcc6
Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30(13).png differ
diff --git a/src/assets/images/equipment/矩形备份 30(14).png b/src/assets/images/equipment/矩形备份 30(14).png
new file mode 100644
index 0000000..bdf2adc
Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30(14).png differ
diff --git a/src/assets/images/equipment/矩形备份 30(15).png b/src/assets/images/equipment/矩形备份 30(15).png
new file mode 100644
index 0000000..253dcc6
Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30(15).png differ
diff --git a/src/assets/images/equipment/矩形备份 30(2).png b/src/assets/images/equipment/矩形备份 30(2).png
new file mode 100644
index 0000000..253dcc6
Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30(2).png differ
diff --git a/src/assets/images/equipment/矩形备份 30(3).png b/src/assets/images/equipment/矩形备份 30(3).png
new file mode 100644
index 0000000..b1329d9
Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30(3).png differ
diff --git a/src/assets/images/equipment/矩形备份 30(4).png b/src/assets/images/equipment/矩形备份 30(4).png
new file mode 100644
index 0000000..245947c
Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30(4).png differ
diff --git a/src/assets/images/equipment/矩形备份 30(5).png b/src/assets/images/equipment/矩形备份 30(5).png
new file mode 100644
index 0000000..b1329d9
Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30(5).png differ
diff --git a/src/assets/images/equipment/矩形备份 30(6).png b/src/assets/images/equipment/矩形备份 30(6).png
new file mode 100644
index 0000000..245947c
Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30(6).png differ
diff --git a/src/assets/images/equipment/矩形备份 30(7).png b/src/assets/images/equipment/矩形备份 30(7).png
new file mode 100644
index 0000000..b1329d9
Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30(7).png differ
diff --git a/src/assets/images/equipment/矩形备份 30(8).png b/src/assets/images/equipment/矩形备份 30(8).png
new file mode 100644
index 0000000..245947c
Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30(8).png differ
diff --git a/src/assets/images/equipment/矩形备份 30(9).png b/src/assets/images/equipment/矩形备份 30(9).png
new file mode 100644
index 0000000..b1329d9
Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30(9).png differ
diff --git a/src/assets/images/equipment/矩形备份 30.png b/src/assets/images/equipment/矩形备份 30.png
new file mode 100644
index 0000000..253dcc6
Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30.png differ
diff --git a/src/assets/images/equipment/编组 58.png b/src/assets/images/equipment/编组 58.png
new file mode 100644
index 0000000..67b7319
Binary files /dev/null and b/src/assets/images/equipment/编组 58.png differ
diff --git a/src/assets/images/equipment/路径.png b/src/assets/images/equipment/路径.png
new file mode 100644
index 0000000..3db97bb
Binary files /dev/null and b/src/assets/images/equipment/路径.png differ
diff --git a/src/router/index.js b/src/router/index.js
index ceb28b8..6398d8a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -100,10 +100,10 @@ export const constantRoutes = [
     component: () => import("@/views/kanban/exception/index"),
     hidden: true,
   },
-   // 看板路由
-   {
-    path: "/kanban/3decharts",
-    component: () => import("@/views/kanban/3decharts/index"),
+    // 看板路由
+  {
+    path: "/kanban/equipment",
+    component: () => import("@/views/kanban/equipment/index"),
     hidden: true,
   },
 ]
diff --git a/src/views/device/faultReport/index.vue b/src/views/device/faultReport/index.vue
index 4ab5447..819466e 100644
--- a/src/views/device/faultReport/index.vue
+++ b/src/views/device/faultReport/index.vue
@@ -54,9 +54,9 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="报修人编号" prop="orderRepairman">
+      <el-form-item label="报修人编号" prop="orderRepairmanCode">
         <el-input
-          v-model="queryParams.orderRepairman"
+          v-model="queryParams.orderRepairmanCode"
           placeholder="请输入报修人编号"
           style="width: 200px"
           clearable
@@ -171,6 +171,15 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
+      <!-- 序号 -->
+      <el-table-column
+        type="index"
+        width="90"
+        align="center"
+        :index="indexMethod"
+        label="序号"
+        fixed
+      />
       <el-table-column
         label="报修单号"
         align="center"
@@ -309,61 +318,67 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-tabs type="border-card">
           <el-tab-pane label="基本信息">
-                      <el-descriptions :column="3" border>
-                        <el-descriptions-item label="设备编码">{{
-                          form.equipmentCode
-                        }}</el-descriptions-item>
-                        <el-descriptions-item label="故障时间">{{
-                          form.orderBreakdownTime
-                        }}</el-descriptions-item>
-                        <el-descriptions-item label="报修来源">{{
-                          form.orderSource
-                        }}</el-descriptions-item>
-                        <el-descriptions-item label="报修时间">{{
-                          form.orderTime
-                        }}</el-descriptions-item>
-                        <el-descriptions-item label="报修人名字">{{
-                          form.orderRepairmanName
-                        }}</el-descriptions-item>
-                        <el-descriptions-item label="联系方式">{{
-                          form.orderConnection
-                        }}</el-descriptions-item>
-                        <el-descriptions-item label="故障描述">{{
-                          form.orderDesc
-                        }}</el-descriptions-item>
-                      </el-descriptions>
-                      <el-descriptions :column="1" border>
-                        <el-descriptions-item label="故障图片">
-                          <el-image
-                            v-for="(item, index) in urlLists"
-                            :key="index"
-                            :src="item"
-                          ></el-image
-                        ></el-descriptions-item>
-                      </el-descriptions>
-                    </el-tab-pane>
-                    <el-tab-pane label="检查项信息">
-                      <el-table :data="checkList" border style="width: 100%">
-                        <el-table-column prop="itemName" label="检查项名称" width="150">
-                        </el-table-column>
-                        <el-table-column prop="standardName" label="标准名称" width="180">
-                        </el-table-column>
-                        <el-table-column prop="standardType" label="标准类型" width="100">
-                        </el-table-column>
-                        <el-table-column prop="detailReach" label="是否达标" width="50">
-                        </el-table-column>
-                        <el-table-column prop="actualValue" label="实际值" width="50">
-                        </el-table-column>
-                        <el-table-column prop="detailUpLimit" label="上限" width="50">
-                        </el-table-column>
-                        <el-table-column prop="detailDownLimit" label="下限" width="50">
-                        </el-table-column>
-                        <el-table-column prop="detailUnit" label="单位" width="50">
-                        </el-table-column>
-                        <el-table-column prop="detailUnit" label="故障图片">
-                        </el-table-column>
-                      </el-table>
-                    </el-tab-pane>
+            <el-descriptions :column="3" border>
+              <el-descriptions-item label="设备编码">{{
+                form.equipmentCode
+              }}</el-descriptions-item>
+              <el-descriptions-item label="故障时间">{{
+                form.orderBreakdownTime
+              }}</el-descriptions-item>
+              <el-descriptions-item label="报修来源">{{
+                form.orderSource
+              }}</el-descriptions-item>
+              <el-descriptions-item label="报修时间">{{
+                form.orderTime
+              }}</el-descriptions-item>
+              <el-descriptions-item label="报修人名字">{{
+                form.orderRepairmanName
+              }}</el-descriptions-item>
+              <el-descriptions-item label="联系方式">{{
+                form.orderConnection
+              }}</el-descriptions-item>
+              <el-descriptions-item label="故障描述">{{
+                form.orderDesc
+              }}</el-descriptions-item>
+            </el-descriptions>
+            <el-descriptions :column="1" border>
+              <el-descriptions-item label="故障图片">
+                <el-image
+                  v-for="(item, index) in urlLists"
+                  :key="index"
+                  :src="item"
+                ></el-image
+              ></el-descriptions-item>
+            </el-descriptions>
+          </el-tab-pane>
+          <el-tab-pane label="检查项信息">
+<el-table :data="checkList" border style="width: 100%">
+              <el-table-column prop="itemName" label="检查项名称" width="200">
+              </el-table-column>
+              <el-table-column prop="itemMethod" label="检查项方法" width="200">
+              </el-table-column>
+              <el-table-column prop="standardName" label="标准名称" width="180">
+              </el-table-column>
+              <el-table-column prop="standardType" label="标准类型" width="100">
+              </el-table-column>
+              <el-table-column prop="detailReach" label="是否达标" width="50">
+                <template slot-scope="scope">
+                  <dict-tag
+                    :options="dict.type.device_reach_standard"
+                    :value="scope.row.detailReach"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column prop="actualValue" label="实际值" width="50">
+              </el-table-column>
+              <el-table-column prop="detailUpLimit" label="上限" width="50">
+              </el-table-column>
+              <el-table-column prop="detailDownLimit" label="下限" width="50">
+              </el-table-column>
+              <el-table-column prop="detailUnit" label="单位" width="45">
+              </el-table-column>
+            </el-table>
+          </el-tab-pane>
           <el-tab-pane label="审核">
             <el-row>
               <el-col :span="24">
@@ -372,7 +387,7 @@
                     <el-radio label="计划性维修">计划性维修</el-radio>
                     <el-radio label="不维修">不维修</el-radio>
                     <el-radio label="委外维修">委外维修</el-radio>
-                    <el-radio label="立即维修" @click.native ="timeBackFilling"
+                    <el-radio label="立即维修" @click.native="timeBackFilling"
                       >立即维修</el-radio
                     >
                   </el-radio-group>
@@ -382,21 +397,21 @@
             <el-row>
               <el-col :span="8" v-if="form.repairDestination == '计划性维修'">
                 <el-form-item prop="workTeam" label="维修组">
-          <el-select
-            v-model="form.workTeam"
-            placeholder="请选择维修组"
-            @change="$forceUpdate()"
-            clearable
-            filterable
-            style="width: 200px"
-          >
-            <el-option
-              v-for="item in teamOption"
-              :key="item.teamCode"
-              :label="item.teamName"
-              :value="item.teamCode"
-            ></el-option>
-          </el-select>
+                  <el-select
+                    v-model="form.workTeam"
+                    placeholder="请选择维修组"
+                    @change="$forceUpdate()"
+                    clearable
+                    filterable
+                    style="width: 200px"
+                  >
+                    <el-option
+                      v-for="item in teamOption"
+                      :key="item.teamCode"
+                      :label="item.teamName"
+                      :value="item.teamCode"
+                    ></el-option>
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8" v-if="form.repairDestination == '计划性维修'">
@@ -461,21 +476,21 @@
             <el-row>
               <el-col :span="8" v-if="form.repairDestination == '立即维修'">
                 <el-form-item prop="workTeam" label="维修组">
-          <el-select
-            v-model="form.workTeam"
-            placeholder="请选择维修组"
-            @change="$forceUpdate()"
-            clearable
-            filterable
-            style="width: 200px"
-          >
-            <el-option
-              v-for="item in teamOption"
-              :key="item.teamCode"
-              :label="item.teamName"
-              :value="item.teamCode"
-            ></el-option>
-          </el-select>
+                  <el-select
+                    v-model="form.workTeam"
+                    placeholder="请选择维修组"
+                    @change="$forceUpdate()"
+                    clearable
+                    filterable
+                    style="width: 200px"
+                  >
+                    <el-option
+                      v-for="item in teamOption"
+                      :key="item.teamCode"
+                      :label="item.teamName"
+                      :value="item.teamCode"
+                    ></el-option>
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8" v-if="form.repairDestination == '立即维修'">
@@ -641,7 +656,7 @@
             </el-descriptions>
           </el-tab-pane>
 
-          <el-tab-pane label="报修信息审核结果">
+          <el-tab-pane label="报修审核结果">
             <el-descriptions
               :column="2"
               border
@@ -657,7 +672,7 @@
                 form.workPlanTime
               }}</el-descriptions-item>
               <el-descriptions-item label="是否停机维修">{{
-                form.workDownMachine
+                form.workDownMachine ? "是" : "否"
               }}</el-descriptions-item>
               <el-descriptions-item label="计划停机时间">{{
                 form.workPlanDownTime
@@ -679,7 +694,7 @@
                 form.workPlanTime
               }}</el-descriptions-item>
               <el-descriptions-item label="是否停机维修">{{
-                form.workDownMachine
+                form.workDownMachine ? "是" : "否"
               }}</el-descriptions-item>
               <el-descriptions-item label="计划停机时间">{{
                 form.workPlanDownTime
@@ -714,24 +729,34 @@
                 form.workConnection
               }}</el-descriptions-item>
             </el-descriptions>
-            <el-descriptions :column="2"
-                                           border
-                                           v-if="form.repairDestination == '委外维修'">
-                          <el-descriptions-item label="委外原因">{{
-                            form.outSourceReason
-                          }}</el-descriptions-item>
-                        </el-descriptions>
+            <el-descriptions
+              :column="2"
+              border
+              v-if="form.repairDestination == '委外维修'"
+            >
+              <el-descriptions-item label="委外原因">{{
+                form.outSourceReason
+              }}</el-descriptions-item>
+            </el-descriptions>
           </el-tab-pane>
 
           <el-tab-pane label="检查项信息">
             <el-table :data="checkList" border style="width: 100%">
-              <el-table-column prop="itemName" label="检查项名称" width="150">
+              <el-table-column prop="itemName" label="检查项名称" width="200">
+              </el-table-column>
+              <el-table-column prop="itemMethod" label="检查项方法" width="200">
               </el-table-column>
               <el-table-column prop="standardName" label="标准名称" width="180">
               </el-table-column>
               <el-table-column prop="standardType" label="标准类型" width="100">
               </el-table-column>
               <el-table-column prop="detailReach" label="是否达标" width="50">
+                <template slot-scope="scope">
+                  <dict-tag
+                    :options="dict.type.device_reach_standard"
+                    :value="scope.row.detailReach"
+                  />
+                </template>
               </el-table-column>
               <el-table-column prop="actualValue" label="实际值" width="50">
               </el-table-column>
@@ -739,9 +764,7 @@
               </el-table-column>
               <el-table-column prop="detailDownLimit" label="下限" width="50">
               </el-table-column>
-              <el-table-column prop="detailUnit" label="单位" width="50">
-              </el-table-column>
-              <el-table-column prop="detailUnit" label="故障图片">
+              <el-table-column prop="detailUnit" label="单位" width="45">
               </el-table-column>
             </el-table>
           </el-tab-pane>
@@ -930,13 +953,21 @@
           </el-tab-pane>
           <el-tab-pane label="检查项信息">
             <el-table :data="checkList" border style="width: 100%">
-              <el-table-column prop="itemName" label="检查项名称" width="150">
+              <el-table-column prop="itemName" label="检查项名称" width="200">
+              </el-table-column>
+              <el-table-column prop="itemMethod" label="检查项方法" width="200">
               </el-table-column>
               <el-table-column prop="standardName" label="标准名称" width="180">
               </el-table-column>
               <el-table-column prop="standardType" label="标准类型" width="100">
               </el-table-column>
               <el-table-column prop="detailReach" label="是否达标" width="50">
+                <template slot-scope="scope">
+                  <dict-tag
+                    :options="dict.type.device_reach_standard"
+                    :value="scope.row.detailReach"
+                  />
+                </template>
               </el-table-column>
               <el-table-column prop="actualValue" label="实际值" width="50">
               </el-table-column>
@@ -944,16 +975,14 @@
               </el-table-column>
               <el-table-column prop="detailDownLimit" label="下限" width="50">
               </el-table-column>
-              <el-table-column prop="detailUnit" label="单位" width="50">
-              </el-table-column>
-              <el-table-column prop="detailUnit" label="故障图片">
+              <el-table-column prop="detailUnit" label="单位" width="45">
               </el-table-column>
             </el-table>
           </el-tab-pane>
         </el-tabs>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancelView">返 回</el-button>
       </div>
     </el-dialog>
   </div>
@@ -977,7 +1006,7 @@ import { getMaintenanceTeamList } from "@/api/device/equTeam";
 export default {
   name: "FaultReport",
   components: { ItemSelect, ItemSelectPerson },
-  dicts: ["device_order_source"],
+  dicts: ["device_order_source", "device_reach_standard"],
   data() {
     return {
       //选择设备维修班组
@@ -1127,25 +1156,36 @@ export default {
     this.getList();
   },
   methods: {
-
-
-
+    // 生成表头序号
+    indexMethod(index) {
+      return index + 1;
+    },
     timeBackFilling() {
-var getTime = new Date().getTime(); //获取到当前时间戳
-  var time = new Date(getTime); //创建一个日期对象
-  function nowDate(time) {
-    var year = time.getFullYear(); // 年
-    var month = (time.getMonth() + 1).toString().padStart(2, '0'); // 月
-    var date = time.getDate().toString().padStart(2, '0'); // 日
-    var hour = time.getHours().toString().padStart(2, '0'); // 时
-    var minute = time.getMinutes().toString().padStart(2, '0'); // 分
-    var second = time.getSeconds().toString().padStart(2, '0'); // 秒
-    return (
-      year + "-" + month + "-" + date + " " + hour + ":" + minute + ":" + second
-    )
-  }
-  console.log(time);
-  console.log(nowDate(time));
+      var getTime = new Date().getTime(); //获取到当前时间戳
+      var time = new Date(getTime); //创建一个日期对象
+      function nowDate(time) {
+        var year = time.getFullYear(); // 年
+        var month = (time.getMonth() + 1).toString().padStart(2, "0"); // 月
+        var date = time.getDate().toString().padStart(2, "0"); // 日
+        var hour = time.getHours().toString().padStart(2, "0"); // 时
+        var minute = time.getMinutes().toString().padStart(2, "0"); // 分
+        var second = time.getSeconds().toString().padStart(2, "0"); // 秒
+        return (
+          year +
+          "-" +
+          month +
+          "-" +
+          date +
+          " " +
+          hour +
+          ":" +
+          minute +
+          ":" +
+          second
+        );
+      }
+      console.log(time);
+      console.log(nowDate(time));
       this.form.workPlanTime = nowDate(time);
     },
     //设备选择
@@ -1158,7 +1198,6 @@ var getTime = new Date().getTime(); //获取到当前时间戳
     },
     //人员选择
     onItemSelectedPerson(obj) {
-      console.log("111111111111", obj);
       this.form.orderRepairmanCode = obj[0].userName;
       this.form.orderRepairmanName = obj[0].nickName;
     },
@@ -1180,6 +1219,10 @@ var getTime = new Date().getTime(); //获取到当前时间戳
       this.open = false;
       this.reset();
     },
+    // 取消按钮
+    cancelView() {
+      this.openView = false;
+    },
     // 审核返回按钮
     cancelCheckForm() {
       this.viewCheck = false;
@@ -1219,6 +1262,8 @@ var getTime = new Date().getTime(); //获取到当前时间戳
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.orderBreakdownTimeArray = null;
+      this.queryParams.orderTimeArray = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -1285,6 +1330,7 @@ var getTime = new Date().getTime(); //获取到当前时间戳
           item1.standardList.forEach((item) => {
             var standard = {};
             standard.itemName = item1.itemName;
+            standard.itemMethod = item1.itemMethod;
             standard.standardName = item.standardName;
             standard.detailUpLimit = item.detailUpLimit;
             standard.detailDownLimit = item.detailDownLimit;
diff --git a/src/views/device/faultReport/selectSingleEquipment.vue b/src/views/device/faultReport/selectSingleEquipment.vue
index c8ca697..a8bdb2a 100644
--- a/src/views/device/faultReport/selectSingleEquipment.vue
+++ b/src/views/device/faultReport/selectSingleEquipment.vue
@@ -1,8 +1,9 @@
 <template>
-  <el-dialog title="设备选择"
+  <el-dialog
+    title="设备选择"
     v-if="showFlag"
     :visible.sync="showFlag"
-    :modal= false
+    :modal="false"
     width="1100px"
     center
     :before-close="cancelEquipmentForm"
@@ -10,26 +11,33 @@
     <el-row :gutter="20">
       <!--分类数据-->
       <el-col :span="5" :xs="24">
-        <el-card >
+        <el-card>
           <span>请选择设备类型：</span>
           <div class="head-container" style="text-align: center">
-              <el-tree
-                :data="treeData1"
-                :props = "{id:'equipmentTypeCode',label:'equipmentTypeName'}"
-                node-key="id"
-                :expand-on-click-node="false"
-                :filter-node-method="filterNode"
-                ref="tree"
-                default-expand-all
-                @node-click="handleNodeClick"
-              />
-            </div>
+            <el-tree
+              :data="treeData1"
+              :props="{ id: 'equipmentTypeCode', label: 'equipmentTypeName' }"
+              node-key="id"
+              :expand-on-click-node="false"
+              :filter-node-method="filterNode"
+              ref="tree"
+              default-expand-all
+              @node-click="handleNodeClick"
+            />
+          </div>
         </el-card>
       </el-col>
 
       <!--设备数据-->
       <el-col :span="19" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          size="small"
+          :inline="true"
+          v-show="showSearch"
+          label-width="68px"
+        >
           <el-form-item label="设备编码" prop="itemCode">
             <el-input
               v-model="queryParams.itemCode"
@@ -49,23 +57,61 @@
             />
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleQuery"
+              >搜索</el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              >重置</el-button
+            >
           </el-form-item>
         </el-form>
-        <el-table v-loading="loading" :data="itemList" @selection-change="handleEquipmentSelectionChange" ref="myTable">
+        <el-table
+          v-loading="loading"
+          :data="itemList"
+          @selection-change="handleEquipmentSelectionChange"
+          ref="myTable"
+        >
           <el-table-column width="50" align="center" type="selection">
-              <!-- <template v-slot="scope">
+            <!-- <template v-slot="scope">
                   <el-radio v-model="selectedItemId" :label="scope.row.itemId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
               </template> -->
           </el-table-column>
           <!-- 序号 -->
-          <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column>
-          <el-table-column label="设备编码" align="center" key="itemCode" prop="equipmentCode" v-if="columns[0].visible" >
+          <el-table-column
+            type="index"
+            width="90"
+            align="center"
+            :index="indexMethod"
+            label="序号"
+          ></el-table-column>
+          <el-table-column
+            label="设备编码"
+            align="center"
+            key="itemCode"
+            prop="equipmentCode"
+            v-if="columns[0].visible"
+          >
           </el-table-column>
-          <el-table-column label="设备类型编码" align="center" key="itemTypeCode" prop="equipmentTypeCode" v-if="columns[2].visible" >
+          <el-table-column
+            label="设备类型编码"
+            align="center"
+            key="itemTypeCode"
+            prop="equipmentTypeCode"
+            v-if="columns[2].visible"
+          >
           </el-table-column>
-          <el-table-column label="设备名称"  align="left" key="itemName" prop="equipmentName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column
+            label="设备名称"
+            align="left"
+            key="itemName"
+            prop="equipmentName"
+            v-if="columns[1].visible"
+            :show-overflow-tooltip="true"
+          />
         </el-table>
 
         <pagination
@@ -78,24 +124,27 @@
       </el-col>
     </el-row>
     <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitEquipmentForm">确 定</el-button>
-        <el-button @click="cancelEquipmentForm">取 消</el-button>
+      <el-button type="primary" @click="submitEquipmentForm">确 定</el-button>
+      <el-button @click="cancelEquipmentForm">取 消</el-button>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import { getEquipmentList,getEquipmentTypeList} from "@/api/device/faultReport";
+import {
+  getEquipmentList,
+  getEquipmentTypeList,
+} from "@/api/device/faultReport";
 import { treeselect } from "@/api/wms/equipment";
-import { Message } from 'element-ui'
+import { Message } from "element-ui";
 
 export default {
   name: "MdItemSingle",
   // components: { Treeselect },
   data() {
     return {
-      treeData1:[],
-      showFlag:false,
+      treeData1: [],
+      showFlag: false,
       // 选中数组
       selectedItemId: undefined,
       selectedRows: undefined,
@@ -106,7 +155,7 @@ export default {
       // 显示搜索条件
       showSearch: true,
       // 总条数
-      total:0,
+      total: 0,
       // 设备产品表格数据
       itemList: null,
       // 树选项
@@ -117,18 +166,20 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        itemName: undefined,
-        equipmentTypeCode: undefined,
+        itemName: null,
+        equipmentTypeCode: null,
         itemTypeId: 0,
-        itemCodeGet: '',
-        itemCode : undefined,
+        itemCodeGet: "",
+        itemCode: null,
+        equipmentCode: null,
+        equipmentName: null,
       },
       // 列信息
       columns: [
         { key: 0, label: `设备编码`, visible: true },
         { key: 1, label: `设备名称`, visible: true },
         { key: 2, label: `设备类型`, visible: true },
-      ]
+      ],
     };
   },
   created() {
@@ -147,29 +198,30 @@ export default {
       this.resetForm("form");
     },
 
-    handleEquipmentSelectionChange (val) {
-      this.itemList = val
+    handleEquipmentSelectionChange(val) {
+      this.itemList = val;
     },
 
-  	// 生成表头序号
-      indexMethod(index){
-        return index+1 ;
-      },
+    // 生成表头序号
+    indexMethod(index) {
+      return index + 1;
+    },
 
     /** 查询设备编码列表*/
     getList() {
       this.loading = true;
-      getEquipmentList(this.queryParams).then(response => {
-          this.itemList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
-      );
+      this.queryParams.equipmentCode = this.queryParams.itemCode;
+      this.queryParams.equipmentName = this.queryParams.itemName;
+      getEquipmentList(this.queryParams).then((response) => {
+        this.itemList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
     },
 
     /** 查询分类下拉树结构 */
     getEquipmentType() {
-      getEquipmentTypeList().then(response => {
+      getEquipmentTypeList().then((response) => {
         console.log(response.rows);
         this.treeData1 = response.rows;
         console.log(this.treeData1);
@@ -185,7 +237,7 @@ export default {
 
     // 节点单击事件
     handleNodeClick(data) {
-      console.log('id',data.id);
+      console.log("id", data.id);
       this.queryParams.equipmentTypeCode = data.equipmentTypeCode;
       console.log(this.equipmentTypeCode);
       this.handleQuery();
@@ -204,43 +256,42 @@ export default {
       this.handleQuery();
     },
 
-
     // 多选框选中数据
-		handleEquipmentSelectionChange(selection) {
-			this.ids = selection.map(item => item.equipmentCode);
-			this.single = selection.length!==1;
-			this.multiple = !selection.length;
-			console.log("多选框",this.ids);
-		},
+    handleEquipmentSelectionChange(selection) {
+      this.ids = selection.map((item) => item.equipmentCode);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+      console.log("多选框", this.ids);
+    },
 
     submitEquipmentForm() {
       const data = this.ids;
-      if(data.length >1){
+      if (data.length > 1) {
         Message.warning("只能选择一个报修机器,请勿选择多个！");
-      }else{
+      } else {
         const equipmentCode = data.toString();
-        if(this.queryParams.itemCodeGet == ""){
+        if (this.queryParams.itemCodeGet == "") {
           this.queryParams.itemCodeGet = equipmentCode;
-        }else{
-          this.queryParams.itemCodeGet = this.queryParams.itemCodeGet + ','+ equipmentCode;
+        } else {
+          this.queryParams.itemCodeGet =
+            this.queryParams.itemCodeGet + "," + equipmentCode;
         }
-      this.selectedRows = this.queryParams.itemCodeGet;
-      this.$emit('onSelected', this.selectedRows);
-      this.queryParams.equipmentTypeCode = null;
-      this.getList();
-      console.log('111111',this.queryParams.equipmentTypeCode);
-      this.showFlag = false;
-      this.queryParams.itemCodeGet = "";
-      }
-      },
-
-    cancelEquipmentForm(){
-      this.queryParams.equipmentTypeCode = null;
+        this.selectedRows = this.queryParams.itemCodeGet;
+        this.$emit("onSelected", this.selectedRows);
+        this.queryParams.equipmentTypeCode = null;
         this.getList();
-        console.log('111111',this.queryParams.equipmentTypeCode);
+        console.log("111111", this.queryParams.equipmentTypeCode);
         this.showFlag = false;
-    }
+        this.queryParams.itemCodeGet = "";
+      }
+    },
 
-  }
+    cancelEquipmentForm() {
+      this.queryParams.equipmentTypeCode = null;
+      this.getList();
+      console.log("111111", this.queryParams.equipmentTypeCode);
+      this.showFlag = false;
+    },
+  },
 };
 </script>
diff --git a/src/views/device/faultReport/selectSinglePerson.vue b/src/views/device/faultReport/selectSinglePerson.vue
index dcd3809..99c4737 100644
--- a/src/views/device/faultReport/selectSinglePerson.vue
+++ b/src/views/device/faultReport/selectSinglePerson.vue
@@ -1,8 +1,9 @@
 <template>
-  <el-dialog title="人员选择"
+  <el-dialog
+    title="人员选择"
     v-if="showFlag"
     :visible.sync="showFlag"
-    :modal= false
+    :modal="false"
     width="800px"
     center
     :before-close="cancel"
@@ -10,7 +11,14 @@
     <el-row :gutter="20">
       <!--人员数据-->
       <el-col :span="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          size="small"
+          :inline="true"
+          v-show="showSearch"
+          label-width="68px"
+        >
           <el-form-item label="人员编码" prop="itemCode">
             <el-input
               v-model="queryParams.itemCode"
@@ -30,17 +38,53 @@
             />
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleQuery"
+              >搜索</el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              >重置</el-button
+            >
           </el-form-item>
         </el-form>
-        <el-table v-loading="loading" :data="itemList" @selection-change="handleSelectionChange" ref="multipleTable">
-          <el-table-column width="50" align="center" type="selection"></el-table-column>
+        <el-table
+          v-loading="loading"
+          :data="itemList"
+          @selection-change="handleSelectionChange"
+          ref="multipleTable"
+        >
+          <el-table-column
+            width="50"
+            align="center"
+            type="selection"
+          ></el-table-column>
           <!-- 序号 -->
-          <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column>
-          <el-table-column label="人员编码" align="center" key="itemCode" prop="userName" v-if="columns[0].visible" >
+          <el-table-column
+            type="index"
+            width="90"
+            align="center"
+            :index="indexMethod"
+            label="序号"
+          ></el-table-column>
+          <el-table-column
+            label="人员编码"
+            align="center"
+            key="itemCode"
+            prop="userName"
+            v-if="columns[0].visible"
+          >
           </el-table-column>
-          <el-table-column label="人员名称"  align="left" key="itemName" prop="nickName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column
+            label="人员名称"
+            align="left"
+            key="itemName"
+            prop="nickName"
+            v-if="columns[1].visible"
+            :show-overflow-tooltip="true"
+          />
         </el-table>
 
         <pagination
@@ -53,22 +97,24 @@
       </el-col>
     </el-row>
     <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" :disabled="multiple">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+      <el-button type="primary" @click="submitForm" :disabled="multiple"
+        >确 定</el-button
+      >
+      <el-button @click="cancel">返 回</el-button>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import { getRepairPersonList} from "@/api/device/faultReport";
-import { Message } from 'element-ui'
+import { getRepairPersonList } from "@/api/device/faultReport";
+import { Message } from "element-ui";
 
 export default {
   name: "MdItemSingle",
   data() {
     return {
-      treeData1:[],
-      showFlag:false,
+      treeData1: [],
+      showFlag: false,
       // 选中数组
       selectedItemId: undefined,
       selectedRows: undefined,
@@ -79,22 +125,24 @@ export default {
       // 显示搜索条件
       showSearch: true,
       // 总条数
-      total:0,
+      total: 0,
       // 人员表格数据
       itemList: null,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        itemName: undefined,
-        itemCodeGet: '',
-        itemCode : undefined,
+        itemName: null,
+        itemCodeGet: "",
+        itemCode: null,
+        nickName: null,
+        userName: null,
       },
       // 列信息
       columns: [
         { key: 0, label: `人员编码`, visible: true },
         { key: 1, label: `人员名称`, visible: true },
-      ]
+      ],
     };
   },
   created() {
@@ -102,35 +150,40 @@ export default {
   },
 
   methods: {
-      // 表单重置
-      reset() {
-        this.form = {
-          itemId: null,
-          itemCode: this.processId,
-          itemType: null,
-        };
-        this.resetForm("form");
-      },
+    // 取消按钮
+    cancel() {
+      this.showFlag = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        itemId: null,
+        itemCode: this.processId,
+        itemType: null,
+      };
+      this.resetForm("form");
+    },
 
-    handleSelectionChange (val) {
-       this.itemList = val;
+    handleSelectionChange(val) {
+      this.itemList = val;
     },
 
-  	 // 生成表头序号
-        indexMethod(index){
-          return index+1 ;
-        },
-    //
+    // 生成表头序号
+    indexMethod(index) {
+      return index + 1;
+    },
 
     /** 查询设备编码列表*/
     getList() {
       this.loading = true;
-      getRepairPersonList(this.queryParams).then(response => {
-          this.itemList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
-      );
+      this.queryParams.userName = this.queryParams.itemCode;
+      this.queryParams.nickName = this.queryParams.itemName;
+      getRepairPersonList(this.queryParams).then((response) => {
+        this.itemList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
     },
 
     /** 搜索按钮操作 */
@@ -147,22 +200,22 @@ export default {
     },
 
     // 多选框选中数据
-		handleSelectionChange(selection) {
-			this.ids = selection.map(item => item.userId);
-			this.userCodes = selection.map(item => item.userName);
-			this.single = selection.length!==1;
-			this.multiple = !selection.length;
-		},
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.userId);
+      this.userCodes = selection.map((item) => item.userName);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
 
     submitForm() {
-      if(this.$refs.multipleTable.selection.length > 1){
+      if (this.$refs.multipleTable.selection.length > 1) {
         Message.warning("只能选择一个报修人,请勿选择多个！");
-      }else{
-           this.$emit('onSelected', this.$refs.multipleTable.selection);
-           this.showFlag = false;
-           this.getList();
+      } else {
+        this.$emit("onSelected", this.$refs.multipleTable.selection);
+        this.showFlag = false;
+        this.getList();
       }
-    }
-  }
+    },
+  },
 };
 </script>
diff --git a/src/views/device/outsourceWorkOrder/index.vue b/src/views/device/outsourceWorkOrder/index.vue
index 80d89de..bc151a6 100644
--- a/src/views/device/outsourceWorkOrder/index.vue
+++ b/src/views/device/outsourceWorkOrder/index.vue
@@ -1,166 +1,285 @@
 <template>
-	<div class="app-container">
-		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px">
-			<el-form-item label="委外工单编码" prop="workCode">
-				<el-input
-					v-model="queryParams.workCode"
-					placeholder="请输入委外工单编码"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="维修人员" prop="workPerson">
-				<el-input
-					v-model="queryParams.workPerson"
-					placeholder="请输入维修人员"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="委外单位" prop="workOutsourcingUnit">
-				<el-input
-					v-model="queryParams.workOutsourcingUnit"
-					placeholder="请输入委外单位"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="联系方式" prop="workConnection">
-				<el-input
-					v-model="queryParams.workConnection"
-					placeholder="请输入联系方式"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="委外费用" prop="workCost">
-				<el-input
-					v-model="queryParams.workCost"
-					placeholder="请输入委外费用"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="委外用时" prop="workCostTime">
-				<el-input
-					v-model="queryParams.workCostTime"
-					placeholder="请输入委外用时"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item>
-				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-			</el-form-item>
-		</el-form>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="98px"
+    >
+      <el-form-item label="委外工单编码" prop="workCode">
+        <el-input
+          v-model="queryParams.workCode"
+          placeholder="请输入委外工单编码"
+          clearable
+          style="width: 200px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="维修人员" prop="workPerson">
+        <el-input
+          v-model="queryParams.workPerson"
+          placeholder="请输入维修人员"
+          style="width: 200px"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="委外单位" prop="workOutsourcingUnit">
+        <el-input
+          v-model="queryParams.workOutsourcingUnit"
+          placeholder="请输入委外单位"
+          style="width: 200px"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联系方式" prop="workConnection">
+        <el-input
+          v-model="queryParams.workConnection"
+          placeholder="请输入联系方式"
+          style="width: 200px"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="委外费用" prop="workCost">
+        <el-input
+          v-model="queryParams.workCost"
+          placeholder="请输入委外费用"
+          clearable
+          style="width: 200px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="委外用时" prop="workCostTime">
+        <el-input
+          v-model="queryParams.workCostTime"
+          placeholder="请输入委外用时"
+          clearable
+          style="width: 200px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="委外类型" prop="workType">
+        <el-select
+          v-model="queryParams.workType"
+          placeholder="请选择委外类型"
+          @change="$forceUpdate()"
+          clearable
+          style="width: 200px"
+          @keyup.enter.native="handleQuery"
+        >
+          <el-option
+            v-for="item in options"
+            :key="item.workType"
+            :label="item.label"
+            :value="item.workType"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
 
-		<el-row :gutter="10" class="mb8">
-			<el-col :span="1.5">
-				<el-button
-					type="primary"
-					plain
-					icon="el-icon-plus"
-					size="mini"
-					@click="handleAdd"
-					v-hasPermi="['device:outsourceWorkOrder:add']"
-				>新增</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="success"
-					plain
-					icon="el-icon-edit"
-					size="mini"
-					:disabled="single"
-					@click="handleUpdate"
-					v-hasPermi="['device:outsourceWorkOrder:edit']"
-				>修改</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="danger"
-					plain
-					icon="el-icon-delete"
-					size="mini"
-					:disabled="multiple"
-					@click="handleDelete"
-					v-hasPermi="['device:outsourceWorkOrder:remove']"
-				>删除</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="warning"
-					plain
-					icon="el-icon-download"
-					size="mini"
-					@click="handleExport"
-					v-hasPermi="['device:outsourceWorkOrder:export']"
-				>导出</el-button>
-			</el-col>
-			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-		</el-row>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['device:outsourceWorkOrder:add']"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['device:outsourceWorkOrder:edit']"
+          >修改</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['device:outsourceWorkOrder:remove']"
+          >删除</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['device:outsourceWorkOrder:export']"
+          >导出</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
 
-		<el-table v-loading="loading" :data="outsourceWorkOrderList" @selection-change="handleSelectionChange">
-			<el-table-column type="selection" width="55" align="center" />
-			<el-table-column label="委外工单编码" align="center" prop="workCode" width="180"/>
-			<el-table-column label="报修单号" align="center" prop="orderCode" width="180"/>
-			<el-table-column label="维修单号" align="center" prop="repairCode" width="180"/>
-			<el-table-column label="设备编码" align="center" prop="equipmentCode" />
-			<el-table-column label="设备名称" align="center" prop="equipmentName" />
-			<el-table-column label="设备类型" align="center" prop="equipmentTypeName" />
-			<el-table-column label="委外维修人员" align="center" prop="workPerson" width="150"/>
-			<el-table-column label="委外单位" align="center" prop="workOutsourcingUnit" width="200"/>
-			<el-table-column label="联系方式" align="center" prop="workConnection" width="150"/>
-			<el-table-column label="委外原因" align="center" prop="workReason" width="150"/>
-			<el-table-column label="委外类型" align="center" prop="workType" />
-			<el-table-column label="委外费用" align="center" prop="workCost" />
-			<el-table-column label="委外用时" align="center" prop="workCostTime" />
-			      <el-table-column width="180" label="创建时间" align="center" prop="createTime">
-              <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.createTime) }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column width="120" label="创建人" align="center" prop="createBy"/>
-            <el-table-column width="180" label="更新时间" align="center" prop="updateTime">
-              <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.updateTime) }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column width="120" label="更新人" align="center" prop="updateBy"/>
-			<el-table-column label="工厂编码" align="center" prop="factoryCode" />
-			<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
-				<template slot-scope="scope">
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-edit"
-						@click="handleUpdate(scope.row)"
-						v-hasPermi="['device:outsourceWorkOrder:edit']"
-					>修改</el-button>
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-delete"
-						@click="handleDelete(scope.row)"
-						v-hasPermi="['device:outsourceWorkOrder:remove']"
-					>删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
+    <el-table
+      v-loading="loading"
+      :data="outsourceWorkOrderList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        label="委外工单编码"
+        align="center"
+        prop="workCode"
+        width="180"
+      />
+      <el-table-column
+        label="报修单号"
+        align="center"
+        prop="orderCode"
+        width="180"
+      />
+      <el-table-column
+        label="维修单号"
+        align="center"
+        prop="repairCode"
+        width="180"
+      />
+      <el-table-column label="设备编码" align="center" prop="equipmentCode" />
+      <el-table-column label="设备名称" align="center" prop="equipmentName" />
+      <el-table-column
+        label="设备类型"
+        align="center"
+        prop="equipmentTypeName"
+      />
+      <el-table-column
+        label="委外维修人员"
+        align="center"
+        prop="workPerson"
+        width="150"
+      />
+      <el-table-column
+        label="委外单位"
+        align="center"
+        prop="workOutsourcingUnit"
+        width="200"
+      />
+      <el-table-column
+        label="联系方式"
+        align="center"
+        prop="workConnection"
+        width="150"
+      />
+      <el-table-column
+        label="委外原因"
+        align="center"
+        prop="workReason"
+        width="150"
+      />
+      <el-table-column label="委外类型" align="center" prop="workType">
+        <template slot-scope="scope">
+          {{ scope.row.workType == 1 ? "保养委外" : "维修委外" }}
+        </template>
+      </el-table-column>
+      <el-table-column label="委外费用" align="center" prop="workCost" />
+      <el-table-column label="委外用时" align="center" prop="workCostTime" />
+      <el-table-column
+        width="180"
+        label="创建时间"
+        align="center"
+        prop="createTime"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        width="120"
+        label="创建人"
+        align="center"
+        prop="createBy"
+      />
+      <el-table-column
+        width="180"
+        label="更新时间"
+        align="center"
+        prop="updateTime"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updateTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        width="120"
+        label="更新人"
+        align="center"
+        prop="updateBy"
+      />
+      <el-table-column label="工厂编码" align="center" prop="factoryCode" />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="150"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['device:outsourceWorkOrder:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['device:outsourceWorkOrder:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
 
-		<pagination
-			v-show="total>0"
-			:total="total"
-			:page.sync="queryParams.pageNum"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList"
-		/>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
-		<!-- 添加或修改委外工单对话框 -->
-		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-			<el-form ref="form" :model="form" :rules="rules" label-width="130px">
-				<el-form-item label="设备编码" prop="equipmentCode">
+    <!-- 添加或修改委外工单对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+        <el-form-item label="设备编码" prop="equipmentCode">
           <el-input
             v-model="form.equipmentCode"
             placeholder="请输入设备编码"
@@ -174,16 +293,44 @@
           </el-input>
           <ItemSelect ref="itemSelect" @onSelected="onItemSelectedEquipment">
           </ItemSelect>
-      	</el-form-item>
-				<el-form-item label="委外维修人员" prop="workPerson">
-					<el-input v-model="form.workPerson" placeholder="请输入委外维修人员" style="width: 270px"/>
-				</el-form-item>
-				<el-form-item label="委外单位" prop="workOutsourcingUnit">
-					<el-input v-model="form.workOutsourcingUnit" placeholder="请输入委外单位" style="width: 270px"/>
-				</el-form-item>
-				<el-form-item label="委外单位联系方式" prop="workConnection">
-					<el-input v-model="form.workConnection" placeholder="请输入委外单位联系方式" style="width: 270px"/>
-				</el-form-item>
+        </el-form-item>
+        <el-form-item label="委外类型" prop="workType">
+          <el-select
+            v-model="form.workType"
+            placeholder="请选择委外类型"
+            @change="$forceUpdate()"
+            clearable
+            style="width: 270px"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.workType"
+              :label="item.label"
+              :value="item.workType"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="委外维修人员" prop="workPerson">
+          <el-input
+            v-model="form.workPerson"
+            placeholder="请输入委外维修人员"
+            style="width: 270px"
+          />
+        </el-form-item>
+        <el-form-item label="委外单位" prop="workOutsourcingUnit">
+          <el-input
+            v-model="form.workOutsourcingUnit"
+            placeholder="请输入委外单位"
+            style="width: 270px"
+          />
+        </el-form-item>
+        <el-form-item label="委外单位联系方式" prop="workConnection">
+          <el-input
+            v-model="form.workConnection"
+            placeholder="请输入委外单位联系方式"
+            style="width: 270px"
+          />
+        </el-form-item>
         <el-form-item label="委外原因" prop="workReason">
           <el-input
             v-model="form.workReason"
@@ -193,119 +340,142 @@
             :autosize="{ minRows: 2, maxRows: 4 }"
           />
         </el-form-item>
-				<el-form-item label="委外费用" prop="workCost">
-					<el-input v-model="form.workCost" placeholder="请输入委外费用" style="width: 270px"/>
-				</el-form-item>
-				<el-form-item label="委外用时" prop="workCostTime">
-					<el-input v-model="form.workCostTime" placeholder="请输入委外用时" style="width: 270px"/>
-				</el-form-item>
-			</el-form>
-			<div slot="footer" class="dialog-footer">
-				<el-button type="primary" @click="submitForm">确 定</el-button>
-				<el-button @click="cancel">取 消</el-button>
-			</div>
-		</el-dialog>
-	</div>
+        <el-form-item label="委外费用" prop="workCost">
+          <el-input
+            v-model="form.workCost"
+            placeholder="请输入委外费用"
+            style="width: 270px"
+          />
+        </el-form-item>
+        <el-form-item label="委外用时" prop="workCostTime">
+          <el-input
+            v-model="form.workCostTime"
+            placeholder="请输入委外用时"
+            style="width: 270px"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-import { listOutsourceWorkOrder, getOutsourceWorkOrder, delOutsourceWorkOrder, addOutsourceWorkOrder, updateOutsourceWorkOrder } from "@/api/device/outsourceWorkOrder";
+import {
+  listOutsourceWorkOrder,
+  getOutsourceWorkOrder,
+  delOutsourceWorkOrder,
+  addOutsourceWorkOrder,
+  updateOutsourceWorkOrder,
+} from "@/api/device/outsourceWorkOrder";
 import ItemSelect from "./selectSingleEquipment.vue";
 
 export default {
-	name: "OutsourceWorkOrder",
-	components: { ItemSelect },
-	data() {
-		return {
-			// 遮罩层
-			loading: true,
-			// 选中数组
-			ids: [],
-			// 非单个禁用
-			single: true,
-			// 非多个禁用
-			multiple: true,
-			// 显示搜索条件
-			showSearch: true,
-			// 总条数
-			total: 0,
-			// 委外工单表格数据
-			outsourceWorkOrderList: [],
-			// 弹出层标题
-			title: "",
-			// 是否显示弹出层
-			open: false,
-			// 查询参数
-			queryParams: {
-				pageNum: 1,
-				pageSize: 10,
-				workCode: null,
-				repairCode: null,
-				workPerson: null,
-				workOutsourcingUnit: null,
-				workConnection: null,
-				workReason: null,
-				workType: null,
-				equipmentCode: null,
-				workCost: null,
-				workCostTime: null,
-				attr1: null,
-				attr2: null,
-				attr3: null,
-				factoryCode: null
-			},
-			// 表单参数
-			form: {},
-			// 表单校验
-			rules: {
-			}
-		};
-	},
-	created() {
-		this.getList();
-	},
-	methods: {
-		/** 查询委外工单列表 */
-		getList() {
-			this.loading = true;
-			listOutsourceWorkOrder(this.queryParams).then(response => {
-				this.outsourceWorkOrderList = response.rows;
-				this.total = response.total;
-				this.loading = false;
-			});
-		},
-		// 取消按钮
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		// 表单重置
-		reset() {
-			this.form = {
-				workId: null,
-				workCode: null,
-				repairCode: null,
-				workPerson: null,
-				workOutsourcingUnit: null,
-				workConnection: null,
-				workReason: null,
-				workType: null,
-				equipmentCode: null,
-				workCost: null,
-				workCostTime: null,
-				attr1: null,
-				attr2: null,
-				attr3: null,
-				delFlag: null,
-				createBy: null,
-				createTime: null,
-				updateBy: null,
-				updateTime: null,
-				factoryCode: null
-			};
-			this.resetForm("form");
-		},
-		//设备选择
+  name: "OutsourceWorkOrder",
+  components: { ItemSelect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 委外工单表格数据
+      outsourceWorkOrderList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        workCode: null,
+        repairCode: null,
+        workPerson: null,
+        workOutsourcingUnit: null,
+        workConnection: null,
+        workReason: null,
+        workType: null,
+        equipmentCode: null,
+        workCost: null,
+        workCostTime: null,
+        attr1: null,
+        attr2: null,
+        attr3: null,
+        factoryCode: null,
+      },
+      options: [
+        {
+          workType: "1",
+          label: "保养委外",
+        },
+        {
+          workType: "0",
+          label: "维修委外",
+        },
+      ],
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询委外工单列表 */
+    getList() {
+      this.loading = true;
+      listOutsourceWorkOrder(this.queryParams).then((response) => {
+        this.outsourceWorkOrderList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        workId: null,
+        workCode: null,
+        repairCode: null,
+        workPerson: null,
+        workOutsourcingUnit: null,
+        workConnection: null,
+        workReason: null,
+        workType: null,
+        equipmentCode: null,
+        workCost: null,
+        workCostTime: null,
+        attr1: null,
+        attr2: null,
+        attr3: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        factoryCode: null,
+      };
+      this.resetForm("form");
+    },
+    //设备选择
     handleSelectEquipment() {
       this.$refs.itemSelect.showFlag = true;
     },
@@ -313,74 +483,82 @@ export default {
     onItemSelectedEquipment(obj) {
       this.form.equipmentCode = obj;
     },
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNum = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm("queryForm");
-			this.handleQuery();
-		},
-		// 多选框选中数据
-		handleSelectionChange(selection) {
-			this.ids = selection.map(item => item.workId)
-			this.single = selection.length!==1
-			this.multiple = !selection.length
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = "添加委外工单";
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const workId = row.workId || this.ids
-			getOutsourceWorkOrder(workId).then(response => {
-				this.form = response.data;
-				this.open = true;
-				this.title = "修改委外工单";
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs["form"].validate(valid => {
-				if (valid) {
-					if (this.form.workId != null) {
-						updateOutsourceWorkOrder(this.form).then(response => {
-							this.$modal.msgSuccess("修改成功");
-							this.open = false;
-							this.getList();
-						});
-					} else {
-						addOutsourceWorkOrder(this.form).then(response => {
-							this.$modal.msgSuccess("新增成功");
-							this.open = false;
-							this.getList();
-						});
-					}
-				}
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const workIds = row.workId || this.ids;
-			this.$modal.confirm('是否确认删除委外工单编号为"' + workIds + '"的数据项？').then(function() {
-				return delOutsourceWorkOrder(workIds);
-			}).then(() => {
-				this.getList();
-				this.$modal.msgSuccess("删除成功");
-			}).catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			this.download('device/outsourceWorkOrder/export', {
-				...this.queryParams
-			}, `outsourceWorkOrder_${new Date().getTime()}.xlsx`)
-		}
-	}
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.workId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加委外工单";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const workId = row.workId || this.ids;
+      getOutsourceWorkOrder(workId).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改委外工单";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.workId != null) {
+            updateOutsourceWorkOrder(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addOutsourceWorkOrder(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const workIds = row.workId || this.ids;
+      this.$modal
+        .confirm('是否确认删除委外工单编号为"' + workIds + '"的数据项？')
+        .then(function () {
+          return delOutsourceWorkOrder(workIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "device/outsourceWorkOrder/export",
+        {
+          ...this.queryParams,
+        },
+        `outsourceWorkOrder_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>
diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue
index d387761..e4b506c 100644
--- a/src/views/device/repairOrder/index.vue
+++ b/src/views/device/repairOrder/index.vue
@@ -248,6 +248,15 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
+      <!-- 序号 -->
+      <el-table-column
+        type="index"
+        width="90"
+        align="center"
+        :index="indexMethod"
+        label="序号"
+        fixed
+      />
       <el-table-column
         label="维修单号"
         align="center"
@@ -825,6 +834,9 @@
               <el-table-column prop="standardType" label="标准类型" width="100">
               </el-table-column>
               <el-table-column prop="detailReach" label="是否达标" width="50">
+                      <template slot-scope="scope">
+                        {{ scope.row.detailReach == "1" ? "达标" : "不达标" }}
+                      </template>
               </el-table-column>
               <el-table-column prop="actualValue" label="实际值" width="50">
               </el-table-column>
diff --git a/src/views/device/repairOrderReport/index.vue b/src/views/device/repairOrderReport/index.vue
index a71499c..de8469d 100644
--- a/src/views/device/repairOrderReport/index.vue
+++ b/src/views/device/repairOrderReport/index.vue
@@ -192,6 +192,7 @@
         align="center"
         :index="indexMethod"
         label="序号"
+        fixed
       >
       </el-table-column>
       <el-table-column
diff --git a/src/views/kanban/dailyoutput/index.vue b/src/views/kanban/dailyoutput/index.vue
index 04ab31b..935365e 100644
--- a/src/views/kanban/dailyoutput/index.vue
+++ b/src/views/kanban/dailyoutput/index.vue
@@ -1290,7 +1290,7 @@ export default {
   background-color: transparent;
   /*将select的宽高等于div的宽高*/
   width: 100%;
-  height: 50px;
+
   /*隐藏select的下拉图标*/
   -webkit-appearance: none;
   -moz-appearance: none;
diff --git a/src/views/kanban/equipment/index.vue b/src/views/kanban/equipment/index.vue
new file mode 100644
index 0000000..7ac077e
--- /dev/null
+++ b/src/views/kanban/equipment/index.vue
@@ -0,0 +1,1162 @@
+<template>
+  <v-scale-screen width="1920" height="1080" :fullScreen="false">
+    <div class="app-container home" style="">
+      <div class="head">
+        <div class="head-content">
+          <div class="title">榄菊设备管理云平台</div>
+        </div>
+        <div class="head-logo">
+          <img src="../../../assets/images/logo.png" alt="" />
+        </div>
+        <div class="back">
+          <el-button @click="back()" type="primary" icon="el-icon-s-home"></el-button>
+        </div>
+      </div>
+      <div class="content-top">
+        <div class="factory">
+          <div class="selectborder">
+            <select v-model="selectxt" class="select1" @change="selectline(selectxt)">
+              <option :key="index" :value="x.parentName" v-for="(x, index) in getLineList">
+                {{ x.deptName }}
+              </option>
+              <!-- <option :key="index" :value="x.seriesName" v-for="(x, index) in ceshib">{{ x.seriesName }}</option> -->
+            </select>
+          </div>
+          <div class="selectborder selectborder1">
+            <select v-model="selectxtclasses" class="select1" @change="selectline2(selectxtclasses)">
+              <option :key="index" :value="x.shiftId" v-for="(x, index) in classesList">
+                {{ x.shiftDesc }}
+              </option>
+              <!-- <option :key="index" :value="x.seriesName" v-for="(x, index) in ceshib">{{ x.seriesName }}</option> -->
+            </select>
+          </div>
+        </div>
+        <div class="timebox">
+          <div class="time">
+            {{ gettimedata }}
+          </div>
+        </div>
+      </div>
+      <div class="content">
+        <div class="itemtop">
+          <div class="left">
+            <div class="item-table">
+              <table class="table-thead" border="0" cellpadding="0" cellspacing="0">
+                <thead>
+                  <tr style="height: 44px;">
+                    <td style="width: 8%;">序号</td>
+                    <td style="width: 18%;">设备名称</td>
+                    <td style="width: 20%;">所在部门</td>
+                    <td style="width: 10%;">状态</td>
+                    <td style="width: 12%;">设备故障率</td>
+                    <td style="width: 12%;">设备有效利用率</td>
+                  </tr>
+                </thead>
+              </table>
+              <div class="table-tbody">
+                <!-- <vue-seamless-scroll :data="getlistcx" :class-option="classOption" class="wrapscroll"> -->
+                <table border="0" cellpadding="0" cellspacing="0">
+                  <tbody>
+                    <tr :class="[index % 2 == 1 ? 'active1' : 'active2']" style="height:48px" :key="index"
+                      v-for="(n, index) in getlist">
+                      <td style="width: 8%;">1</td>
+                      <td style="width: 18%;">测试设备</td>
+                      <td style="width: 20%;">测试部门1</td>
+                      <td style="width: 10%;">在用</td>
+                      <td style="width: 12%;">10%</td>
+                      <td style="width: 12%;">90%</td>
+                    </tr>
+                  </tbody>
+                </table>
+                <!-- </vue-seamless-scroll> -->
+              </div>
+            </div>
+            <div class="item-table item-table1">
+              <div class="titlebox" style="margin-bottom: 14px;">
+                <div class="titlename">维修工单</div>
+              </div>
+              <table class="table-thead" border="0" cellpadding="0" cellspacing="0">
+                <thead>
+                  <tr style="height: 44px;">
+                    <td style="width: 8%;">序号</td>
+                    <td style="width: 12%;">设备名称</td>
+                    <td style="width: 12%;">设备编码</td>
+                    <td style="width: 12%;">设备位置</td>
+                    <td style="width: 12%;">故障原因</td>
+                    <td style="width: 12%;">维修组</td>
+                    <td style="width: 10%;">是否立即维修</td>
+                    <td style="width: 18%;">维修时间</td>
+
+                  </tr>
+                </thead>
+              </table>
+              <div class="table-tbody">
+                <!-- <vue-seamless-scroll :data="getlistcx" :class-option="classOption" class="wrapscroll"> -->
+                <table border="0" cellpadding="0" cellspacing="0">
+                  <tbody>
+                    <tr :class="[index % 2 == 1 ? 'active1' : 'active2']" style="height:48px" :key="index"
+                      v-for="(n, index) in getlist">
+                      <td style="width: 8%;">1</td>
+                      <td style="width: 12%;">测试设备</td>
+                      <td style="width: 12%;">BM000001</td>
+                      <td style="width: 12%;">位置1</td>
+                      <td style="width: 12%;">故障原因1</td>
+                      <td style="width: 12%;">维修组</td>
+                      <td style="width: 10%;">是</td>
+                      <td style="width: 18%;">2023-11-07 08:30:33</td>
+                    </tr>
+                  </tbody>
+                </table>
+                <!-- </vue-seamless-scroll> -->
+              </div>
+            </div>
+          </div>
+          <div class="right">
+            <div class="echart1title">
+              完好设备占比
+            </div>
+            <div class="echartbox" id="echart1" style="margin: auto;  margin-top: 60px;width: 395px; height: 175px">
+
+            </div>
+            <div class="equipmentinfobox">
+              <div class="box">
+                <div class="number">
+                  <span class="number1">
+                    24
+                  </span>
+                  <span class="name1">
+                    台
+                  </span>
+                </div>
+                <div class="name2">
+                  设备总数
+                </div>
+              </div>
+              <div class="box">
+                <div class="number">
+                  <span class="number1">
+                    24
+                  </span>
+                  <span class="name1">
+                    台
+                  </span>
+                </div>
+                <div class="name2">
+                  设备总数
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="itembottom">
+          <div class="item-table item-table1">
+            <div class="titlebox" style="margin-bottom: 14px;">
+              <div class="titlename">设备综合效率</div>
+            </div>
+            <table class="table-thead" border="0" cellpadding="0" cellspacing="0">
+              <thead>
+                <tr style="height: 44px;">
+                  <td style="width: 8%;">排名</td>
+                  <td style="width: 12%;">设备名称</td>
+                  <td style="width: 12%;">设备OEE</td>
+
+                </tr>
+              </thead>
+            </table>
+            <div class="table-tbody">
+              <!-- <vue-seamless-scroll :data="getlistcx" :class-option="classOption" class="wrapscroll"> -->
+              <table border="0" cellpadding="0" cellspacing="0">
+                <tbody>
+                  <tr :class="[index % 2 == 1 ? 'active1' : 'active2']" style="height:48px" :key="index"
+                    v-for="(n, index) in getlist">
+                    <td style="width: 8%;">1</td>
+                    <td style="width: 12%;">测试设备</td>
+                    <td style="width: 12%;">88%</td>
+                  </tr>
+                </tbody>
+              </table>
+              <!-- </vue-seamless-scroll> -->
+            </div>
+          </div>
+          <div class="item-table item-table1">
+            <div class="titlebox" style="margin-bottom: 14px;">
+              <div class="titlename">设备稳定性</div>
+            </div>
+            <table class="table-thead" border="0" cellpadding="0" cellspacing="0">
+              <thead>
+                <tr style="height: 44px;">
+                  <td style="width: 8%;">排名</td>
+                  <td style="width: 12%;">设备名称</td>
+                  <td style="width: 12%;">MTBF</td>
+
+                </tr>
+              </thead>
+            </table>
+            <div class="table-tbody">
+              <!-- <vue-seamless-scroll :data="getlistcx" :class-option="classOption" class="wrapscroll"> -->
+              <table border="0" cellpadding="0" cellspacing="0">
+                <tbody>
+                  <tr :class="[index % 2 == 1 ? 'active1' : 'active2']" style="height:48px" :key="index"
+                    v-for="(n, index) in getlist">
+                    <td style="width: 8%;">1</td>
+                    <td style="width: 12%;">测试设备</td>
+                    <td style="width: 12%;">88%</td>
+                  </tr>
+                </tbody>
+              </table>
+              <!-- </vue-seamless-scroll> -->
+            </div>
+          </div>
+          <div class="item-table item-table1">
+            <div class="titlebox" style="margin-bottom: 14px;">
+              <div class="titlename">设备维修质量</div>
+            </div>
+            <table class="table-thead" border="0" cellpadding="0" cellspacing="0">
+              <thead>
+                <tr style="height: 44px;">
+                  <td style="width: 8%;">排名</td>
+                  <td style="width: 12%;">设备名称</td>
+                  <td style="width: 12%;">设备OEE</td>
+
+                </tr>
+              </thead>
+            </table>
+            <div class="table-tbody">
+              <!-- <vue-seamless-scroll :data="getlistcx" :class-option="classOption" class="wrapscroll"> -->
+              <table border="0" cellpadding="0" cellspacing="0">
+                <tbody>
+                  <tr :class="[index % 2 == 1 ? 'active1' : 'active2']" style="height:48px" :key="index"
+                    v-for="(n, index) in getlist">
+                    <td style="width: 8%;">1</td>
+                    <td style="width: 12%;">测试设备</td>
+                    <td style="width: 12%;">88%</td>
+                  </tr>
+                </tbody>
+              </table>
+              <!-- </vue-seamless-scroll> -->
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- <div class="item"></div> -->
+      <!-- <div class="item"></div> -->
+    </div>
+  </v-scale-screen>
+</template>
+
+<script>
+import {
+  getBoardFactory,
+  getMesBoardEquProductionToday,
+  getBoardShifts,
+} from "@/api/kanban/dailyoutput";
+import * as echarts from "echarts";
+import moment from "moment";
+// import Echarts3D from "./echarts3d.vue";
+// import Echarts3D2 from "./echarts3d2.vue";
+export default {
+  name: "Index",
+  components: {
+  },
+  data() {
+    return {
+      gettimedata: "",
+      selectxt: null,
+      selectxtclasses: null,
+      getLineList: [],
+      classesList: [],
+      number1: 0,
+      number2: 0,
+      number3: 0,
+      number4: 0,
+      nameList: [
+        "成型机一",
+        "成型机二",
+        "成型机三",
+        "成型机四",
+        "成型机五",
+        "成型机六",
+        "成型机五",
+        "成型机六",
+      ],
+      valueList: [1639, 1422, 1306, 1131, 1040, 732, 1040, 732],
+      optionDatalist1: [],
+      optionDatalist2: [],
+      optionDatalist3: [],
+      optionDatalist4: [],
+      colorlist: ["#005aff", "#f8b551"],
+      datetime: null,
+      time1: null,
+      getlist: [
+        {
+
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+
+},
+      ],
+    };
+  },
+  created() { },
+  destroyed() {
+    clearInterval(this.time1);
+    this.time1 = null;
+  },
+  mounted() {
+    // this.datetime = moment().subtract(2, "day").format("yyyy-MM-DD");
+    //console.log('zhuanhuahou',this.dateRangeone)
+    this.selectFactorylist();
+    this.gettime();
+    this.initChart1();
+  },
+  methods: {
+    back() {
+      this.$router.push({ path: "/index" });
+    },
+    gettime() {
+      this.gettimedata = moment().format("YYYY-MM-DD HH:mm:ss ");
+      setInterval(() => {
+        this.gettimedata = moment().format("YYYY-MM-DD HH:mm:ss ");
+      }, 1000);
+    },
+    selectFactorylist() {
+      const _this = this;
+      getBoardFactory({
+        factory: null,
+      }).then((response) => {
+        if (response.data) {
+          _this.getLineList = response.data;
+          _this.selectxt = _this.getLineList[0].parentName;
+          getBoardShifts({
+            factory: _this.selectxt,
+          }).then((response) => {
+            if (response.data) {
+              console.log(response.data);
+              _this.classesList = response.data;
+              _this.selectxtclasses = _this.classesList[0].shiftId;
+              _this.initChart1();
+              _this.time1 = setInterval(() => {
+                _this.initChart1();
+              }, 1000 * 60 * 1);
+            }
+          });
+        }
+
+
+
+      });
+    },
+    initChart1() {
+
+      var myChart1 = echarts.init(document.querySelector("#echart1"));
+      var option1 = {
+        //提示框组件。开发实际中去掉了指针，提示框可以不用设置。
+        tooltip: {
+          formatter: "{a} <br/>{b} : {c}%",
+        },
+        grid: {
+        },
+        //下面属性才是仪表盘的核心！！反正我是这么认为的！！！
+        series: [
+          {
+            //类型
+            splitNumber: 4, //刻度数量
+            type: "gauge",
+            //半径
+            radius: 155,
+            //起始角度。圆心 正右手侧为0度，正上方为90度，正左手侧为180度。
+            startAngle: 180,
+            //结束角度。
+            endAngle: 0,
+            center: ["50%", "100%"],
+            //仪表盘轴线相关配置。
+            name: "内层盘",
+            type: "gauge",
+            axisLine: {
+              lineStyle: {
+                width: 10,
+                color: [
+                  [
+                    1,
+                    new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+                      {
+                        offset: 0,
+                        color: "#040610",
+                      },
+                      {
+                        offset: 0.2,
+                        color: "#083782",
+                      },
+                      {
+                        offset: 0.5,
+                        color: "#0E5EFD",
+                      },
+                      {
+                        offset: 0.8,
+                        color: "#083782",
+                      },
+                      {
+                        offset: 1,
+                        color: "#040610",
+                      },
+                    ]),
+                  ],
+                ],
+              },
+            },
+            axisTick: {
+              lineStyle: {
+                color: "#fff",
+                width: 1,
+              },
+              length: 6,
+              splitNumber: 1,
+              show: false,
+            },
+            splitLine: {
+              show: false,
+            },
+            axisLabel: {
+              show: false,
+            },
+            pointer: {
+              show: false,
+            },
+            data: [
+              {
+                show: false,
+                value: "0",
+              },
+            ],
+            detail: {
+              show: 0,
+            },
+          },
+          {
+            //类型
+            splitNumber: 4, //刻度数量
+            type: "gauge",
+            //半径
+            radius: 115,
+            //起始角度。圆心 正右手侧为0度，正上方为90度，正左手侧为180度。
+            startAngle: 180,
+            //结束角度。
+            endAngle: 0,
+            center: ["50%", "100%"],
+            //仪表盘轴线相关配置。
+            name: "内层盘",
+            type: "gauge",
+            axisLine: {
+              lineStyle: {
+                width: 25,
+                color: [
+                  [
+                    1,
+                    new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+                      {
+                        offset: 0.1,
+                        color: "#3E82FF",
+                      },
+                      {
+                        offset: 0.6,
+                        color: "#65FBFF",
+                      },
+                      {
+                        offset: 1,
+                        color: "#23317D",
+                      },
+                    ]),
+                  ],
+                ],
+              },
+            },
+            axisTick: {
+              lineStyle: {
+                color: "#fff",
+                width: 1,
+              },
+              length: 6,
+              splitNumber: 1,
+              show: false,
+            },
+            splitLine: {
+              show: false,
+            },
+            axisLabel: {
+              show: false,
+            },
+            pointer: {
+              show: false,
+            },
+            axisLabel: {
+              show: false,
+            },
+            data: [
+              {
+                show: false,
+                value: "0",
+              },
+            ],
+            detail: {
+              show: false,
+            },
+          },
+          {
+            //类型
+            splitNumber: 4, //刻度数量
+            type: "gauge",
+            //半径
+            radius: 115,
+            //起始角度。圆心 正右手侧为0度，正上方为90度，正左手侧为180度。
+            startAngle: 18,
+            //结束角度。
+            endAngle: 0,
+            center: ["50%", "100%"],
+            //仪表盘轴线相关配置。
+            name: "内层盘",
+            type: "gauge",
+            axisLine: {
+              lineStyle: {
+                width: 25,
+                color: [
+                  [
+                    1,
+                    new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+                      {
+                        offset: 0.1,
+                        color: "#351A0E",
+                      },
+                      {
+                        offset: 0.6,
+                        color: "#363121",
+                      },
+                      {
+                        offset: 1,
+                        color: "#351A0E",
+                      },
+                    ]),
+                  ],
+                ],
+              },
+            },
+            axisTick: {
+              lineStyle: {
+                color: "#fff",
+                width: 1,
+              },
+              length: 6,
+              splitNumber: 1,
+              show: false,
+            },
+            splitLine: {
+              show: false,
+            },
+            axisLabel: {
+              show: false,
+            },
+            pointer: {
+              show: false,
+            },
+            axisLabel: {
+              show: false,
+            },
+            data: [
+              {
+                show: false,
+                value: "0",
+              },
+            ],
+            detail: {
+              show: false,
+            },
+          },
+
+          {
+            //类型
+            color: "#fff",
+            splitNumber: 4, //刻度数量
+            type: "gauge",
+            name: '完好设备占比',
+            //半径
+            radius: 135,
+            //起始角度。圆心 正右手侧为0度，正上方为90度，正左手侧为180度。
+            startAngle: 180,
+            //结束角度。
+            endAngle: 0,
+            center: ["50%", "100%"],
+            //仪表盘轴线相关配置。
+            axisLine: {
+              show: true,
+              // 属性lineStyle控制线条样式
+              lineStyle: {
+                width: 20,
+                color: [
+                  [
+                    1,
+                    new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+                      {
+                        offset: 0.1,
+                        color: "#3A76F0",
+                      },
+                      {
+                        offset: 0.6,
+                        color: "#23327E",
+                      },
+                      {
+                        offset: 1,
+                        color: "#3A76F0",
+                      },
+                    ]),
+                  ],
+                ],
+              },
+            },
+            //分隔线样式。
+            splitLine: {
+              show: false,
+            },
+            //刻度样式。
+            axisTick: {
+              // show: false,
+              splitNumber: 8,
+              length: 20,
+              lineStyle: {
+                color: "#04060F",
+              },
+              distance: -20,
+            },
+            //刻度标签。
+            axisLabel: {
+              // splitNumber: 10,
+              // distance: -12,
+              // fontSize: 17,
+              color: "#ffffff",
+              show: false,
+            },
+            //仪表盘指针。
+            pointer: {
+              //这个show属性好像有问题，因为在这次开发中，需要去掉指正，我设置false的时候，还是显示指针，估计是BUG吧，我用的echarts-3.2.3；希望改进。最终，我把width属性设置为0，成功搞定！
+              show: false,
+              //指针长度
+              length: "90%",
+              width: 0,
+            },
+            //仪表盘标题。
+            title: {
+              show: true,
+              offsetCenter: [0, "40%"], // x, y，单位px
+              color: "#fff",			// 文字的颜色,默认 #333。
+              fontSize: 20,
+            },
+            //仪表盘详情，用于显示数据。
+            detail: {
+              show: true,
+              valueAnimation: true,
+              formatter: "{value}%",
+              offsetCenter: [0, "-10%"],
+              textStyle: {
+                color: "#fff",
+                fontSize: 30,
+              },
+
+            },
+            data: [
+              {
+                value: 10,
+              },
+
+            ],
+          },
+        ],
+      };
+      myChart1.setOption(option1);
+    },
+    selectline() {
+      const _this = this;
+      this.optionDatalist1 = [];
+      this.optionDatalist2 = [];
+      this.optionDatalist3 = [];
+      this.optionDatalist4 = [];
+      getBoardShifts({
+        factory: _this.selectxt,
+      }).then((response) => {
+        if (response.data) {
+          console.log(response.data);
+          _this.classesList = response.data;
+          _this.selectxtclasses = _this.classesList[0].shiftId;
+          _this.initChart1();
+        }
+      });
+    },
+    selectline2() {
+      this.initChart1();
+    },
+    //左侧第一个选择类型下拉框 回调函数
+  },
+};
+</script>
+<style lang="scss" scoped>
+.app-container {
+  padding: 0px 24px;
+}
+
+.home {
+  width: 100%;
+  height: 100vh;
+  background: url("../../../assets/images/bg-body.png") no-repeat;
+  background-size: 100% 100%;
+  background-color: #050711;
+
+  .head {
+    width: 100%;
+    height: 74px;
+    position: relative;
+
+    .head-content {
+      height: 74px;
+      background-image: url("../../../assets/images/bg-head.png");
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      text-align: center;
+
+      .title {
+        font-size: 42px;
+        font-weight: 400;
+        color: #ffffff;
+      }
+    }
+
+    .head-logo {
+      position: absolute;
+      left: 0px;
+      top: 1px;
+
+      img {
+        height: 38px;
+        // width: ;
+      }
+    }
+
+    .back {
+      position: absolute;
+      right: 0px;
+      top: 5px;
+    }
+  }
+
+  .content-top {
+    display: flex;
+    justify-content: space-between;
+    position: relative;
+
+    .factory {
+      width: 540px;
+      height: 60px;
+      background: url("../../../assets/images/bg- border1.png") no-repeat;
+      background-size: 100% 100%;
+      text-align: center;
+      position: absolute;
+      top: -17px;
+      left: 0px;
+    }
+
+    .timebox {
+      width: 480px;
+      height: 60px;
+      background: url("../../../assets/images/bg-border2.png") no-repeat;
+      background-size: 100% 100%;
+      text-align: center;
+      position: absolute;
+      top: -17px;
+      right: 0px;
+
+      .time {
+        font-size: 30px;
+        font-weight: 400;
+        color: #ffffff;
+        line-height: 71px;
+      }
+    }
+  }
+
+  .content {
+    margin-top: 63px;
+
+    .itemtop {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      .left {
+        .item-table {
+          width: 1243px;
+          height: 292px;
+          background: url('../../../assets/images/equipment/bg-border1.png') no-repeat;
+          background-size: 100% 100%;
+          padding: 27px 21px 30px 25px;
+          box-sizing: border-box;
+          box-sizing: border-box;
+
+          .table-thead {
+            width: 1197px;
+            height: 44px;
+            margin: auto;
+            background: #0A1A33;
+
+            td {
+              font-size: 19px;
+              font-family: NotoSansHans-Medium, NotoSansHans;
+              font-weight: 500;
+              color: #159AFF;
+              text-align: center;
+              white-space: nowrap;
+            }
+          }
+
+          .table-tbody {
+            height: 192px;
+            // width: 1775px;
+            margin: auto;
+            overflow-y: scroll;
+            table {
+              width: 100%;
+
+              tbody {
+                width: 100%;
+
+                td {
+                  font-size: 19px;
+                  font-family: NotoSansHans-Medium, NotoSansHans;
+                  font-weight: 500;
+                  color: #FFFFFF;
+                  text-align: center;
+                  border-bottom: 1px dashed #6C8097
+                }
+              }
+            }
+          }
+        }
+
+        .item-table1 {
+          margin-top: 20px;
+          padding-top: 19px;
+
+          .table-tbody {
+            height: 144px;
+          }
+        }
+      }
+
+      .right {
+        margin-left: 23px;
+        width: 610px;
+        height: 604px;
+        background: url('../../../assets/images/equipment/bg-border1.png') no-repeat;
+        background-size: 100% 100%;
+        // padding: 27px 21px 30px 25px;
+        box-sizing: border-box;
+        position: relative;
+
+        .echartbox {
+          margin-top: 50px;
+        }
+
+        .echart1title {
+          display: inline-table;
+          position: absolute;
+          top: -27px;
+          left: 0px;
+          bottom: 0px;
+          right: 0px;
+          margin: auto;
+          z-index: 9999;
+          font-size: 24px;
+          font-weight: bold;
+          color: #FFFFFF;
+        }
+
+        .equipmentinfobox {
+          margin-top: 105px;
+          display: flex;
+          align-items: center;
+          justify-content: space-around;
+
+          .box {
+            width: 186px;
+            height: 180px;
+            background: url('../../../assets/images/equipment/number.png') no-repeat;
+            background-size: 100% 100%;
+            text-align: center;
+            padding-top: 30px;
+            box-sizing: border-box;
+
+            .number {
+              .number1 {
+                font-size: 60px;
+                font-weight: 500;
+                color: #66FFFF;
+              }
+
+              .name1 {
+                font-size: 32px;
+                font-weight: 400;
+                color: #FFFFFF;
+              }
+            }
+
+            .name2 {
+              margin-top: 15px;
+              font-size: 32px;
+              font-weight: bold;
+              color: #FFFFFF;
+            }
+          }
+        }
+      }
+    }
+
+    .itembottom {
+      margin-top: 19px;
+      display: flex;
+      justify-content: space-around;
+      .item-table {
+        width: 610px;
+        height: 292px;
+        background: url('../../../assets/images/equipment/bg-border1.png') no-repeat;
+        background-size: 100% 100%;
+        padding: 27px 21px 30px 25px;
+        box-sizing: border-box;
+        box-sizing: border-box;
+
+        .table-thead {
+          width: 1197px;
+          height: 44px;
+          margin: auto;
+          background: #0A1A33;
+
+          td {
+            font-size: 19px;
+            font-family: NotoSansHans-Medium, NotoSansHans;
+            font-weight: 500;
+            color: #159AFF;
+            text-align: center;
+            white-space: nowrap;
+          }
+        }
+
+        .table-tbody {
+          height: 192px;
+          // width: 1775px;
+          margin: auto;
+          overflow-y: scroll;
+
+          table {
+            width: 100%;
+
+            tbody {
+              width: 100%;
+
+              td {
+                font-size: 19px;
+                font-family: NotoSansHans-Medium, NotoSansHans;
+                font-weight: 500;
+                color: #FFFFFF;
+                text-align: center;
+                border-bottom: 1px dashed #6C8097
+              }
+            }
+          }
+        }
+      }
+
+      .item-table1 {
+        margin-top: 20px;
+        padding-top: 19px;
+
+        .table-thead {
+          width: 565.01px;
+        }
+
+        .table-tbody {
+          height: 144px;
+        }
+      }
+    }
+  }
+}
+
+.titlebox {
+  width: 431px;
+  height: 38px;
+  background: url("../../../assets/images/bg-title.png") no-repeat;
+  background-size: 100% 100%;
+  //   text-align: center;
+  font-size: 20px;
+  font-weight: bold;
+  color: #ffffff;
+  line-height: 38px;
+  letter-spacing: 2px;
+  text-shadow: 0px 2px 4px rgba(0, 0, 0, 0.5);
+  padding-left: 60px;
+  //   .titlename{
+  //     position: relative;
+  //     left: 24px;
+  //   }
+}
+
+.factory {
+  display: flex;
+  // justify-content: space-around;
+}
+
+.selectborder {
+  background-color: transparent;
+  border-radius: 4px;
+  // border: 2px solid #27408c;
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  width: 310px;
+  margin-left: 50px;
+}
+
+.selectborder1 {
+  background-color: transparent;
+  border-radius: 4px;
+  // border: 2px solid #27408c;
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  width: 88px;
+  margin-left: 25px;
+}
+
+.selectborder select {
+  /*清除select的边框样式*/
+  border: none;
+  /*清除select聚焦时候的边框颜色*/
+  outline: none;
+  background-color: transparent;
+  /*将select的宽高等于div的宽高*/
+  width: 100%;
+  height: 50px;
+  /*隐藏select的下拉图标*/
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  font-size: 25px;
+  font-weight: 400;
+  color: #ffffff;
+  line-height: 42px;
+}
+
+.selectborder option {
+  /*清除select的边框样式*/
+  border: none;
+  /*清除select聚焦时候的边框颜色*/
+  outline: none;
+  background-color: transparent;
+  /*将select的宽高等于div的宽高*/
+  width: 100%;
+  height: 50px;
+  /*隐藏select的下拉图标*/
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  padding-left: 20px;
+  font-size: 25px;
+  font-weight: 500;
+  color: #3fa2ff;
+  border-radius: 0%;
+}
+
+.selectborder1 option {
+  /*清除select的边框样式*/
+  border: none;
+  /*清除select聚焦时候的边框颜色*/
+  outline: none;
+  background-color: transparent;
+  /*将select的宽高等于div的宽高*/
+  width: 200px;
+  height: 50px;
+  /*隐藏select的下拉图标*/
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  padding-left: 20px;
+  font-size: 25px;
+  font-weight: 500;
+  color: #3fa2ff;
+  border-radius: 0%;
+}
+
+.selectborder:after {
+  content: "";
+  width: 24px;
+  height: 24px;
+  background: url(../../../assets/images/xiala.png) no-repeat center;
+  /*通过定位将图标放在合适的位置*/
+  position: absolute;
+  right: 0px;
+  top: 25%;
+  /*给自定义的图标实现点击下来功能*/
+  pointer-events: none;
+}
+
+.selectborder1:after {
+  content: "";
+  width: 24px;
+  height: 24px;
+  background: url(../../../assets/images/xiala.png) no-repeat center;
+  /*通过定位将图标放在合适的位置*/
+  position: absolute;
+  right: 0px;
+  top: 25%;
+  /*给自定义的图标实现点击下来功能*/
+  pointer-events: none;
+}
+
+::v-deep .el-button--primary {
+  color: #ffffff;
+  background-color: #325e82;
+  border-color: #0a0f19;
+}
+
+.active1 {
+  background-color: #0D1B2F;
+}
+
+.active2 {
+  // background-color: #04060E;
+}
+::-webkit-scrollbar {
+  width: 3px;
+  height: 0px;
+  background-color: #0c0642;
+}
+
+/*定义滚动条轨道 内阴影+圆角*/
+::-webkit-scrollbar-track {
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+  border-radius: 8px;
+  background-color: #07356a;
+}
+
+/*定义滑块 内阴影+圆角*/
+::-webkit-scrollbar-thumb {
+  border-radius: 8px;
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+  background-color: #0091ff;
+}
+</style>