From 664db98c9e8595ce4dd636a27f480e3a08b81ff5 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 21 二月 2025 11:13:51 +0800
Subject: [PATCH] 新增可忽略的维修时间

---
 web/src/views/modules/basicInfo/ParamData.vue |  172 +++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 107 insertions(+), 65 deletions(-)

diff --git a/web/src/views/modules/basicInfo/ParamData.vue b/web/src/views/modules/basicInfo/ParamData.vue
index ecf9669..63c3402 100644
--- a/web/src/views/modules/basicInfo/ParamData.vue
+++ b/web/src/views/modules/basicInfo/ParamData.vue
@@ -3,7 +3,7 @@
     <el-row :gutter="5">
       <el-col :span="4">
         <div class="fa-card-a" style="margin-right: 5px;height: calc(100vh - 123px)">
-          <product-model-tree @on-selected="onProductSelected" showXdy="false"/>
+          <product-model-tree ref="modelTree" @on-selected="onProductSelected" @on-default="onDefault" showXdy="false" :isShow="false"/>
         </div>
       </el-col>
       <el-col :span="20">
@@ -12,7 +12,8 @@
                            delete-url="/basicInfo/ParamData/"
                            @dataLoaded="dataLoaded"
                            v-slot="{ table }"
-                           :paging='false'>
+                           :paging='false'
+          >
             <el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
               <el-form-item>
                 <zt-dict v-model="dataForm.basicJoinCompute" dict="is_or_not" placeholder="鏄惁鍙備笌璁$畻" clearable></zt-dict>
@@ -29,9 +30,12 @@
                          clearable></zt-dict>
               </el-form-item>
               <el-form-item>
+                <el-input v-model="dataForm.name" placeholder="璇疯緭鍏ュ悕绉�" clearable></el-input>
+              </el-form-item>
+              <el-form-item>
                 <zt-button v-if="dataForm.srcId" type="warning" @click="handleSaveRows">淇濆瓨</zt-button>
                 <zt-button v-if="dataForm.srcId" type="query" @click="table.query()"/>
-                <zt-button type="add" v-if="dataForm.productType==='3'" @click="add()"/>
+               <!-- <zt-button type="add" v-if="dataForm.productType==='3'" @click="add()"/>-->
                 <zt-button v-if="dataForm.srcId" type="delete" @click="table.deleteHandle()"/>
               </el-form-item>
             </el-form>
@@ -39,14 +43,15 @@
               <el-tab-pane label="鍩烘湰鍙潬鎬�" name="first">
                 <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px"
                           v-adaptive="{bottomOffset:30}"
+                          :header-cell-style="{'text-align':'center'}"
                           class="paramsDataTable"
                           @selection-change="table.selectionChangeHandle">
                   <el-table-column type="selection" :key="1" width="40" align="center"/>
                   <el-table-column prop="name" :key="2" label="鍚嶇О" fixed="left" width="120"/>
-                  <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='2'"
+                  <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='4'"
                                    prop="reliabDistribType"
                                    label="鍙潬鎬у垎甯冪被鍨�" :key="27"
-                                   width="100">
+                                   align="center">
                     <template v-slot="{ row }">
                       <el-select v-if="row.isEdit" v-model="row.reliabDistribType"
                                  placeholder="璇烽�夋嫨">
@@ -61,24 +66,25 @@
                                    :hit="hit"/>
                     </template>
                   </el-table-column>
-                  <el-table-column v-if="dataForm.productType==='4'" :key="3" prop="baseOperatRatio" label="鍩烘湰鍙潬鎬ц繍琛屾瘮">
+                  <el-table-column v-if="dataForm.productType==='2'" :key="3" prop="baseOperatRatio" label="鍩烘湰鍙潬鎬ц繍琛屾瘮"
+                                   align="right">
                     <template slot-scope="scope">
                       <el-input v-if="scope.row.isEdit" v-model="scope.row.baseOperatRatio"></el-input>
                       <span v-else v-text="scope.row.baseOperatRatio"></span>
                     </template>
                   </el-table-column>
-                  <el-table-column v-if="dataForm.productType==='5'||dataForm.productType==='4'" :key="4"
+                  <el-table-column v-if="dataForm.productType==='1'||dataForm.productType==='2'" :key="4"
                                    prop="actualRunTime"
