From dafeebdf7460060f44abfde12b436e38e7220a59 Mon Sep 17 00:00:00 2001
From: xzt <1113240624@qq.com>
Date: Tue, 11 Mar 2025 17:24:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A0=87=E5=87=86=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=BA=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectInfo/projectWarning/list.vue       |  77 +++-
 .../src/views/standard/bad/index.vue          | 427 +++++++-----------
 .../src/views/standard/good/index.vue         | 420 +++++++----------
 3 files changed, 408 insertions(+), 516 deletions(-)

diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectWarning/list.vue b/jwtech-admin-page/src/views/building/projectInfo/projectWarning/list.vue
index 4a659bfe..ea6cade6 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/projectWarning/list.vue
+++ b/jwtech-admin-page/src/views/building/projectInfo/projectWarning/list.vue
@@ -94,8 +94,8 @@
           </el-table-column>
           <el-table-column label="进度要求" align="center" prop="scheduleReq" min-width="120"/>
           <el-table-column label="时间节点" align="center" prop="dateNode" min-width="120"/>
-          <el-table-column label="年度" align="center" prop="conYear" min-width="120"/>
-          <el-table-column label="约束条件" align="center" prop="conRule" min-width="120"/>
+          <el-table-column label="年度" align="center" prop="conYear" :formatter="yearFormat" min-width="120"/>
+          <el-table-column label="约束条件" align="center" prop="conRule" :formatter="constraintFormat" min-width="120"/>
           <el-table-column label="预警描述" align="center" prop="ruleMsg" min-width="120"/>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
             <template slot-scope="scope">
@@ -171,8 +171,8 @@
           </el-table-column>
           <el-table-column label="进度要求" align="center" prop="scheduleReq" min-width="120"/>
           <el-table-column label="时间节点" align="center" prop="dateNode" min-width="120"/>
-          <el-table-column label="年度" align="center" prop="conYear" min-width="120"/>
-          <el-table-column label="约束条件" align="center" prop="conRule" min-width="120"/>
+          <el-table-column label="年度" align="center" prop="conYear" :formatter="yearFormat" min-width="120"/>
+          <el-table-column label="约束条件" align="center" prop="conRule" :formatter="constraintFormat" min-width="120"/>
           <el-table-column label="预警描述" align="center" prop="ruleMsg" min-width="120"/>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
             <template slot-scope="scope">
@@ -207,19 +207,50 @@
     />
 
     <!-- 添加或修改进度填报预警管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="open" width="650px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="进度要求" prop="scheduleReq">
           <el-input v-model="form.scheduleReq" placeholder="请输入进度要求" />
         </el-form-item>
         <el-form-item label="时间节点" prop="dateNode">
-          <el-input v-model="form.dateNode" placeholder="请输入时间节点" />
+          <el-date-picker
+            v-model="form.dateNode"
+            type="date"
+            style="width: 100%;"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
         </el-form-item>
         <el-form-item label="年度" prop="conYear">
-          <el-input v-model="form.conYear" placeholder="请输入年度" />
+          <el-select
+            v-model="form.conYear"
+            placeholder="请选择年度"
+            clearable
+            style="width: 100%;"
+          >
+            <el-option
+              v-for="dict in yearOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="约束条件" prop="conRule">
-          <el-input v-model="form.conRule" placeholder="请输入约束条件" />
+          <el-select
+            v-model="form.conRule"
+            placeholder="请选择约束条件"
+            clearable
+            style="width: 100%;"
+          >
+            <el-option
+              v-for="dict in constraintOption"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="预警描述" prop="ruleMsg">
           <el-input type="textarea" :rows="5" v-model="form.ruleMsg" placeholder="请输入预警描述" />
@@ -308,21 +339,21 @@ export default {
           {
             required: true,
             message: "请输入时间节点",
-            trigger: "blur",
+            trigger: "change",
           },
         ],
         conYear: [
           {
             required: true,
             message: "请输入年度",
-            trigger: "blur",
+            trigger: "change",
           },
         ],
         conRule: [
           {
             required: true,
             message: "请输入约束条件",
-            trigger: "blur",
+            trigger: "change",
           },
         ],
         ruleMsg: [
@@ -334,7 +365,9 @@ export default {
         ],
       },
       activeName: 'regular',
