From 01d6b05750a30f2e17d85d917e9bac80b7c34e92 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期五, 26 四月 2024 09:31:34 +0800
Subject: [PATCH] Merge branch 'dev-threejs'
---
src/views/system/result/detail/detail.vue | 195 ++++++------------------------------------------
1 files changed, 26 insertions(+), 169 deletions(-)
diff --git a/src/views/system/result/detail/detail.vue b/src/views/system/result/detail/detail.vue
index 16209a7..d6f25ac 100644
--- a/src/views/system/result/detail/detail.vue
+++ b/src/views/system/result/detail/detail.vue
@@ -2,136 +2,10 @@
<div class="app-container">
<el-page-header @back="goBack" content="璇︽儏椤甸潰">
</el-page-header>
- <el-container>
- <el-main style="padding-top: 0px">
- <h2>鑰冩牳鍒嗘暟鏄庣粏</h2>
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-<!-- <el-form-item label="鑰冩牳瀵硅薄" prop="ruleName">-->
-<!-- <el-select-->
-<!-- v-model="queryParams.address"-->
-<!-- placeholder="璇烽�夋嫨鍖哄煙"-->
-<!-- clearable-->
-<!-- >-->
-<!-- <el-option label="鑷础甯�" value="鑷础甯�"/>-->
-<!-- <el-option label="娌挎哗鍖�" value="娌挎哗鍖�"/>-->
-<!-- <el-option label="澶у畨鍖�" value="澶у畨鍖�"/>-->
-<!-- <el-option label="璐′簳鍖�" value="璐′簳鍖�"/>-->
-<!-- <el-option label="鑷祦浜曞尯" value="鑷祦浜曞尯"/>-->
-<!-- <el-option label="楂樻柊鍖�" value="楂樻柊鍖�"/>-->
-<!-- <el-option label="鑽ｅ幙" value="鑽ｅ幙"/>-->
-<!-- <el-option label="瀵岄『鍘�" value="瀵岄『鍘�"/>-->
-<!-- </el-select>-->
-<!-- </el-form-item>-->
- <el-form-item label="鑰冩牳鏃ユ湡" prop="createTime">
- <div class="block">
- <el-date-picker
- v-model="value2"
- align="right"
- type="date"
- placeholder="閫夋嫨鏃ユ湡"
- :picker-options="pickerOptions">
- </el-date-picker>
- </div>
- </el-form-item>
- <el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleScoreUpdate"
- >淇敼</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- >鍒犻櫎</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getScoreList"></right-toolbar>
- </el-row>
- <el-table v-loading="loading" :data="scoreList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="鑰冩牳瑙勫垯" align="center" prop="ruleId">
- <template slot-scope="scope">
- <div v-if="scope.row.ruleId == 5">涓�鏈轰竴妗ｆ敞鍐岀巼</div>
- <div v-else-if="scope.row.ruleId == 4">涓�鏈轰竴妗ｅ悎鏍肩巼</div>
- <div v-else-if="scope.row.ruleId == 3">骞冲彴鍦ㄧ嚎鐜�</div>
- </template>
- </el-table-column>
- <el-table-column label="鑰冩牳瀵硅薄" align="center" prop="unitName">
- <template slot-scope="scope">
- <div v-if="scope.row.unitName ==='鎴愰兘x杩愮淮' ">鎴愰兘x杩愮淮</div>
- <div v-else>鑷祦浜曞尯</div>
- </template>
- </el-table-column>
- <el-table-column label="鍒嗗��" align="center" prop="score" />
- <el-table-column label="鑰冩牳鏃堕棿" align="center" prop="createTime" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleScoreUpdate(scope.row)"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleScoreDelete(scope.row)"
- >鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
- <pagination
- v-show="total>0"
- :total="scoreTotal"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getRuleList"
- />
- </el-main>
- </el-container>
<el-container>
<el-main>
<h2>鑰冩牳瑙勫垯</h2>
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleRuleUpdate"
- >淇敼</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- >鍒犻櫎</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getRuleList"></right-toolbar>
- </el-row>
-
<el-table v-loading="loading" :data="ruleList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="瑙勫垯鍚嶇О" align="center" prop="ruleName" />
@@ -144,12 +18,6 @@
icon="el-icon-edit"
@click="handleRuleUpdate(scope.row)"
>淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- >鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -167,40 +35,6 @@
<el-container>
<el-main>
<h2>鑰冩牳鎴愮哗</h2>
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-<!-- <el-form-item label="鑰冩牳瀵硅薄" prop="ruleName">-->
-<!-- <el-select-->
-<!-- v-model="queryParams.address"-->
-<!-- placeholder="璇烽�夋嫨鍖哄煙"-->
-<!-- clearable-->
-<!-- >-->
-<!-- <el-option label="鑷础甯�" value="鑷础甯�"/>-->
-<!-- <el-option label="娌挎哗鍖�" value="娌挎哗鍖�"/>-->
-<!-- <el-option label="澶у畨鍖�" value="澶у畨鍖�"/>-->
-<!-- <el-option label="璐′簳鍖�" value="璐′簳鍖�"/>-->
-<!-- <el-option label="鑷祦浜曞尯" value="鑷祦浜曞尯"/>-->
-<!-- <el-option label="楂樻柊鍖�" value="楂樻柊鍖�"/>-->
-<!-- <el-option label="鑽ｅ幙" value="鑽ｅ幙"/>-->
-<!-- <el-option label="瀵岄『鍘�" value="瀵岄『鍘�"/>-->
-<!-- </el-select>-->
-<!-- </el-form-item>-->
- <el-form-item label="鑰冩牳鏃ユ湡" prop="createTime">
- <div class="block">
- <el-date-picker
- v-model="value2"
- align="right"
- type="date"
- placeholder="閫夋嫨鏃ユ湡"
- :picker-options="pickerOptions">
- </el-date-picker>
- </div>
- </el-form-item>
- <el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
-
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
@@ -209,14 +43,13 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
- v-hasPermi="['system:checkRule:export']"
>瀵煎嚭</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getRuleList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="checkResultList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="鑰冩牳鏃ユ湡" align="center" prop="date" width="120px"/>
+ <el-table-column label="鑰冩牳鏃ユ湡" align="center" prop="date" width="120px" fixed/>
<el-table-column label="鑰冩牳瀵硅薄" align="center" prop="target" width="120px"/>
<el-table-column label="骞冲彴鍦ㄧ嚎鐜�(鏉冮噸锛�0.5)" align="center" prop="platformOnline" width="120px"/>
<el-table-column label="涓�鏈轰竴妗ｅ悎鏍肩巼(鏉冮噸锛�0.5)" align="center" prop="monitorQualification" width="120px"/>
@@ -238,6 +71,16 @@
<el-table-column label="瑙嗛浼犺緭缃戝嵄闄╄祫浜у緱鍒嗘瘮閲�(鏉冮噸锛�0.075)" align="center" prop="videoTransmissionDangerousAssetsScore" width="120px"/>
<el-table-column label="瑙嗛浼犺緭缃戣竟鐣屽畬鏁存�ф娴嬫墸鍒嗛」(鏉冮噸锛�0.2)" align="center" prop="videoTransmissionBoundaryIntegrityDetection" width="120px"/>
<el-table-column label="鏈堣繍琛岀巼" align="center" prop="operatingRate"/>
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" fixed="right">
+ <template slot-scope="scope">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleUpdate(scope.row,scope.index)"
+ >淇敼</el-button>
+ </template>
+ </el-table-column>
</el-table>
</el-main>
</el-container>
@@ -391,6 +234,8 @@
dicts: ['platform_audit_state'],
data() {
return {
+ activeIndex: '1',
+ activeIndex2: '1',
activeNames: ['1'],
companyName: "鎴愰兘x杩愮淮鍏徃",
detailTitle: '',
@@ -785,7 +630,10 @@
this.download('system/checkResult/export', {
...this.queryParams
}, `checkResult_${new Date().getTime()}.xlsx`)
- }
+ },
+ handleSelect(key, keyPath) {
+ console.log(key, keyPath);
+ },
}
};
</script>
@@ -838,4 +686,13 @@
flex-direction: row;
justify-content: center;
}
+.header-container {
+ display: flex;
+ align-items: center; /* 鍨傜洿灞呬腑 */
+}
+
+.header-container h2 {
+ margin-right: 10px; /* 鏍规嵁闇�瑕佽皟鏁存爣棰樺拰鑿滃崟涔嬮棿鐨勯棿璺� */
+}
+
</style>
--
Gitblit v1.8.0