最新提交

pengwei

2025-03-12 18fcb8ad28f583e3e1b99b23e4f7d9e1833dcd83

 ÏîÄ¿´úÂë/client/src/views/tts/DataLogging/Datalogging.vue

@@ -24,7 +24,8 @@
      <div class="serch">
        <div class="time_box">
          <el-select
            v-model="value"
            v-if="isactive == 1"
            v-model="queryForm.value"
            placeholder="请选择"
            size="small"
            style="width: 6.19rem; height: 2rem; margin-right: 0.98rem"
@@ -36,7 +37,7 @@
              :value="item.value"
            />
          </el-select>
          <div class="time">派工日期</div>
          <div class="time">创建日期</div>
          <el-date-picker
            v-model="queryForm.selectTime"
            prefix-icon="none"
@@ -58,27 +59,45 @@
            size="small"
          />
        </div>
        <div class="serch_box">
          <div class="serchb">全局搜索</div>
        <!-- <div class="serch_box">
          <div class="serchb">
            <el-select
              v-model="queryForm.selectType"
              placeholder="请选择"
              size="small"
              style="width: 100%; height: 100%; font-size: 0.15rem"
            >
              <el-option
                v-for="item in selectoptions"
                :key="item.value"
                :label="item.label"
                :value="item.value"
              />
            </el-select>
          </div>
          <input
            v-model="queryForm.selectName"
            v-model="queryForm.selectInput"
            placeholder="请输入关键词搜索"
            style="border-left: 0.06rem solid #e2e2e2"
          />
        </div>
        </div> -->
        <el-button
          @click="handleQuery"
          type="primary"
          size="small"
          style="margin-left: 0.98rem; height: 2rem"
          >查询</el-button
        >
        <el-button size="small" style="height: 2rem">重置</el-button>
        <el-button size="small" style="height: 2rem" @click="resetQuery"
          >重置</el-button
        >
      </div>
      <div class="btns">
        <div style="display: flex; align-items: center">
          <el-button
            size="small"
            style="width: 5.5rem; height: 2rem; font-size: 0.88rem"
            @click="printExcel"
            >批量导出</el-button
          >
        </div>
@@ -88,6 +107,7 @@
        <el-table
          v-if="isactive == 1"
          :data="tableData"
          height="450"
          style="width: 100%"
          :header-cell-style="{
            background: 'rgba(250,250,250,1)',
@@ -103,21 +123,45 @@
          }"
        >
          <el-table-column type="selection" align="center" />
          <el-table-column prop="address" label="序号" align="center" />
          <el-table-column prop="name" label="车组号" align="center" />
          <el-table-column prop="address" label="车厢号" align="center" />
          <el-table-column prop="address" label="转向架" align="center" />
          <el-table-column prop="address" label="检修班组" align="center" />
          <el-table-column prop="address" label="技术员" align="center" />
          <el-table-column prop="address" label="机械质检员" align="center" />
          <el-table-column prop="address" label="地沟质检员" align="center" />
          <el-table-column prop="address" label="电气质检员" align="center" />
          <el-table-column prop="address" label="检修工长" align="center" />
          <el-table-column prop="address" label="创建时间" align="center" />
          <el-table-column prop="address" label="任务状态" align="center" />
          <el-table-column prop="address" label="操作" align="center">
            <template #default="">
              <el-button size="small" type="text" @click="Findmore"
          <el-table-column prop="id" label="序号" align="center" />
          <el-table-column prop="trainNum" label="车组号" align="center" />
          <el-table-column prop="coachNum" label="车厢号" align="center" />
          <el-table-column prop="bogie" label="转向架" align="center" />
          <el-table-column prop="processDept" label="检修班组" align="center" />
          <el-table-column prop="jiShuYuan" label="技术员" align="center" />
          <el-table-column
            prop="zhiJianYuan_LC"
            label="机械质检员"
            align="center"
          />
          <el-table-column
            prop="zhiJianYuan_DG"
            label="地沟质检员"
            align="center"
          />
          <el-table-column
            prop="zhiJianYuan_DQ"
            label="电气质检员"
            align="center"
          />
          <el-table-column prop="gongZhang" label="检修工长" align="center" />
          <el-table-column prop="createTime" label="创建时间" align="center" />
          <el-table-column prop="taskstatus" label="任务状态" align="center">
            <template #default="scope">
              <span style="color: #ff651a" v-if="scope.row.taskstatus == 0"
                >待派工</span
              >
              <span style="color: #c4ccd5" v-if="scope.row.taskstatus == 1"
                >已派工</span
              >
            </template>
          </el-table-column>
          <el-table-column label="操作" align="center">
            <template #default="scope">
              <el-button
                size="small"
                type="text"
                @click="Findmore(scope.row.nJtaskID)"
                >查看详情</el-button
              >
            </template>
@@ -128,6 +172,7 @@
        <el-table
          v-if="isactive == 2"
          :data="tableData"
          height="450"
          style="width: 100%"
          :header-cell-style="{
            background: 'rgba(250,250,250,1)',