-                                   label="瀹為檯杩愯鏃堕棿">
+                                   label="瀹為檯杩愯鏃堕棿" align="right">
                     <template slot-scope="scope">
                       <el-input v-if="scope.row.isEdit" v-model="scope.row.actualRunTime"></el-input>
                       <span v-else v-text="scope.row.actualRunTime"></span>
                     </template>
                   </el-table-column>
-                  <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='2'" :key="5"
+                  <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='4'" :key="5"
                                    label="鍩烘湰鍙潬鎬ц绠�">
                     <!--                <zt-table-column-dict prop="joinCompute" :keys="6" label="鍙傚姞璁$畻" width="100" dict="is_or_not"/>-->
-                    <el-table-column prop="basicJoinCompute" label="鍙傚姞璁$畻" :key="6">
+                    <el-table-column prop="basicJoinCompute" label="鍙傚姞璁$畻" :key="6" width="100" align="center">
                       <template v-slot="{ row }">
                         <el-select v-if="row.isEdit" v-model="row.basicJoinCompute"
                                    placeholder="鍙傚姞璁$畻">
@@ -93,49 +99,49 @@
                                      :typeColor="typeColor" :size="size" :effect="effect" :hit="hit"/>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="basicMtbfRegulate" :key="7" label="瑙勫畾MTBF">
+                    <el-table-column prop="basicMtbfRegulate" :key="7" label="MTBF" align="right" width="110">
                       <template slot-scope="scope">
                         <el-input v-if="scope.row.isEdit" v-model="scope.row.basicMtbfRegulate"></el-input>
-                        <span v-else v-text="scope.row.basicMtbfRegulate"></span>
+                        <span v-else>{{scope.row.basicMtbfRegulate | keepNumber}}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="basicMtbfAccept" :key="8" label="鍙帴鍙楃殑MTBF" width="100">
+                    <!--<el-table-column prop="basicMtbfAccept" :key="8" label="鍙帴鍙楃殑MTBF" width="100">
                       <template slot-scope="scope">
                         <el-input v-if="scope.row.isEdit" v-model="scope.row.basicMtbfAccept"></el-input>
                         <span v-else v-text="scope.row.basicMtbfAccept"></span>
                       </template>
-                    </el-table-column>
-                    <el-table-column prop="basicMtbfRegulSuccRate" :key="9" label="MTBF瑙勫畾鎴愬姛鐜�">
+                    </el-table-column>-->
+                    <el-table-column prop="basicMtbfRegulSuccRate" :key="9" label="鎴愬姛鐜�" align="right">
                       <template slot-scope="scope">
                         <el-input v-if="scope.row.isEdit" v-model="scope.row.basicMtbfRegulSuccRate"></el-input>
                         <span v-else v-text="scope.row.basicMtbfRegulSuccRate"></span>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="basicMtbfAcceptSuccRate" :key="10" label="MTBF鍙帴鍙楁垚鍔熺巼" width="140">
-                      <template slot-scope="scope">
-                        <el-input v-if="scope.row.isEdit" v-model="scope.row.basicMtbfAcceptSuccRate"></el-input>
-                        <span v-else v-text="scope.row.basicMtbfAcceptSuccRate"></span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column prop="basicUnitNum" label="鍗曞厓鏁伴噺" :key="11" width="100">
+                    <!-- <el-table-column prop="basicMtbfAcceptSuccRate" :key="10" label="MTBF鍙帴鍙楁垚鍔熺巼" width="120">
+                       <template slot-scope="scope">
+                         <el-input v-if="scope.row.isEdit" v-model="scope.row.basicMtbfAcceptSuccRate"></el-input>
+                         <span v-else v-text="scope.row.basicMtbfAcceptSuccRate"></span>
+                       </template>
+                     </el-table-column>-->
+                    <el-table-column prop="basicUnitNum" label="鍗曞厓鏁伴噺" :key="11" width="100" align="center">
                       <template slot-scope="scope">
                         <el-input v-if="scope.row.isEdit" v-model="scope.row.basicUnitNum"></el-input>
                         <span v-else v-text="scope.row.basicUnitNum"></span>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="basicRunsNum" label="杩愯娆℃暟" :key="12" width="100">
