-添加：5s管理相关功能

master/src/main/java/com/ruoyi/project/production/controller/TFivesChangeRecordController.java

@@ -1,24 +1,19 @@
 package com.ruoyi.project.production.controller;
 
-import java.util.List;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.production.domain.TFivesChangeRecord;
-import com.ruoyi.project.production.service.ITFivesChangeRecordService;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.production.domain.TFivesChangeRecord;
+import com.ruoyi.project.production.service.ITFivesChangeRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * 区域检查整改记录Controller
@@ -76,6 +71,10 @@ public class TFivesChangeRecordController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TFivesChangeRecord tFivesChangeRecord)
     {
+        tFivesChangeRecord.setCreatedate(new Date());
+        tFivesChangeRecord.setCreaterCode(String.valueOf(getUserId()));
+        tFivesChangeRecord.setCheckerId(String.valueOf(getUserId()));
+        tFivesChangeRecord.setCheckerName(getNickName());
         return toAjax(tFivesChangeRecordService.insertTFivesChangeRecord(tFivesChangeRecord));
     }
 

master/src/main/java/com/ruoyi/project/production/controller/TFivesMonthlyInspectionController.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -70,6 +71,8 @@ public class TFivesMonthlyInspectionController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TFivesMonthlyInspection tFivesMonthlyInspection)
     {
+        tFivesMonthlyInspection.setCreatedate(new Date());
+        tFivesMonthlyInspection.setCreaterCode(getUserId().toString());
         return toAjax(tFivesMonthlyInspectionService.insertTFivesMonthlyInspection(tFivesMonthlyInspection));
     }
 

master/src/main/java/com/ruoyi/project/production/controller/TFivesRegionController.java

@@ -1,24 +1,19 @@
 package com.ruoyi.project.production.controller;
 
-import java.util.List;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.production.domain.TFivesRegion;
-import com.ruoyi.project.production.service.ITFivesRegionService;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.production.domain.TFivesRegion;
+import com.ruoyi.project.production.service.ITFivesRegionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * 区域列台账Controller
@@ -76,6 +71,8 @@ public class TFivesRegionController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TFivesRegion tFivesRegion)
     {
+        tFivesRegion.setCreatedate(new Date());
+        tFivesRegion.setCreaterCode(getUserId().toString());
         return toAjax(tFivesRegionService.insertTFivesRegion(tFivesRegion));
     }
 

ui/src/views/production/record/index.vue

@@ -30,10 +30,10 @@
       </el-form-item>
       <el-form-item label="检查日期" prop="checkDate">
         <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.checkDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择检查日期">