@@ -143,34 +188,38 @@
          }"
        >
          <el-table-column type="selection" align="center" />
          <el-table-column prop="address" label="任务名称" align="center" />
          <el-table-column prop="name" label="技术员" align="center" />
          <el-table-column prop="address" label="检修工长" align="center" />
          <el-table-column prop="address" label="派工日期" align="center" />
          <el-table-column prop="address" label="完成日期" align="center" />
          <el-table-column prop="address" label="机械力矩值明细" align="center">
            <template #default="">
          <el-table-column prop="takeName" label="任务名称" align="center" />
          <el-table-column prop="jiShuYuan" label="技术员" align="center" />
          <el-table-column prop="gongZhang" label="检修工长" align="center" />
          <el-table-column
            prop="dispatchTime"
            label="派工日期"
            align="center"
          />
          <el-table-column prop="endTime" label="完成日期" align="center" />
          <el-table-column label="机械力矩值明细" align="center">
            <template #default="scope">
              <span
                style="color: blue; font-size: 0.88rem; cursor: pointer"
                @click="Findtorque"
                @click="LcFindtorque(scope.row.nJtaskID)"
                >查看</span
              >
            </template></el-table-column
          >
          <el-table-column prop="address" label="电气力矩值明细" align="center">
            <template #default="">
            <template #default="scope">
              <span
                style="color: blue; font-size: 0.88rem; cursor: pointer"
                @click="Findtorque"
                @click="DqFindtorque(scope.row.nJtaskID)"
                >查看</span
              >
            </template>
          </el-table-column>
          <el-table-column prop="address" label="电气力矩值明细" align="center">
            <template #default="">
          <el-table-column prop="address" label="地沟力矩值明细" align="center">
            <template #default="scope">
              <span
                style="color: blue; font-size: 0.88rem; cursor: pointer"
                @click="Findtorque"
                @click="DgFindtorque(scope.row.nJtaskID)"
                >查看</span
              >
            </template></el-table-column
@@ -181,6 +230,7 @@
        <el-table
          v-if="isactive == 3"
          :data="tableData"
          height="450"
          style="width: 100%"
          :header-cell-style="{
            background: 'rgba(250,250,250,1)',
@@ -196,10 +246,10 @@
          }"
        >
          <el-table-column type="selection" align="center" />
          <el-table-column prop="address" label="登录账号" align="center" />
          <el-table-column prop="name" label="真实姓名" align="center" />
          <el-table-column prop="address" label="登录IP" align="center" />
          <el-table-column prop="address" label="登录时间" align="center" />
          <el-table-column prop="account" label="登录账号" align="center" />
          <el-table-column prop="trurName" label="真实姓名" align="center" />
          <el-table-column prop="logIP" label="登录IP" align="center" />
          <el-table-column prop="createdate" label="登录时间" align="center" />
        </el-table>
      </div>
      <div