+                    <el-table-column prop="basicRunsNum" label="杩愯娆℃暟" :key="12" width="100" align="center">
                       <template slot-scope="scope">
                         <el-input v-if="scope.row.isEdit" v-model="scope.row.basicRunsNum"></el-input>
                         <span v-else v-text="scope.row.basicRunsNum"></span>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="basicMtbfOperatingRatio" :key="13" label="MTBF杩愯姣�" width="80">
+                    <el-table-column prop="basicMtbfOperatingRatio" :key="13" label="杩愯姣�" align="right">
                       <template slot-scope="scope">
                         <el-input v-if="scope.row.isEdit" v-model="scope.row.basicMtbfOperatingRatio"></el-input>
                         <span v-else v-text="scope.row.basicMtbfOperatingRatio"></span>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="basicSingleRunTime" :key="14" label="杩愯鏃堕棿" width="100">
+                    <el-table-column prop="basicSingleRunTime" :key="14" label="杩愯鏃堕棿" align="right" width="100">
                       <template slot-scope="scope">
                         <el-input v-if="scope.row.isEdit" v-model="scope.row.basicSingleRunTime"></el-input>
                         <span v-else v-text="scope.row.basicSingleRunTime"></span>
@@ -154,56 +160,64 @@
               </el-tab-pane>
 
 
-              <el-tab-pane label="浠诲姟鍙潬鎬�" name="second" v-if="dataForm.productType==='3'||dataForm.productType==='2'">
+              <el-tab-pane label="浠诲姟鍙潬鎬�" name="second" v-if="dataForm.productType==='3'||dataForm.productType==='4'">
                 <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px"
                           v-adaptive="{bottomOffset:30}"
                           class="paramsDataTable"
-                          @selection-change="table.selectionChangeHandle">
+                          @selection-change="table.selectionChangeHandle"
+                          :header-cell-style="{'text-align':'center'}">
                   <el-table-column type="selection" :key="1" width="40" align="center"/>
                   <el-table-column prop="name" :key="2" label="鍚嶇О" fixed="left" width="120"/>
 
-                  <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='2'" :key="15"
+                  <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='4'" :key="15"
                                    label="浠诲姟鍙潬鎬ц绠�">
-                    <el-table-column prop="taskMtbcfRegulate" :key="16" label="瑙勫畾MTBCF" width="100">
+                    <el-table-column prop="taskMtbcfRegulate" :key="16" label="MTBCF" width="110" align="right">
                       <template slot-scope="scope">
                         <el-input v-if="scope.row.isEdit" v-model="scope.row.taskMtbcfRegulate"></el-input>
-                        <span v-else v-text="scope.row.taskMtbcfRegulate"></span>
+                        <span v-else>{{scope.row.taskMtbcfRegulate | keepNumber}}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="taskMtbcfAccept" :key="17" label="鍙帴鍙楃殑MTBCF" width="100">
+                    <!--<el-table-column prop="taskMtbcfAccept" :key="17" label="鍙帴鍙楃殑MTBCF" width="100">
                       <template slot-scope="scope">
                         <el-input v-if="scope.row.isEdit" v-model="scope.row.taskMtbcfAccept"></el-input>
                         <span v-else v-text="scope.row.taskMtbcfAccept"></span>
                       </template>
-                    </el-table-column>
-                    <el-table-column prop="taskMtbcfRegulSuccRate" :key="18" label="MTBCF瑙勫畾鎴愬姛鐜�" width="120">
+                    </el-table-column>-->
+                    <el-table-column prop="taskMtbcfRegulSuccRate" :key="18" label="鎴愬姛鐜�" align="right">
                       <template slot-scope="scope">
                         <el-input v-if="scope.row.isEdit" v-model="scope.row.taskMtbcfRegulSuccRate"></el-input>
                         <span v-else v-text="scope.row.taskMtbcfRegulSuccRate"></span>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="taskMtbcfAcceptSuccRate" :key="19" label="MTBCF鍙帴鍙楁垚鍔熺巼" width="140">
