fix:回退原先版本

charles

2024-04-29 c7f3fd5215399b37d0511b3bd555150ff1b13507

 src/views/dashboard/index.vue

@@ -7,7 +7,7 @@
      <ChannelCollapse :channels="channels"></ChannelCollapse>
    </template>
    <template #middleBlock1>
      <DashboardTitle></DashboardTitle>
      <DashboardTitle @should-reload="reloadAllData"></DashboardTitle>
    </template>
    <template #middleBlock2>
      <el-tabs v-model="activeMainTabName" class="main-info-tabs">
@@ -15,25 +15,41 @@
          <ProcessingInfo style="margin-top: 6px" :task="activeTask"></ProcessingInfo>
        </el-tab-pane>
        <el-tab-pane label="工艺信息" name="工艺信息">
          <el-scrollbar always>
            <ProcessInfo
              v-for="item in craftModelStore.craftModelList"
              :key="item.ID"
              :craft-model="item"
              :task="activeTask"
              :active-arr="activeArr"
              @detail="openCraftModelDetailModal"
              @update="updateCraft"
            ></ProcessInfo>
          </el-scrollbar>
          <div style="height: 300px">
            <el-scrollbar always class="scroller" style="height: 100%">
              <div
                v-infinite-scroll="craftModelStore.loadMore"
                infinite-scroll-delay="500"
                infinite-scroll-distance="40"
                style="display: flex; align-items: center; flex-wrap: wrap"
              >
                <ProcessInfo
                  v-for="item in craftModelStore.craftModelList"
                  :key="item.ID"
                  :task="activeTask"
                  :active-arr="activeArr"
                  :craft-model="item"
                  @detail="openCraftModelDetailModal"
                  @update="updateCraft"
                ></ProcessInfo>
              </div>
              <div class="craft-loaded-tip">
                <el-icon v-if="craftModelStore.loading" class="is-loading" size="30">
                  <Loading />
                </el-icon>

                <div v-if="!craftModelStore.hasMore && craftModelStore.craftModelList.length > 6">加载完成</div>
              </div>
            </el-scrollbar>
          </div>
        </el-tab-pane>
        <el-tab-pane label="物料清单" name="物料清单">
          <InputMaterialsList
            :material-list="activeTask?.Procedure.procedure.inputMaterials"
            :material-list="activeTask?.Procedure?.procedure?.inputMaterials"
            @detail-click="showMaterialDetailModal"
          ></InputMaterialsList>
          <OutputMaterialsList
            :material-list="activeTask?.Procedure.procedure.outputMaterials"
            :material-list="activeTask?.Procedure?.procedure?.outputMaterials"
            @detail-click="showMaterialDetailModal"
          ></OutputMaterialsList>
        </el-tab-pane>
@@ -42,10 +58,12 @@
    <template #middleBlock3>
      <SubTitle>任务详情</SubTitle>
      <div class="task-detail">
        <TaskControl :task="activeTask" @should-reload="reloadAllData"></TaskControl>
        <el-scrollbar always class="scroller">
          <TaskControl :task="activeTask" :workers="currentWorkers" @should-reload="reloadChannel"></TaskControl>
          <ColorInfo :type="1"></ColorInfo>
          <ColorInfo :type="2"></ColorInfo>
        </el-scrollbar>
      </div>
      <ColorInfo :type="1"></ColorInfo>
      <ColorInfo :type="2"></ColorInfo>
    </template>
    <template #middleBlock4>
      <SubTitle>人员信息</SubTitle>
@@ -57,13 +75,17 @@
      </div>
    </template>
    <template #rightBlock2>
      <DeviceStatusInfo :plc="plcStore.plcInfo" :type="1"></DeviceStatusInfo>
      <DeviceStatusInfo :type="1"></DeviceStatusInfo>
      <DeviceStatusInfo :device="deviceStore.deviceInfo" :type="2"></DeviceStatusInfo>
      <DeviceNumberInfo></DeviceNumberInfo>
    </template>
      <DeviceNumberInfo></DeviceNumberInfo> </template
    >当前任务:
    <template #rightBlock3>
      <SubTitle>知识库</SubTitle>
      <KnowledgeInfo></KnowledgeInfo>
      <div class="task-detail-right-3">
        <el-scrollbar always class="scroller">
          <KnowledgeInfo></KnowledgeInfo>
        </el-scrollbar>
      </div>
      <BigButton class="btn" bg-color="red">红灯呼叫</BigButton>
    </template>
  </DashboardLayout>
@@ -77,9 +99,10 @@
  <MaterialDetails v-model="showMaterialDetail" :material="currentMaterialInfo"></MaterialDetails>
</template>
<script setup lang="ts">
import { computed, ref, watch } from 'vue'
import { computed, ref } from 'vue'
import ChannelCollapse from '@/views/dashboard/components/ChannelCollapse.vue'
import type { Worker, Order, Task, Material } from '@/api/task'

