运行记录填报

src/api/pms/iotopeationfill/index.ts

@@ -28,6 +28,7 @@ export interface IotOpeationFillVO {
   orderType:string
   orderStatus:number
   crateTime:Date
+  totalRunTime:number
 }
 
 // 运行记录填报 API

src/views/pms/iotopeationfill/index.vue

@@ -76,27 +76,28 @@
 
     <!-- 列表 -->
     <ContentWrap>
-      <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table v-loading="loading" :data="list" :stripe="true"  >
         <el-table-column label="序号" width="60" align="center">
           <template #default="scope">
             {{ scope.$index + 1 }}
           </template>
         </el-table-column>
-        <el-table-column label="工单名称" align="center" prop="orderName" />
-        <el-table-column label="工单类型" align="center" prop="orderType" />
+        <el-table-column label="工单名称" align="center" prop="orderName" width="300"/>
+        <el-table-column label="责任人" align="center" prop="userName" />
+<!--        <el-table-column label="工单类型" align="center" prop="orderType" />-->
         <el-table-column label="工单状态" align="center" prop="orderStatus" >
           <template #default="scope">
             <dict-tag :type="DICT_TYPE.OPERATION_FILL_ORDER_STATUS" :value="scope.row.orderStatus" />
           </template>
         </el-table-column>
 <!--        <el-table-column label="备注" align="center" prop="remark" />-->
-        <el-table-column
+<!--        <el-table-column
           label="创建时间"
           align="center"
           prop="createTime"
           :formatter="dateFormatter"
           width="180px"
-        />
+        />-->
         <el-table-column label="操作" align="center" min-width="120px">
           <template #default="scope">
   <!--          <el-button-->
@@ -118,11 +119,28 @@
             <el-button
               link
               type="primary"
-              @click="openWrite(scope.row.deptId)"
+              @click="openWrite(scope.row.deptId+','+scope.row.userId)"
               v-hasPermi="['rq:iot-opeation-fill:update']"
             >
               填写
             </el-button>
+            <el-button
+              link
+              type="primary"
+              @click="openWrite(scope.row.deptId)"
+              v-if='scope.row.orderStatus === "已完成"'
+            >
+              查看
+
+            </el-button>
+            <el-button
+              link
+              type="primary"
+              @click="openWrite(scope.row.deptId)"
+              v-else
+            >
+              查看
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -170,7 +188,7 @@ const queryParams = reactive({
   createTime: [],
   deptId: undefined,
   deviceIds: undefined,
-  userId:undefined,
+  userId:useUserStore().getUser.id
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
@@ -207,7 +225,7 @@ const formRef = ref()
 const openForm = (id?: number) => {
   push({ name: 'InspectOrderDetail', params:{id} })
 }
-const openWrite = (id?: number) => {
+const openWrite = (id?: string) => {
   push({ name: 'FillOrderInfo',params:{id}})
 }
 /** 删除按钮操作 */

src/views/pms/iotopeationfill/index1.vue

@@ -19,8 +19,25 @@
         </template>
         <div class="form-wrapper">
           <el-form label-width="120px">
+            <div style="margin-left: 24px">
+              <el-form class="demo-form-inline" :inline="true">
+                <el-form-item label="所属队伍:">
+                  {{item.orgName}}
+                </el-form-item>
+                <el-form-item label="累计运行时间:">
+                  {{totalRunTime1}}h
+                </el-form-item>
+              </el-form>
+            </div>
             <div v-for="(item,index) in attrList" :key="index">
-              <el-form-item :label='item.name' prop="deviceId">
+                <el-form-item :label='item.name' prop="deviceId" v-if="item.name==='累计运行时间'" >
+                  <el-input
+                    v-model="item.fillContent" @input="attrList[index].fillContent = $event.target.fillContent"
+                    clearable
+                    style="width: 200px"
+                  />
+                </el-form-item>
+              <el-form-item :label='item.name' prop="deviceId" v-else>
                 <el-input
                   v-model="item.fillContent" @input="attrList[index].fillContent = $event.target.fillContent"
                   clearable
@@ -64,6 +81,7 @@ const list = ref<IotOpeationFillVO[]>([]) // 列表的数据
 const attrList = ref<IotOpeationFillVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
 const arry1 =ref([]);
+let totalRunTime1: string = '123'
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
@@ -82,7 +100,6 @@ const queryParams = reactive({
   creDate: [],
   createTime: [],
   deviceCategoryId:1,
-  userId:useUserStore().getUser.id
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
@@ -97,7 +114,8 @@ const formatDescription = async(row, column, cellValue) =>{
 const getList = async () => {
   loading.value = true
   try {
-    queryParams.deptId = deptId;
+    queryParams.deptId = deptId.split(",")[0];
+    queryParams.userId = deptId.split(",")[1];
     const data = await IotOpeationFillApi.getIotOpeationFillPage(queryParams)
     list.value = data;
     list.value.forEach(function (item, index) {
@@ -152,7 +170,13 @@ const getAttrList = async () => {
   try {
     const data = await IotOpeationFillApi.getAttrs(queryParams)
     attrList.value = data;
+
+    totalRunTime1 = Number(attrList.value[0].totalRunTime).toFixed(2)
     attrList.value.forEach(function (item,index){
+      if(item.name=='累计运行时间'){
+        totalRunTime1 = Number(item.fillContent).toFixed(2)
+      }
+      item.fillContent = Number(item.fillContent).toFixed(2)
       item.deviceCode = queryParams.deviceCode;
       item.deptId = queryParams.deptId;
       item.deviceId = queryParams.deviceId;