Merge remote-tracking branch 'origin/xf_dev' into xf_dev

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "综合管控采集平台",
+  "name": "生产线综合管控采集平台",
   "version": "1.0.0",
   "private": true,
   "type": "module",

src/views/device/analysis/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="mainContentBox">
-    <avue-crud
+    <!-- <avue-crud
       ref="crudRef"
       v-model:search="search"
       v-model="form"
@@ -15,215 +15,18 @@
       @size-change="dataList"
       @current-change="dataList"
       @selection-change="selectionChange"
-    >
-      <template #menu-left="{ size }">
-        <el-button
-          :disabled="toDeleteIds.length < 1"
-          type="danger"
-          icon="el-icon-delete"
-          :size="size"
-          v-hasPerm="[ButtonPermKeys.DEVICE.BTNS.repair_del]"
-          @click="multipleDelete"
-          >删除</el-button
-        >
-      </template>
-      <template #menu="{ size, row, index }">
-        <!-- <el-button
-          @click="maintenance(row, 0)"
-          icon="el-icon-check"
-          text
-          type="primary"
-          :size="size"
-          >流程</el-button
-        > -->
-        <!--        <el-button @click="maintenance(row,1)"
-                   icon="el-icon-fold"
-                   text
-                   type="primary"
-                   :size="size">记录</el-button>-->
-      </template>
-    </avue-crud>
-    <el-dialog
-      v-model="dialog.visible"
-      :title="dialog.title"
-      width="850px"
-      @close="dialog.visible = false"
-    >
-      <device-page @device-info="deviceInfo" />
-    </el-dialog>
-
-    <el-dialog
-      v-model="dialog1.visible"
-      :title="dialog1.title"
-      width="750px"
-      height="80%"
-      @close="dialog1.visible = false"
-    >
-      <el-timeline style="max-width: 500px; margin-left: 100px">
-        <el-timeline-item center type="success" placement="top">
-          <el-card>
-            <h4>设备报故</h4>
-            <p>设备编号： {{ maintenanceInfo.deviceNo }}</p>
-            <p>设备名称： {{ maintenanceInfo.deviceName }}</p>
-            <p>报故人员： {{ maintenanceInfo.creator }}</p>
-            <p>故障描述： {{ maintenanceInfo.bugRemark }}</p>
-            <p>报故时间： {{ maintenanceInfo.created }}</p>
-          </el-card>
-        </el-timeline-item>
-        <el-timeline-item
-          center
-          placement="top"
-          :type="maintenanceInfo.state === 0 ? 'primary' : 'success'"
-        >
-          <el-card v-if="viewPage">
-            <h4>设备维修</h4>
-            <p>维修人员： {{ maintenanceInfo.handleUser }}</p>
-            <p>维修内容： {{ maintenanceInfo.handleContent }}</p>
-            <p>
-              处理结果：
-              {{
-                maintenanceInfo.handleUser
-                  ? maintenanceInfo.handleResult === 0
-                    ? "可正常运行"
-                    : "报废"
-                  : ""
-              }}
-            </p>
-          </el-card>
-          <el-card v-if="!viewPage">
-            <h4>设备维修</h4>
-            <el-form
-              ref="maintenanceInfoForm1"
-              :model="maintenanceInfo"
-              label-width="auto"
-              style="max-width: 400px"
-              :rules="rules1"
-            >
-              <el-form-item label="维修人员" prop="handleUser">
-                <!--                <el-input :disabled="maintenanceInfo.state !== 0" v-model="maintenanceInfo.handleUser" />-->
-                <el-select
-                  v-model="maintenanceInfo.handleUser"
-                  placeholder="维修人员"
-                  :disabled="maintenanceInfo.state !== 0"
-                  size="large"
-                  filterable
-                >
-                  <el-option
-                    v-for="item in userList"
-                    :key="item.userName"
-                    :label="item.userName"
-                    :value="item.userName"
-                  />
-                </el-select>
-              </el-form-item>
-              <el-form-item label="维修内容" prop="handleContent">
-                <el-input
-                  :disabled="maintenanceInfo.state !== 0"
-                  type="textarea"
-                  :rows="2"
-                  v-model="maintenanceInfo.handleContent"
-                />
-              </el-form-item>
-              <el-form-item label="处理结果">
-                <el-radio-group
-                  :disabled="maintenanceInfo.state !== 0"
-                  v-model="maintenanceInfo.handleResult"
-                  class="ml-4"
-                >
-                  <el-radio :value="0">可正常运行</el-radio>
-                  <el-radio :value="1">报废</el-radio>
-                </el-radio-group>
-              </el-form-item>
-              <el-form-item style="margin-left: 45%">
-                <el-button
-                  type="primary"
-                  v-if="maintenanceInfo.state === 0"
-                  v-hasPerm="[ButtonPermKeys.DEVICE.BTNS.repair_repair]"
-                  :disabled="maintenanceInfo.state !== 0"
-                  @click="maintenanceSubmit1"
-                  >维修</el-button
-                >
-              </el-form-item>
-            </el-form>
-          </el-card>
-        </el-timeline-item>
-        <el-timeline-item
-          center
-          placement="top"
-          :type="
-            maintenanceInfo.state === 1
-              ? 'primary'
-              : maintenanceInfo.state === 0
-                ? 'info'
-                : 'success'
-          "
-        >
-          <el-card v-if="viewPage">
-            <h4>设备审批</h4>
-            <p>审批人员： {{ maintenanceInfo.auditUser }}</p>
-            <p>
-              审批结果：
-              {{
-                maintenanceInfo.auditUser
-                  ? maintenanceInfo.auditResult === 0
-                    ? "通过"
-                    : "不通过"
-                  : ""
-              }}
-            </p>
-          </el-card>
-          <el-card v-if="!viewPage">
-            <h4>设备审批</h4>
-            <el-form
-              ref="maintenanceInfoForm2"
-              v-if="maintenanceInfo.state >= 1"
-              :model="maintenanceInfo"
-              label-width="auto"
-              style="max-width: 400px"
-              :rules="rules2"
-            >
-              <el-form-item label="审批人员" prop="auditUser">
-                <!--                <el-input :disabled="maintenanceInfo.state !== 1 && readonly"  v-model="maintenanceInfo.auditUser" />-->
-                <el-select
-                  v-model="maintenanceInfo.auditUser"
-                  placeholder="审批人员"
-                  :disabled="maintenanceInfo.state !== 1 && readonly"
-                  size="large"
-                  filterable
-                >
-                  <el-option
-                    v-for="item in userList"
-                    :key="item.userName"
-                    :label="item.userName"
-                    :value="item.userName"
-                  />
-                </el-select>
-              </el-form-item>
-              <el-form-item label="审批结果">
-                <el-radio-group
-                  :disabled="maintenanceInfo.state !== 1 && readonly"
-                  v-model="maintenanceInfo.auditResult"
-                  class="ml-4"
-                >
-                  <el-radio :value="0">通过</el-radio>
-                  <el-radio :value="1">不通过</el-radio>
-                </el-radio-group>
-              </el-form-item>
-              <el-form-item style="margin-left: 45%">
-                <el-button
-                  type="primary"
-                  v-if="maintenanceInfo.state === 1"
-                  v-hasPerm="[ButtonPermKeys.DEVICE.BTNS.repair_audit]"
-                  :disabled="maintenanceInfo.state !== 1"
-                  @click="maintenanceSubmit2"
-                  >审批</el-button
-                >
-              </el-form-item>
-            </el-form>
-          </el-card>
-        </el-timeline-item>
-      </el-timeline>
-    </el-dialog>
+    /> -->
+    <el-table :data="tableData" border style="width: 100%">
+      <el-table-column label="日期" prop="a" />
+      <el-table-column label="月份" prop="b" />
+      <el-table-column label="客户" prop="c" />
+      <el-table-column label="车间" prop="d" />
+      <el-table-column label="设备名称" prop="e" />
+      <el-table-column label="设备型号" prop="f" />
+      <el-table-column label="点检次数" prop="g" />
+      <el-table-column label="异常次数" prop="h" />
+      <el-table-column label="备注" prop="i" />
+    </el-table>
   </div>
 </template>
 <script setup>