-                      <template slot-scope="scope">
-                        <el-input v-if="scope.row.isEdit" v-model="scope.row.taskMtbcfAcceptSuccRate"></el-input>
-                        <span v-else v-text="scope.row.taskMtbcfAcceptSuccRate"></span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column prop="taskMtbcfOperatingRatio" :key="20" label="MTBCF杩愯姣�" width="100">
+                    <!-- <el-table-column prop="taskMtbcfAcceptSuccRate" :key="19" label="MTBCF鍙帴鍙楁垚鍔熺巼" width="100">
+                       <template slot-scope="scope">
+                         <el-input v-if="scope.row.isEdit" v-model="scope.row.taskMtbcfAcceptSuccRate"></el-input>
+                         <span v-else v-text="scope.row.taskMtbcfAcceptSuccRate"></span>
+                       </template>
+                     </el-table-column>-->
+                    <el-table-column prop="taskMtbcfOperatingRatio" :key="20" label="杩愯姣�" align="right">
                       <template slot-scope="scope">
                         <el-input v-if="scope.row.isEdit" v-model="scope.row.taskMtbcfOperatingRatio"></el-input>
                         <span v-else v-text="scope.row.taskMtbcfOperatingRatio"></span>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="taskMtbcfOtherParams" :key="21" label="MTBCF鍏朵粬鍙傛暟">
+                    <el-table-column prop="taskMtbcfOtherParams2" :key="21" label="鍏朵粬鍙傛暟2" align="right">
                       <template slot-scope="scope">
-                        <el-input v-if="scope.row.isEdit" v-model="scope.row.taskMtbcfOtherParams"></el-input>
-                        <span v-else v-text="scope.row.taskMtbcfOtherParams"></span>
+                        <el-input v-if="scope.row.isEdit" v-model="scope.row.taskMtbcfOtherParams2"></el-input>
+                        <span v-else v-text="scope.row.taskMtbcfOtherParams2"></span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="taskMtbcfOtherParams3" :key="30" label="鍏朵粬鍙傛暟3" align="right">
+                      <template slot-scope="scope">
+                        <el-input v-if="scope.row.isEdit" v-model="scope.row.taskMtbcfOtherParams3"></el-input>
+                        <span v-else v-text="scope.row.taskMtbcfOtherParams3"></span>
                       </template>
                     </el-table-column>
                   </el-table-column>
-                  <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='2'" :key="22" label="缁翠慨鍒嗗竷">
+                  <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='4'" :key="22" label="缁翠慨鍒嗗竷"
+                                   align="center">
                     <!--                <zt-table-column-dict prop="repairable" :keys="23" label="鍙淮淇�" dict="is_or_not"/>-->
-                    <el-table-column prop="repairable" label="鍙淮淇�" :key="23">
+                    <el-table-column prop="repairable" label="鍙淮淇�" :key="23" width="80" align="center">
                       <template v-slot="{ row }">
                         <el-select v-if="row.isEdit" v-model="row.repairable"
                                    placeholder="璇烽�夋嫨">
@@ -219,7 +233,7 @@
                       </template>
                     </el-table-column>
                     <!--                <zt-table-column-dict prop="repairDistribType" :keys="24" label="缁翠慨鍒嗗竷绫诲瀷" width="140" dict="RepairDistribType"/>-->
-                    <el-table-column prop="repairDistribType" label="缁翠慨鍒嗗竷绫诲瀷" :key="24" width="140">
+                    <el-table-column prop="repairDistribType" label="缁翠慨鍒嗗竷绫诲瀷" :key="24" width="130" align="center">
                       <template v-slot="{ row }">
                         <el-select v-if="row.isEdit" v-model="row.repairDistribType"
                                    placeholder="璇烽�夋嫨">
@@ -234,16 +248,28 @@
                                      :typeD="typeD" :typeColor="typeColor" :size="size" :effect="effect" :hit="hit"/>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="repairMttcr" label="MTTCR" :key="25" width="100">
+                    <el-table-column prop="repairMttcr" label="MTTCR" :key="25" width="100" align="right">
                       <template slot-scope="scope">
                         <el-input v-if="scope.row.isEdit" v-model="scope.row.repairMttcr"></el-input>
-                        <span v-else v-text="scope.row.repairMttcr"></span>
+                        <span v-else>{{scope.row.repairMttcr | keepNumber}}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="repairMttcrOtherParams" :key="26" label="MTTCR鍏朵粬鍙傛暟" width="180">
+                    <el-table-column prop="repairMttcrOtherParams2" :key="26" label="鍏朵粬鍙傛暟2" align="right">
                       <template slot-scope="scope">
