From 4652431ce329b4dec6c4dcc0758d5c4ff97e0666 Mon Sep 17 00:00:00 2001
From: 86134 <aa>
Date: 星期六, 11 十一月 2023 09:57:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/product/workbench/taskinfo-pane.vue | 650 +++++++++++++++++++---------------------------------------
1 files changed, 216 insertions(+), 434 deletions(-)
diff --git a/src/views/product/workbench/taskinfo-pane.vue b/src/views/product/workbench/taskinfo-pane.vue
index 8f6f61c..d5b1dd8 100644
--- a/src/views/product/workbench/taskinfo-pane.vue
+++ b/src/views/product/workbench/taskinfo-pane.vue
@@ -2,39 +2,25 @@
<div ref="taskInfoDiv" class="taskinfo-div">
<div class="need-feed-header">
<div style="height:28px;line-height:28px;">
- <el-divider class="pane-divider" direction="vertical"></el-divider
- ><span style="font-size:14px;font-weight:bold">宸ュ崟璇︾粏淇℃伅</span>
- <div
- style="display: inline-block;vertical-align: middle;margin-left:2px;cursor: pointer;"
- @click="shrinkExpandTaskInfo"
- >
- <i
- :class="[
- 'taskinfo-header',
- 'el-icon-arrow-right',
- taskInfoShow ? 'is-active' : ''
- ]"
- ></i>
+ <el-divider class="pane-divider" direction="vertical"></el-divider><span
+ style="font-size:14px;font-weight:bold">宸ュ崟璇︾粏淇℃伅</span>
+ <div style="display: inline-block;vertical-align: middle;margin-left:2px;cursor: pointer;"
+ @click="shrinkExpandTaskInfo">
+ <i :class="[
+ 'taskinfo-header',
+ 'el-icon-arrow-right',
+ taskInfoShow ? 'is-active' : ''
+ ]"></i>
</div>
</div>
</div>
- <div
- ref="taskInfoMainDiv"
- class="taskinfo-main"
- :style="{ height: taskInfoMainHeight }"
- v-show="taskInfoShow"
- >
- <el-tabs
- v-model="taskInfoActiveName"
- type="card"
- class="taskInfoMainTab"
- @tab-click="handleClick"
- >
+ <div ref="taskInfoMainDiv" class="taskinfo-main" :style="{ height: taskInfoMainHeight }" v-show="taskInfoShow">
+ <el-tabs v-model="taskInfoActiveName" type="card" class="taskInfoMainTab" @tab-click="handleClick">
<el-tab-pane label="涓昏淇℃伅" name="涓昏淇℃伅">
<el-row>
<el-col :span="10" :offset="1" class="taskinfo-pane-div">
<el-row>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<div class="param-top">
<div class="form-item">
<label>閿�鍞鍗曞彿</label>
@@ -53,7 +39,7 @@
</div>
</div>
</div>
- </el-col>
+ </el-col> -->
<el-col :span="12">
<div class="param-top">
<div class="form-item">
@@ -64,12 +50,22 @@
</div>
</div>
</el-col>
- <el-col :span="12"
- ><div class="param-top">
+ <el-col :span="12">
+ <div class="param-top">
<div class="form-item">
<label>宸ュ簭</label>
<div style="color: #7A9EFD">
{{ currOperateTask.operationName }}
+ </div>
+ </div>
+ </div>
+ </el-col>
+ <el-col :span="24">
+ <div class="param-top">
+ <div class="form-item">
+ <label>闆朵欢鍚嶇О</label>
+ <div style="color: #7A9EFD">
+ {{ currOperateTask.partName }}
</div>
</div>
</div>
@@ -91,16 +87,6 @@
<el-col :span="12">
<div class="param-top">
<div class="form-item">
- <label>闆朵欢鍚嶇О</label>
- <div style="color: #7A9EFD">
- {{ currOperateTask.partName }}
- </div>
- </div>
- </div>
- </el-col>
- <el-col :span="12">
- <div class="param-top">
- <div class="form-item">
<label>鎴愬搧瑙勬牸</label>
<div style="color: #7A9EFD">
{{ currOperateTask.productName }}
@@ -108,7 +94,7 @@
</div>
</div>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<div class="param-top">
<div class="form-item">
<label>杞藉叿瑙勬牸</label>
@@ -117,7 +103,7 @@
</div>
</div>
</div>
- </el-col>
+ </el-col> -->
</el-row>
</el-col>
</el-row>
@@ -147,7 +133,7 @@
</div>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<div class="param-top">
<div class="form-item">
<label>鐩橀暱</label>
@@ -164,6 +150,16 @@
? 0
: currOperateTask.discNum
}}鐩�
+ </div>
+ </div>
+ </div>
+ </el-col> -->
+ <el-col :span="12">
+ <div class="param-top">
+ <div class="form-item">
+ <label>瀹為檯寮�濮嬫椂闂�</label>
+ <div style="color: #7A9EFD">
+ {{ currOperateTask.actualStartDate }}
</div>
</div>
</div>
@@ -192,7 +188,6 @@
</div>
</div>
</el-col>
-
<el-col :span="12">
<div class="param-top">
<div class="form-item">
@@ -203,17 +198,7 @@
</div>
</div>
</el-col>
- <el-col :span="12">
- <div class="param-top">
- <div class="form-item">
- <label>瀹為檯寮�濮嬫椂闂�</label>
- <div style="color: #7A9EFD">
- {{ currOperateTask.actualStartDate }}
- </div>
- </div>
- </div>
- </el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<div class="param-top">
<div class="form-item">
<label>瀹㈡埛鍚嶇О</label>
@@ -222,7 +207,7 @@
</div>
</div>
</div>
- </el-col>
+ </el-col> -->
</el-row>
</el-col>
</el-row>
@@ -232,75 +217,37 @@
<el-tree :data="batchTree" node-key="id"> </el-tree>
</div>
</el-tab-pane>-->
- <el-tab-pane label="鎸夋壒娆℃姤宸�" name="鎸夋壒娆℃姤宸�">
+ <!-- <el-tab-pane label="鎸夋壒娆℃姤宸�" name="鎸夋壒娆℃姤宸�">
<div>
- <ctable
- class="task-detail-info-table"
- :table="taskDetailInfoTable"
+ <ctable class="task-detail-info-table" :table="taskDetailInfoTable"
@handleSelectionChange="taskDetailInfoHandleSelectionChange"
- @objectSpanMethod="objectSpanMethodForTaskDetailInfo(arguments)"
- :mergeCols="detailInfoMergeCols"
- :searchList="taskDetailInfoSearchList"
- :uploadInfo="taskDetailInfoUploadInfo"
- :prelang="taskDetailInfoPrelang"
- :options="taskDetailInfoOptions"
- :paramObj="taskDetailInfoParamObj"
- :isShowPagination="isShowPagination"
- :bottomOffset="65"
- :ajaxFun="taskDetailInfoAjaxFun"
- ref="segmentmergeTaskDetailInfoTable"
- >
+ @objectSpanMethod="objectSpanMethodForTaskDetailInfo(arguments)" :mergeCols="detailInfoMergeCols"
+ :searchList="taskDetailInfoSearchList" :uploadInfo="taskDetailInfoUploadInfo"
+ :prelang="taskDetailInfoPrelang" :options="taskDetailInfoOptions" :paramObj="taskDetailInfoParamObj"
+ :isShowPagination="isShowPagination" :bottomOffset="65" :ajaxFun="taskDetailInfoAjaxFun"
+ ref="segmentmergeTaskDetailInfoTable">
<template #toolbar>
<div style="display:flex;">
<div style="display:flex;margin-left:5px ;">
- <el-button
- style="height:32px;"
- @click="beginEdit()"
- type="primary"
- v-show="isEditShow"
- >缂栬緫
+ <el-button style="height:32px;" @click="beginEdit()" type="primary" v-show="isEditShow">缂栬緫
</el-button>
</div>
<div style="display:flex;margin-left:5px ;">
- <el-button
- style="height:32px;"
- @click="cancelEdit()"
- type="primary"
- v-show="!isEditShow"
- >鍙栨秷
+ <el-button style="height:32px;" @click="cancelEdit()" type="primary" v-show="!isEditShow">鍙栨秷
</el-button>
</div>
<div style="display:flex;margin-left:10px ;">
- <el-button
- style="height:32px;"
- @click="saveEdit()"
- type="primary"
- v-show="!isEditShow"
- >淇濆瓨
+ <el-button style="height:32px;" @click="saveEdit()" type="primary" v-show="!isEditShow">淇濆瓨
</el-button>
</div>
<div style="display:flex;margin-left:5px ;">
- <div
- style="font-weight:bold;font-size:15px;line-height:28px;margin-right:5px;"
- >
+ <div style="font-weight:bold;font-size:15px;line-height:28px;margin-right:5px;">
宸ュ簭閫夋嫨
</div>
<div style="display:flex;">
- <el-select
- v-model="selectedOperationIds"
- placeholder="璇烽�夋嫨"
- multiple
- clearable
- size="mini"
- class="segmentmerge-operation-select"
- @change="setQueryObj"
- >
- <el-option
- v-for="item in operationList"
- :key="item.id"
- :label="item.name"
- :value="item.id"
- >
+ <el-select v-model="selectedOperationIds" placeholder="璇烽�夋嫨" multiple clearable size="mini"
+ class="segmentmerge-operation-select" @change="setQueryObj">
+ <el-option v-for="item in operationList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</div>
@@ -309,57 +256,32 @@
</template>
</ctable>
</div>
- </el-tab-pane>
+ </el-tab-pane> -->
</el-tabs>
</div>
- <div
- ref="taskInfoBodyDiv"
- class="taskinfo-body"
- :style="{ height: taskInfoBodyHeight }"
- >
+ <div ref="taskInfoBodyDiv" class="taskinfo-body" :style="{ height: taskInfoBodyHeight }">
<div style="display:flex;justify-content:space-between;height:100%;">
<div style="height:100%;width:70%;">
<!-- <div v-if="paramTabs.length == 0" class="taskinfo-body-div">-->
<!-- 涓嶅瓨鍦ㄧ粦瀹氱殑宸ヨ壓鍗″拰閰嶇洏鍗�-->
<!-- </div>-->
<el-tabs v-model="activeName" type="card" @tab-click="handleTabClick">
- <el-tab-pane
- v-for="(paramTab, index) in paramTabs"
- :key="index"
- :label="paramTab"
- :name="paramTab"
- >
+ <el-tab-pane v-for="(paramTab, index) in paramTabs" :key="index" :label="paramTab" :name="paramTab">
<div class="pane-div">
<div>
- <el-divider
- class="pane-divider"
- direction="vertical"
- ></el-divider
- ><span style="font-size:14px;font-weight:bold">鍙傛暟闆�</span>
+ <el-divider class="pane-divider" direction="vertical"></el-divider><span
+ style="font-size:14px;font-weight:bold">鍙傛暟闆�</span>
<div class="template-content-div">
- <el-select
- v-model="currTemplateId"
- placeholder="璇烽�夋嫨"
- style="width: 300px;"
- @change="tabParamsClick()"
- clearable
- >
- <el-option
- v-for="item in everyTabParams"
- :key="item.id"
- :label="item.operationTemplateName"
- :value="item.id"
- >
+ <el-select v-model="currTemplateId" placeholder="璇烽�夋嫨" style="width: 300px;" @change="tabParamsClick()"
+ clearable>
+ <el-option v-for="item in everyTabParams" :key="item.id" :label="item.operationTemplateName"
+ :value="item.id">
<div style="display: table;width: 300px;">
<div style="display: table-row;">
- <div
- style="display: table-cell;width:50%;text-align: center;"
- >
+ <div style="display: table-cell;width:50%;text-align: center;">
{{ item.systemNo }}
</div>
- <div
- style="display: table-cell;text-align: center;"
- >
+ <div style="display: table-cell;text-align: center;">
{{ item.operationTemplateName }}
</div>
</div>
@@ -430,45 +352,21 @@
</div>
</div>
<div style="margin-top:14px;">
- <el-divider
- class="pane-divider"
- direction="vertical"
- ></el-divider
- ><span style="font-size:14px;font-weight:bold">鍙傛暟</span>
+ <el-divider class="pane-divider" direction="vertical"></el-divider><span
+ style="font-size:14px;font-weight:bold">鍙傛暟</span>
<div class="params-content-div">
- <el-table
- :data="params"
- :height="tableHeight"
- :header-cell-style="paramsTableHeaderStyle"
- :row-class-name="tableRowClassName"
- class="taskinfo-params-table"
- >
- <el-table-column
- prop="code"
- label="缂栧彿"
- width="200"
- align="center"
- >
+ <el-table :data="params" :height="tableHeight" :header-cell-style="paramsTableHeaderStyle"
+ :row-class-name="tableRowClassName" class="taskinfo-params-table">
+ <el-table-column prop="code" label="缂栧彿" width="200" align="center">
</el-table-column>
- <el-table-column
- prop="parameterItem"
- label="鍚嶇О"
- width="200"
- align="center"
- >
+ <el-table-column prop="parameterItem" label="鍚嶇О" width="200" align="center">
<template slot-scope="scope">
- <span
- >{{ scope.row.parameterItem }}锛坽{
- scope.row.unit
- }}锛�</span
- >
+ <span>{{ scope.row.parameterItem }}锛坽{
+ scope.row.unit
+ }}锛�</span>
</template>
</el-table-column>
- <el-table-column
- prop="paramValue"
- label="鍊�"
- align="center"
- >
+ <el-table-column prop="paramValue" label="鍊�" align="center">
</el-table-column>
</el-table>
</div>
@@ -482,7 +380,7 @@
</div>
</el-tab-pane>
<!--宸ヨ壓閰嶇疆鍗�-->
- <el-tab-pane :label="tabNameExt0" :name="tabNameExt0" class="l-mes">
+ <!-- <el-tab-pane :label="tabNameExt0" :name="tabNameExt0" class="l-mes"> -->
<!-- <div style="margin-left: 40px">
<el-radio v-model="configContent.modelType" label="01" disabled
>妯℃澘1</el-radio
@@ -491,91 +389,44 @@
>妯℃澘2</el-radio
>
</div> -->
- <el-divider content-position="left">閰嶇疆鍗曞唴瀹�</el-divider>
+ <!-- <el-divider content-position="left">閰嶇疆鍗曞唴瀹�</el-divider> -->
<!--妯℃澘1-->
- <div
- class="node-content-remark"
- v-if="configContent.modelType === '01'"
- >
- <el-form
- class="configform1"
- :inline="true"
- ref="form"
- label-width="80px"
- >
+ <!-- <div class="node-content-remark" v-if="configContent.modelType === '01'">
+ <el-form class="configform1" :inline="true" ref="form" label-width="80px">
<el-form-item label="璁㈠崟缂栧彿锛�">
<el-input v-model="configContent.proNo" readonly></el-input>
</el-form-item>
<el-form-item label="椤圭洰鍚嶇О锛�">
- <el-input
- v-model="configContent.proName"
- readonly
- ></el-input>
+ <el-input v-model="configContent.proName" readonly></el-input>
</el-form-item>
- <el-form-item
- label="鐢熶骇瑕佹眰鎻忚堪锛�"
- style="width: 100%"
- label-width="105px"
- >
+ <el-form-item label="鐢熶骇瑕佹眰鎻忚堪锛�" style="width: 100%" label-width="105px">
<div class="ql-editor" v-html="configContent.remark1" />
</el-form-item>
- </el-form>
+ </el-form> -->
<!-- 鐢熶骇瑕佹眰鎻忚堪锛�-->
- </div>
+ <!-- </div> -->
<!--妯℃澘2-->
- <div
- class="node-content-remark2"
- v-if="configContent.modelType === '02'"
- >
- <div
- class="node-content-remark2"
- style="width: 90%;margin-left: 30px;"
- >
- <el-form
- class="configform2"
- :inline="true"
- ref="form"
- label-width="80px"
- >
+ <!-- <div class="node-content-remark2" v-if="configContent.modelType === '02'">
+ <div class="node-content-remark2" style="width: 90%;margin-left: 30px;">
+ <el-form class="configform2" :inline="true" ref="form" label-width="80px">
<el-form-item label="鍚堝悓缂栧彿锛�" style="width: 40%">
- <el-input
- v-model="configContent.proNo"
- readonly
- ></el-input>
+ <el-input v-model="configContent.proNo" readonly></el-input>
</el-form-item>
<el-form-item label="椤圭洰鍚嶇О锛�" style="width: 40%">
- <el-input
- v-model="configContent.proName"
- readonly
- ></el-input>
+ <el-input v-model="configContent.proName" readonly></el-input>
</el-form-item>
<el-form-item label="鍗板瓧瑕佹眰锛�" style="width: 100%">
- <el-input
- v-model="configContent.printReq"
- readonly
- ></el-input>
+ <el-input v-model="configContent.printReq" readonly></el-input>
</el-form-item>
- <el-form-item
- label="鐢熶骇瑙勬牸鍨嬪彿鍙婃暟閲忥細"
- style="width: 100%"
- label-width="140px"
- >
+ <el-form-item label="鐢熶骇瑙勬牸鍨嬪彿鍙婃暟閲忥細" style="width: 100%" label-width="140px">
<div class="ql-editor" v-html="configContent.remark1" />
</el-form-item>
- <el-form-item
- label="鐢熶骇瑕佹眰鎻忚堪锛�"
- style="width: 100%"
- label-width="105px"
- >
+ <el-form-item label="鐢熶骇瑕佹眰鎻忚堪锛�" style="width: 100%" label-width="105px">
<div class="ql-editor" v-html="configContent.remark2" />
</el-form-item>
- <el-form-item
- label="瀹為檯鍗板瓧瑕佹眰锛�"
- style="width: 80%"
- label-width="105px"
- >
+ <el-form-item label="瀹為檯鍗板瓧瑕佹眰锛�" style="width: 80%" label-width="105px">
<el-input v-model="configContent.realPrintReq"></el-input>
</el-form-item>
<el-row class="bodyrow">
@@ -584,9 +435,7 @@
<div class="form-item" style="text-align: left">
<label>鍙戞场缂嗚姱(桅mm)</label>
<div style="color: #7A9EFD">
- <el-input
- v-model="configContent.cableCore"
- ></el-input>
+ <el-input v-model="configContent.cableCore"></el-input>
</div>
</div>
</div>
@@ -603,9 +452,7 @@
<div class="form-item">
<label>妯¤姱(桅mm)</label>
<div style="color: #7A9EFD">
- <el-input
- v-model="configContent.modelCore"
- ></el-input>
+ <el-input v-model="configContent.modelCore"></el-input>
</div>
</div>
</div>
@@ -615,33 +462,27 @@
<div class="form-item">
<label>妯″(桅mm)</label>
<div style="color: #7A9EFD">
- <el-input
- v-model="configContent.modelSleeve"
- ></el-input>
+ <el-input v-model="configContent.modelSleeve"></el-input>
</div>
</div>
</div>
</el-col>
- <el-col :span="3"
- ><div class="param-top">
+ <el-col :span="3">
+ <div class="param-top">
<div class="form-item">
<label>瀹氬緞妯�(桅mm)</label>
<div style="color: #7A9EFD">
- <el-input
- v-model="configContent.sizingModel"
- ></el-input>
+ <el-input v-model="configContent.sizingModel"></el-input>
</div>
</div>
</div>
</el-col>
- <el-col :span="3"
- ><div class="param-top">
+ <el-col :span="3">
+ <div class="param-top">
<div class="form-item">
<label>杩囨ā(桅mm)</label>
<div style="color: #7A9EFD">
- <el-input
- v-model="configContent.strandModel"
- ></el-input>
+ <el-input v-model="configContent.strandModel"></el-input>
</div>
</div>
</div>
@@ -651,153 +492,72 @@
浜у搧鐨勬�ц兘瑕佹眰锛�20鈩冩椂鐨勭數姘旂壒寰�
</div>
- <el-table
- :data="configContent.processConfigDataList"
- style="width: 100%;margin-top: 10px"
- border
- >
+ <el-table :data="configContent.processConfigDataList" style="width: 100%;margin-top: 10px" border>
<el-table-column prop="date" label="棰戠巼(MHz)">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.frequency"
- disabled
- ></el-input>
+ <el-input v-model="scope.row.frequency" disabled></el-input>
</template>
</el-table-column>
<el-table-column prop="name" label="鏈�澶т紶閫佽“鍑�(dB/km)">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.deliveryReduce"
- disabled
- ></el-input>
+ <el-input v-model="scope.row.deliveryReduce" disabled></el-input>
</template>
</el-table-column>
- <el-table-column
- prop="province"
- label="鑰﹀悎鎹熻�梞ax(dB),2绫�,95%"
- >
+ <el-table-column prop="province" label="鑰﹀悎鎹熻�梞ax(dB),2绫�,95%">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.couplingLoss"
- disabled
- ></el-input>
+ <el-input v-model="scope.row.couplingLoss" disabled></el-input>
</template>
</el-table-column>
</el-table>
- <el-form-item
- label="宸ヤ綔棰戝甫鍐呴┗娉㈡瘮锛�"
- style="width: 80%"
- label-width="120px"
- >
- <el-input
- v-model="configContent.workFrequency"
- disabled
- ></el-input>
+ <el-form-item label="宸ヤ綔棰戝甫鍐呴┗娉㈡瘮锛�" style="width: 80%" label-width="120px">
+ <el-input v-model="configContent.workFrequency" disabled></el-input>
</el-form-item>
- <el-form-item
- label="棰戠巼鑼冨洿锛�"
- style="width: 80%"
- label-width="120px"
- >
- <el-input
- v-model="configContent.frequencyRange"
- disabled
- ></el-input>
+ <el-form-item label="棰戠巼鑼冨洿锛�" style="width: 80%" label-width="120px">
+ <el-input v-model="configContent.frequencyRange" disabled></el-input>
</el-form-item>
- <el-form-item
- label="鐩存祦鐢甸樆锛�"
- style="width: 80%"
- label-width="120px"
- >
- <el-input
- v-model="configContent.resistance"
- disabled
- ></el-input>
+ <el-form-item label="鐩存祦鐢甸樆锛�" style="width: 80%" label-width="120px">
+ <el-input v-model="configContent.resistance" disabled></el-input>
</el-form-item>
- <el-form-item
- label="澶囨敞锛�"
- style="width: 100%"
- label-width="120px"
- >
+ <el-form-item label="澶囨敞锛�" style="width: 100%" label-width="120px">
<div class="ql-editor" v-html="configContent.remark4" />
</el-form-item>
</el-form>
</div>
</div>
- </el-tab-pane>
+ </el-tab-pane> -->
<!--宸ヨ壓闄勪欢-->
- <el-tab-pane :label="tabNameExt1" :name="tabNameExt1">
- <el-table
- :data="processConfigFileTableData"
- border
- style="width: 100%;"
- :header-cell-style="{
- background: 'antiquewhite',
- color: '#333'
- }"
- >
- <el-table-column
- prop="orderNumber"
- label="璁㈠崟鍙�"
- align="center"
- ></el-table-column>
- <el-table-column
- prop="lineNumber"
- label="琛屽彿"
- align="center"
- ></el-table-column>
- <el-table-column
- prop="originalFileName"
- label="鏂囦欢鍚�"
- align="center"
- ></el-table-column>
- <el-table-column
- prop="createUser"
- label="涓婁紶浜�"
- align="center"
- ></el-table-column>
- <el-table-column
- prop="createTime"
- label="涓婁紶鏃堕棿"
- align="center"
- ></el-table-column>
+ <!-- <el-tab-pane :label="tabNameExt1" :name="tabNameExt1">
+ <el-table :data="processConfigFileTableData" border style="width: 100%;" :header-cell-style="{
+ background: 'antiquewhite',
+ color: '#333'
+ }">
+ <el-table-column prop="orderNumber" label="璁㈠崟鍙�" align="center"></el-table-column>
+ <el-table-column prop="lineNumber" label="琛屽彿" align="center"></el-table-column>
+ <el-table-column prop="originalFileName" label="鏂囦欢鍚�" align="center"></el-table-column>
+ <el-table-column prop="createUser" label="涓婁紶浜�" align="center"></el-table-column>
+ <el-table-column prop="createTime" label="涓婁紶鏃堕棿" align="center"></el-table-column>
<el-table-column label="鎿嶄綔">
<template slot-scope="scope">
- <el-button
- @click="downloadProcessConfigFile(scope.row)"
- type="text"
- size="small"
- >涓嬭浇</el-button
- >
+ <el-button @click="downloadProcessConfigFile(scope.row)" type="text" size="small">涓嬭浇</el-button>
</template>
</el-table-column>
</el-table>
- </el-tab-pane>
+ </el-tab-pane> -->
<!--缁撴瀯鍥�-->
- <el-tab-pane :label="tabNameExt2" :name="tabNameExt2">
+ <!-- <el-tab-pane :label="tabNameExt2" :name="tabNameExt2">
<div style="text-align: center; padding: 15px 15px;">
- <img
- width="70%"
- v-for="(image, index) in structureImages"
- :key="index"
- :src="image.url"
- alt=""
- />
+ <img width="70%" v-for="(image, index) in structureImages" :key="index" :src="image.url" alt="" />
</div>
- </el-tab-pane>
+ </el-tab-pane> -->
</el-tabs>
</div>
<div style="height:100%;width:27%;">
<div style="height: 50px;line-height:50px;">
- <span style="color:#363636;font-size:16px;font-weight:700;"
- >宸ヨ壓澶囨敞</span
- >
+ <span style="color:#363636;font-size:16px;font-weight:700;">宸ヨ壓澶囨敞</span>
</div>
- <div
- style="height:calc( 100% - 50px );overflow: auto;padding:10px 10px;"
- >
+ <div style="height:calc( 100% - 50px );overflow: auto;padding:10px 10px;">
<div>
<span v-html="this.currOperateTask.routingOperationRemark"></span>
</div>
@@ -805,26 +565,13 @@
</div>
</div>
</div>
- <productOutByBatchFormDialog
- :currshowlist.sync="showProductByBatchForm"
- :productList="productList"
- :discToolMeasurementVal="discToolMeasurementVal"
- :parentInfo="parentInfo"
- :currentDutyRecord="currentDutyRecord"
- :personBoardList="personBoardList"
- :groupStatus="groupStatus"
- :orderSnGenerateIdList="orderSnGenerateIdList"
- @refreshTaskDetailInfoList="getSegmentmergeTaskDetailInfoData"
- />
- <isReproduceFormDialog
- :currshowlist.sync="showIsReproduceForm"
- :orderSnGenerateIdList="orderSnGenerateIdList"
- @refreshTaskDetailInfoList="getSegmentmergeTaskDetailInfoData"
- />
- <processConfigurationSheetDialog
- :currshowlist.sync="showProcessConfigurationSheet"
- :orderInfo="orderInfo"
- />
+ <productOutByBatchFormDialog :currshowlist.sync="showProductByBatchForm" :productList="productList"
+ :discToolMeasurementVal="discToolMeasurementVal" :parentInfo="parentInfo" :currentDutyRecord="currentDutyRecord"
+ :personBoardList="personBoardList" :groupStatus="groupStatus" :orderSnGenerateIdList="orderSnGenerateIdList"
+ @refreshTaskDetailInfoList="getSegmentmergeTaskDetailInfoData" />
+ <isReproduceFormDialog :currshowlist.sync="showIsReproduceForm" :orderSnGenerateIdList="orderSnGenerateIdList"
+ @refreshTaskDetailInfoList="getSegmentmergeTaskDetailInfoData" />
+ <processConfigurationSheetDialog :currshowlist.sync="showProcessConfigurationSheet" :orderInfo="orderInfo" />
</div>
</template>
<style lang="scss" scoped>
@@ -834,13 +581,16 @@
justify-content: space-between;
align-items: center;
}
+
.taskinfo-header.is-active {
transform: rotate(90deg);
}
+
.taskinfo-header {
transition: transform 0.3s;
font-weight: 300;
}
+
.taskinfo-div {
height: 100%;
overflow: auto;
@@ -848,11 +598,13 @@
/*display: flex;
flex-direction: column;*/
}
+
.taskinfo-pane-div {
border: 0.5px solid #f8f8fb;
border-radius: 10px;
height: 120px;
}
+
.taskinfo-main {
/*flex-grow: 0;
flex-shrink: 0;*/
@@ -861,10 +613,12 @@
justify-content: space-between;
overflow: auto;
}
+
.taskinfo-main-item {
width: 33%;
position: relative;
}
+
.param-top {
width: 100%;
height: 30px;
@@ -895,6 +649,7 @@
vertical-align: text-top;
}
}
+
/*.taskinfo-main-item img {*/
/* width: 100%;*/
/*}*/
@@ -904,45 +659,55 @@
margin-top: 5px;
background-color: #fff;
}
-.taskinfo-body >>> .el-tabs {
+
+.taskinfo-body>>>.el-tabs {
height: 100%;
}
-.taskinfo-body >>> .el-tabs__item.is-active {
+
+.taskinfo-body>>>.el-tabs__item.is-active {
color: #363636;
background-color: #fff;
font-weight: bold;
}
-.taskinfo-body >>> .el-tabs__item:hover {
+
+.taskinfo-body>>>.el-tabs__item:hover {
color: #363636;
font-weight: bold;
}
-.taskinfo-body >>> .el-tabs__item {
+
+.taskinfo-body>>>.el-tabs__item {
background-color: #f3f8fb;
min-width: 115px;
height: 49px;
font-size: 16px !important;
text-align: center;
}
-.taskinfo-body >>> .el-tabs__content {
+
+.taskinfo-body>>>.el-tabs__content {
height: calc(100% - 65px);
}
-.taskinfo-body >>> .el-tabs__content .el-tab-pane {
+
+.taskinfo-body>>>.el-tabs__content .el-tab-pane {
height: 100%;
overflow: auto;
}
+
.configform1 {
.el-input {
width: 300px;
}
}
+
.configform2 {
/deep/ .el-form-item__content {
width: 70% !important;
}
+
.el-input {
width: 100%;
}
}
+
.taskinfo-body-div {
text-align: center;
margin: auto;
@@ -950,6 +715,7 @@
color: #9ec1eb;
white-space: nowrap;
}
+
.pane-div {
height: 100%;
padding: 5px 14px;
@@ -959,17 +725,21 @@
width: 4px;
background-color: #4283ee;
}
+
.template-content-div {
margin-top: 14px;
}
-.template-content-div > div:first-child img {
+
+.template-content-div>div:first-child img {
width: 100%;
}
+
.template-listbody-div {
height: calc(100% - 94px);
overflow: auto;
}
-.template-listbody-div > div {
+
+.template-listbody-div>div {
width: 100%;
height: 54px;
margin-bottom: 4px;
@@ -977,101 +747,122 @@
box-shadow: 0px 2px 14px 2px rgba(47, 47, 47, 0.06);
border: solid 1px #f0f0f0;
}
+
.template-unchecked-div {
background-color: #fff;
}
+
.template-checked-div {
background-color: #6290ec;
}
+
.template-checked-systemno {
color: #fffdfd;
}
+
.template-checked-templatename {
color: #fffdfd;
}
+
.template-unchecked-systemno {
color: #4898fc;
}
+
.template-unchecked-templatename {
color: #3f3f3f;
}
-.template-listbody-div >>> .el-checkbox.is-disabled .el-checkbox__inner {
+
+.template-listbody-div>>>.el-checkbox.is-disabled .el-checkbox__inner {
cursor: pointer;
}
-.template-listbody-div
- >>> .el-checkbox.is-disabled.is-checked
- .el-checkbox__inner {
+
+.template-listbody-div>>>.el-checkbox.is-disabled.is-checked .el-checkbox__inner {
background-color: #fff;
border-color: #409eff;
}
-.template-listbody-div
- >>> .el-checkbox.is-disabled.is-checked
- .el-checkbox__inner::after {
+
+.template-listbody-div>>>.el-checkbox.is-disabled.is-checked .el-checkbox__inner::after {
border-color: #409eff;
}
+
.params-content-div {
margin-top: 14px;
}
-.el-table >>> .stripe-row {
+
+.el-table>>>.stripe-row {
background: #eef3fd;
}
+
.params-pagination {
margin-top: 5px;
text-align: right;
}
-.params-pagination >>> .el-icon-arrow-left {
+
+.params-pagination>>>.el-icon-arrow-left {
background: url('/img/workbench/icon_previous.png') center center no-repeat;
background-size: cover;
}
-.params-pagination >>> .el-icon-arrow-left:before {
+.params-pagination>>>.el-icon-arrow-left:before {
content: '鏇�';
font-size: 20px;
visibility: hidden;
}
-.params-pagination >>> .el-icon-arrow-right {
+
+.params-pagination>>>.el-icon-arrow-right {
background: url('/img/workbench/icon_next.png') center center no-repeat;
background-size: cover;
}
-.params-pagination >>> .el-icon-arrow-right:before {
+.params-pagination>>>.el-icon-arrow-right:before {
content: '鎹�';
font-size: 20px;
visibility: hidden;
}
-.params-pagination >>> .el-pager li {
+
+.params-pagination>>>.el-pager li {
min-width: 28px;
}
-.params-pagination >>> button {
+
+.params-pagination>>>button {
min-width: 23.5px;
}
-.params-pagination >>> .btn-prev {
+
+.params-pagination>>>.btn-prev {
padding: 0px 4px 0px 2px;
}
-.params-pagination >>> .btn-next {
+
+.params-pagination>>>.btn-next {
padding: 0px 2px 0px 4px;
}
-.taskinfo-params-table >>> td {
+
+.taskinfo-params-table>>>td {
padding: 3px 0px;
}
-.taskInfoMainTab >>> .el-tabs__header {
+
+.taskInfoMainTab>>>.el-tabs__header {
margin: 0 0;
}
-.taskInfoMainTab >>> .el-tabs__header {
+
+.taskInfoMainTab>>>.el-tabs__header {
margin: 0 0;
}
-.taskInfoMainTab >>> .el-tabs__header .el-tabs__item {
+
+.taskInfoMainTab>>>.el-tabs__header .el-tabs__item {
height: 28px;
line-height: 28px;
}
+
.bodyrow {
.el-input {
width: 80%;
}
+
.form-item {
text-align: center;
}
}
+
.ql-editor {
color: #444;
line-height: 20px;
@@ -1080,26 +871,17 @@
font-size: 12px;
border-bottom: 1px solid #ddd;
}
-.task-detail-info-table >>> .custom-table-div {
+
+.task-detail-info-table>>>.custom-table-div {
margin-top: 0px !important;
}
-.task-detail-info-table
- >>> .custom-table-div
- .customTable
- .el-table__body-wrapper
- .el-table__row
- .cell {
+.task-detail-info-table>>>.custom-table-div .customTable .el-table__body-wrapper .el-table__row .cell {
padding-left: 0px !important;
padding-right: 0px !important;
}
-.task-detail-info-table
- >>> .customTable
- .el-table__header-wrapper
- .el-table__header
- .el-table-column--selection
- .el-checkbox__input {
+.task-detail-info-table>>>.customTable .el-table__header-wrapper .el-table__header .el-table-column--selection .el-checkbox__input {
display: none;
}
</style>
@@ -1481,8 +1263,8 @@
computed: {
...mapGetters(['userInfo'])
},
- mounted() {},
- created() {},
+ mounted() { },
+ created() { },
methods: {
handleClick() {
if (this.taskInfoActiveName == '鎸夋壒娆℃姤宸�') {
--
Gitblit v1.9.3