@@ -215,340 +265,14 @@
          size="small"
          background
          layout="prev, pager, next"
          :total="1"
          :current-page="pageQuery.page"
          :page-size="pageQuery.rows"
          :total="pageTotal"
          @size-change="handleSizeChange"
          @current-change="handleCurrentChange"
        />
      </div>
    </div>

    <!-- æ–°å»ºç¼–辑弹出框 -->
    <!-- <el-dialog
      v-model="dialogVisible"
      title=""
      width="60%"
      :before-close="handleClose"
      top="2%"
    >
      <template #title>
        <div
          style="
            height: 3.63rem;
            display: flex;
            border-bottom: 1px solid #e6e6e6;
          "
        >
          <span
            style="color: rgb(16, 16, 16); font-size: 1rem; font-weight: bold"
            >派任务</span
          >
        </div>
      </template>
      <el-form :model="form" label-width="auto" label-position="top">
        <el-row :gutter="20">
          <el-col :span="8">
            <el-form-item>
              <template #label>
                <div style="display: flex; align-items: flex-end">
                  <span style="color: red; margin-right: 0.2rem">*</span>
                  <span
                    style="font-size: 0.88rem; color: black; font-weight: bold"
                    >任务名称</span
                  >
                </div>
              </template>
              <el-input size="small" v-model="form.name" placeholder="请输入" />
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item>
              <template #label>
                <div style="display: flex; align-items: flex-end">
                  <span style="color: red; margin-right: 0.2rem">*</span>
                  <span
                    style="font-size: 0.88rem; color: black; font-weight: bold"
                    >技术员</span
                  >
                </div>
              </template>
              <el-input size="small" v-model="form.name" placeholder="请输入" />
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item>
              <template #label>
                <div style="display: flex; align-items: flex-end">
                  <span style="color: red; margin-right: 0.2rem">*</span>
                  <span
                    style="font-size: 0.88rem; color: black; font-weight: bold"
                    >检修工长</span
                  >
                </div>
              </template>
              <el-input size="small" v-model="form.name" placeholder="请输入" />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <span
            style="
              color: rgb(16, 16, 16);
              font-size: 1rem;
              font-weight: bold;
              margin-bottom: 1.25rem;
            "
            >质检组</span
          >
        </el-row>
        <el-row :gutter="20">
          <el-col :span="8">
            <el-form-item>
              <template #label>
                <div style="display: flex; align-items: flex-end">
                  <span style="color: red; margin-right: 0.2rem">*</span>
                  <span
                    style="font-size: 0.88rem; color: black; font-weight: bold"
                    >电气质检</span
                  >
                </div>
              </template>
              <el-select v-model="value" placeholder="请选择" size="small">
                <el-option
                  v-for="item in options"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
                />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item>
              <template #label>
                <div style="display: flex; align-items: flex-end">
                  <span style="color: red; margin-right: 0.2rem">*</span>
                  <span
                    style="font-size: 0.88rem; color: black; font-weight: bold"
                    >机械质检</span
                  >
                </div>
              </template>
              <el-select v-model="value" placeholder="请选择" size="small">
                <el-option
                  v-for="item in options"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
                />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item>
              <template #label>
                <div style="display: flex; align-items: flex-end">
                  <span style="color: red; margin-right: 0.2rem">*</span>
                  <span
                    style="font-size: 0.88rem; color: black; font-weight: bold"
                    >地沟质检</span
                  >
                </div>
              </template>
              <el-select v-model="value" placeholder="请选择" size="small">
                <el-option
                  v-for="item in options"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
                />
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <span
            style="
              color: rgb(16, 16, 16);
              font-size: 1rem;
              font-weight: bold;
              margin-bottom: 1.25rem;
            "
            >电气组</span
          >
        </el-row>
        <el-row :gutter="20">
          <el-col :span="8">
            <el-form-item>
              <template #label>
                <div style="display: flex; align-items: flex-end">
                  <span style="color: red; margin-right: 0.2rem">*</span>
                  <span
                    style="font-size: 0.88rem; color: black; font-weight: bold"
                    >电气力矩作业员</span
                  >
                </div>
              </template>
              <el-select v-model="value" placeholder="请选择" size="small">
                <el-option
                  v-for="item in options"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
                />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item>
              <template #label>
                <div style="display: flex; align-items: flex-end">
                  <span style="color: red; margin-right: 0.2rem">*</span>
                  <span
                    style="font-size: 0.88rem; color: black; font-weight: bold"
                    >电气辅助员</span
                  >
                </div>
              </template>
              <el-select v-model="value" placeholder="请选择" size="small">
                <el-option
                  v-for="item in options"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
                />
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <span
            style="
              color: rgb(16, 16, 16);
              font-size: 1rem;
              font-weight: bold;
              margin-bottom: 1.25rem;
            "
            >机械组</span
          >
        </el-row>
        <el-row :gutter="20">
          <el-col :span="8">
            <el-form-item>
              <template #label>
                <div style="display: flex; align-items: flex-end">
                  <span style="color: red; margin-right: 0.2rem">*</span>
                  <span
                    style="font-size: 0.88rem; color: black; font-weight: bold"
                    >机械力矩作业员</span
                  >
                </div>
              </template>
              <el-select v-model="value" placeholder="请选择" size="small">
                <el-option
                  v-for="item in options"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
                />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item>
              <template #label>
                <div style="display: flex; align-items: flex-end">
                  <span style="color: red; margin-right: 0.2rem">*</span>
                  <span
                    style="font-size: 0.88rem; color: black; font-weight: bold"
                    >机械辅助员</span
                  >
                </div>
              </template>
              <el-select v-model="value" placeholder="请选择" size="small">
                <el-option
                  v-for="item in options"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
                />
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <span
            style="
              color: rgb(16, 16, 16);
              font-size: 1rem;
              font-weight: bold;
              margin-bottom: 1.25rem;
            "
            >地沟组</span
          >
        </el-row>
        <el-row :gutter="20">
          <el-col :span="8">
            <el-form-item>
              <template #label>
                <div style="display: flex; align-items: flex-end">
                  <span style="color: red; margin-right: 0.2rem">*</span>
                  <span
                    style="font-size: 0.88rem; color: black; font-weight: bold"
                    >地沟力矩作业员</span
                  >
                </div>
              </template>
              <el-select v-model="value" placeholder="请选择" size="small">
                <el-option
                  v-for="item in options"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
                />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item>
              <template #label>
                <div style="display: flex; align-items: flex-end">
                  <span style="color: red; margin-right: 0.2rem">*</span>
                  <span
                    style="font-size: 0.88rem; color: black; font-weight: bold"
                    >地沟辅助员</span
                  >
                </div>
              </template>
              <el-select v-model="value" placeholder="请选择" size="small">
                <el-option
                  v-for="item in options"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
                />
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
      <template #footer>
        <div class="dialog-footer" style="text-align: center">
          <el-button
            size="small"
            @click="dialogVisible = false"
            style="height: 2rem; font-size: 0.88rem"
            >取消</el-button
          >

          <el-button
            size="small"
            type="primary"
            @click="dialogVisible = false"
            style="height: 2rem; font-size: 0.88rem"
          >
            ä¿å­˜
          </el-button>
        </div>
      </template>
    </el-dialog> -->

    <!-- æŸ¥çœ‹è¯¦æƒ…弹出框 -->
    <el-dialog
@@ -598,7 +322,9 @@
            "
            :span="3"
          >
            <span style="font-size: 0.88rem; color: #000">车型：BY</span>
            <span style="font-size: 0.88rem; color: #000"
              >车型：{{ datildata.trainKind }}</span
            >
          </el-col>
          <el-col
            style="
@@ -610,7 +336,9 @@
            "
            :span="3"
          >
            <span style="font-size: 0.88rem; color: #000">车组号：123</span>
            <span style="font-size: 0.88rem; color: #000"
              >车组号：{{ datildata.trainNum }}</span
            >
          </el-col>
          <el-col
            style="
