代码提交

src/views/rent-facility/index.vue

@@ -28,17 +28,17 @@
 
           <el-table-column prop="valueA" label="线路设备配置率">
             <template slot-scope="scope">
-              <span class="link" @click="handleDrill(scope.row, 0)">{{ scope.row.valueA }}</span>
+              <span class="link" @click="handleDrill(scope.row, 0)">{{ scope.row.valueA + scope.row.newValueA }}</span>
             </template>
           </el-table-column>
           <el-table-column prop="valueB" label="电缆设备配置率">
             <template slot-scope="scope">
-              <span class="link" @click="handleDrill(scope.row, 1)">{{ scope.row.valueB }}</span>
+              <span class="link" @click="handleDrill(scope.row, 1)">{{ scope.row.valueB+scope.row.newValueB }}</span>
             </template>
           </el-table-column>
           <el-table-column prop="valueC" label="变电设备配置率">
             <template slot-scope="scope">
-              <span class="link" @click="handleDrill(scope.row, 2)">{{ scope.row.valueC }}</span>
+              <span class="link" @click="handleDrill(scope.row, 2)">{{ scope.row.valueC+scope.row.newValueC }}</span>
             </template>
           </el-table-column>
         </el-table>

src/views/rent-facility/line.vue

@@ -4,6 +4,7 @@
       <!-- 替换 Element Plus 图标为 Element UI 的图标使用方式 -->
       <i class="el-icon-arrow-left back-icon" @click="$emit('back')"></i>
       <span class="second-page-title">{{ title }}</span>
+
     </div>
 
     <el-table
@@ -14,8 +15,13 @@
       :cell-style="{ textAlign: 'center' }"
       class="custom-table detail-table"
     >
-      <el-table-column prop="index" label="序号" width="60"/>
+      <el-table-column prop="index" type="index" label="序号" width="60"/>
       <el-table-column prop="name" label="装备名称" width="120"/>
+      <el-table-column prop="isNew" label="是否新型" width="120">
+        <template slot-scope="scope">
+          {{ scope.row.isNew == '0' ? '否' : '是' }}
+        </template>
+      </el-table-column>
       <el-table-column label="基本配置标准（台/套）" align="center">
         <el-table-column prop="standard" label="标准" width="80"/>
         <el-table-column prop="combinedName" label="装备种类"/>
@@ -31,11 +37,12 @@
       <el-table-column prop="rent" label="租赁装备数量" width="120">
         <!-- Vue2 中使用 slot-scope 替代 #default -->
         <template slot-scope="scope">
-          <span class="cell-yellow">{{ scope.row.rent }}</span>
+          <span class="cell-yellow">{{ 0 }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="actual" label="装备实际配置率" width="130"/>
     </el-table>
+    <span style="color: red;font-size: 12px;float: right;height: 30px;">新型装备最多统计20分</span>
   </div>
 </template>
 

src/views/system/equipment/index.vue

@@ -18,7 +18,8 @@
       <!--装备数据-->
       <el-col :span="19" :xs="24" style="background-color: #FFFFFF;height: 100%;margin-top: 10px">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-                 label-width="70px">
+                 label-width="70px"
+        >
           <el-form-item label="分类" prop="jijuType">
             <el-select
               v-model="queryParams.jijuType"
@@ -153,7 +154,7 @@
     <el-dialog
       title="编辑基本配置"
       :visible.sync="inputDialogVisible"
-      width="900px"
+      width="60%"
       :close-on-click-modal="false"
     >
       <!-- 新增装备名称显示区域 -->
@@ -167,6 +168,7 @@
         </el-button>
         <div class="config-table-header">
           <span class="config-th" style="width:180px;">配置类型</span>
+          <span class="config-th" style="width:180px;">是否新型</span>
           <span class="config-th" style="width:180px;">基本配置标准(台/套)</span>
           <span class="config-th" style="width:180px;">装备配置率</span>
           <span class="config-th" style="width:180px;">配置说明</span>
@@ -181,6 +183,15 @@
                          :value="dict.value"
               />
             </el-select>
+
+            <el-select
+              v-model="item.isNew"
+              placeholder="请选择"
+              style="width: 180px;margin-left: 10px"
+            >
+              <el-option label="否" value="0"/>
+              <el-option label="是" value="1"/>
+            </el-select>
             <el-input style="width: 180px;margin-left: 10px"
                       v-model="item.basicConfig"
                       placeholder="请输入基本配置标准"
@@ -336,7 +347,8 @@ export default {
         configurationType: '',
         basicConfig: '',
         configurationRate: '',
-        configurationDescription: ''
+        configurationDescription: '',
+        isNew: '0'
       })
     },
     /**
@@ -492,11 +504,13 @@ export default {
       // 检查是否可编辑
       if (!this.checkSelectable(row)) return
       selectConfigList({
+        jijuType: row.jijuType,
         typeId: row.equipmentId,
         deptId: this.currentDeptId
       }).then(res => {
         if (res.code === 200) {
           res.data.forEach(item => {
+            console.log(item)
             this.configForm.configs.push(item)
           })
         }
@@ -531,7 +545,7 @@ export default {
           basicConfig: Number(this.configForm.basicConfig)
         }
    */
-
+    console.log(this.configForm)
       updateEquipmentConfig(this.configForm).then(response => {
         this.$message.success('配置保存成功')
         this.getList()

src/views/toolsManage/codeToolsLedger/index.vue

@@ -664,27 +664,27 @@ export default {
           this.dialogForm.certificateList = this.dialogForm.certificates.map((item) => item.fileUrl).join(',')
         }
         if (this.dialogForm.inspectionReports && this.dialogForm.inspectionReports.length > 0) {
-          this.dialogForm.inspectionReportList = this.dialogForm.inspectionReports.map((item) => item.fileUrl).join(',')
+          this.dialogForm.inspectionList = this.dialogForm.inspectionReports.map((item) => item.fileUrl).join(',')
         }
         if (this.dialogForm.purchaseInvoices && this.dialogForm.purchaseInvoices.length > 0) {
           this.dialogForm.purchaseInvoicesList = this.dialogForm.purchaseInvoices.map((item) => item.fileUrl).join(',')
         }
-        // 确保fileList是数组格式
+        // // 确保fileList是数组格式
-        if (!Array.isArray(this.dialogForm.fileList)) {
+        // if (!Array.isArray(this.dialogForm.fileList)) {
-          this.dialogForm.fileList = this.dialogForm.fileList
+        //   this.dialogForm.fileList = this.dialogForm.fileList
-            ? this.dialogForm.fileList.split(',').map((url) => ({
+        //     ? this.dialogForm.fileList.split(',').map((url) => ({
-                name: url.split('/').pop(),
+        //         name: url.split('/').pop(),
-                url: url,
+        //         url: url,
-                uid: new Date().getTime() + Math.random(),
+        //         uid: new Date().getTime() + Math.random(),
-              }))
+        //       }))
-            : []
+        //     : []
-        } else {
+        // } else {
-          // 为数组中的文件添加uid
+        //   // 为数组中的文件添加uid
-          this.dialogForm.fileList = this.dialogForm.fileList.map((file) => ({
+        //   this.dialogForm.fileList = this.dialogForm.fileList.map((file) => ({
-            ...file,
+        //     ...file,
-            uid: file.uid || new Date().getTime() + Math.random(),
+        //     uid: file.uid || new Date().getTime() + Math.random(),
-          }))
+        //   }))
-        }
+        // }
         console.log('🚀 ~ this.dialogForm:', this.dialogForm)
       })
     },