+                        v-model="queryParams.checkDate"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择检查日期">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="检查人姓名" prop="checkerName">
@@ -68,7 +68,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['production:record:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -78,7 +79,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['production:record:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -88,17 +90,19 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['production:record:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleImport"
+          v-hasPermi="['production:record:edit']"
+        >导入
+        </el-button>
       </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['production:record:edit']"
-            >导入</el-button>
-        </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -106,13 +110,15 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['production:record:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange" :height="clientHeight"
+              border>
+      <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="区域序号" align="center" prop="regionOrder" :show-overflow-tooltip="true"/>
       <el-table-column label="位置" align="center" prop="position" :show-overflow-tooltip="true"/>
       <el-table-column label="负责人" align="center" prop="owner" :show-overflow-tooltip="true"/>
@@ -135,20 +141,30 @@
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleChange(scope.row)"
+            v-hasPermi="['production:record:edit']"
+          >整改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['production:record:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['production:record:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -165,44 +181,70 @@
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="区域序号" prop="regionOrder">
-          <el-input v-model="form.regionOrder" placeholder="请输入区域序号" />
+          <el-input v-model="form.regionOrder" placeholder="请输入区域序号"/>
         </el-form-item>
         <el-form-item label="位置" prop="position">
-          <el-input v-model="form.position" placeholder="请输入位置" />
+          <el-input v-model="form.position" placeholder="请输入位置"/>
         </el-form-item>
         <el-form-item label="负责人" prop="owner">
-          <el-input v-model="form.owner" placeholder="请输入负责人" />
+          <el-input v-model="form.owner" placeholder="请输入负责人"/>
         </el-form-item>
         <el-form-item label="检查日期" prop="checkDate">
           <el-date-picker clearable size="small" style="width: 100%"
-            v-model="form.checkDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择检查日期">
+                          v-model="form.checkDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择检查日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="检查人" prop="checkerId">
-          <el-input v-model="form.checkerId" placeholder="请输入检查人" />
-        </el-form-item>
+        <!--        <el-form-item label="检查人" prop="checkerId">
+                  <el-input v-model="form.checkerId" placeholder="请输入检查人" />
+                </el-form-item>-->
         <el-form-item label="检查问题描述" prop="checkProblem">
-          <el-input v-model="form.checkProblem" placeholder="请输入检查问题描述" />
+          <el-input v-model="form.checkProblem" placeholder="请输入检查问题描述"/>
+        </el-form-item>
+        <el-form-item label="检查附件" prop="fileId">
+        <el-upload
+          ref="file"
+          :headers="file.headers"
+          :action="file.url"
+          :disabled="file.isUploading"
+          :on-progress="handleFileDocProgress"
+          :on-success="handleFileDocSuccess"
+          :auto-upload="true"
+          accept=".jpg,.png"
+          :multiple="true"
+          :file-list="fileList"
+          list-type="picture-card"
+        >
+          <i class="el-icon-plus"></i>
+        </el-upload>
+      </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
         </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog title="添加整改记录" :visible.sync="changeOpen" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="整改日期" prop="changeDate">
           <el-date-picker clearable size="small" style="width: 100%"
-            v-model="form.changeDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择整改日期">
+                          v-model="form.changeDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择整改日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="整改内容">
           <el-input type="textarea" v-model="form.changeContent" placeholder="请输入整改内容"/>
         </el-form-item>
         <el-form-item label="整改结果" prop="changeResult">
-          <el-input v-model="form.changeResult" placeholder="请输入整改结果" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remarks">
-          <el-input v-model="form.remarks" placeholder="请输入备注" />
+          <el-input v-model="form.changeResult" placeholder="请输入整改结果"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -210,57 +252,80 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-      <!-- 用户导入对话框 -->
-      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-          <el-upload
-                  ref="upload"
-                  :limit="1"
-                  accept=".xlsx, .xls"
-                  :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
-                  :disabled="upload.isUploading"
-                  :on-progress="handleFileUploadProgress"
-                  :on-success="handleFileSuccess"
-                  :auto-upload="false"
-                  drag
-          >
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">
-                  将文件拖到此处，或
-                  <em>点击上传</em>
-              </div>
-              <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
-              </div>
-              <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
-          </el-upload>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</el-button>
-          </div>
-      </el-dialog>
+
+    <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">
+          将文件拖到此处，或
+          <em>点击上传</em>
+        </div>
+        <div class="el-upload__tip" slot="tip">
+          <el-checkbox v-model="upload.updateSupport"/>
+          是否更新已经存在的用户数据
+          <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+        </div>
+        <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listRecord, getRecord, delRecord, addRecord, updateRecord, exportRecord, importTemplate} from "@/api/production/record";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
+import {
+  listRecord,
+  getRecord,
+  delRecord,
+  addRecord,
+  updateRecord,
+  exportRecord,
+  importTemplate
+} from "@/api/production/record";
+import {treeselect} from "@/api/system/dept";
+import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Editor from '@/components/Editor';
+import {getFile} from "@/api/production/file";
 
 export default {
   name: "Record",
-  components: { Treeselect },
+  components: {Treeselect},
   // components: { Editor },
   data() {
     return {
+      file: {
+        file: "",
+        open: false,
+        // 是否禁用上传
+        isUploading: false,
+        // 设置上传的请求头部
+        headers: {Authorization: "Bearer " + getToken()},
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/production/file/uploadFile",
+      },
       // 遮罩层
       loading: true,
       // 选中数组
       ids: [],
+      fileList: [],
+      fileIds: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -275,24 +340,25 @@ export default {
       title: "",
       // 部门树选项
       deptOptions: undefined,
-      clientHeight:300,
+      clientHeight: 300,
       // 是否显示弹出层
       open: false,
-        // 用户导入参数
-        upload: {
-            // 是否显示弹出层（用户导入）
-            open: false,
-            // 弹出层标题（用户导入）
-            title: "",
-            // 是否禁用上传
-            isUploading: false,
-            // 是否更新已经存在的用户数据
-            updateSupport: 0,
-            // 设置上传的请求头部
-            headers: { Authorization: "Bearer " + getToken() },
-            // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/production/record/importData"
-        },
+      changeOpen: false,
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: {Authorization: "Bearer " + getToken()},
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/production/record/importData"
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -321,26 +387,47 @@ export default {
       // 表单校验
       rules: {
         deptId: [
-          { required: true, message: "部门编号不能为空", trigger: "blur" }
+          {required: true, message: "部门编号不能为空", trigger: "blur"}
         ]
       }
     };
   },
   watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-            this.$refs.tree.filter(val);
-        }
-   },
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
   created() {
-      //设置表格高度对应屏幕高度
-      this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
-      })
+    //设置表格高度对应屏幕高度
+    this.$nextTick(() => {
+      this.clientHeight = document.body.clientHeight - 250
+    })
     this.getList();
     this.getTreeselect();
   },
   methods: {
+    openFile(fileIds) {
+      console.log(fileIds)
+      this.file.open = true;
+      this.srcList = [];
+      let ids = fileIds.split(',');
+      console.log(ids)
+      for (let id of ids) {
+        console.log(id)
+        getFile(id).then(res => {
+          this.srcList.push(process.env.VUE_APP_BASE_API + res.data.url)
+        })
+      }
+    },
+    //附件上传中处理
+    handleFileDocProgress(event, file, fileList) {
+      this.file.file = file;
+    },
+    //附件上传成功处理
+    handleFileDocSuccess(response, file, fileList) {
+      this.fileIds.push(response.data);
+    },
     /** 查询区域检查整改记录列表 */
     getList() {
       this.loading = true;
@@ -350,15 +437,16 @@ export default {
         this.loading = false;
       });
     },
-     /** 查询部门下拉树结构 */
-     getTreeselect() {
-          treeselect().then(response => {
-              this.deptOptions = response.data;
-          });
-     },
+    /** 查询部门下拉树结构 */
+    getTreeselect() {
+      treeselect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;
+      this.changeOpen = false;
       this.reset();
     },
     // 表单重置
@@ -400,7 +488,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -419,6 +507,15 @@ export default {
         this.title = "修改区域检查整改记录";
       });
     },