@@ -622,7 +350,9 @@
            "
            :span="3"
          >
            <span style="font-size: 0.88rem; color: #000">股道：2</span>
            <span style="font-size: 0.88rem; color: #000"
              >股道：{{ datildata.track }}</span
            >
          </el-col>
          <el-col
            style="
@@ -634,7 +364,9 @@
            "
            :span="3"
          >
            <span style="font-size: 0.88rem; color: #000">车厢号：1</span>
            <span style="font-size: 0.88rem; color: #000"
              >车厢号：{{ datildata.coachNum }}</span
            >
          </el-col>
          <el-col
            style="
@@ -646,7 +378,9 @@
            "
            :span="4"
          >
            <span style="font-size: 0.88rem; color: #000">转向架：G</span>
            <span style="font-size: 0.88rem; color: #000"
              >转向架：{{ datildata.bogie }}</span
            >
          </el-col>
          <el-col
            style="
@@ -658,7 +392,9 @@
            "
            :span="4"
          >
            <span style="font-size: 0.88rem; color: #000">检修班组：A</span>
            <span style="font-size: 0.88rem; color: #000"
              >检修班组：{{ datildata.processDept }}</span
            >
          </el-col>
          <el-col
            style="
@@ -670,7 +406,9 @@
            "
            :span="4"
          >
            <span style="font-size: 0.88rem; color: #000">技术员：张安</span>
            <span style="font-size: 0.88rem; color: #000"
              >技术员：{{ datildata.jiShuYuan }}</span
            >
          </el-col>
        </el-row>
        <el-row>
@@ -684,7 +422,9 @@
            "
            :span="6"
          >
            <span style="font-size: 0.88rem; color: #000">创建时间：</span>
            <span style="font-size: 0.88rem; color: #000"
              >创建时间：{{ datildata.createTime }}</span
            >
          </el-col>
          <el-col
            style="
@@ -696,7 +436,9 @@
            "
            :span="6"
          >
            <span style="font-size: 0.88rem; color: #000">派工时间：</span>
            <span style="font-size: 0.88rem; color: #000"
              >派工时间：{{ datildata.dispatchTime }}</span
            >
          </el-col>
          <el-col
            style="
@@ -709,7 +451,7 @@
            :span="12"
          >
            <span style="font-size: 0.88rem; color: #000"
              >技术员确认时间：</span
              >技术员确认时间：{{ datildata.confirmTime_JS }}</span
            >
          </el-col>
          <el-col
@@ -722,7 +464,9 @@
            "
            :span="6"
          >
            <span style="font-size: 0.88rem; color: #000">开始时间：</span>
            <span style="font-size: 0.88rem; color: #000"
              >开始时间：{{ datildata.startTime }}</span
            >
          </el-col>
          <el-col
            style="
@@ -734,7 +478,9 @@
            "
            :span="18"
          >
            <span style="font-size: 0.88rem; color: #000">结束时间：</span>
            <span style="font-size: 0.88rem; color: #000"
              >结束时间：{{ datildata.endTime }}</span
            >
          </el-col>
        </el-row>
        <el-row
@@ -765,7 +511,7 @@
            :span="6"
          >
            <span style="font-size: 0.88rem; color: #000"
              >机械质检员：张安</span
              >机械质检员：{{ datildata.zhiJianYuan_LC }}</span
            >
          </el-col>
          <el-col
@@ -779,7 +525,7 @@
            :span="6"
          >
            <span style="font-size: 0.88rem; color: #000"
              >地沟质检员：李四</span
              >地沟质检员：{{ datildata.zhiJianYuan_DG }}</span
            >
          </el-col>
          <el-col
@@ -793,7 +539,7 @@
            :span="8"
          >
            <span style="font-size: 0.88rem; color: #000"
              >电气质检员：王五</span
              >电气质检员：{{ datildata.zhiJianYuan_DQ }}</span
            >
          </el-col>
          <el-col
@@ -806,20 +552,8 @@
            "
            :span="4"
          >
            <span style="font-size: 0.88rem; color: #000">检修工长：小七</span>
          </el-col>
          <el-col
            style="
              display: flex;
              align-items: center;
              border: 1px solid #bec7d1;
              height: 3.49rem;
              padding-left: 0.7rem;
            "
            :span="6"
          >
            <span style="font-size: 0.88rem; color: #000"
              >机械质检员确认时间：</span
              >检修工长：{{ datildata.gongZhang }}</span
            >
          </el-col>
          <el-col
@@ -833,7 +567,21 @@
            :span="6"
          >
            <span style="font-size: 0.88rem; color: #000"
              >地沟质检员确认时间：</span
              >机械质检员确认时间：{{ datildata.confirmTime_LC }}</span
            >
          </el-col>
          <el-col
            style="
              display: flex;
              align-items: center;
              border: 1px solid #bec7d1;
              height: 3.49rem;
              padding-left: 0.7rem;
            "
            :span="6"
          >
            <span style="font-size: 0.88rem; color: #000"
              >地沟质检员确认时间：{{ datildata.confirmTime_DG }}</span
            >
          </el-col>
          <el-col
@@ -847,7 +595,7 @@
            :span="8"
          >
            <span style="font-size: 0.88rem; color: #000"
              >电气质检员确认时间：</span
              >电气质检员确认时间：{{ datildata.confirmTime_DQ }}</span
            >
          </el-col>
          <el-col
