From 40db95fc0c7a3f9a50f063c3c10659b89d649561 Mon Sep 17 00:00:00 2001
From: Guo XIn <371864209@qq.com>
Date: Mon, 28 Aug 2023 10:50:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=E9=A1=B5=E9=9D=A2=E6=94=B9=E4=B8=BA=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=B1=9E=E6=80=A7=E6=A0=B9=E6=8D=AE=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=BF=9B=E8=A1=8C=E5=8A=A8=E6=80=81=E6=B8=B2?=
 =?UTF-8?q?=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/css/sys/file/fileView.css          |  2 +
 .../main/resources/static/js/sys/file/view.js |  8 +++-
 .../resources/view/sys/file/fileView.html     | 46 +++----------------
 3 files changed, 16 insertions(+), 40 deletions(-)

diff --git a/shandan-system/src/main/resources/static/css/sys/file/fileView.css b/shandan-system/src/main/resources/static/css/sys/file/fileView.css
index f25595e..1ad2dd8 100644
--- a/shandan-system/src/main/resources/static/css/sys/file/fileView.css
+++ b/shandan-system/src/main/resources/static/css/sys/file/fileView.css
@@ -51,6 +51,8 @@ ul.file-viewer-tab li:hover {
 }
 .file-property .field-name{
     width: 70px;
+    text-align: right;
+    padding-right: 10px;
 }
 .file-property .field-value{
     flex: 1;
diff --git a/shandan-system/src/main/resources/static/js/sys/file/view.js b/shandan-system/src/main/resources/static/js/sys/file/view.js
index bb8b4b2..7e580a5 100644
--- a/shandan-system/src/main/resources/static/js/sys/file/view.js
+++ b/shandan-system/src/main/resources/static/js/sys/file/view.js
@@ -9,6 +9,9 @@
 layui.use(['layer', 'laytpl', 'dropdown', 'carousel', 'form', 'datalabel'], function () {
     for (let col in file) {
         switch (col) {
+            case 'secretLevel':
+                $(`label[name="${col}"]`).text(DICT.getText('secret_level', file[col]));
+                break;
             case 'taskNature':
                 $(`label[name="${col}"]`).text(DICT.getText('task_nature', file[col]));
                 break;
@@ -26,7 +29,10 @@ layui.use(['layer', 'laytpl', 'dropdown', 'carousel', 'form', 'datalabel'], func
                     }
                 }
                 break;
-            case 'secretLevel':
+            case 'exerciseData':
+                $(`label[name="${col}"]`).text(file[col] == 0 ? '否' : '是');
+                break;
+            case '':
                 $(`label[name="${col}"]`).text(DICT.getText('secret_level', file[col]));
                 break;
             default:
diff --git a/shandan-system/src/main/resources/view/sys/file/fileView.html b/shandan-system/src/main/resources/view/sys/file/fileView.html
index 8c8b03a..5815ed2 100644
--- a/shandan-system/src/main/resources/view/sys/file/fileView.html
+++ b/shandan-system/src/main/resources/view/sys/file/fileView.html
@@ -35,45 +35,13 @@
                     <label class="field-name">文件名称</label>
                     <label class="field-value" name="fileName"></label>
                 </div>
-                <div class="file-property">
-                    <label class="field-name">文件密级</label>
-                    <label class="field-value" name="secretLevel"></label>
-                </div>
-                <div class="file-property">
-                    <label class="field-name">录入人员</label>
-                    <label class="field-value" name="entryStaff"></label>
-                </div>
-                <div class="file-property">
-                    <label class="field-name">导弹编号</label>
-                    <label class="field-value" name="missileNumber"></label>
-                </div>
-                <div class="file-property">
-                    <label class="field-name">目标/靶标类型</label>
-                    <label class="field-value" name="targetNumber"></label>
-                </div>
-                <div class="file-property">
-                    <label class="field-name">文件来源</label>
-                    <label class="field-value" name="source"></label>
-                </div>
-                <div class="file-property">
-                    <label class="field-name">目标性质</label>
-                    <label class="field-value" name="taskNature"></label>
-                </div>
-                <div class="file-property">
-                    <label class="field-name">部队代号</label>
-                    <label class="field-value" name="troopCode"></label>
-                </div>
-                <div class="file-property">
-                    <label class="field-name">装备型号</label>
-                    <label class="field-value" name="equipmentModel"></label>
-                </div>
-                <div class="file-property">
-                    <label class="field-name">任务时间</label>
-                    <label class="field-value" th:text="${file_inputDate}"></label>
-                </div>
-                <div class="file-property">
-                    <label class="field-name">文件描述</label>
-                    <label class="field-value" name="remark"></label>
+                <div class="file-property"
+                     th:each="field,iterStat : ${uploadFormConfig}"
+                     th:if="${field.isShow}"
+                     th:style="${field.fieldType == 'textarea' ? 'width: calc(100% - 30px);' : ''}"
+                     th:with="username=*{userName}">
+                    <label class="field-name" th:text="${field.showTitle}">文件名称</label>
+                    <label class="field-value" th:name="${field.fieldName}" th:value="${field.fieldName}"></label>
                 </div>
                 <div class="file-property" th:each="labelSet, iterState:${LabelConfigSet}">
                     <label class="field-name" th:text="${labelSet.fieldTitle}">标签类型</label>