-      formData: {}
+      formData: {},
+      yearOptions: [],
+      constraintOption: []
     }
   },
   watch: {
@@ -348,6 +381,7 @@ export default {
     }
   },
   created() {
+    this.getDictList()
     this.queryParams.data.proNo = this.$route.query.proNo
     this.handleJudgeTab()
     this.getProjectInfo()
@@ -375,6 +409,23 @@ export default {
         this.loading = false;
       });
     },
+    // 获取字典信息
+    getDictList() {
+      this.getDicts("sl_year").then((response) => {
+        this.yearOptions = response.data;
+      })
+      this.getDicts("sl_constraint").then((response) => {
+        this.constraintOption = response.data;
+      })
+    },
+    // 菜单状态字典翻译
+    yearFormat(row, column) {
+      return this.selectDictLabel(this.yearOptions, row.conYear);
+    },
+    // 菜单状态字典翻译
+    constraintFormat(row, column) {
+      return this.selectDictLabel(this.constraintOption, row.conRule);
+    },
     handleJudgeTab() {
       let tabNum = this.$route.query.tabNum
       if (tabNum === '1') {
@@ -407,7 +458,7 @@ export default {
         updateUid: null,
         updateTime: null,
         remark: null,
-        status: "0"
+        status: null
       };
       this.resetForm("form");
     },
diff --git a/jwtech-admin-page/src/views/standard/bad/index.vue b/jwtech-admin-page/src/views/standard/bad/index.vue
index 98e0b5f8..9d0dda3f 100644
--- a/jwtech-admin-page/src/views/standard/bad/index.vue
+++ b/jwtech-admin-page/src/views/standard/bad/index.vue
@@ -18,183 +18,7 @@
           ></el-button>
         </el-input>
       </el-form-item>
-      <el-form-item label="良好行为" prop="goodBehavior">
-        <el-input
-          v-model="queryParams.data.goodBehavior"
-          placeholder="请输入良好行为"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="表彰级别" prop="commendationLevel">
-        <el-input
-          v-model="queryParams.data.commendationLevel"
-          placeholder="请输入表彰级别"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="认定或颁奖部门" prop="authority">
-        <el-input
-          v-model="queryParams.data.authority"
-          placeholder="请输入认定或颁奖部门"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="加分值" prop="bonusPoints">
-        <el-input
-          v-model="queryParams.data.bonusPoints"
-          placeholder="请输入加分值"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="有效期" prop="validityPeriod">
-        <el-input
-          v-model="queryParams.data.validityPeriod"
-          placeholder="请输入有效期"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="公告期" prop="noticePeriod">
-        <el-input
-          v-model="queryParams.data.noticePeriod"
-          placeholder="请输入公告期"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="不良行为" prop="badBehavior">
-        <el-input
-          v-model="queryParams.data.badBehavior"
-          placeholder="请输入不良行为"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="类型" prop="type">
-        <el-select v-model="queryParams.data.type" placeholder="请选择类型" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建人" prop="createUid">
-        <el-input
-          v-model="queryParams.data.createUid"
-          placeholder="请输入创建人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="更新人" prop="updateUid">
-        <el-input
-          v-model="queryParams.data.updateUid"
-          placeholder="请输入更新人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="附件" prop="standAttachment">
-        <el-input
-          v-model="queryParams.data.standAttachment"
-          placeholder="请输入附件"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
       <el-form-item>
-        <el-button type="cyan" 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>
@@ -244,20 +68,30 @@
     <el-table v-loading="loading" :data="standardList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" fixed/>
       <el-table-column label="序号" type="index" width="50" align="center" fixed/>
-
       <el-table-column label="标准名称" align="center" prop="standardName" min-width="120"/>
-      <el-table-column label="良好行为" align="center" prop="goodBehavior" min-width="120"/>
-      <el-table-column label="表彰级别" align="center" prop="commendationLevel" min-width="120"/>
-      <el-table-column label="认定或颁奖部门" align="center" prop="authority" min-width="120"/>
-      <el-table-column label="加分值" align="center" prop="bonusPoints" min-width="120"/>
-      <el-table-column label="有效期" align="center" prop="validityPeriod" min-width="120"/>
-      <el-table-column label="公告期" align="center" prop="noticePeriod" min-width="120"/>
-      <el-table-column label="不良行为" align="center" prop="badBehavior" min-width="120"/>
-      <el-table-column label="类型" align="center" prop="type" min-width="120"/>
-      <el-table-column label="创建人" align="center" prop="createUid" min-width="120"/>
-      <el-table-column label="更新人" align="center" prop="updateUid" min-width="120"/>
-      <el-table-column label="备注" align="center" prop="remark" min-width="120"/>
-      <el-table-column label="附件" align="center" prop="standAttachment" min-width="120"/>
+      <el-table-column label="不良行为" align="center" prop="goodBehavior" min-width="120"/>
+      <el-table-column label="等级" align="center" prop="commendationLevel" min-width="120"/>
+      <el-table-column label="扣分值" align="center" prop="bonusPoints" min-width="120"/>
+      <el-table-column label="扣分期限" align="center" prop="validityPeriod" min-width="120"/>
+      <el-table-column label="公告期限" align="center" prop="noticePeriod" min-width="120"/>
+      <el-table-column label="附件" align="center" prop="standAttachment" min-width="120">
+        <template slot-scope="scope">
+          <div
+            v-for="(item, index) in JSON.parse(
+              scope.row.standAttachment
+            )"
+            :key="item + index"
+          >
+            <i class="el-icon-document"></i>
+            {{ item.name }}
+            <i
+              class="el-icon-download"
+              @click="downloadFile1(scope, index)"
+              style="cursor: pointer"
+            ></i>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
         <template slot-scope="scope">
           <el-button