@@ -861,7 +609,7 @@
            :span="4"
          >
            <span style="font-size: 0.88rem; color: #000"
              >检修工长确认时间：</span
              >检修工长确认时间：{{ datildata.confirmTime_GZ }}</span
            >
          </el-col>
        </el-row>
@@ -893,7 +641,7 @@
            :span="3"
          >
            <span style="font-size: 0.88rem; color: #000"
              >机械力矩作业员：李四</span
              >机械力矩作业员：{{ datildata.liJu_LC }}</span
            >
          </el-col>
          <el-col
@@ -907,7 +655,7 @@
            :span="3"
          >
            <span style="font-size: 0.88rem; color: #000"
              >机械辅助员：张三</span
              >机械辅助员：{{ datildata.fuZhu_LC }}</span
            >
          </el-col>
          <el-col
@@ -921,7 +669,7 @@
            :span="3"
          >
            <span style="font-size: 0.88rem; color: #000"
              >地沟力矩作业员：李四</span
              >地沟力矩作业员：{{ datildata.liJu_DG }}</span
            >
          </el-col>
          <el-col
@@ -935,7 +683,7 @@
            :span="3"
          >
            <span style="font-size: 0.88rem; color: #000"
              >地沟辅助员：张三</span
              >地沟辅助员：{{ datildata.fuZhu_DG }}</span
            >
          </el-col>
          <el-col
@@ -949,7 +697,7 @@
            :span="4"
          >
            <span style="font-size: 0.88rem; color: #000"
              >电气力矩作业员：王五</span
              >电气力矩作业员：{{ datildata.liJu_DQ }}</span
            >
          </el-col>
          <el-col
@@ -963,7 +711,7 @@
            :span="8"
          >
            <span style="font-size: 0.88rem; color: #000"
              >电气辅助员：李力</span
              >电气辅助员：{{ datildata.fuZhu_DQ }}</span
            >
          </el-col>
        </el-row>
@@ -978,7 +726,9 @@
            "
            :span="6"
          >
            <span style="font-size: 0.88rem; color: #000">机械开始时间：</span>
            <span style="font-size: 0.88rem; color: #000"
              >机械开始时间：{{ datildata.startTime_LC }}</span
            >
          </el-col>
          <el-col
            style="
@@ -990,7 +740,9 @@
            "
            :span="6"
          >
            <span style="font-size: 0.88rem; color: #000">地沟开始时间：</span>
            <span style="font-size: 0.88rem; color: #000"
              >地沟开始时间：{{ datildata.startTime_DG }}</span
            >
          </el-col>
          <el-col
            style="
@@ -1002,7 +754,9 @@
            "
            :span="12"
          >
            <span style="font-size: 0.88rem; color: #000">电气开始时间：</span>
            <span style="font-size: 0.88rem; color: #000"
              >电气开始时间：{{ datildata.startTime_DQ }}</span
            >
          </el-col>
          <el-col
            style="
@@ -1014,7 +768,9 @@
            "
            :span="6"
          >
            <span style="font-size: 0.88rem; color: #000">机械结束时间：</span>
            <span style="font-size: 0.88rem; color: #000"
              >机械结束时间：{{ datildata.endTime_LC }}</span
            >
          </el-col>
          <el-col
            style="
@@ -1026,7 +782,9 @@
            "
            :span="6"
          >
            <span style="font-size: 0.88rem; color: #000">地沟结束时间</span>
            <span style="font-size: 0.88rem; color: #000"
              >地沟结束时间：{{ datildata.endTime_DG }}</span
            >
          </el-col>
          <el-col
            style="
@@ -1038,7 +796,9 @@
            "
            :span="12"
          >
            <span style="font-size: 0.88rem; color: #000">电气结束时间：</span>
            <span style="font-size: 0.88rem; color: #000"
              >电气结束时间：{{ datildata.endTime_DQ }}</span
            >
          </el-col>
        </el-row>
      </div>
@@ -1060,7 +820,7 @@
            :class="titleClass"
            style="color: rgb(16, 16, 16); font-size: 1rem; font-weight: bold"
          >
            åŠ›çŸ©å€¼æ˜Žç»†ï¼ˆç”µæ°”）
            åŠ›çŸ©å€¼æ˜Žç»†ï¼ˆ{{ title }}）
          </h4>
          <el-icon @click="close" size="15"><CloseBold /></el-icon>
        </div>
@@ -1070,7 +830,7 @@
        <div style="height: 100%; width: 13.5rem">
          <div
            style="
              width: 13.5rem;
              width: 17rem;
              padding: 0.8rem 2rem;
              box-sizing: border-box;
              background-color: rgba(247, 247, 247, 1);
@@ -1086,7 +846,7 @@
            >
              <span style="width: 6rem; text-align: right; display: block"
                >任务名称：</span
              ><span>转向架</span>
              ><span>{{ pesonData[0].takename }}</span>
            </div>
            <div
              style="
@@ -1098,7 +858,7 @@
            >
              <span style="width: 6rem; text-align: right; display: block"
                >技术员：</span
              ><span>张三</span>
              ><span>{{ pesonData[0].jishuyuan }}</span>
            </div>
            <div
              style="
@@ -1109,8 +869,8 @@
              "
            >
              <span style="width: 6rem; text-align: right; display: block"
                >检修工厂：</span
              ><span>李四</span>
                >检修工长：</span
              ><span>{{ pesonData[0].gonzhang }}</span>
            </div>
            <div
              style="