+    handleChange(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getRecord(id).then(response => {
+        this.form = response.data;
+        this.changeOpen = true;
+        this.title = "添加区域检查整改记录";
+      });
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
@@ -427,6 +524,7 @@ export default {
             updateRecord(this.form).then(response => {
               this.msgSuccess("修改成功");
               this.open = false;
+              this.changeOpen = false;
               this.getList();
             });
           } else {
@@ -443,56 +541,56 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$confirm('是否确认删除?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delRecord(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delRecord(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有区域检查整改记录数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportRecord(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportRecord(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
     },
-      /** 导入按钮操作 */
-      handleImport() {
-          this.upload.title = "用户导入";
-          this.upload.open = true;
-      },
-      /** 下载模板操作 */
-      importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
-      },
-      // 文件上传中处理
-      handleFileUploadProgress(event, file, fileList) {
-          this.upload.isUploading = true;
-      },
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
-          this.upload.open = false;
-          this.upload.isUploading = false;
-          this.$refs.upload.clearFiles();
-          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
-          this.getList();
-      },
-      // 提交上传文件
-      submitFileForm() {
-          this.$refs.upload.submit();
-      }
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "用户导入";
+      this.upload.open = true;
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      importTemplate().then(response => {
+        this.download(response.msg);
+      });
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert(response.msg, "导入结果", {dangerouslyUseHTMLString: true});
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    }
   }
 };
 </script>