@@ -287,48 +121,51 @@
     />
 
     <!-- 添加或修改行为标准库对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
         <el-form-item label="标准名称" prop="standardName">
           <el-input v-model="form.standardName" placeholder="请输入标准名称" />
         </el-form-item>
-        <el-form-item label="良好行为" prop="goodBehavior">
+        <el-form-item label="不良行为" prop="goodBehavior">
           <el-input v-model="form.goodBehavior" placeholder="请输入良好行为" />
         </el-form-item>
-        <el-form-item label="表彰级别" prop="commendationLevel">
+        <el-form-item label="等级" prop="commendationLevel">
           <el-input v-model="form.commendationLevel" placeholder="请输入表彰级别" />
         </el-form-item>
-        <el-form-item label="认定或颁奖部门" prop="authority">
-          <el-input v-model="form.authority" placeholder="请输入认定或颁奖部门" />
-        </el-form-item>
-        <el-form-item label="加分值" prop="bonusPoints">
-          <el-input v-model="form.bonusPoints" placeholder="请输入加分值" />
-        </el-form-item>
-        <el-form-item label="有效期" prop="validityPeriod">
-          <el-input v-model="form.validityPeriod" placeholder="请输入有效期" />
+        <el-form-item label="扣分值" prop="bonusPoints">
+          <el-input v-model="form.bonusPoints" placeholder="请输入扣分值" />
         </el-form-item>
-        <el-form-item label="公告期" prop="noticePeriod">
-          <el-input v-model="form.noticePeriod" placeholder="请输入公告期" />
+        <el-form-item label="扣分期限" prop="validityPeriod">
+          <el-input v-model="form.validityPeriod" placeholder="请输入扣分期限" />
         </el-form-item>
-        <el-form-item label="不良行为" prop="badBehavior">
-          <el-input v-model="form.badBehavior" placeholder="请输入不良行为" />
-        </el-form-item>
-        <el-form-item label="类型" prop="type">
-          <el-select v-model="form.type" placeholder="请选择类型" style="width: 100%">
-            <el-option label="请选择字典生成" value="" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="创建人" prop="createUid">
-          <el-input v-model="form.createUid" placeholder="请输入创建人" />
-        </el-form-item>
-        <el-form-item label="更新人" prop="updateUid">
-          <el-input v-model="form.updateUid" placeholder="请输入更新人" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+        <el-form-item label="公告期限" prop="noticePeriod">
+          <el-input v-model="form.noticePeriod" placeholder="请输入公告期限" />
         </el-form-item>
         <el-form-item label="附件" prop="standAttachment">