@@ -1122,7 +882,7 @@
            >
              <span style="width: 6rem; text-align: right; display: block"
                >质检员：</span
              ><span>七七</span>
              ><span>{{ pesonData[0].zhijianyuan }}</span>
            </div>
            <div
              style="
@@ -1134,7 +894,7 @@
            >
              <span style="width: 6rem; text-align: right; display: block"
                >力矩作业员：</span
              ><span>王五</span>
              ><span>{{ pesonData[0].lijuzouyeyuan }}</span>
            </div>
            <div
              style="
@@ -1146,7 +906,7 @@
            >
              <span style="width: 6rem; text-align: right; display: block"
                >辅助员：</span
              ><span>小刘</span>
              ><span>{{ pesonData[0].fuzyuan }}</span>
            </div>
            <div
              style="
@@ -1159,19 +919,24 @@
              <span style="width: 6rem; text-align: right; display: block"
                >任务详情：</span
              >
              <el-popover placement="bottom" :width="600" trigger="click">
              <el-popover
                placement="bottom"
                :width="600"
                trigger="click"
                @show="checkTask(pesonData[0].njtakeid)"
              >
                <template #reference>
                  <span style="color: blue; font-size: 0.88rem; cursor: pointer"
                    >查看</span
                  >
                </template>
                <el-table :data="gridData" width="100%">
                  <el-table-column property="date" label="车型" />
                  <el-table-column property="name" label="车组" />
                  <el-table-column property="address" label="股道" />
                  <el-table-column property="address" label="车厢号位置" />
                  <el-table-column property="address" label="转向架位置" />
                  <el-table-column property="address" label="检修班组" />
                <el-table :data="taskData" width="100%">
                  <el-table-column property="trainKind" label="车型" />
                  <el-table-column property="trainNum" label="车组" />
                  <el-table-column property="track" label="股道" />
                  <el-table-column property="coachNum" label="车厢号位置" />
                  <el-table-column property="bogie" label="转向架位置" />
                  <el-table-column property="processDept" label="检修班组" />
                </el-table>
              </el-popover>
            </div>
@@ -1183,17 +948,20 @@
            <el-timeline-item
              v-for="(activity, index) in activities"
              :key="index"
              :timestamp="'力矩值：' + activity.timestamp"
              :timestamp="
                '力矩值：' + activity.torqueOne + '----' + activity.torqueTwo
              "
            >
              {{ activity.content }}
              {{ activity.craftsStep }}
              <el-popover
                placement="bottom"
                :width="600"
                :width="800"
                trigger="click"
                style="margin-left: 0.8rem"
              >
                <template #reference>
                  <span
                    @click="checkcontent(activity.craftID)"
                    style="
                      color: blue;
                      font-size: 0.88rem;
@@ -1203,10 +971,10 @@
                    >查看</span
                  >
                </template>
                <el-table :data="gridData" width="100%">
                  <el-table-column property="date" label="工艺内容" />
                  <el-table-column property="name" label="工具" />
                  <el-table-column property="name" label="物料" />
                <el-table :data="contentData" width="100%">
                  <el-table-column prop="craftContent" label="工艺内容" />
                  <el-table-column prop="tools" label="工具" />
                  <el-table-column prop="name" label="物料" />
                </el-table>
              </el-popover>
            </el-timeline-item>
@@ -1217,16 +985,47 @@
  </div>