import type { Task, Material } from '@/api/task'
import type { CraftModel } from '@/api/craftModel'
import PersonInfo from '@/views/dashboard/components/PersonInfo.vue'
import ProcessInfo from '@/views/dashboard/components/ProcessInfo.vue'
@@ -99,12 +122,17 @@
import TaskControl from '@/views/dashboard/components/TaskControl.vue'
import SubTitle from '@/views/dashboard/components/SubTitle.vue'
import DashboardTitle from '@/views/dashboard/components/DashboardTitle.vue'
import { usePLCStore } from '@/stores/plc'
// import { usePLCStore } from '@/stores/plc'
import { useDevicesStore } from '@/stores/devices'
import { useCraftModelStore } from '@/stores/craftModel'
import CraftDetailModal from '@/views/dashboard/components/CraftDetailModal.vue'
import MaterialDetails from '@/views/dashboard/components/MaterialDetails.vue'

import { updateCraftParams } from '@/api'
import { Loading } from '@element-plus/icons-vue'
import { isNumber } from 'lodash-es'
import { getToken } from '@/common/utils/index'
const token = getToken()

defineOptions({
  name: 'DashboardView'
@@ -114,14 +142,6 @@
const taskStore = useTasksStore()
const workers = computed(() => {
  return taskStore.activeTask?.Procedure?.procedure?.workers ?? []
})

const order = computed(() => {
  return {
    finishNumber: 0,
    unit: '个',
    amount: '10'
  } as unknown as Order
})

const taskTabsList = [
@@ -143,7 +163,7 @@

const tasksStore = useTasksStore()
const { activeTask, channels } = storeToRefs(tasksStore)
tasksStore.getChannels(1)
tasksStore.getChannels(1, true)

function changeTab(tab: LabelValue) {
  tasksStore.getChannels(tab.value)
@@ -153,15 +173,25 @@
 * 完成任务或者下发参数成功后要刷新通道数据
 * @param task
 */
function reloadAllData(task: Task) {
  tasksStore.reload(task.Channel)
function reloadChannel(task: Task) {
  if (token !== null || token !== '' || token !== 'undefined') {
    tasksStore.reloadChannel(task.Channel)
    location.reload()
  }
}

function reloadAllData() {
  tasksStore.reloadAllData()
  location.reload()
}
// 启动plc 轮询
const plcStore = usePLCStore()
plcStore.startPollingPLC()
// const plcStore = usePLCStore()
// plcStore.startPollingPLC()
// 启动 设备 轮询
const deviceStore = useDevicesStore()
deviceStore.startPollingDevice()
// console.log(deviceStore, '1111')
// localStorage.setItem('currentDeviceID', deviceStore.deviceInfo.currentDeviceID)

// 切换任务时获取对应任务的工艺模型信息
const craftModelStore = useCraftModelStore()
@@ -170,7 +200,7 @@
const showCraftModelDetail = ref(false)
// 当前要展示的工艺详情
const currentCraftModelInfo = ref<CraftModel>()
const activeArr = ref([])
const activeArr = ref<string[]>([])
function openCraftModelDetailModal(craftModel: CraftModel) {
  currentCraftModelInfo.value = craftModel
  showCraftModelDetail.value = true
@@ -187,13 +217,14 @@
            message: '更新成功！',
            type: 'success'
          })
          craftModelStore.getCraftModelList()
        }
      },
      (err) => {
        console.error(err, '----err')
        setTimeout(() => {
          editActive(craftModel)
        }, 3000000)
        }, 300)
      }
    )
  }
@@ -201,7 +232,7 @@
function editActive(craftModel: CraftModel) {
  for (let i in activeArr.value) {
    if (activeArr.value[i] == craftModel.number) {
      activeArr.value.splice(i, 1)
      activeArr.value.splice(Number(i), 1)
    }
  }
}
@@ -219,6 +250,17 @@
  currentMaterialInfo.value = material
  showMaterialDetail.value = true
}

const currentWorkers = computed(() => {
  const channel = activeTask.value?.Channel
  if (isNumber(channel)) {
    console.log(activeTask.value?.Procedure?.procedure?.workers, '99999')
    // return []
    return activeTask.value?.Procedure?.procedure?.workers ?? []
  } else {
    return []
  }
})
</script>

<style scoped lang="scss">
@@ -228,7 +270,7 @@
  display: flex;
  align-items: center;
  justify-content: center;
  padding-top: 12px;
  padding-top: 22px;
}
:deep(.el-tabs) {
  height: 100%;
@@ -268,4 +310,23 @@
  width: 100%;
  font-size: 20px;
}
.craft-loaded-tip {
  height: 40px;
  text-align: center;
  display: flex;
  align-items: center;
  justify-content: center;
}
.scroller {
  padding: 4px 10px;
}
.task-detail {
  width: 100%;
  height: calc(100% - 32px);
  padding-right: 5px;
}
.task-detail-right-3 {
  width: 100%;
  height: calc(100% - 32px - 50px);
}
</style>