-          <el-input v-model="form.standAttachment" placeholder="请输入附件" />
+          <!-- <el-input v-model="form.standAttachment" placeholder="请输入附件" /> -->
+          <el-upload
+            class="upload-demo"
+            action="thinking/common/upload"
+            :headers="headers"
+            :before-upload="
+              (file) => $fileBeforeUpload(file, 'acceptDocumentFileList')
+            "
+            :on-preview="handlePreview"
+            :on-remove="handleRemove"
+            :before-remove="beforeRemove"
+            multiple
+            :on-exceed="handleExceed"
+            :on-success="submitAcceptDocumentUpload"
+            :file-list="acceptDocumentFileList"
+          >
+            <el-button size="small" type="primary" plain>
+              <i class="el-icon-upload el-icon--right"></i>
+              点击上传
+            </el-button>
+            <div slot="tip" class="el-upload__tip">
+              支持jpg/png/pdf/word/excel文件等
+            </div>
+          </el-upload>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -341,7 +178,8 @@
 
 <script>
 import { listStandard, getStandard, delStandard, addStandard, updateStandard, exportStandard } from "@/api/standard/standard";
-
+import { getFileStream } from "@/api/system/upload";
+import { getToken } from "@/utils/auth";
 export default {
   name: "Standard",
   data() {
@@ -370,19 +208,19 @@ export default {
         pageSize: 10,
         ids:null,
         data:{
-                                                                                standardName: null,
-                                                                    goodBehavior: null,
-                                                                    commendationLevel: null,
-                                                                    authority: null,
-                                                                    bonusPoints: null,
-                                                                    validityPeriod: null,
-                                                                    noticePeriod: null,
-                                                                    badBehavior: null,
-                                                                    type: null,
-                                                                    createUid: null,
-                                                                    updateUid: null,
-                                                                                                                                                        standAttachment: null
-                                    },
+          standardName: null,
+          goodBehavior: null,
+          commendationLevel: null,
+          authority: null,
+          bonusPoints: null,
+          validityPeriod: null,
+          noticePeriod: null,
+          badBehavior: null,
+          type: '2',
+          createUid: null,
+          updateUid: null,
+          standAttachment: null
+        },
         // 排序方式
         params: {
           // 按哪个字段排序
@@ -395,7 +233,31 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+        standardName: [
+          { required: true, message: "请输入标准名称", trigger: "blur" },
+        ],
+        goodBehavior: [
+          { required: true, message: "请输入不良行为", trigger: "blur" },
+        ],
+        commendationLevel: [
+          { required: true, message: "请输入等级", trigger: "blur" },
+        ],
+        bonusPoints: [
+          { required: true, message: "请输入扣分值", trigger: "blur" },
+        ],
+        validityPeriod: [
+          { required: true, message: "请输入扣分期限", trigger: "blur" },
+        ],
+        noticePeriod: [
+          { required: true, message: "请输入公告期限", trigger: "blur" },
+        ],
+      },
+      // 请求头
+      headers: {
+        jianwei: "jwtech " + getToken(),
+      },
+      // 文档附件
+      acceptDocumentFileList: [],
     };
   },
   created() {
@@ -428,7 +290,7 @@ export default {
         validityPeriod: null,
         noticePeriod: null,
         badBehavior: null,
-        type: null,
+        type: '2',
         createUid: null,
         updateUid: null,
         createTime: null,
@@ -443,24 +305,24 @@ export default {
       this.queryParams = {
         pageNum: 1,
         pageSize: 10,
-          data:{
-                                                          id: null,
-                                                                            standardName: null,
-                                                                            goodBehavior: null,
-                                                                            commendationLevel: null,
-                                                                            authority: null,
-                                                                            bonusPoints: null,
-                                                                            validityPeriod: null,
-                                                                            noticePeriod: null,
-                                                                            badBehavior: null,
-                                                                            type: null,
-                                                                            createUid: null,
-                                                                            updateUid: null,
-                                                                            createTime: null,
-                                                                            updateTime: null,
-                                                                            remark: null,
-                                                                            standAttachment: null
-                                          },
+        data:{
+          id: null,
+          standardName: null,
+          goodBehavior: null,
+          commendationLevel: null,
+          authority: null,
+          bonusPoints: null,
+          validityPeriod: null,
+          noticePeriod: null,
+          badBehavior: null,
+          type: '2',
+          createUid: null,
+          updateUid: null,
+          createTime: null,
+          updateTime: null,
+          remark: null,
+          standAttachment: null
+        },
         // 排序方式
         params: {
           // 按哪个字段排序
@@ -507,6 +369,9 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.form.standAttachment = JSON.stringify(
+            this.acceptDocumentFileList
+          );
           if (this.form.id != null) {
             updateStandard(this.form).then(response => {
               if (response.code === 200) {
@@ -564,7 +429,59 @@ export default {
             this.downloadFile(response, true, response.msg);
           // this.download(response.msg);
         }).catch(function() {});
-    }
+    },
+    // 表格中下载
+    downloadFile1(scope, index) {
+      // console.log(scope);
+      let file = JSON.parse(scope.row.standAttachment)[index];
+      this.handlePreview(file);
+    },
+    // 点击预览的文件进行下载
+    handlePreview(file) {
+      // console.log(file);
+      getFileStream({ fileName: file.fileName }).then((res) => {
+        const blob = new Blob([res], {
+          // type类型后端返回来的数据中会有，根据自己实际进行修改
+          // 表格下载为 application/xlsx，压缩包为 application/zip等，
+          type: "application/xlsx",
+        }); //excel,pdf等
+        const href = URL.createObjectURL(blob); //创建新的URL表示指定的blob对象
+        const a = document.createElement("a"); //创建a标签
+        a.style.display = "none";
+        a.href = href; // 指定下载链接
+        a.download = file.name; //指定下载文件名
+        a.click(); //触发下载
+        URL.revokeObjectURL(a.href); //释放URL对象
+      });
+    },
+    handleRemove(file, fileList) {
+      // console.log(file, fileList);
+      let index = this.acceptDocumentFileList.findIndex(
+        (item) => item.uid === file.uid
+      );
+      // 删除文件
+      this.acceptDocumentFileList.splice(index, 1);
+    },
+    beforeRemove(file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`);
+    },
+    handleExceed(files, fileList) {
+      this.$message.warning(
+        `当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
+          files.length + fileList.length
+        } 个文件`
+      );
+    },
+    // 上传附件
+    submitAcceptDocumentUpload(_, fileList) {
+      console.log("fileList", fileList);
+      this.acceptDocumentFileList.push({
+        name: fileList.name,
+        fileName: fileList.response.fileName,
+        url: fileList.response.url,
+        uid: fileList.uid,
+      });
+    },
   }
 };
 </script>
diff --git a/jwtech-admin-page/src/views/standard/good/index.vue b/jwtech-admin-page/src/views/standard/good/index.vue
index 98e0b5f8..236c8541 100644
--- a/jwtech-admin-page/src/views/standard/good/index.vue
+++ b/jwtech-admin-page/src/views/standard/good/index.vue
@@ -18,183 +18,7 @@
           ></el-button>
         </el-input>
       </el-form-item>
-      <el-form-item label="良好行为" prop="goodBehavior">
-        <el-input
-          v-model="queryParams.data.goodBehavior"
-          placeholder="请输入良好行为"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="表彰级别" prop="commendationLevel">
-        <el-input
-          v-model="queryParams.data.commendationLevel"
-          placeholder="请输入表彰级别"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="认定或颁奖部门" prop="authority">
-        <el-input
-          v-model="queryParams.data.authority"
-          placeholder="请输入认定或颁奖部门"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="加分值" prop="bonusPoints">
-        <el-input
-          v-model="queryParams.data.bonusPoints"
-          placeholder="请输入加分值"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="有效期" prop="validityPeriod">
-        <el-input
-          v-model="queryParams.data.validityPeriod"
-          placeholder="请输入有效期"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="公告期" prop="noticePeriod">
-        <el-input
-          v-model="queryParams.data.noticePeriod"
-          placeholder="请输入公告期"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="不良行为" prop="badBehavior">
-        <el-input
-          v-model="queryParams.data.badBehavior"
-          placeholder="请输入不良行为"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="类型" prop="type">
-        <el-select v-model="queryParams.data.type" placeholder="请选择类型" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建人" prop="createUid">
-        <el-input
-          v-model="queryParams.data.createUid"
-          placeholder="请输入创建人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="更新人" prop="updateUid">
-        <el-input
-          v-model="queryParams.data.updateUid"
-          placeholder="请输入更新人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="附件" prop="standAttachment">
-        <el-input
-          v-model="queryParams.data.standAttachment"
-          placeholder="请输入附件"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
       <el-form-item>
-        <el-button type="cyan" 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>
@@ -244,20 +68,31 @@
     <el-table v-loading="loading" :data="standardList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" fixed/>
       <el-table-column label="序号" type="index" width="50" align="center" fixed/>
-
       <el-table-column label="标准名称" align="center" prop="standardName" min-width="120"/>
-      <el-table-column label="良好行为" align="center" prop="goodBehavior" min-width="120"/>
       <el-table-column label="表彰级别" align="center" prop="commendationLevel" min-width="120"/>
+      <el-table-column label="良好行为" align="center" prop="goodBehavior" min-width="120"/>
       <el-table-column label="认定或颁奖部门" align="center" prop="authority" min-width="120"/>
       <el-table-column label="加分值" align="center" prop="bonusPoints" min-width="120"/>
-      <el-table-column label="有效期" align="center" prop="validityPeriod" min-width="120"/>
-      <el-table-column label="公告期" align="center" prop="noticePeriod" min-width="120"/>
-      <el-table-column label="不良行为" align="center" prop="badBehavior" min-width="120"/>
-      <el-table-column label="类型" align="center" prop="type" min-width="120"/>
-      <el-table-column label="创建人" align="center" prop="createUid" min-width="120"/>
-      <el-table-column label="更新人" align="center" prop="updateUid" min-width="120"/>
-      <el-table-column label="备注" align="center" prop="remark" min-width="120"/>
-      <el-table-column label="附件" align="center" prop="standAttachment" min-width="120"/>
+      <el-table-column label="有效期（年）" align="center" prop="validityPeriod" min-width="120"/>
+      <el-table-column label="公告期（年）" align="center" prop="noticePeriod" min-width="120"/>
+      <el-table-column label="附件" align="center" prop="standAttachment" min-width="120">
+        <template slot-scope="scope">
+          <div
+            v-for="(item, index) in JSON.parse(
+              scope.row.standAttachment
+            )"
+            :key="item + index"
+          >
+            <i class="el-icon-document"></i>
+            {{ item.name }}
+            <i
+              class="el-icon-download"
+              @click="downloadFile1(scope, index)"
+              style="cursor: pointer"
+            ></i>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
         <template slot-scope="scope">
           <el-button
@@ -287,48 +122,54 @@
     />
 
     <!-- 添加或修改行为标准库对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
         <el-form-item label="标准名称" prop="standardName">
           <el-input v-model="form.standardName" placeholder="请输入标准名称" />
         </el-form-item>
-        <el-form-item label="良好行为" prop="goodBehavior">
-          <el-input v-model="form.goodBehavior" placeholder="请输入良好行为" />
-        </el-form-item>
         <el-form-item label="表彰级别" prop="commendationLevel">
           <el-input v-model="form.commendationLevel" placeholder="请输入表彰级别" />
         </el-form-item>
+        <el-form-item label="良好行为" prop="goodBehavior">
+          <el-input v-model="form.goodBehavior" placeholder="请输入良好行为" />
+        </el-form-item>
         <el-form-item label="认定或颁奖部门" prop="authority">
           <el-input v-model="form.authority" placeholder="请输入认定或颁奖部门" />
         </el-form-item>
         <el-form-item label="加分值" prop="bonusPoints">
           <el-input v-model="form.bonusPoints" placeholder="请输入加分值" />
         </el-form-item>
-        <el-form-item label="有效期" prop="validityPeriod">
-          <el-input v-model="form.validityPeriod" placeholder="请输入有效期" />
+        <el-form-item label="有效期（年）" prop="validityPeriod">
+          <el-input v-model="form.validityPeriod" placeholder="请输入有效期（年）" />
         </el-form-item>
-        <el-form-item label="公告期" prop="noticePeriod">
-          <el-input v-model="form.noticePeriod" placeholder="请输入公告期" />
-        </el-form-item>
-        <el-form-item label="不良行为" prop="badBehavior">
-          <el-input v-model="form.badBehavior" placeholder="请输入不良行为" />
-        </el-form-item>
-        <el-form-item label="类型" prop="type">
-          <el-select v-model="form.type" placeholder="请选择类型" style="width: 100%">
-            <el-option label="请选择字典生成" value="" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="创建人" prop="createUid">
-          <el-input v-model="form.createUid" placeholder="请输入创建人" />
-        </el-form-item>
-        <el-form-item label="更新人" prop="updateUid">
-          <el-input v-model="form.updateUid" placeholder="请输入更新人" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+        <el-form-item label="公告期（年）" prop="noticePeriod">
+          <el-input v-model="form.noticePeriod" placeholder="请输入公告期（年）" />
         </el-form-item>
         <el-form-item label="附件" prop="standAttachment">
-          <el-input v-model="form.standAttachment" placeholder="请输入附件" />
+          <!-- <el-input v-model="form.standAttachment" placeholder="请输入附件" /> -->
+          <el-upload
+            class="upload-demo"
+            action="thinking/common/upload"
+            :headers="headers"
+            :before-upload="
+              (file) => $fileBeforeUpload(file, 'acceptDocumentFileList')
+            "
+            :on-preview="handlePreview"
+            :on-remove="handleRemove"
+            :before-remove="beforeRemove"
+            multiple
+            :on-exceed="handleExceed"
+            :on-success="submitAcceptDocumentUpload"
+            :file-list="acceptDocumentFileList"
+          >
+            <el-button size="small" type="primary" plain>
+              <i class="el-icon-upload el-icon--right"></i>
+              点击上传
+            </el-button>
+            <div slot="tip" class="el-upload__tip">
+              支持jpg/png/pdf/word/excel文件等
+            </div>
+          </el-upload>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -341,7 +182,8 @@
 
 <script>
 import { listStandard, getStandard, delStandard, addStandard, updateStandard, exportStandard } from "@/api/standard/standard";
-
+import { getFileStream } from "@/api/system/upload";
+import { getToken } from "@/utils/auth";
 export default {
   name: "Standard",
   data() {
@@ -370,19 +212,19 @@ export default {
         pageSize: 10,
         ids:null,
         data:{
-                                                                                standardName: null,
-                                                                    goodBehavior: null,
-                                                                    commendationLevel: null,
-                                                                    authority: null,
-                                                                    bonusPoints: null,
-                                                                    validityPeriod: null,
-                                                                    noticePeriod: null,
-                                                                    badBehavior: null,
-                                                                    type: null,
-                                                                    createUid: null,
-                                                                    updateUid: null,
-                                                                                                                                                        standAttachment: null
-                                    },
+          standardName: null,
+          goodBehavior: null,
+          commendationLevel: null,
+          authority: null,
+          bonusPoints: null,
+          validityPeriod: null,
+          noticePeriod: null,
+          badBehavior: null,
+          type: '1',
+          createUid: null,
+          updateUid: null,
+          standAttachment: null
+        },
         // 排序方式
         params: {
           // 按哪个字段排序
@@ -395,7 +237,34 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+        standardName: [
+          { required: true, message: "请输入标准名称", trigger: "blur" },
+        ],
+        commendationLevel: [
+          { required: true, message: "请输入表彰级别", trigger: "blur" },
+        ],
+        goodBehavior: [
+          { required: true, message: "请输入良好行为", trigger: "blur" },
+        ],
+        authority: [
+          { required: true, message: "请输入认定或颁奖部门", trigger: "blur" },
+        ],
+        bonusPoints: [
+          { required: true, message: "请输入加分值", trigger: "blur" },
+        ],
+        validityPeriod: [
+          { required: true, message: "请输入有效期（年）", trigger: "blur" },
+        ],
+        noticePeriod: [
+          { required: true, message: "请输入公告期（年）", trigger: "blur" },
+        ],
+      },
+      // 请求头
+      headers: {
+        jianwei: "jwtech " + getToken(),
+      },
+      // 文档附件
+      acceptDocumentFileList: [],
     };
   },
   created() {
@@ -428,7 +297,7 @@ export default {
         validityPeriod: null,
         noticePeriod: null,
         badBehavior: null,
-        type: null,
+        type: '1',
         createUid: null,
         updateUid: null,
         createTime: null,
@@ -443,24 +312,24 @@ export default {
       this.queryParams = {
         pageNum: 1,
         pageSize: 10,
-          data:{
-                                                          id: null,
-                                                                            standardName: null,
-                                                                            goodBehavior: null,
-                                                                            commendationLevel: null,
-                                                                            authority: null,
-                                                                            bonusPoints: null,
-                                                                            validityPeriod: null,
-                                                                            noticePeriod: null,
-                                                                            badBehavior: null,
-                                                                            type: null,
-                                                                            createUid: null,
-                                                                            updateUid: null,
-                                                                            createTime: null,
-                                                                            updateTime: null,
-                                                                            remark: null,
-                                                                            standAttachment: null
-                                          },
+        data:{
+          id: null,
+          standardName: null,
+          goodBehavior: null,
+          commendationLevel: null,
+          authority: null,
+          bonusPoints: null,
+          validityPeriod: null,
+          noticePeriod: null,
+          badBehavior: null,
+          type: '1',
+          createUid: null,
+          updateUid: null,
+          createTime: null,
+          updateTime: null,
+          remark: null,
+          standAttachment: null
+        },
         // 排序方式
         params: {
           // 按哪个字段排序
@@ -507,6 +376,9 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.form.standAttachment = JSON.stringify(
+            this.acceptDocumentFileList
+          );
           if (this.form.id != null) {
             updateStandard(this.form).then(response => {
               if (response.code === 200) {
@@ -564,7 +436,59 @@ export default {
             this.downloadFile(response, true, response.msg);
           // this.download(response.msg);
         }).catch(function() {});
-    }
+    },
+    // 表格中下载
+    downloadFile1(scope, index) {
+      // console.log(scope);
+      let file = JSON.parse(scope.row.standAttachment)[index];
+      this.handlePreview(file);
+    },
+    // 点击预览的文件进行下载
+    handlePreview(file) {
+      // console.log(file);
+      getFileStream({ fileName: file.fileName }).then((res) => {
+        const blob = new Blob([res], {
+          // type类型后端返回来的数据中会有，根据自己实际进行修改
+          // 表格下载为 application/xlsx，压缩包为 application/zip等，
+          type: "application/xlsx",
+        }); //excel,pdf等
+        const href = URL.createObjectURL(blob); //创建新的URL表示指定的blob对象
+        const a = document.createElement("a"); //创建a标签
+        a.style.display = "none";
+        a.href = href; // 指定下载链接
+        a.download = file.name; //指定下载文件名
+        a.click(); //触发下载
+        URL.revokeObjectURL(a.href); //释放URL对象
+      });
+    },
+    handleRemove(file, fileList) {
+      // console.log(file, fileList);
+      let index = this.acceptDocumentFileList.findIndex(
+        (item) => item.uid === file.uid
+      );
+      // 删除文件
+      this.acceptDocumentFileList.splice(index, 1);
+    },
+    beforeRemove(file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`);
+    },
+    handleExceed(files, fileList) {
+      this.$message.warning(
+        `当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
+          files.length + fileList.length
+        } 个文件`
+      );
+    },
+    // 上传附件
+    submitAcceptDocumentUpload(_, fileList) {
+      console.log("fileList", fileList);
+      this.acceptDocumentFileList.push({
+        name: fileList.name,
+        fileName: fileList.response.fileName,
+        url: fileList.response.url,
+        uid: fileList.uid,
+      });
+    },
   }
 };
 </script>