</template>
<script setup>
import { ref, reactive } from "vue";
import { ref, reactive, onMounted } from "vue";
import { ElMessage, ElMessageBox } from "element-plus";
const queryForm = reactive({
import { formatTime } from "@/utils/index.js";
import {
  GetPageData,
  GetDataDetail,
  GetWorkOrder,
  GetContent,
  GetPerson,
  GetTaskInfo,
  GetLogin,
  ExportApi,
  ExportApi2,
  ExportApi3,
} from "@/api/newapi/Datalogging";
const obj = {
  selectName: "",
  selectTime: [], // æ—¶é—´èŒƒå›´
  selectType: "",
  selectInput: "",
  value: "",
};
const queryForm = ref({
  selectName: "",
  selectTime: [], // æ—¶é—´èŒƒå›´
  selectType: "",
  selectInput: "",
  value: "",
});

const tableData = ref([]);

const options = ref([]);
const options = ref([
  {
    value: 1,
    label: "已派工",
  },
  {
    value: 0,
    label: "待派工",
  },
]);
const props = { multiple: true };

const table = ref(false);
@@ -1235,70 +1034,448 @@
const claimdialogVisible = ref(false);
const dialogVisible = ref(false);
const TorquedialogVisible = ref(false);
const activities = [
const activities = ref([]);
const pageTotal = ref(0);

//分页请求参数
const pageQuery = ref({
  page: 1, //当前页面
  rows: 10, //每页显示条数
  order: "desc", //排序方式
  sort: "createTime", //排序字段
  wheres: "", //条件查询
});
const datildata = ref({});
const title = ref("机械");
const contentData = ref([]);
const pesonData = ref([]);
const taskData = ref([]);
//任务记录
const tasklogging = [
  {
    content: "1.1工前准备",
    timestamp: "2018-04-15",
    value: "takeName",
    label: "任务名称",
  },
  {
    content: "2.1牵引电机电缆安装（仅动车转向架）",
    timestamp: "2018-04-13",
    value: "trainNum",
    label: "车组",
  },
  {
    content: "2.2牵引电机电缆安装（仅动车转向架）",
    timestamp: "2018-04-11",
  },
  {
    content: "2.3牵引电机电缆安装（仅动车转向架）",
    timestamp: "2018-04-11",
  },
  {
    content: "2.4牵引电机电缆安装（仅动车转向架）",
    timestamp: "2018-04-11",
  },
  {
    content: "2.4牵引电机电缆安装（仅动车转向架）",
    timestamp: "2018-04-11",
  },
  {
    content: "2.4牵引电机电缆安装（仅动车转向架）",
    timestamp: "2018-04-11",
  },
  {
    content: "2.4牵引电机电缆安装（仅动车转向架）",
    timestamp: "2018-04-11",
  },
  {
    content: "2.4牵引电机电缆安装（仅动车转向架）",
    timestamp: "2018-04-11",
  },
  {
    content: "2.4牵引电机电缆安装（仅动车转向架）",
    timestamp: "2018-04-11",
  },
  {
    content: "2.4牵引电机电缆安装（仅动车转向架）",
    timestamp: "2018-04-11",
    value: "coachNum",
    label: "车厢号",
  },
];
//作业单记录
const worklogging = [
  {
    value: "takeName",
    label: "任务名称",
  },
  {
    value: "jiShuYuan",
    label: "技术员",
  },
  {
    value: "gongZhang",
    label: "检修工长",
  },
];
//登录记录
const loginlogging = [
  {
    value: "userName",
    label: "用户名",
  },
  {
    value: "trurName",
    label: "真实姓名",
  },
];
const selectoptions = ref([]);

// æŸ¥è¯¢
const query = () => {
  if (isactive.value == 1) {
    initData();
  } else if (isactive.value == 2) {
    WorkinitData();
  } else {
    LogininitData();
  }
};

selectoptions.value = tasklogging;
const changeactive = (index) => {
  isactive.value = index;
  if (index == 1) {
    selectoptions.value = tasklogging;
    initData();
  } else if (index == 2) {
    selectoptions.value = worklogging;
    WorkinitData();
  } else {
    selectoptions.value = loginlogging;
    LogininitData();
  }
};
function cancelClick() {
  table.value = false;
}
function confirmClick() {
  table.value = false;
}
// æŸ¥çœ‹è¯¦æƒ…
const Findmore = () => {
const Findmore = (id) => {
  GetDataDetail(id).then((res) => {
    datildata.value = res.data;
  dialogVisible.value = true;
  });
};
// æŸ¥çœ‹åŠ›çŸ©
const Findtorque = () => {
// æŸ¥çœ‹æœºæ¢°
const LcFindtorque = (id) => {
  title.value = "机械";
  GetContent({
    page: 1,
    rows: 10,
    total: 100,
    tableName: "",
    sort: "",
    order: "",
    wheres: "",
    export: true,
    value: "",
    filter: [
      {
        name: "craftType",
        value: title.value,
        displayType: "string",
      },
    ],
  }).then((res) => {
    activities.value = res.rows;
  });
  GetPerson({
    page: 1,
    rows: 10,
    total: 100,
    tableName: "",
    sort: "",
    order: "",
    wheres: "",
    export: true,
    value: "",
    filter: [
      {
        name: "grouptype",
        value: title.value,
        displayType: "String",
      },
      {
        name: "njtakeid",
        value: id,
        displayType: "String",
      },
    ],
  }).then((res) => {
    pesonData.value = res.rows;
  TorquedialogVisible.value = true;
  });
};
//查看电气
const DqFindtorque = (id) => {
  title.value = "电气";
  GetContent({
    page: 1,
    rows: 10,
    total: 100,
    tableName: "",
    sort: "",
    order: "",
    wheres: "",
    export: true,
    value: "",
    filter: [
      {
        name: "craftType",
        value: title.value,
        displayType: "string",
      },
    ],
  }).then((res) => {
    activities.value = res.rows;
  });
  GetPerson({
    page: 1,
    rows: 10,
    total: 100,
    tableName: "",
    sort: "",
    order: "",
    wheres: "",
    export: true,
    value: "",
    filter: [
      {
        name: "grouptype",
        value: title.value,
        displayType: "String",
      },
      {
        name: "njtakeid",
        value: id,
        displayType: "String",
      },
    ],
  }).then((res) => {
    pesonData.value = res.rows;
    TorquedialogVisible.value = true;
  });
};
//查看地沟
const DgFindtorque = (id) => {
  title.value = "地沟";
  GetContent({
    page: 1,
    rows: 10,
    total: 100,
    tableName: "",
    sort: "",
    order: "",
    wheres: "",
    export: true,
    value: "",
    filter: [
      {
        name: "craftType",
        value: title.value,
        displayType: "string",
      },
    ],
  }).then((res) => {
    activities.value = res.rows;
  });
  GetPerson({
    page: 1,
    rows: 10,
    total: 100,
    tableName: "",
    sort: "",
    order: "",
    wheres: "",
    export: true,
    value: "",
    filter: [
      {
        name: "grouptype",
        value: title.value,
        displayType: "String",
      },
      {
        name: "njtakeid",
        value: id,
        displayType: "String",
      },
    ],
  }).then((res) => {
    pesonData.value = res.rows;
    TorquedialogVisible.value = true;
  });
};
//查看步骤内容
const checkcontent = (id) => {
  GetContent({
    page: 1,
    rows: 10,
    total: 100,
    tableName: "",
    sort: "",
    order: "",
    wheres: "",
    export: true,
    value: "",
    filter: [
      {
        name: "craftID",
        value: id,
        displayType: "string",
      },
    ],
  }).then((res) => {
    contentData.value = res.rows;
  });
};

//查看任务信息
const checkTask = (id) => {
  GetTaskInfo({
    page: 1,
    rows: 10,
    total: 100,
    tableName: "",
    sort: "",
    order: "",
    wheres: "",
    export: true,
    value: "",
    filter: [
      {
        name: "njtaskid",
        value: id,
        displayType: "String",
      },
    ],
  }).then((res) => {
    taskData.value = res.rows;
  });
};

//分页页面大小改变
const handleSizeChange = (val) => {
  pageQuery.value.rows = val;
  if (isactive.value == 1) {
    initData();
  } else if (isactive.value == 2) {
    WorkinitData();
  } else {
  }
};

//分页页面改变
const handleCurrentChange = (val) => {
  pageQuery.value.page = val;
  if (isactive.value == 1) {
    initData();
  } else if (isactive.value == 2) {
    WorkinitData();
  } else {
  }
};
//任务记录
const initData = () => {
  // æŸ¥è¯¢æ¡ä»¶
  const startTime = formatTime(queryForm.value.selectTime[0]);
  const endTime = formatTime(queryForm.value.selectTime[1]);
  const filter = [
    {
      name: "taskstatus",
      value: queryForm.value.value,
      displayType: "String",
    },
    {
      name: queryForm.value.selectType,
      value: queryForm.value.selectInput,
      displayType: "String",
    },
    { name: "createTime", value: startTime, displayType: "ThanOrEqual" },
    { name: "createTime", value: endTime, displayType: "LessOrEqual" },
  ];
  GetPageData({
    ...pageQuery.value,
    filter,
  }).then((res) => {
    tableData.value = res.rows;
    pageTotal.value = res.total;
  });
};
//作业单记录
const WorkinitData = () => {
  // æŸ¥è¯¢æ¡ä»¶
  const startTime = formatTime(queryForm.value.selectTime[0]);
  const endTime = formatTime(queryForm.value.selectTime[1]);
  const filter = [
    {
      name: queryForm.value.selectType,
      value: queryForm.value.selectInput,
      displayType: "String",
    },
    { name: "createTime", value: startTime, displayType: "ThanOrEqual" },
    { name: "createTime", value: endTime, displayType: "LessOrEqual" },
  ];
  GetWorkOrder({
    ...pageQuery.value,
    filter,
  }).then((res) => {
    tableData.value = res.rows;
    pageTotal.value = res.total;
  });
};

//登录记录
const LogininitData = () => {
  // æŸ¥è¯¢æ¡ä»¶
  const startTime = formatTime(queryForm.value.selectTime[0]);
  const endTime = formatTime(queryForm.value.selectTime[1]);
  const filter = [
    {
      name: queryForm.value.selectType,
      value: queryForm.value.selectInput,
      displayType: "String",
    },
    { name: "createTime", value: startTime, displayType: "ThanOrEqual" },
    { name: "createTime", value: endTime, displayType: "LessOrEqual" },
  ];
  GetLogin({
    ...pageQuery.value,
    filter,
  }).then((res) => {
    tableData.value = res.rows;
    pageTotal.value = res.total;
  });
};

//数据检索事件
const handleQuery = () => {
  pageQuery.value.page = 1;
  if (isactive.value == 1) {
    initData();
  } else if (isactive.value == 2) {
    WorkinitData();
  } else {
    LogininitData();
  }
};

const resetQuery = () => {
  queryForm.value = { selectName: "", selectTime: [] };
  pageQuery.value.page = 1;
  initData();
};

const printExcel = () => {
  // æŸ¥è¯¢æ¡ä»¶
  const startTime = formatTime(queryForm.value.selectTime[0]);
  const endTime = formatTime(queryForm.value.selectTime[1]);
  const filter = [
    {
      name: queryForm.value.selectType,
      value: queryForm.value.selectInput,
      displayType: "String",
    },
    {
      name: "pustatus",
      value: queryForm.value.selectName,
      displayType: "String",
    },
    { name: "createTime", value: startTime, displayType: "ThanOrEqual" },
    { name: "createTime", value: endTime, displayType: "LessOrEqual" },
  ];
  if (isactive.value == 1) {
    ExportApi({
      ...pageQuery.value,
      filter,
    });
  }
  if (isactive.value == 2) {
    ExportApi2({
      ...pageQuery.value,
      filter,
    });
  }
  if (isactive.value == 3) {
    ExportApi3({
      ...pageQuery.value,
      filter,
    });
  }
};

onMounted(() => {
  initData();
});
</script>
<style lang="scss" scoped>
.Datalogging {
@@ -1363,8 +1540,6 @@
          width: 6.88rem;
          height: 2rem;
          text-align: center;
          border: 0.06rem solid rgba(222, 222, 222, 1);
          border-radius: 0.25rem 0 0 0.25rem;
          font-size: 0.75rem;
          display: flex;
          align-items: center;