-                        <el-input v-if="scope.row.isEdit" v-model="scope.row.repairMttcrOtherParams"></el-input>
-                        <span v-else v-text="scope.row.repairMttcrOtherParams"></span>
+                        <el-input v-if="scope.row.isEdit" v-model="scope.row.repairMttcrOtherParams2"></el-input>
+                        <span v-else v-text="scope.row.repairMttcrOtherParams2"></span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="repairMttcrOtherParams3" :key="27" label="鍏朵粬鍙傛暟3" align="right">
+                      <template slot-scope="scope">
+                        <el-input v-if="scope.row.isEdit" v-model="scope.row.repairMttcrOtherParams3"></el-input>
+                        <span v-else v-text="scope.row.repairMttcrOtherParams3"></span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="negligibleRepairTime" :key="28" label="鍙拷鐣ョ殑缁翠慨鏃堕棿" align="right">
+                      <template slot-scope="scope">
+                        <el-input v-if="scope.row.isEdit" v-model="scope.row.negligibleRepairTime"></el-input>
+                        <span v-else v-text="scope.row.negligibleRepairTime"></span>
                       </template>
                     </el-table-column>
                   </el-table-column>
@@ -287,19 +313,21 @@
         effect: '',
         hit: false,
         dataForm: {
-          pageCode: this.$route.query.pageCode,
           id: '',
           pid: '',
           srcId: '',
           name: '',
           dataThreeList: null,
-          productType: '5',
+          productType: '1',
           basicJoinCompute: '',
           repairable: '',
           repairDistribType: '',
           reliabDistribType: ''
         },
         isOrNot: [{
+          value: 0,
+          label: '鍚�'
+        },{
           value: 1,
           label: '鏄�'
         }],
@@ -316,20 +344,31 @@
           {
             value: 1,
             label: '鎸囨暟鍒嗗竷'
-          }, {
+          },
+          {
             value: 2,
-            label: '浜岄」鍒嗗竷'
+            label: '濞佸竷灏斿垎甯�'
           },
           {
             value: 3,
-            label: '濞佸竷灏斿垎甯�'
-          },
+            label: '浜岄」鍒嗗竷'
+          }
         ],
         // editingCell:null,
         dataList: [],
         originalTableData: [],
         originalData: null, // 璁板綍淇敼鍓嶇殑鏁版嵁
       }
+    },
+    filters: {
+      keepNumber(value) { //杩囨护鍣ㄤ繚鐣�4涓哄皬鏁�
+        const numM = Number(value).toFixed(5);
+        if (numM === "NaN") {
+          return "0.0000";
+        }
+        const realVal = numM.substring(0, numM.length - 1);
+        return realVal;
+      },
     },
     // 鍦ㄧ粍浠朵腑瀹氫箟 beforeRouteLeave 瀵艰埅瀹堝崼
     beforeRouteLeave(to, from, next) {
@@ -354,19 +393,14 @@
       SelectTyModel
     },
     mounted() {
-      this.pageCode = this.$route.query.pageCode
-      this.dataForm.pageCode = this.$route.query.pageCode
-      console.log(this.pageCode, 'this.pageCode this.pageCode')
+      this.$refs.modelTree.getProductList()
     },
     methods: {
-      handleClick() {
-
-      },
       add() {
         this.$refs.SelectTyModel.$refs.dialog.init(null, {
-          type: this.dataForm.productType - 1,
+          type: this.dataForm.productType + 1,
           id: this.dataForm.srcId,
-          pageCode: this.pageCode
+          pageCode: 'expect'
         })
         console.log(this.dataForm.srcId, 'add')
       },
@@ -422,6 +456,14 @@
           this.$refs.tableObj.query()
         })
       },
+      onDefault(defaultId) {
+        this.dataForm.srcId = defaultId
+        this.dataForm.productType = '1'
+        this.activeName = 'first'
+        this.$nextTick(() => {
+          this.$refs.tableObj.query()
+        })
+      },
       dataLoaded(data) {
         this.dataList = data
         for (let dataList of data) {

--
Gitblit v1.9.1