@@ -235,6 +38,96 @@ import { getUserList } from "@/api/system/user";
 import { repair, audit } from "@/api/device/index";
 import { useCommonStoreHook } from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
+const tableData = [
+  {
+    a: "2016-05-03",
+    b: "5",
+    c: "A",
+    d: "JG",
+    e: "运载器",
+    f: "SG-53",
+    g: "4",
+    h: "0",
+    i: "-",
+  },
+  {
+    a: "2016-05-03",
+    b: "5",
+    c: "A",
+    d: "JG",
+    e: "运载器",
+    f: "SG-53",
+    g: "4",
+    h: "0",
+    i: "-",
+  },
+  {
+    a: "2016-05-03",
+    b: "5",
+    c: "A",
+    d: "JG",
+    e: "运载器",
+    f: "SG-53",
+    g: "4",
+    h: "0",
+    i: "-",
+  },
+  {
+    a: "2016-05-03",
+    b: "5",
+    c: "A",
+    d: "JG",
+    e: "运载器",
+    f: "SG-53",
+    g: "4",
+    h: "0",
+    i: "-",
+  },
+  {
+    a: "2016-05-03",
+    b: "5",
+    c: "A",
+    d: "JG",
+    e: "运载器",
+    f: "SG-53",
+    g: "4",
+    h: "0",
+    i: "-",
+  },
+  {
+    a: "2016-05-03",
+    b: "5",
+    c: "A",
+    d: "JG",
+    e: "运载器",
+    f: "SG-53",
+    g: "4",
+    h: "0",
+    i: "-",
+  },
+  {
+    a: "2016-05-03",
+    b: "5",
+    c: "A",
+    d: "JG",
+    e: "运载器",
+    f: "SG-53",
+    g: "4",
+    h: "0",
+    i: "-",
+  },
+  {
+    a: "2016-05-03",
+    b: "5",
+    c: "A",
+    d: "JG",
+    e: "运载器",
+    f: "SG-53",
+    g: "4",
+    h: "0",
+    i: "-",
+  },/
+];
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 const test = () => {
   isShowTable.value = true;
@@ -332,91 +225,63 @@ const rules2 = reactive({
 // 设置表格列或者其他自定义的option
 option.value = Object.assign(option.value, {
   delBtn: false,
-  selection: true,
-  labelWidth: 150,
-  viewBtn: false,
+  selection: false,
+  addBtn: false,
   editBtn: false,
+  viewBtn: false,
+  searchBtn: false,
+  menu: false,
   column: [
     {
-      label: "设备编号",
-      prop: "deviceNo",
-      search: true,
-      rules: [
-        {
-          required: true,
-          message: "设备编号不能为空",
-          trigger: "trigger",
-        },
-      ],
-      click: ({ value, column }) => {
-        if (column.boxType) {
-          dialog.visible = true;
-        }
-      },
+      label: "日期",
+      prop: "a",
+      addDisabled: true,
+      search: false,
     },
     {
-      label: "设备名称",
-      prop: "deviceName",
-      addDisabled: true,
-      search: true,
+      label: "月份",
+      prop: "b",
+      display: false,
     },
     {
-      label: "设备类型",
-      prop: "deviceType",
-      type: "select",
-      addDisabled: true,
-      search: true,
-      dicUrl: dictDataUtil.request_url + dictDataUtil.TYPE_CODE.device_type,
-      props: {
-        label: "dictLabel",
-        value: "dictValue",
-      },
-      rules: [
-        {
-          required: true,
-          message: "设备类型不能为空",
-          trigger: "trigger",
-        },
-      ],
+      label: "客户",
+      prop: "c",
+      width: "180",
+      display: false,
     },
     {
-      label: "设备位置",
-      addDisabled: true,
-      prop: "devicePosition",
+      label: "车间",
+      prop: "d",
+      width: "180",
+      display: false,
     },
     {
-      label: "故障描述",
-      prop: "bugRemark",
-      minRows: 2, //最小行/最小值
-      type: "textarea", //类型为多行文本域框
-      maxlength: 512, //最大输入长度,
-      rules: [
-        {
-          required: true,
-          message: "故障描述不能为空",
-          trigger: "trigger",
-        },
-      ],
+      label: "设备名称",
+      prop: "e",
+      width: "180",
+      display: false,
     },
     {
-      label: "维修状态",
-      prop: "state",
-      type: "select",
+      label: "设备型号",
+      prop: "f",
+      width: "180",
       display: false,
-      dicData: [
-        { label: "待维修", value: 0 },
-        { label: "待审批 ", value: 1 },
-        { label: "已完成", value: 2 },
-      ],
     },
     {
-      label: "报故人",
-      prop: "creator",
+      label: "点检次数",
+      prop: "g",
+      width: "180",
+      display: false,
+    },
+    {
+      label: "异常次数",
+      prop: "h",
+      width: "180",
       display: false,
     },
     {
-      label: "报故日期",
-      prop: "created",
+      label: "备注",
+      prop: "i",
       width: "180",
       display: false,
     },

src/views/report/environment/temperature/index.vue

@@ -5,9 +5,9 @@
         <div class="box">
           <div class="titleText">防静电监控</div>
           <div class="itemBox">
-            <div class="item" v-for="(item, index) in 20">
+            <div class="item" v-for="(item, index in option) in 20">
               <div class="sc"></div>
-              <div class="gw">工位:{{ index }}</div>
+              <div class="gw">工位:{{ item }}</div>
             </div>
           </div>
         </div>
@@ -35,7 +35,18 @@
 <script setup>
 import Tables from "./tables.vue";
 import * as echarts from "echarts";
-
+const option={
+  'JG-装配1',
+  'JG-装配2',
+  'JG-装配3',
+  'JG-捡练4',
+  'JG-捡练5',
+  '预期套01',
+  'JG-测试1',
+  'JG-装配4',
+  'JG-测试2',
+  '入库工位',
+}
 const activeName = ref("first");
 
 const charts1 = shallowRef(null);