Эх сурвалжийг харах

控制台打印清除,新增态势营房Api

sunyanqiang 3 жил өмнө
parent
commit
7f4639d851
70 өөрчлөгдсөн 1239 нэмэгдсэн , 1356 устгасан
  1. 7 0
      src/api/taishi/taishi.js
  2. 20 0
      src/assets/icons/svg/安防监控1.svg
  3. 3 4
      src/views/PrintsLog/printlog/index.vue
  4. 331 294
      src/views/PrintsManage/manage/index.vue
  5. 1 4
      src/views/barracksManagement/checkin/index.vue
  6. 12 36
      src/views/barracksManagement/flats/index.vue
  7. 0 6
      src/views/bdglSecret/secret/index.vue
  8. 1 6
      src/views/bdglregular/regularcountinfo/index.vue
  9. 69 53
      src/views/bdglregular/regularinfo/index.vue
  10. 50 38
      src/views/bdglregular/specialinfo/index.vue
  11. 1 11
      src/views/combatduty/Quantitative/index.vue
  12. 3 7
      src/views/combatduty/RateOfTen/index.vue
  13. 0 1
      src/views/combatduty/basedutyinfo/index.vue
  14. 0 1
      src/views/combatduty/grassdutyinfo/index.vue
  15. 0 1
      src/views/combatduty/militarydutyinfo/index.vue
  16. 1 2
      src/views/combatduty/regisdutyinfo/index.vue
  17. 6 10
      src/views/combatduty/taskdutyinfo/index.vue
  18. 1 2
      src/views/combatduty/teamdutyinfo/index.vue
  19. 4 18
      src/views/doormanManage/bdglVisit/index.vue
  20. 7 1
      src/views/grassrootsregistration/bdglarmament/index.vue
  21. 6 1
      src/views/grassrootsregistration/bdglcookbook/index.vue
  22. 12 2
      src/views/grassrootsregistration/bdglequip/index.vue
  23. 6 1
      src/views/grassrootsregistration/bdglfood/index.vue
  24. 6 1
      src/views/grassrootsregistration/bdglpublicproperty/index.vue
  25. 6 1
      src/views/grassrootsregistration/bdglsecrecy/index.vue
  26. 0 1
      src/views/grassrootsregistration/bdglsoldier/index.vue
  27. 0 2
      src/views/grassrootsregistration/bdglweekwork/index.vue
  28. 0 2
      src/views/grassrootsregistration/personnelRoster/index.vue
  29. 1 1
      src/views/grassrootsregistration/statistics/index.vue
  30. 2 4
      src/views/materialManagement/distribution/index.vue
  31. 0 2
      src/views/materialManagement/equipmentReceiving/index.vue
  32. 0 1
      src/views/materialManagement/materialRegistration/index.vue
  33. 0 1
      src/views/materialManagement/propertyChange/index.vue
  34. 0 1
      src/views/medicalhealth/antiepidemicguoqi/index.vue
  35. 0 1
      src/views/medicalhealth/antiepidemiclingyong/index.vue
  36. 1 1
      src/views/medicalhealth/antiepidemicputin/index.vue
  37. 0 1
      src/views/medicalhealth/antiepidemicruin/index.vue
  38. 0 1
      src/views/medicalhealth/bdgldurgarchives/index.vue
  39. 0 1
      src/views/medicalhealth/bdgldurgguoqi/index.vue
  40. 0 2
      src/views/medicalhealth/bdgldurglingyong/index.vue
  41. 1 1
      src/views/medicalhealth/bdgldurgputin/index.vue
  42. 0 1
      src/views/medicalhealth/bdgldurgputout/index.vue
  43. 0 1
      src/views/medicalhealth/bdgldurgruin/index.vue
  44. 0 1
      src/views/medicalhealth/consumelingyong/index.vue
  45. 0 1
      src/views/medicalhealth/consumeputout/index.vue
  46. 0 1
      src/views/medicalhealth/consumeruin/index.vue
  47. 0 2
      src/views/medicalhealth/examine/index.vue
  48. 0 2
      src/views/militaryvehicleManagement/thebus/index.vue
  49. 1 3
      src/views/militaryvehicleManagement/thebusAccessLog/index.vue
  50. 0 6
      src/views/militaryvehicleManagement/thebusApply/index.vue
  51. 1 6
      src/views/militaryvehicleManagement/thebusList/index.vue
  52. 10 16
      src/views/monitoring/camera/index.vue
  53. 0 7
      src/views/peopleChuRu/bdglLeave/index.vue
  54. 0 1
      src/views/peopleChuRu/peopleBorrow/index.vue
  55. 0 3
      src/views/peopleManage/people/index.vue
  56. 1 3
      src/views/phone/cabinet/index.vue
  57. 64 25
      src/views/pt.vue
  58. 57 65
      src/views/regulations/fileinfo/index.vue
  59. 192 192
      src/views/taishi/index.vue
  60. 212 246
      src/views/taishi/tanshi1.vue
  61. 4 15
      src/views/thought/getready/index.vue
  62. 7 20
      src/views/thought/parliament/index.vue
  63. 2 3
      src/views/thought/responses/index.vue
  64. 2 10
      src/views/thought/talk/index.vue
  65. 27 30
      src/views/thought/teacher/index.vue
  66. 77 92
      src/views/thought/teacherFile/index.vue
  67. 2 3
      src/views/thought/thoughtPlan/index.vue
  68. 8 19
      src/views/thought/weekjob/index.vue
  69. 7 32
      src/views/workingArrangements/planTask/index.vue
  70. 7 26
      src/views/workingArrangements/workTask/index.vue

+ 7 - 0
src/api/taishi/taishi.js

@@ -100,4 +100,11 @@ export function getLeavlNumber() {
     url: "/situation/situationinfo/getLeavlNumber",
     method: "get"
   });
+}
+// 营房统计
+export function zaiweipeopleGet() {
+  return request({
+    url: "/situation/situationinfo/getBarracks",
+    method: "get"
+  });
 }

+ 20 - 0
src/assets/icons/svg/安防监控1.svg

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 200 200" style="enable-background:new 0 0 200 200;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M112.1,168.5c-6.7,0-13.2-2.6-17.9-7.4l-68-68.1c-9.9-9.9-9.9-25.9,0-35.8l33.5-33.5c9.9-9.8,25.9-9.8,35.8,0
+	l68.1,68.1c9.9,9.9,9.9,25.9,0,35.8L130,161.2C125.3,165.9,118.8,168.6,112.1,168.5L112.1,168.5z M77.6,32c-2.6,0-5,1-6.9,2.8
+	L37.2,68.4c-3.8,3.8-3.8,9.9,0,13.7l68.1,68.1c3.8,3.8,9.9,3.8,13.7,0l33.5-33.5c3.8-3.8,3.8-9.9,0-13.7c0,0,0,0,0,0l-68.1-68
+	C82.6,33,80.1,32,77.6,32z"/>
+<path class="st0" d="M143.9,182c-4.9,0-9.6-1.9-13.1-5.4l-13.6-13.6c-3.1-3.1-3.1-8,0-11.1c0,0,0,0,0,0l39.6-39.5
+	c3.1-3.1,8-3.1,11.1,0l13.6,13.6c6.6,6.8,7.3,17.4,1.8,25c-0.2,0.3-0.5,0.6-0.7,0.9l-24.7,24.7c-0.2,0.2-0.4,0.4-0.6,0.6
+	C153.4,180.3,148.8,182,143.9,182L143.9,182z M133.9,157.5l8.1,8.1c1.1,1.1,3.3,1,5.1-0.4l23.8-23.8c0.7-1.4,0.5-3.1-0.5-4.3
+	l-8.1-8.1L133.9,157.5z M79.9,99.7c-2.1,0-4.1-0.8-5.5-2.3L40,63.1C37,60,37,55.1,40,52c3.1-3.1,8-3.1,11.1,0l34.3,34.3
+	c3.1,3.1,3.1,8,0,11.1C84,98.9,82,99.7,79.9,99.7z M19,179.9c-4.3,0-7.8-3.5-7.8-7.8l0,0L11,122.3c0-4.3,3.5-7.8,7.8-7.8
+	c0,0,0,0,0,0c4.3,0,7.8,3.5,7.8,7.8l0,0l0.1,49.8C26.8,176.4,23.3,179.9,19,179.9C19,179.9,19,179.9,19,179.9L19,179.9z"/>
+<path class="st0" d="M74.4,145.4h-55c-4.3,0-7.8-3.5-7.8-7.8c0-4.3,3.5-7.8,7.8-7.8c0,0,0,0,0,0h55c4.3,0,7.8,3.5,7.8,7.8
+	C82.3,141.9,78.8,145.4,74.4,145.4C74.4,145.4,74.4,145.4,74.4,145.4z"/>
+</svg>

+ 3 - 4
src/views/PrintsLog/printlog/index.vue

@@ -250,7 +250,8 @@
             type="text"
             @click="handleDelete(scope.row)"
             v-hasPermi="['PrintsLog:printlog:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -632,7 +633,6 @@ export default {
     printCodeblur() {
       if (this.form.printCode) {
         listPrintlog({ printCode: this.form.printCode }).then((response) => {
-          // console.log(response)
           if (response.rows[0]) {
             this.form = response.rows[0];
             if (this.form.returnNumber) {
@@ -640,8 +640,7 @@ export default {
             } else {
               this.form.returnNumber = 0;
             }
-          }else{
-            console.log(11)
+          } else {
           }
         });
       }

+ 331 - 294
src/views/PrintsManage/manage/index.vue

@@ -9,7 +9,6 @@
     >
       <el-form-item prop="name">
         <el-input
-
           v-model="queryParams.name"
           placeholder="请输入文件名称"
           clearable
@@ -331,47 +330,47 @@
       append-to-body
       :close-on-click-modal="false"
     >
-    <div class="userAgree">
-      <el-form
-        ref="form"
-        :model="form"
-        :inline="true"
-        :rules="rules"
-        label-width="120px"
-      >
-        <div class="jiben">发送人信息</div>
-        <el-form-item label="发送人" prop="sendName">
-          <el-input
-            v-model="form.sendName"
-            disabled
-            placeholder="请输入发送人"
-          />
-        </el-form-item>
-        <el-form-item label="文印室" prop="printRoom">
-          <el-select
-            v-model="form.printRoom"
-            clearable
-            placeholder="请选择文印室"
-          >
-            <el-option
-              v-for="dict in printRooms"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="parseInt(dict.dictValue)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <div class="jiben">打印说明</div>
-        <el-form-item label prop="explainInfo">
-          <el-input
-            v-model="form.explainInfo"
-            type="textarea"
-            placeholder="请输入打印说明"
-            class="textarea-explainInfo"
-          />
-        </el-form-item>
-        <div class="jiben">文件信息</div>
-        <!-- <el-form-item label="文件名称">
+      <div class="userAgree">
+        <el-form
+          ref="form"
+          :model="form"
+          :inline="true"
+          :rules="rules"
+          label-width="120px"
+        >
+          <div class="jiben">发送人信息</div>
+          <el-form-item label="发送人" prop="sendName">
+            <el-input
+              v-model="form.sendName"
+              disabled
+              placeholder="请输入发送人"
+            />
+          </el-form-item>
+          <el-form-item label="文印室" prop="printRoom">
+            <el-select
+              v-model="form.printRoom"
+              clearable
+              placeholder="请选择文印室"
+            >
+              <el-option
+                v-for="dict in printRooms"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="parseInt(dict.dictValue)"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <div class="jiben">打印说明</div>
+          <el-form-item label prop="explainInfo">
+            <el-input
+              v-model="form.explainInfo"
+              type="textarea"
+              placeholder="请输入打印说明"
+              class="textarea-explainInfo"
+            />
+          </el-form-item>
+          <div class="jiben">文件信息</div>
+          <!-- <el-form-item label="文件名称">
           <el-input v-model="form.name" placeholder="请输入文件名称" />
         </el-form-item>
         <el-form-item label="打印份数" prop="printNumber">
@@ -384,16 +383,16 @@
         <el-form-item label="文件大小" prop="size">
           <el-input v-model="form.size" placeholder="请输入文件大小" />
         </el-form-item> -->
-        <!-- <el-form-item label="单位ID" prop="unitId">
+          <!-- <el-form-item label="单位ID" prop="unitId">
           <el-input v-model="form.unitId" placeholder="请输入单位ID" />
         </el-form-item>-->
-        <!-- <el-form-item label="单位名称" prop="unitName">
+          <!-- <el-form-item label="单位名称" prop="unitName">
           <el-input v-model="form.unitName" placeholder="请输入单位名称" />
         </el-form-item>-->
-        <!-- <el-form-item label="文件类型" prop="type">
+          <!-- <el-form-item label="文件类型" prop="type">
           <el-input v-model="form.type" placeholder="请输入文件类型" />
         </el-form-item> -->
-        <!-- <el-form-item label="级别" prop="levelM">
+          <!-- <el-form-item label="级别" prop="levelM">
           <el-select v-model="form.levelM" clearable placeholder="请选择级别">
             <el-option
               v-for="dict in levelMs"
@@ -403,13 +402,13 @@
             ></el-option>
           </el-select>
         </el-form-item> -->
-        <!-- <el-form-item label="是否需要归还" prop="isReturn">
+          <!-- <el-form-item label="是否需要归还" prop="isReturn">
           <el-radio-group v-model="form.isReturn" style="width:200px;" size="mini">
             <el-radio label="1">归还</el-radio>
             <el-radio label="0">无需归还</el-radio>
           </el-radio-group>
         </el-form-item>-->
-        <!-- <el-form-item label="是否为彩打" prop="isPrintColor">
+          <!-- <el-form-item label="是否为彩打" prop="isPrintColor">
           <el-radio-group
             v-model="form.isPrintColor"
             style="width: 200px"
@@ -429,50 +428,59 @@
             <el-radio label="0">否</el-radio>
           </el-radio-group>
         </el-form-item> -->
-        <div class="box3" v-for="(item, i) in tomList" :key="i">
-          <el-form
-            ref="refform"
-            :model="form"
-            :rules="rules"
-            label-width="80px"
-            :inline="true"
-            style="margin-left:20px"
-          >
-           <el-form-item  prop="type">
-              <el-input class="forEach" disabled v-model="item.type" placeholder="请输入文件类型" />
-              <!-- <el-select v-model="form.type" placeholder="请选择类型">
+          <div class="box3" v-for="(item, i) in tomList" :key="i">
+            <el-form
+              ref="refform"
+              :model="form"
+              :rules="rules"
+              label-width="80px"
+              :inline="true"
+              style="margin-left: 20px"
+            >
+              <el-form-item prop="type">
+                <el-input
+                  class="forEach"
+                  disabled
+                  v-model="item.type"
+                  placeholder="请输入文件类型"
+                />
+                <!-- <el-select v-model="form.type" placeholder="请选择类型">
             <el-option label="请选择字典生成" value />
           </el-select>-->
-            </el-form-item>
-              <el-form-item  prop="size">
-              <el-input class="forEach" disabled v-model="item.size" placeholder="请输入文件大小" />
-            </el-form-item>
-            <el-form-item  prop="levelM">
-              <el-select
-                v-model="item.levelM"
-                clearable
-                class="forEach"
-                placeholder="请选择级别"
-              >
-                <el-option
-                  
-                  v-for="dict in levelMs"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="parseInt(dict.dictValue)"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item  prop="printNumber">
-              <el-input
-              class="forEach"
-                v-model="item.printNumber"
-                :min="0"
-                placeholder="请输入打印份数"
-              />
-            </el-form-item>
-            <el-form-item>
-              <!-- <el-button
+              </el-form-item>
+              <el-form-item prop="size">
+                <el-input
+                  class="forEach"
+                  disabled
+                  v-model="item.size"
+                  placeholder="请输入文件大小"
+                />
+              </el-form-item>
+              <el-form-item prop="levelM">
+                <el-select
+                  v-model="item.levelM"
+                  clearable
+                  class="forEach"
+                  placeholder="请选择级别"
+                >
+                  <el-option
+                    v-for="dict in levelMs"
+                    :key="dict.dictValue"
+                    :label="dict.dictLabel"
+                    :value="parseInt(dict.dictValue)"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item prop="printNumber">
+                <el-input
+                  class="forEach"
+                  v-model="item.printNumber"
+                  :min="0"
+                  placeholder="请输入打印份数"
+                />
+              </el-form-item>
+              <el-form-item>
+                <!-- <el-button
                 type="primary"
                 icon="el-icon-plus"
                 size="mini"
@@ -480,37 +488,44 @@
                 @click="addForms"
                 v-if="i == tomList.length - 1"
               ></el-button> -->
-              <el-button
-                type="danger"
-                icon="el-icon-close"
-                size="mini"
-                style="padding: 11px 10px 10px 10px"
-                v-if="i >=0"
-                @click="delForms(i)"
-              ></el-button>
-            </el-form-item>
-            <el-form-item >
-              <el-input class="fileName"  suffix-icon="el-icon-document" disabled v-model="item.name" placeholder="请输入文件名称" />
-            </el-form-item>
-            
-          
-            <!-- <el-form-item label="单位ID" prop="unitId">
+                <el-button
+                  type="danger"
+                  icon="el-icon-close"
+                  size="mini"
+                  style="padding: 11px 10px 10px 10px"
+                  v-if="i >= 0"
+                  @click="delForms(i)"
+                ></el-button>
+              </el-form-item>
+              <el-form-item>
+                <el-input
+                  class="fileName"
+                  suffix-icon="el-icon-document"
+                  disabled
+                  v-model="item.name"
+                  placeholder="请输入文件名称"
+                />
+              </el-form-item>
+
+              <!-- <el-form-item label="单位ID" prop="unitId">
           <el-input v-model="form.unitId" placeholder="请输入单位ID" />
         </el-form-item>-->
-            <!-- <el-form-item label="单位名称" prop="unitName">
+              <!-- <el-form-item label="单位名称" prop="unitName">
           <el-input v-model="form.unitName" placeholder="请输入单位名称" />
         </el-form-item>-->
-        
-           
-            
-            <!-- <el-form-item label="是否需要归还" prop="isReturn">
+
+              <!-- <el-form-item label="是否需要归还" prop="isReturn">
           <el-radio-group v-model="form.isReturn" style="width:200px;" size="mini">
             <el-radio label="1">归还</el-radio>
             <el-radio label="0">无需归还</el-radio>
           </el-radio-group>
         </el-form-item>-->
-            <el-form-item label="是否为彩打" label-width="150px" prop="isPrintColor">
-              <!-- <el-radio-group
+              <el-form-item
+                label="是否为彩打"
+                label-width="150px"
+                prop="isPrintColor"
+              >
+                <!-- <el-radio-group
             v-model="item.isPrintColor"
             style="width: 200px"
             size="mini"
@@ -518,19 +533,23 @@
             <el-radio label="1">是</el-radio>
             <el-radio label="0">否</el-radio>
           </el-radio-group> -->
-              <el-switch
-                v-model="item.isPrintColor"
-                active-color="#13ce66"
-                inactive-color="#ccc"
-                active-value="1"
-                inactive-value="0"
+                <el-switch
+                  v-model="item.isPrintColor"
+                  active-color="#13ce66"
+                  inactive-color="#ccc"
+                  active-value="1"
+                  inactive-value="0"
+                >
+                </el-switch>
+                <span class="greed" v-if="item.isPrintColor == '1'"></span>
+                <span class="CCC" v-if="item.isPrintColor == '0'"></span>
+              </el-form-item>
+              <el-form-item
+                label="是否为双面打"
+                label-width="150px"
+                prop="isPrintTwo"
               >
-              </el-switch>
-              <span class="greed" v-if="item.isPrintColor == '1'"></span>
-              <span class="CCC" v-if="item.isPrintColor == '0'"></span>
-            </el-form-item>
-            <el-form-item label="是否为双面打" label-width="150px" prop="isPrintTwo">
-              <!-- <el-radio-group
+                <!-- <el-radio-group
                 v-model="item.isPrintTwo"
                 style="width: 200px"
                 size="mini"
@@ -538,47 +557,46 @@
                 <el-radio label="1">是</el-radio>
                 <el-radio label="0">否</el-radio>
               </el-radio-group> -->
-              <el-switch
-                v-model="item.isPrintTwo"
-                active-color="#13ce66"
-                inactive-color="#ccc"
-                active-value="1"
-                inactive-value="0"
-              >
-              </el-switch>
-              <span class="greed" v-if="item.isPrintTwo == '1'"></span>
-              <span class="CCC" v-if="item.isPrintTwo == '0'"></span>
-            </el-form-item>
-          
-          </el-form>
-        </div>
-           <el-form-item style="margin-left:20px" prop="name">
-          <!-- <fileUpload v-model="form.file" /> -->
-          <el-upload
-            :action="uploadFileUrl"
-            :before-upload="handleBeforeUpload"
-            :file-list="fileList"
-            :limit="limit"
-            :on-error="handleUploadError"
-            :on-exceed="handleExceed"
-            :on-success="handleUploadSuccess"
-            :show-file-list="false"
-            :headers="headers"
-            class="upload-file-uploader"
-            ref="upload"
-            style="width: 200px"
-            name="pfile"
-          >
-            <!-- 上传按钮 -->
-            <el-button size="mini" type="primary" class="select_file"
-              >选取文件</el-button
+                <el-switch
+                  v-model="item.isPrintTwo"
+                  active-color="#13ce66"
+                  inactive-color="#ccc"
+                  active-value="1"
+                  inactive-value="0"
+                >
+                </el-switch>
+                <span class="greed" v-if="item.isPrintTwo == '1'"></span>
+                <span class="CCC" v-if="item.isPrintTwo == '0'"></span>
+              </el-form-item>
+            </el-form>
+          </div>
+          <el-form-item style="margin-left: 20px" prop="name">
+            <!-- <fileUpload v-model="form.file" /> -->
+            <el-upload
+              :action="uploadFileUrl"
+              :before-upload="handleBeforeUpload"
+              :file-list="fileList"
+              :limit="limit"
+              :on-error="handleUploadError"
+              :on-exceed="handleExceed"
+              :on-success="handleUploadSuccess"
+              :show-file-list="false"
+              :headers="headers"
+              class="upload-file-uploader"
+              ref="upload"
+              style="width: 200px"
+              name="pfile"
             >
-          </el-upload>
-        </el-form-item>
-        <!-- <el-form-item label="发送人ID" prop="sendId">
+              <!-- 上传按钮 -->
+              <el-button size="mini" type="primary" class="select_file"
+                >选取文件</el-button
+              >
+            </el-upload>
+          </el-form-item>
+          <!-- <el-form-item label="发送人ID" prop="sendId">
           <el-input v-model="form.sendId" placeholder="请输入发送人ID" />
         </el-form-item>-->
-        <!-- <el-form-item label="创建时间" prop="creattime">
+          <!-- <el-form-item label="创建时间" prop="creattime">
           <el-date-picker
             clearable
             size="small"
@@ -589,7 +607,7 @@
           ></el-date-picker>
         </el-form-item>-->
 
-        <!-- <el-form-item label="打印状态(1 打印中  2 已打印)">
+          <!-- <el-form-item label="打印状态(1 打印中  2 已打印)">
           <el-radio-group v-model="form.printStatus">
             <el-radio label="1">请选择字典生成</el-radio>
           </el-radio-group>
@@ -606,8 +624,8 @@
         <el-form-item label="打印回复信息" prop="printInfo">
           <el-input v-model="form.printInfo" placeholder="请输入打印回复信息" />
         </el-form-item>-->
-      </el-form>
-    </div>
+        </el-form>
+      </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel" size="btn">取 消</el-button>
@@ -627,7 +645,7 @@
         :inline="true"
         :rules="rules"
         label-width="120px"
-        style="margin-left:15px"
+        style="margin-left: 15px"
       >
         <div class="jiben">发送人信息</div>
         <el-form-item label="发送人" prop="sendName">
@@ -661,56 +679,79 @@
           />
         </el-form-item>
         <div class="jiben">文件信息</div>
-           <el-form-item   prop="type">
-              <el-input class="forEach" disabled v-model="form1.type" placeholder="请输入文件类型" />
-              <!-- <el-select v-model="form.type" placeholder="请选择类型">
+        <el-form-item prop="type">
+          <el-input
+            class="forEach"
+            disabled
+            v-model="form1.type"
+            placeholder="请输入文件类型"
+          />
+          <!-- <el-select v-model="form.type" placeholder="请选择类型">
             <el-option label="请选择字典生成" value />
           </el-select>-->
-            </el-form-item>
-              <el-form-item  prop="size">
-              <el-input class="forEach" disabled v-model="form1.size" placeholder="请输入文件大小" />
-            </el-form-item>
-            <el-form-item  prop="levelM">
-              <el-select
-                v-model="form1.levelM"
-                clearable
-                class="forEach"
-                placeholder="请选择级别"
-              >
-                <el-option
-                  
-                  v-for="dict in levelMs"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="parseInt(dict.dictValue)"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item  prop="printNumber">
-              <el-input
-              class="forEach"
-                v-model="form1.printNumber"
-                :min="0"
-                placeholder="请输入打印份数"
-              />
-            </el-form-item>
-            <el-form-item >
-              <el-input class="fileName" suffix-icon="el-icon-document" disabled v-model="form1.name" placeholder="请输入文件名称" />
-            </el-form-item>
-            <el-form-item label="是否为彩打" label-width="150px" prop="isPrintColor">
-              <el-switch
-                v-model="form1.isPrintColor"
-                active-color="#13ce66"
-                inactive-color="#ccc"
-                active-value="1"
-                inactive-value="0"
-              >
-              </el-switch>
-              <span class="greed" v-if="form1.isPrintColor == '1'"></span>
-              <span class="CCC" v-if="form1.isPrintColor == '0'"></span>
-            </el-form-item>
-            <el-form-item label="是否为双面打" label-width="150px" prop="isPrintTwo">
-              <!-- <el-radio-group
+        </el-form-item>
+        <el-form-item prop="size">
+          <el-input
+            class="forEach"
+            disabled
+            v-model="form1.size"
+            placeholder="请输入文件大小"
+          />
+        </el-form-item>
+        <el-form-item prop="levelM">
+          <el-select
+            v-model="form1.levelM"
+            clearable
+            class="forEach"
+            placeholder="请选择级别"
+          >
+            <el-option
+              v-for="dict in levelMs"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="parseInt(dict.dictValue)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="printNumber">
+          <el-input
+            class="forEach"
+            v-model="form1.printNumber"
+            :min="0"
+            placeholder="请输入打印份数"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-input
+            class="fileName"
+            suffix-icon="el-icon-document"
+            disabled
+            v-model="form1.name"
+            placeholder="请输入文件名称"
+          />
+        </el-form-item>
+        <el-form-item
+          label="是否为彩打"
+          label-width="150px"
+          prop="isPrintColor"
+        >
+          <el-switch
+            v-model="form1.isPrintColor"
+            active-color="#13ce66"
+            inactive-color="#ccc"
+            active-value="1"
+            inactive-value="0"
+          >
+          </el-switch>
+          <span class="greed" v-if="form1.isPrintColor == '1'"></span>
+          <span class="CCC" v-if="form1.isPrintColor == '0'"></span>
+        </el-form-item>
+        <el-form-item
+          label="是否为双面打"
+          label-width="150px"
+          prop="isPrintTwo"
+        >
+          <!-- <el-radio-group
                 v-model="item.isPrintTwo"
                 style="width: 200px"
                 size="mini"
@@ -718,18 +759,18 @@
                 <el-radio label="1">是</el-radio>
                 <el-radio label="0">否</el-radio>
               </el-radio-group> -->
-              <el-switch
-                v-model="form1.isPrintTwo"
-                active-color="#13ce66"
-                inactive-color="#ccc"
-                active-value="1"
-                inactive-value="0"
-              >
-              </el-switch>
-              <span class="greed" v-if="form1.isPrintTwo == '1'"></span>
-              <span class="CCC" v-if="form1.isPrintTwo == '0'"></span>
-            </el-form-item>
-             <el-form-item prop="name">
+          <el-switch
+            v-model="form1.isPrintTwo"
+            active-color="#13ce66"
+            inactive-color="#ccc"
+            active-value="1"
+            inactive-value="0"
+          >
+          </el-switch>
+          <span class="greed" v-if="form1.isPrintTwo == '1'"></span>
+          <span class="CCC" v-if="form1.isPrintTwo == '0'"></span>
+        </el-form-item>
+        <el-form-item prop="name">
           <!-- <fileUpload v-model="form.file" /> -->
           <el-upload
             :action="uploadFileUrl"
@@ -752,11 +793,11 @@
             >
           </el-upload>
         </el-form-item>
-          </el-form>
-          
+      </el-form>
+
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="updatesubmit">确 定</el-button>
-        <el-button @click="open1=false" size="btn">取 消</el-button>
+        <el-button @click="open1 = false" size="btn">取 消</el-button>
       </div>
     </el-dialog>
     <el-dialog
@@ -1075,7 +1116,7 @@ export default {
       },
       // 表单参数
       form: {
-        printsManageList:[],
+        printsManageList: [],
       },
       dyform: {},
       // 表单校验
@@ -1150,10 +1191,10 @@ export default {
         },
       ],
       // 上传文件
-      tomLists:[],
-      form1:{},
-      open1:false,
-      title1:""
+      tomLists: [],
+      form1: {},
+      open1: false,
+      title1: "",
     };
   },
   created() {
@@ -1205,7 +1246,7 @@ export default {
       this.loading = true;
       listManage(this.queryParams).then((response) => {
         this.manageList = response.rows;
-        console.log(this.manageList)
+
         this.total = response.total;
         this.loading = false;
       });
@@ -1284,7 +1325,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.tomList = [
+      (this.tomList = [
         {
           // 文件名称
           name: null,
@@ -1299,9 +1340,9 @@ export default {
           // 是否为双面打
           isPrintTwo: null,
         },
-      ],
-       this.fileList=[]
-        this.reset();
+      ]),
+        (this.fileList = []);
+      this.reset();
       this.open = true;
       this.title = "添加集中文印";
       this.form.sendName = Cookies.get("nickName");
@@ -1310,7 +1351,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       // this.tomList=[]
-      this.tomList=[
+      (this.tomList = [
         {
           // 文件名称
           name: null,
@@ -1325,13 +1366,13 @@ export default {
           // 是否为双面打
           isPrintTwo: null,
         },
-      ],
-      this.fileList=[]
+      ]),
+        (this.fileList = []);
       this.reset();
       const id = row.id || this.ids;
       getManage(id).then((response) => {
         this.form1 = response.data;
-        console.log(this.form)
+
         this.form1.isPrintColor = response.data.isPrintColor + "";
         this.form1.isPrintTwo = response.data.isPrintTwo + "";
         // this.tomList[0].name=this.form.name
@@ -1342,40 +1383,37 @@ export default {
         // this.tomList[0].levelM=this.form.levelM
         //   this.tomList[0].isPrintColor=this.form.isPrintColor
         // this.tomList[0].isPrintTwo=this.form.isPrintTwo
-        //    console.log(this.tomList)
+
         this.open1 = true;
         this.title1 = "修改集中文印";
       });
     },
     // 修改提交
-    updatesubmit(){
+    updatesubmit() {
       this.$refs["form1"].validate((valid) => {
         if (valid) {
-            updateManage(this.form1).then((response) => {
-              console.log(this.form1)
-              this.$modal.msgSuccess("修改成功");
-              this.open1 = false;
-              this.getList();
-            });
+          updateManage(this.form1).then((response) => {
+            this.$modal.msgSuccess("修改成功");
+            this.open1 = false;
+            this.getList();
+          });
         }
       });
     },
     /** 提交按钮 */
     submitForm() {
-      // console.log(this.tomList);
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            console.log(this.form)
             updateManage(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            this.form.printsManageList=this.tomList
-            console.log(this.form)
-            addManage(this.form).then((response) => {  
+            this.form.printsManageList = this.tomList;
+
+            addManage(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -1415,28 +1453,28 @@ export default {
     },
     // 上传前校检格式和大小
     handleBeforeUpload(file) {
-      // console.log(file)
       // 校检文件类型
       this.tomLists.name = file.name;
-      this.form1.name=file.name
+      this.form1.name = file.name;
       if (file.size == 0) {
         this.tomLists.size = "0 B";
-        this.form1.size="0 B"
+        this.form1.size = "0 B";
       }
       var k = 1024;
       var sizes = ["B", "KB", "MB", "GB", "TB", "EB", "ZB", "YB"];
       var i = Math.floor(Math.log(file.size) / Math.log(k));
       this.tomLists.size = file.size;
-      this.form1.size=file.size;
+      this.form1.size = file.size;
       this.tomLists.size =
         (file.size / Math.pow(k, i)).toPrecision(3) + "" + sizes[i];
-      this.form1.size=(file.size / Math.pow(k, i)).toPrecision(3) + "" + sizes[i]
+      this.form1.size =
+        (file.size / Math.pow(k, i)).toPrecision(3) + "" + sizes[i];
       if (this.fileType) {
         let fileExtension = "";
         if (file.name.lastIndexOf(".") > -1) {
           fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
           this.tomLists.type = fileExtension;
-          this.form1.type=fileExtension
+          this.form1.type = fileExtension;
         }
         const isTypeOk = this.fileType.some((type) => {
           if (file.type.indexOf(type) > -1) return true;
@@ -1450,7 +1488,7 @@ export default {
           this.tomLists.name = null;
           this.tomLists.size = null;
           this.tomLists.type = null;
-          this.form1.name=null
+          this.form1.name = null;
           this.form1.size = null;
           this.form1.type = null;
           return false;
@@ -1477,18 +1515,21 @@ export default {
     // 上传成功回调
     handleUploadSuccess(res, file) {
       this.$message.success("上传成功");
-      this.fileList.push({ name: file.name, file: res.url , size :this.tomLists.size,type:this.tomLists.type });
-      
+      this.fileList.push({
+        name: file.name,
+        file: res.url,
+        size: this.tomLists.size,
+        type: this.tomLists.type,
+      });
+
       this.$emit("input", this.fileList);
-      console.log(this.fileList)
-      this.tomList=this.fileList
+
+      this.tomList = this.fileList;
       this.form1.file = res.url;
       // this.tomList.push(this.form)
-      // console.log(this.tomList)
     },
     //打印
     handlePrint(row) {
-      // console.log(row);
       this.dyreset();
       this.dyopen = true;
       this.title = "打印";
@@ -1502,7 +1543,7 @@ export default {
       this.dyform.printRoom = row.printRoom;
       this.dyform.type = row.type;
       // this.dyform.isReturn = row.isReturn + "";
-      console.log(this.dyform);
+
       if (row.isPrintColor == 1) {
         this.yaoqiu = "彩打";
         this.yaoqiuflg = true;
@@ -1522,7 +1563,6 @@ export default {
     },
     // 查看按钮预览
     handlelook(row) {
-      // console.log(row);
       if (row.type == "docx" || row.type == "doc") {
         this.open33 = true;
         axios({
@@ -1530,25 +1570,20 @@ export default {
           responseType: "blob", // 设置响应文件格式
           url: row.file,
         }).then(({ data }) => {
-          console.log(data);
           $(".docx").attr("id", "printArea");
-          // console.log($(".docx"));
+
           docx.renderAsync(data, this.$refs.file); // 渲染到页面预览
         });
       } else if (row.type == "pdf") {
         this.previewDialog = true;
         this.pdfurl = row.file;
-        this.pageNum=1
+        this.pageNum = 1;
       } else if (row.type == "xlsx") {
-        console.log(222)
-        console.log(row.file)
         axios
           .get(row.file, {
             responseType: "arraybuffer", // 设置响应体类型为arraybuffer
           })
           .then(({ data }) => {
-            console.log(data);
-
             let workbook = XLSX.read(new Uint8Array(data), { type: "array" }); // 解析数据
             this.open44 = true;
             var worksheet = workbook.Sheets[workbook.SheetNames[0]]; // workbook.SheetNames 下存的是该文件每个工作表名字,这里取出第一个工作表
@@ -1579,8 +1614,6 @@ export default {
           }
 
           printCode(this.dyform).then((res) => {
-            console.log(this.dyform);
-            // console.log(this.dyform)
             if (res.code == 200) {
               if (this.dyform.type == "pdf") {
                 // let blob = new Blob([res]);
@@ -1591,9 +1624,13 @@ export default {
                 // link.click();
                 // link.remove();
                 let xhr = new XMLHttpRequest();
-                xhr.open("get", process.env.VUE_APP_BASE_API +
-                  "/profile/print/" +
-                  res.printFileName, true);
+                xhr.open(
+                  "get",
+                  process.env.VUE_APP_BASE_API +
+                    "/profile/print/" +
+                    res.printFileName,
+                  true
+                );
                 xhr.setRequestHeader("Content-Type", `application/pdf`);
                 xhr.responseType = "blob";
                 let that = this;
@@ -1610,7 +1647,7 @@ export default {
                       href = window.URL.createObjectURL(blob); //创建下载的链接
                     }
                     downloadElement.href = href;
-                    console.log(that.dyform.printName);
+
                     downloadElement.download = that.dyform.printName;
                     // tagFileName +
                     //下载后文件名
@@ -1625,9 +1662,12 @@ export default {
                 xhr.send();
                 this.dyopen = false;
                 this.getList();
-              }else{
+              } else {
                 let downloadElement = document.createElement("a");
-                downloadElement.href =process.env.VUE_APP_BASE_API +"/profile/print/" +res.printFileName;
+                downloadElement.href =
+                  process.env.VUE_APP_BASE_API +
+                  "/profile/print/" +
+                  res.printFileName;
                 downloadElement.download = this.dyform.printName;
                 document.body.appendChild(downloadElement);
                 downloadElement.click(); //点击下载
@@ -1657,12 +1697,10 @@ export default {
       // this.dyform.printNumber = row.printNumber;
       // this.dyform.printRoom = row.printRoom;
       // this.dyform.type = row.type;
-      // console.log(this.dyform);
-      // console.log(row)
+
       this.printManage = row;
-      // console.log(this.dyform)
+
       tkbox(this.printManage).then((res) => {
-        console.log(res);
         this.printshow = false;
         this.getList();
       });
@@ -1672,7 +1710,6 @@ export default {
      */
     previewPDF(row, index) {
       this.previewDialog = true;
-      console.log("", row, index);
     },
     // 上一页函数,
     prePage() {
@@ -1710,7 +1747,7 @@ export default {
        * 打印界面字符乱码是因为你pdf中使用了自定义字体导致的,谷歌浏览器打印的时候预览界面真的变成了真·方块字 ,解决方案如下:
        * 用文章最后的pdfjsWrapper.js在替换掉node_modules/vue-pdf/src/pdfjsWrapper.js
        */
-      console.log("打印");
+
       this.$refs.pdf.print();
     },
   },
@@ -1984,12 +2021,12 @@ export default {
   color: #cccccc;
 }
 /* 文件名称表格 */
-::v-deep .fileName .el-input__inner{
+::v-deep .fileName .el-input__inner {
   width: 316px !important;
   text-indent: 1em;
   /* background-color: #196299; */
 }
-::v-deep .fileName .el-input__suffix{
+::v-deep .fileName .el-input__suffix {
   left: -280px;
 }
 </style>

+ 1 - 4
src/views/barracksManagement/checkin/index.vue

@@ -255,12 +255,10 @@ export default {
   name: "Checkin",
   data() {
     var validatePass = (rule, value, callback) => {
-      console.log(value);
       var MobileRegex = /^(\d+)*#+(\d+)$/;
       if (!MobileRegex.test(value)) {
         callback(new Error("位置格式不正确!"));
       } else {
-        console.log("11");
         callback();
       }
     };
@@ -316,7 +314,7 @@ export default {
       this.loading = true;
       listCheckin(this.queryParams).then((response) => {
         this.checkinList = response.rows;
-        console.log(this.checkinList);
+
         this.total = response.total;
         this.loading = false;
       });
@@ -378,7 +376,6 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      console.log(this.form);
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {

+ 12 - 36
src/views/barracksManagement/flats/index.vue

@@ -751,31 +751,23 @@ export default {
       this.getdeptList = res.data;
     });
     // this.selectPeo1();
-     // 获取执行单位列表
-      getDept2().then((res) => {
-        // console.log(res,2)
-        this.users = res.data;
-        // console.log(this.users);
-      });
+    // 获取执行单位列表
+    getDept2().then((res) => {
+      this.users = res.data;
+    });
   },
   methods: {
     // 获取所有人员
     getSuoYou() {
       getAll().then((response) => {
-        console.log(response);
         this.executors = response.rows;
       });
     },
     unit4Format(row, column) {
-      // console.log(row)
       var deptName = "";
-      // console.log(this.ziDian1)
-      // console.log(row.type)
+
       this.ziDian1.map((item) => {
-        // console.log(item)
-        // console.log(item.dictSort,item.dictLabel)
         if (item.dictSort == row.rankId) {
-          // console.log(item.dictLabel)
           deptName = item.dictLabel;
         }
       });
@@ -784,30 +776,24 @@ export default {
     // 查询计划类型
     getdict1() {
       getDicts(this.dictType.dictType).then((res) => {
-        // console.log(res);
         this.ziDian = res.data;
-        // console.log(this.ziDian);
       });
     },
     // 查询计划类型
     getdict() {
       getDicts(this.dictType.dictType1).then((res) => {
-        // console.log(res);
         this.ziDian1 = res.data;
-        // console.log(this.ziDian1);
       });
     },
     // 军衔
     junxian(id, name) {
       this.form.rankId = id;
       this.form.rankName = name;
-      // console.log(id)
     },
     //  peopleIds(val){
     //   this.form.peopleId=val.id;
     //   this.form.peopleName=val.name;
-    //   console.log(val)
-    //   // console.log(item
+
     //   this.form.rankId=val.rankId
     //   // getDicts(this.dictType.dictType1).then((res) => {
     //   //   this.ziDian1 = res.data;
@@ -819,7 +805,6 @@ export default {
     //   // });
     // },
     peopleIds(name, item) {
-      console.log(item);
       this.form.rankName = "";
       this.form.peopleName = name;
       this.form.duty = item.duty;
@@ -835,14 +820,12 @@ export default {
       this.ziDian1.forEach((item) => {
         if (this.form.rankId == item.dictSort)
           this.form.rankName = item.dictLabel;
-        // console.log(this.form.rankName)
       });
-      // console.log(this.form.rankId)
     },
     peopleIds1(id, name) {
       this.queryParams.id = id;
       this.queryParams.peopleName = name;
-      // console.log(id);
+
       this.getList();
     },
     leibie() {
@@ -850,36 +833,33 @@ export default {
     },
     // 到访单位选中触发
     selectPeo1(val) {
-     
       this.queryParams.unitId = val.id;
       // this.queryParams.peopleName = "";
       // this.queryParams.unitName = val.label;
-      // // console.log(this.queryParams);
+
       this.getZhuChi(this.queryParams.unitId);
       this.getList();
     },
     // 获取执行人
     getZhuChi(id) {
-      // console.log(id)
       deptUser(id).then((res) => {
         this.executor = res.data;
         this.executors = res.data;
-        // console.log(this.executor)
+
         // this.form.unitName=this.executor
       });
     },
     // 到访单位选中触发
     selectPeo(val) {
-      // console.log(val)
       this.form.unitId = val.id;
-      // console.log(val)
+
       this.form.peopleName = "";
       this.form.name = "";
       this.form.rankName = "";
       this.form.peopleId = "";
       // this.form.name=""
       this.form.unitName = val.label;
-      // console.log(this.form.unitId)
+
       this.getZhuChi(this.form.unitId);
     },
     //  // 查询计划类型
@@ -896,7 +876,7 @@ export default {
       this.loading = true;
       listFlats(this.queryParams).then((response) => {
         this.flatsList = response.rows;
-        console.log(this.flatsList);
+
         this.total = response.total;
         this.loading = false;
       });
@@ -966,9 +946,7 @@ export default {
       this.title = "添加公寓住房申请人员资格审查登记";
       // 获取执行单位列表
       getDept2().then((res) => {
-        // console.log(res,2)
         this.users = res.data;
-        // console.log(this.users);
       });
     },
     /** 修改按钮操作 */
@@ -984,7 +962,6 @@ export default {
         this.ziDian1.forEach((item) => {
           if (item.dictSort == this.form.rankId) {
             this.form.rankName = item.dictLabel;
-            // console.log(this.form.rankName)
           }
         });
         this.open = true;
@@ -993,7 +970,6 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      console.log(this.form);
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {

+ 0 - 6
src/views/bdglSecret/secret/index.vue

@@ -560,7 +560,6 @@ export default {
     /** 查询部门下拉树结构 */
     getTreeselect() {
       getDept().then((response) => {
-        // console.log(response);
         this.deptOptions = response.data;
       });
     },
@@ -572,15 +571,12 @@ export default {
     },
     // 选中添加部门单位触发
     department() {
-      console.log(this.form);
       getZhuChiRen(this.form.unitId).then((res) => {
-        console.log(res);
         this.renYuan = res.data;
       });
     },
     // 选中责任人触发
     zheRenRe(name) {
-      // // console.log(val);
       // this.form.peopleId = val.id;
       this.form.peopleName = name;
     },
@@ -590,7 +586,6 @@ export default {
     },
     // 选中批准人触发
     piZhuiRen(name) {
-      // console.log(val);
       // this.form.peopleId2 = val.id;
       this.form.people2Name = name;
     },
@@ -685,7 +680,6 @@ export default {
       this.opens = false;
       const id = row.id || this.ids;
       getSecret(id).then((response) => {
-        console.log(response);
         this.wordInfo = response.data;
         this.title = "查看网络/手机/涉密载体登记本";
         this.menuRoleVisible = true;

+ 1 - 6
src/views/bdglregular/regularcountinfo/index.vue

@@ -145,16 +145,13 @@ export default {
       unitrank().then((res) => {
         if (res.code == 200) {
           this.peopleList = res.data;
-          // console.log(this.peopleList)
+
           this.peopleList.forEach((item) => {
-            // console.log(item.zongfen)
             return (item.zongfen = item.zongfen.split(".")[0]);
           });
           this.peopleList.forEach((item) => {
-            // console.log(item.zongfen)
             return (item.subscore = item.subscore.split(".")[0]);
           });
-          // console.log(this.peopleList)
         }
       });
     },
@@ -395,7 +392,6 @@ export default {
       });
     },
     rowclick(row) {
-    
       this.$router
         .push({
           path: "/bdglregular/regularinfo",
@@ -405,7 +401,6 @@ export default {
     },
     //饼状图点击事件
     eConsole(param) {
-      // console.log(param.data);
       this.$router
         .push({
           path: "/bdglregular/regularinfo",

+ 69 - 53
src/views/bdglregular/regularinfo/index.vue

@@ -194,6 +194,18 @@
           >加分录入</el-button
         >
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['bdglregular:regularinfo:remove']"
+          >删除</el-button
+        >
+      </el-col>
       <!-- <el-col :span="1.5">
         <el-button
           type="success"
@@ -241,8 +253,18 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" type="index" />
-      <el-table-column label="受检单位" align="center" key="inspectedUnit" prop="inspectedUnit" />
-      <el-table-column label="类型" align="center" key="inspectionType" prop="inspectionType">
+      <el-table-column
+        label="受检单位"
+        align="center"
+        key="inspectedUnit"
+        prop="inspectedUnit"
+      />
+      <el-table-column
+        label="类型"
+        align="center"
+        key="inspectionType"
+        prop="inspectionType"
+      >
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.inspectionType"
@@ -272,7 +294,7 @@
         prop="inspectionSite"
         key="inspectionSite"
       />
-      <el-table-column label="分值" align="center" key="score"   prop="score">
+      <el-table-column label="分值" align="center" key="score" prop="score">
         <template slot-scope="scope">
           <div style="color: rgb(255 106 0)" v-if="queryParams.caoZuoType == 0">
             {{ scope.row.score }}
@@ -341,9 +363,9 @@
             type="text"
             v-if="
               scope.row.caoZuoType == '0' &&
-                scope.row.isCaoZuoDept == 0 &&
-                (scope.row.currentState == '未通过' ||
-                  scope.row.currentState == '待处理')
+              scope.row.isCaoZuoDept == 0 &&
+              (scope.row.currentState == '未通过' ||
+                scope.row.currentState == '待处理')
             "
             @click="handleUpdate(scope.row)"
             >整改</el-button
@@ -354,8 +376,8 @@
             @click="shenpifun(scope.row)"
             v-if="
               queryParams.caoZuoType == 0 &&
-                scope.row.isShenPi == 0 &&
-                scope.row.currentState == '待验收'
+              scope.row.isShenPi == 0 &&
+              scope.row.currentState == '待验收'
             "
             >审批</el-button
           >
@@ -865,7 +887,7 @@
             class="wenjian"
           />
           <a
-            :href="url+form.documentProof"
+            :href="url + form.documentProof"
             :download="form.wenjianname"
             title="下载"
             style="color: white; margin-left: 10px"
@@ -925,7 +947,7 @@ import {
   editissuccess,
   editisfalse,
   bumenlist,
-  listRegularinfos
+  listRegularinfos,
 } from "@/api/bdglregular/regularinfo";
 import { getUserProfile } from "@/api/system/user";
 export default {
@@ -975,7 +997,7 @@ export default {
         correctiveAction: null,
         pictureProof: null,
         documentProof: null,
-        caoZuoType: 0
+        caoZuoType: 0,
       },
       // 用户
       user: {},
@@ -986,27 +1008,27 @@ export default {
       // 表单校验
       rules: {
         unitCheck: [
-          { required: true, message: "检查单位不能为空", trigger: "change" }
+          { required: true, message: "检查单位不能为空", trigger: "change" },
         ],
         inspectedUnit: [
-          { required: true, message: "受检单位不能为空", trigger: "change" }
+          { required: true, message: "受检单位不能为空", trigger: "change" },
         ],
         inspectionType: [
-          { required: true, message: "类型不能为空", trigger: "change" }
+          { required: true, message: "类型不能为空", trigger: "change" },
         ],
         inspectionTime: [
-          { required: true, message: "检查时间不能为空", trigger: "change" }
+          { required: true, message: "检查时间不能为空", trigger: "change" },
         ],
         inspectionSite: [
-          { required: true, message: "检查地点不能为空", trigger: "blur" }
+          { required: true, message: "检查地点不能为空", trigger: "blur" },
         ],
         score: [{ required: true, message: "分值不能为空", trigger: "blur" }],
         rectificationTime: [
-          { required: true, message: "整改时间不能为空", trigger: "change" }
+          { required: true, message: "整改时间不能为空", trigger: "change" },
         ],
         chargePeople: [
-          { required: true, message: "负责人不能为空", trigger: "change" }
-        ]
+          { required: true, message: "负责人不能为空", trigger: "change" },
+        ],
       },
       //单位
       unitId: [],
@@ -1026,7 +1048,7 @@ export default {
       isActive: null,
       sp: null,
       open3: false,
-      url: process.env.VUE_APP_BASE_API
+      url: process.env.VUE_APP_BASE_API,
     };
   },
   created() {
@@ -1052,29 +1074,28 @@ export default {
       correctiveAction: null,
       pictureProof: null,
       documentProof: null,
-      caoZuoType: 0
+      caoZuoType: 0,
     };
     // this.danWiess()
     //部门数据
-    getDept().then(res => {
+    getDept().then((res) => {
       if (res.code == 200) {
         this.unitId = res.data;
       }
     });
     //调动人员对象
-    listPeople().then(res => {
+    listPeople().then((res) => {
       if (res.code == 200) {
         this.peopleIds = res.rows;
       }
     });
     //检查类型
-    this.getDicts("inspectionType").then(response => {
+    this.getDicts("inspectionType").then((response) => {
       this.inspectionType = response.data;
     });
 
     if (this.$route.query.id) {
-      bumenlist(this.$route.query.id).then(res => {
-     
+      bumenlist(this.$route.query.id).then((res) => {
         this.regularinfoList = res.rows;
         this.total = res.total;
         this.loading = false;
@@ -1106,10 +1127,10 @@ export default {
         correctiveAction: null,
         pictureProof: null,
         documentProof: null,
-        caoZuoType: 0
+        caoZuoType: 0,
       };
       if (to.query.id) {
-        bumenlist(to.query.id).then(res => {
+        bumenlist(to.query.id).then((res) => {
           this.regularinfoList = res.rows;
           this.total = res.total;
           this.loading = false;
@@ -1118,8 +1139,7 @@ export default {
         this.queryParams.inspectedUnitId = to.query.obj.id + "";
         this.queryParams.currentState = to.query.obj.name + "";
 
-        listRegularinfos(this.queryParams).then(res => {
-        
+        listRegularinfos(this.queryParams).then((res) => {
           this.regularinfoList = res.rows;
           this.total = res.total;
           this.loading = false;
@@ -1129,20 +1149,17 @@ export default {
       }
 
       // listRegularinfos
-      // console.log(to.query.obj);
-    }
+    },
   },
   mounted() {
-    
     // this.danWiess()
   },
   methods: {
     danWiess() {
       // 获取当前用户接口
-      getUserProfile().then(response => {
+      getUserProfile().then((response) => {
         this.user = response.data;
-        
-        // console.log(response.data.dept.deptId+"这是")
+
         // if(response)
         this.danWies = response.data.dept.deptId;
       });
@@ -1150,7 +1167,7 @@ export default {
     /** 查询经常性检查列表 */
     getList() {
       this.loading = true;
-      listRegularinfo(this.queryParams).then(response => {
+      listRegularinfo(this.queryParams).then((response) => {
         this.regularinfoList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -1187,7 +1204,7 @@ export default {
         correctiveAction: null,
         pictureProof: null,
         documentProof: null,
-        reasonReturn: null
+        reasonReturn: null,
       };
       this.resetForm("form");
     },
@@ -1203,7 +1220,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id);
+      this.ids = selection.map((item) => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -1255,7 +1272,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getRegularinfo(id).then(response => {
+      getRegularinfo(id).then((response) => {
         this.form = response.data;
         this.disabled = true;
         this.open = true;
@@ -1275,7 +1292,7 @@ export default {
       this.isdisabled = true;
       this.reset();
       const id = row.id || this.ids;
-      getRegularinfo(id).then(response => {
+      getRegularinfo(id).then((response) => {
         this.form = response.data;
         this.open1 = true;
         this.title = "修改经常性检查";
@@ -1291,7 +1308,7 @@ export default {
     shenpifun(row) {
       this.reset();
       const id = row.id || this.ids;
-      getRegularinfo(id).then(response => {
+      getRegularinfo(id).then((response) => {
         this.disabled = true;
         this.form = response.data;
         this.open3 = true;
@@ -1304,7 +1321,7 @@ export default {
     },
     //通过
     tongguofun() {
-      editissuccess(this.form).then(res => {
+      editissuccess(this.form).then((res) => {
         if (res.code == 200) {
           this.$modal.msgSuccess("审批成功");
           this.open = false;
@@ -1331,7 +1348,7 @@ export default {
     },
     //未通过提交
     weitongguofun() {
-      editisfalse(this.form).then(res => {
+      editisfalse(this.form).then((res) => {
         this.$modal.msgSuccess("操作成功");
         this.open = false;
         this.getList();
@@ -1346,7 +1363,7 @@ export default {
         }
       }
       this.form.caoZuoType = this.queryParams.caoZuoType;
-      editquestion(this.form).then(response => {
+      editquestion(this.form).then((response) => {
         this.$modal.msgSuccess("整改成功");
         this.open = false;
         this.open1 = false;
@@ -1356,8 +1373,7 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      // console.log(this.form)
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.documentProof) {
             if (typeof this.form.documentProof != "string") {
@@ -1368,7 +1384,7 @@ export default {
           }
           if (this.form.id != null) {
             this.form.caoZuoType = this.queryParams.caoZuoType;
-            updateRegularinfo(this.form).then(response => {
+            updateRegularinfo(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.open1 = false;
@@ -1377,7 +1393,7 @@ export default {
             });
           } else {
             this.form.caoZuoType = this.queryParams.caoZuoType;
-            addRegularinfo(this.form).then(response => {
+            addRegularinfo(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.open1 = false;
@@ -1393,7 +1409,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         .confirm("是否确认删除经常性检查的数据项?")
-        .then(function() {
+        .then(function () {
           return delRegularinfo(ids);
         })
         .then(() => {
@@ -1411,7 +1427,7 @@ export default {
           this.exportLoading = true;
           return exportRegularinfo(queryParams);
         })
-        .then(response => {
+        .then((response) => {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
@@ -1439,8 +1455,8 @@ export default {
       if (this.form.score < 0) {
         this.form.score = null;
       }
-    }
-  }
+    },
+  },
 };
 </script>
 <style scoped>

+ 50 - 38
src/views/bdglregular/specialinfo/index.vue

@@ -150,6 +150,18 @@
           >加分录入</el-button
         >
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['bdglregular:specialinfo:remove']"
+          >删除</el-button
+        >
+      </el-col>
       <!-- <el-col :span="1.5">
         <el-button
           type="primary"
@@ -301,9 +313,9 @@
             type="text"
             v-if="
               queryParams.caoZuoType == 0 &&
-                scope.row.isCaoZuoDept == 0 &&
-                (scope.row.currentState == '未通过' ||
-                  scope.row.currentState == '待处理')
+              scope.row.isCaoZuoDept == 0 &&
+              (scope.row.currentState == '未通过' ||
+                scope.row.currentState == '待处理')
             "
             @click="handleUpdate(scope.row)"
             >整改</el-button
@@ -314,8 +326,8 @@
             @click="shenpifun(scope.row)"
             v-if="
               queryParams.caoZuoType == 0 &&
-                scope.row.isShenPi == 0 &&
-                scope.row.currentState == '待验收'
+              scope.row.isShenPi == 0 &&
+              scope.row.currentState == '待验收'
             "
             >审批</el-button
           >
@@ -680,7 +692,7 @@ import {
   editissuccess,
   editisfalse,
   bumenlist,
-  listSpecialinfos
+  listSpecialinfos,
 } from "@/api/bdglregular/specialinfo";
 
 export default {
@@ -725,24 +737,24 @@ export default {
         documentProof: null,
         createUserId: null,
         createUser: null,
-        caoZuoType: 0
+        caoZuoType: 0,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         inspectedUnit: [
-          { required: true, message: "受检单位不能为空", trigger: "change" }
+          { required: true, message: "受检单位不能为空", trigger: "change" },
         ],
         inspectionTime: [
-          { required: true, message: "检查时间不能为空", trigger: "change" }
+          { required: true, message: "检查时间不能为空", trigger: "change" },
         ],
         rectificationTime: [
-          { required: true, message: "整改时间为空", trigger: "change" }
+          { required: true, message: "整改时间为空", trigger: "change" },
         ],
         chargePeople: [
-          { required: true, message: "整改负责人不能为空", trigger: "change" }
-        ]
+          { required: true, message: "整改负责人不能为空", trigger: "change" },
+        ],
       },
       //单位
       unitId: [],
@@ -759,7 +771,7 @@ export default {
       zg: null,
       open3: false,
       isActive: null,
-      url: process.env.VUE_APP_BASE_API
+      url: process.env.VUE_APP_BASE_API,
     };
   },
   created() {
@@ -780,22 +792,22 @@ export default {
       documentProof: null,
       createUserId: null,
       createUser: null,
-      caoZuoType: 0
+      caoZuoType: 0,
     };
     //部门数据
-    getDept().then(res => {
+    getDept().then((res) => {
       if (res.code == 200) {
         this.unitId = res.data;
       }
     });
     //调动人员对象
-    listPeople().then(res => {
+    listPeople().then((res) => {
       if (res.code == 200) {
         this.peopleIds = res.rows;
       }
     });
     if (this.$route.query.id) {
-      bumenlist(this.$route.query.id).then(res => {
+      bumenlist(this.$route.query.id).then((res) => {
         this.specialinfoList = res.rows;
         this.total = res.total;
         this.loading = false;
@@ -804,7 +816,7 @@ export default {
       this.queryParams.inspectedUnitId = this.$route.query.obj.id;
       this.queryParams.currentState = this.$route.query.obj.name + "";
 
-      listSpecialinfos(this.queryParams).then(res => {
+      listSpecialinfos(this.queryParams).then((res) => {
         this.specialinfoList = res.rows;
         this.total = res.total;
         this.loading = false;
@@ -832,10 +844,10 @@ export default {
         documentProof: null,
         createUserId: null,
         createUser: null,
-        caoZuoType: 0
+        caoZuoType: 0,
       };
       if (to.query.id) {
-        bumenlist(to.query.id).then(res => {
+        bumenlist(to.query.id).then((res) => {
           this.specialinfoList = res.rows;
           this.total = res.total;
           this.loading = false;
@@ -844,7 +856,7 @@ export default {
         this.queryParams.inspectedUnitId = to.query.obj.id;
         this.queryParams.currentState = to.query.obj.name + "";
 
-        listSpecialinfos(this.queryParams).then(res => {
+        listSpecialinfos(this.queryParams).then((res) => {
           this.specialinfoList = res.rows;
           this.total = res.total;
           this.loading = false;
@@ -852,13 +864,13 @@ export default {
       } else {
         this.getList();
       }
-    }
+    },
   },
   methods: {
     /** 查询专项检查列表 */
     getList() {
       this.loading = true;
-      listSpecialinfo(this.queryParams).then(response => {
+      listSpecialinfo(this.queryParams).then((response) => {
         this.specialinfoList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -889,7 +901,7 @@ export default {
         createTime: null,
         createUserId: null,
         createUser: null,
-        updateTime: null
+        updateTime: null,
       };
       this.resetForm("form");
     },
@@ -905,7 +917,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id);
+      this.ids = selection.map((item) => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -946,7 +958,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getSpecialinfo(id).then(response => {
+      getSpecialinfo(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改专项检查";
@@ -966,7 +978,7 @@ export default {
       this.isdisabled = true;
       this.reset();
       const id = row.id || this.ids;
-      getSpecialinfo(id).then(response => {
+      getSpecialinfo(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改专项检查";
@@ -983,7 +995,7 @@ export default {
     shenpifun(row) {
       this.reset();
       const id = row.id || this.ids;
-      getSpecialinfo(id).then(response => {
+      getSpecialinfo(id).then((response) => {
         this.disabled = true;
         this.form = response.data;
         this.open3 = true;
@@ -995,7 +1007,7 @@ export default {
     },
     //通过
     tongguofun() {
-      editissuccess(this.form).then(res => {
+      editissuccess(this.form).then((res) => {
         if (res.code == 200) {
           this.$modal.msgSuccess("审批成功");
           this.open = false;
@@ -1016,7 +1028,7 @@ export default {
     },
     //未通过提交
     weitongguofun() {
-      editisfalse(this.form).then(res => {
+      editisfalse(this.form).then((res) => {
         this.$modal.msgSuccess("操作成功");
         this.open = false;
         this.getList();
@@ -1031,7 +1043,7 @@ export default {
         }
       }
       this.form.caoZuoType = this.queryParams.caoZuoType;
-      editquestion(this.form).then(response => {
+      editquestion(this.form).then((response) => {
         this.$modal.msgSuccess("整改成功");
         this.open = false;
         this.open3 = false;
@@ -1041,7 +1053,7 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.documentProof) {
             if (typeof this.form.documentProof != "string") {
@@ -1053,7 +1065,7 @@ export default {
 
           if (this.form.id != null) {
             this.form.caoZuoType = this.queryParams.caoZuoType;
-            editquestion(this.form).then(response => {
+            editquestion(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.open3 = false;
@@ -1061,7 +1073,7 @@ export default {
             });
           } else {
             this.form.caoZuoType = this.queryParams.caoZuoType;
-            addSpecialinfo(this.form).then(response => {
+            addSpecialinfo(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.open3 = false;
@@ -1076,7 +1088,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         .confirm("是否确认删除专项检查的数据项?")
-        .then(function() {
+        .then(function () {
           return delSpecialinfo(ids);
         })
         .then(() => {
@@ -1094,7 +1106,7 @@ export default {
           this.exportLoading = true;
           return exportSpecialinfo(queryParams);
         })
-        .then(response => {
+        .then((response) => {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
@@ -1122,8 +1134,8 @@ export default {
       if (this.form.score < 0) {
         this.form.score = null;
       }
-    }
-  }
+    },
+  },
 };
 </script>
 <style scoped>

+ 1 - 11
src/views/combatduty/Quantitative/index.vue

@@ -520,7 +520,6 @@ export default {
   created() {
     // 人员情况
     listshow().then((res) => {
-      // console.log(res)
       this.peopleQK = res.data;
     });
     // 基地值班
@@ -534,7 +533,6 @@ export default {
       if (res.rows[0] != undefined) {
         this.GreatDuty1 = res.rows[0];
       }
-      // console.log(res);
     });
     greatDutys().then((res) => {
       this.fenShu = res.data[0];
@@ -545,15 +543,12 @@ export default {
 
     // // 装备值班接口
     equipment().then((res) => {
-      // console.log(res)
       if (res.rows != undefined) {
         this.Equipment = res.rows;
       }
-      // console.log(this.Equipment)
     });
     // 执行任务人员情况
     zhixingrenwu().then((res) => {
-      // console.log(res);
       if (res.rows != undefined) {
         this.performanceTask = res.rows;
       }
@@ -562,27 +557,22 @@ export default {
   mounted() {
     // // 军车值班接口
     militaryDuty().then((res) => {
-      // console.log(res.rows)
       this.MilitaryDuty = res.rows;
-      // console.log(res.rows)
+
       this.MilitaryDuty.map((item) => {
         this.ziDian.map((items) => {
-          // console.log(items)
           if (item.modelInfo == items.dictValue) {
-            // console.log(items.dictLabel)
             return (item.modelInfo = items.dictLabel);
           }
           this.MilitaryDuty = this.MilitaryDuty;
         });
       });
-      // console.log(this.MilitaryDuty)
     });
   },
   methods: {
     // 查询字典
     getdict() {
       getDicts(this.dictType.dictType).then((res) => {
-        // console.log(res);
         this.ziDian = res.data;
       });
     },

+ 3 - 7
src/views/combatduty/RateOfTen/index.vue

@@ -650,7 +650,6 @@ export default {
   },
   mounted() {
     getReteOfTen().then((res) => {
-      // console.log(res)
       this.loading1 = true;
       this.form = res.rows[0];
       this.myEcharts();
@@ -666,7 +665,6 @@ export default {
     this.getLiuliang();
     getzbky().then((res) => {
       this.zbky = res.msg;
-      console.log(this.zbky);
     });
   },
   methods: {
@@ -675,7 +673,7 @@ export default {
         this.loading2 = true;
         this.form1 = {};
         this.zhuangbei = res.rows[0];
-        console.log(this.zhuangbei);
+
         this.myEcharts();
         this.loading2 = false;
       });
@@ -697,7 +695,7 @@ export default {
       this.open1 = true;
       this.form1.zbky = this.zbky;
       this.form1 = this.zhuangbei;
-      console.log(this.form1);
+
       addzbwl().then((res) => {
         this.form1 = res.rows[0];
       });
@@ -711,7 +709,6 @@ export default {
     },
     // 编辑人员五率确定
     submitForm() {
-      console.log(this.form);
       this.$refs["form"].validate((valid) => {
         if (valid) {
           updatewulv(this.form).then((response) => {
@@ -848,7 +845,6 @@ export default {
                 name: { color: "#fff", fontSize: 14 },
               },
               formatter: function (params) {
-                // console.log(data[1].value)
                 // 设置满编率
                 // var n = data[0].value / (data[1].value + data[0].value);
                 if (_this.form.bzrs == 0 || _this.form.sjrs == 0) {
@@ -917,7 +913,7 @@ export default {
         },
       ];
       data3[1].value = this.form.sjrs - data3[0].value;
-      // console.log(data3[1].value)
+
       var data4 = [
         {
           value: this.form.cdrs,

+ 0 - 1
src/views/combatduty/basedutyinfo/index.vue

@@ -711,7 +711,6 @@ export default {
     },
     gettreeselect() {
       getDept().then((res) => {
-        console.log(res);
         if (res.code == 200) {
           this.deptOptions = res.data;
         }

+ 0 - 1
src/views/combatduty/grassdutyinfo/index.vue

@@ -720,7 +720,6 @@ export default {
     // 获取外面部门树形
     treeselect() {
       getWeiShu().then((res) => {
-        console.log(res);
         this.deptOptionss = res.data;
       });
     },

+ 0 - 1
src/views/combatduty/militarydutyinfo/index.vue

@@ -629,7 +629,6 @@ export default {
     },
     //司机联系方式
     driverNamefun(val) {
-      //  console.log(val)
       this.form.driverName = val.name;
       this.form.telephone = val.phone;
       this.form.driverId = val.id;

+ 1 - 2
src/views/combatduty/regisdutyinfo/index.vue

@@ -559,7 +559,6 @@ export default {
     getList() {
       this.loading = true;
       listRegisdutyinfo(this.queryParams).then((response) => {
-        console.log(response);
         this.regisdutyinfoList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -642,7 +641,7 @@ export default {
             });
           } else {
             this.form.regisDutyList = this.relatives;
-            // console.log(this.form);
+
             addRegisdutyinfo(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;

+ 6 - 10
src/views/combatduty/taskdutyinfo/index.vue

@@ -583,7 +583,6 @@ export default {
   },
   methods: {
     downloadss(URL, name) {
-      // console.log(URL)
       let xhr = new XMLHttpRequest();
       xhr.open("get", URL, true);
       xhr.setRequestHeader("Content-Type", `application/pdf`);
@@ -601,7 +600,7 @@ export default {
             href = window.URL.createObjectURL(blob); //创建下载的链接
           }
           downloadElement.href = href;
-          // console.log(that.dyform.printName);
+
           downloadElement.download = name; // tagFileName + //下载后文件名
           document.body.appendChild(downloadElement);
           downloadElement.click(); //点击下载
@@ -719,7 +718,7 @@ export default {
           // 文件名称
           item.name = item.filename;
         });
-        console.log(this.form);
+
         //  var fileNameS=[];
         //  var filename= this.form.filename.split(',')
         //  var filepath= this.form.filepath.split(',')
@@ -741,19 +740,18 @@ export default {
         this.form.taskdutyFus.forEach((item) => {
           item.filepath = process.env.VUE_APP_BASE_API + item.filepath;
         });
-        console.log(this.form);
+
         this.open1 = true;
         this.title1 = "查看执行任务";
       });
     },
     /** 提交按钮 */
     submitForm() {
-      // console.log(this.form.fileName)
       // this.form.filename = "";
       // this.form.filepath = "";
-      // console.log(this.form.fileNameS)
+
       // for (var i of this.form.fileNameS) {
-      //   // console.log(i)
+
       //   this.form.filename += i.name + ",";
       //   this.form.filepath += i.url + ",";
       // }
@@ -765,7 +763,7 @@ export default {
       //   0,
       //   this.form.filepath.length - 1
       // );
-      console.log(this.form);
+
       if (this.form.taskdutyFus) {
         this.form.taskdutyFus.forEach((item) => {
           // 文件路径
@@ -777,7 +775,6 @@ export default {
         });
       }
 
-      console.log(this.form);
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
@@ -827,7 +824,6 @@ export default {
     },
     //联系方式
     driverNamefun(val) {
-      //  console.log(val)
       this.form.commanderName = val.name;
       this.form.commanderPhone = val.phone;
       this.form.commanderId = val.id;

+ 1 - 2
src/views/combatduty/teamdutyinfo/index.vue

@@ -920,7 +920,6 @@ export default {
     },
     gettreeselect() {
       getDept().then((res) => {
-        console.log(res);
         if (res.code == 200) {
           this.deptOptions = res.data;
         }
@@ -1005,7 +1004,7 @@ export default {
       this.loading = true;
       listTeamdutyinfo(this.queryParams).then((response) => {
         this.teamdutyinfoList = response.rows;
-        console.log(response.rows);
+
         this.total = response.total;
         this.loading = false;
       });

+ 4 - 18
src/views/doormanManage/bdglVisit/index.vue

@@ -392,7 +392,6 @@ export default {
       return fmt;
     },
     unit2Format(row, column) {
-      console.log(row);
       var deptName = "";
       deptName = row.unitName;
       // if(this.bdglVisitList[0].unitId==row.unitId){
@@ -402,24 +401,21 @@ export default {
     },
     peopleIds(id) {
       this.form.peopleId = id;
-      console.log(id);
     },
     // 获取执行人
     getZhuChi(id) {
-      // console.log(id)
       deptUser(id).then((res) => {
         this.executor = res.data;
-        // console.log(this.executor)
+
         // this.form.unitName=this.executor
       });
     },
     // 到访单位选中触发
     selectPeo(val) {
-      console.log(val);
       this.form.unitId = val.id;
       this.form.peopleName = "";
       this.form.unitName = val.label;
-      // console.log(this.form.unitId)
+
       this.getZhuChi(this.form.unitId);
     },
     // 到访单位选中触发
@@ -436,9 +432,8 @@ export default {
     getList() {
       this.loading = true;
       listBdglVisit(this.queryParams).then((response) => {
-        // console.log(response)
         this.bdglVisitList = response.rows;
-        console.log(this.bdglVisitList);
+
         this.total = response.total;
         this.loading = false;
       });
@@ -469,7 +464,6 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      console.log(this.queryParams);
       this.queryParams.pageNum = 1;
       this.getList();
     },
@@ -493,24 +487,18 @@ export default {
       this.title = "添加人员来访登记";
       // 获取执行单位列表
       getDept2().then((res) => {
-        // console.log(res,2)
         this.users = res.data;
-        console.log(this.users);
       });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       getDept2().then((res) => {
-        // console.log(res)
-        // console.log(res,2)
         this.users = res.data;
-        console.log(this.users);
       });
       const id = row.id || this.ids;
-      // console.log(row)
+
       getBdglVisit(id).then((response) => {
-        console.log(response.data);
         this.form = response.data;
         this.open = true;
         this.title = "修改人员来访登记";
@@ -518,11 +506,9 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      console.log(this.form);
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            console.log(this.form);
             updateBdglVisit(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;

+ 7 - 1
src/views/grassrootsregistration/bdglarmament/index.vue

@@ -107,7 +107,12 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="单位" align="center" prop="unitName" />
+      <el-table-column
+        label="单位"
+        align="center"
+        prop="unitName"
+        width="150"
+      />
       <el-table-column label="名称" align="center" prop="name" />
       <el-table-column
         label="登记日期"
@@ -136,6 +141,7 @@
         align="center"
         class-name="small-padding fixed-width"
         width="200"
+        fixed="right"
       >
         <template slot-scope="scope">
           <el-button

+ 6 - 1
src/views/grassrootsregistration/bdglcookbook/index.vue

@@ -111,7 +111,12 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="单位" align="center" prop="unitName" />
+      <el-table-column
+        label="单位"
+        align="center"
+        prop="unitName"
+        width="150"
+      />
       <!-- <el-table-column label="更新时间" align="center" prop="id" /> -->
       <el-table-column label="食谱标题" align="center" prop="title" />
       <el-table-column

+ 12 - 2
src/views/grassrootsregistration/bdglequip/index.vue

@@ -107,10 +107,20 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="单位" align="center" prop="unitName1" />
+      <el-table-column
+        label="单位"
+        align="center"
+        prop="unitName1"
+        width="150"
+      />
       <el-table-column label="类型" align="center" prop="type" />
       <el-table-column label="物品名称" align="center" prop="title" />
-      <el-table-column label="配发单位" align="center" prop="unitName" />
+      <el-table-column
+        label="配发单位"
+        align="center"
+        prop="unitName"
+        width="150"
+      />
       <el-table-column label="配发时间" align="center" prop="granttime" />
       <el-table-column label="配发数量" align="center" prop="grantnum" />
       <el-table-column label="库存数量" align="center" prop="stocknum" />

+ 6 - 1
src/views/grassrootsregistration/bdglfood/index.vue

@@ -115,7 +115,12 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="单位" align="center" prop="unitName" />
+      <el-table-column
+        label="单位"
+        align="center"
+        prop="unitName"
+        width="150"
+      />
       <el-table-column label="值班员" align="center" prop="peopleName" />
       <!-- <el-table-column label="更新时间" align="center" prop="id" /> -->
       <el-table-column

+ 6 - 1
src/views/grassrootsregistration/bdglpublicproperty/index.vue

@@ -103,7 +103,12 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="单位" align="center" prop="unitName" />
+      <el-table-column
+        label="单位"
+        align="center"
+        prop="unitName"
+        width="150"
+      />
       <el-table-column label="名称" align="center" prop="name" />
       <el-table-column label="规格型号" align="center" prop="version" />
       <el-table-column label="数量" align="center" prop="quantity" />

+ 6 - 1
src/views/grassrootsregistration/bdglsecrecy/index.vue

@@ -104,7 +104,12 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="单位" align="center" prop="deptName" />
+      <el-table-column
+        label="单位"
+        align="center"
+        prop="deptName"
+        width="150"
+      />
       <el-table-column label="分类" align="center" prop="kind" />
       <el-table-column label="编号" align="center" prop="number" />
       <el-table-column label="密级" align="center" prop="confidential" />

+ 0 - 1
src/views/grassrootsregistration/bdglsoldier/index.vue

@@ -597,7 +597,6 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      console.log(1);
       // 人员列表
       this.reset();
       this.renYuan = [];

+ 0 - 2
src/views/grassrootsregistration/bdglweekwork/index.vue

@@ -900,8 +900,6 @@ export default {
                 this.getList();
               });
             } else {
-              // console.log(this.gongZuoTiem, this.form.startTime);
-              // console.log(this.gongZuoTiem, this.form.endTime);
               this.$modal.msgWarning("请选择开始时间与结束时间区级内的日期");
             }
           } else {

+ 0 - 2
src/views/grassrootsregistration/personnelRoster/index.vue

@@ -980,9 +980,7 @@ export default {
   methods: {
     // 查询人员名册
     xiangQi(id) {
-      // console.log(id);
       // getXiangQi(id).then((res) => {
-      //   // console.log(res.data[0]);
       //  this.renshu=res.data[0]
       // });
     },

+ 1 - 1
src/views/grassrootsregistration/statistics/index.vue

@@ -340,7 +340,7 @@ export default {
     //   const id = row.id || this.ids;
     //   getStatistics(id).then((response) => {
     //     this.wordInfo = response.data;
-    //     console.log(this.wordInfo);
+
     //     this.title = "军事训练月统计报表";
     //     this.menuRoleVisible = true;
     //   });

+ 2 - 4
src/views/materialManagement/distribution/index.vue

@@ -700,12 +700,11 @@ export default {
     // 点击选择接收人触发
     rens(data) {
       this.form.recipientId = data.id;
-      // console.log(data);
+
       this.$set(this.form, "recipient", data.name);
     },
     // 点击发放对象
     dianJi(value) {
-      console.log(value);
       if (value == "0") {
         this.danWei = false;
         this.ren = true;
@@ -736,7 +735,6 @@ export default {
     },
     // 点击物品名称触发
     wuPing(data) {
-      // console.log(data);
       this.form.responsibilityUnit = data.responsibilityUnit;
       this.form.price = data.price;
       this.form.archivesId = data.archivesId;
@@ -826,7 +824,7 @@ export default {
       this.getTreeselect();
       this.reset();
       const id = row.id || this.ids;
-      console.log(row);
+
       if (row.outPeople == "单位") {
         this.danWei = true;
         this.ren = false;

+ 0 - 2
src/views/materialManagement/equipmentReceiving/index.vue

@@ -644,7 +644,6 @@ export default {
     },
     // 点击发放对象
     dianJi(value) {
-      // console.log(value);
       if (value == "0") {
         this.danWei = false;
         this.ren = true;
@@ -671,7 +670,6 @@ export default {
     },
     // 点击物品名称触发
     wuPing(data) {
-      // console.log(data);
       this.form.responsibilityUnit = data.responsibilityUnit;
       this.form.price = data.price;
       this.form.archivesId = data.archivesId;

+ 0 - 1
src/views/materialManagement/materialRegistration/index.vue

@@ -591,7 +591,6 @@ export default {
     },
     // 点击物品名称触发
     wuPing(data) {
-      // console.log(data);
       this.form.archivesId = data.id;
       this.form.materialXh = data.materialXh;
       this.form.responsibilityUnit = data.responsibilityUnit;

+ 0 - 1
src/views/materialManagement/propertyChange/index.vue

@@ -508,7 +508,6 @@ export default {
   methods: {
     // 物品名称触发
     wuPing(data) {
-      // console.log(data);
       this.form.beforeUnitName = data.responsibilityUnit;
       this.form.beforeUnitId = data.unitId;
       this.form.beforePeopleName = data.personLiable;

+ 0 - 1
src/views/medicalhealth/antiepidemicguoqi/index.vue

@@ -415,7 +415,6 @@ export default {
           cancelButtonText: "取消",
         })
         .then(() => {
-          // console.log(this.form);
           this.form.state = "1";
           updateAntiepidemicputin(this.form).then((response) => {
             this.$modal.msgSuccess("销毁成功");

+ 0 - 1
src/views/medicalhealth/antiepidemiclingyong/index.vue

@@ -554,7 +554,6 @@ export default {
     getTreeselect() {
       getDept().then((response) => {
         this.deptOptions = response.data;
-        // console.log(this.deptOptions);
       });
     },
     // 选择防疫品

+ 1 - 1
src/views/medicalhealth/antiepidemicputin/index.vue

@@ -530,7 +530,7 @@ export default {
             });
           } else {
             this.form.surplus = this.form.putIn;
-            // console.log(this.form);
+
             addAntiepidemicputin(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;

+ 0 - 1
src/views/medicalhealth/antiepidemicruin/index.vue

@@ -342,7 +342,6 @@ export default {
     // 获取防疫品列表
     getFang() {
       listAntiepidemicarchives().then((response) => {
-        // console.log(response);
         this.fangList = response.rows;
       });
     },

+ 0 - 1
src/views/medicalhealth/bdgldurgarchives/index.vue

@@ -427,7 +427,6 @@ export default {
     getTreeselect() {
       getDept().then((response) => {
         this.deptOptions = response.data;
-        // console.log(this.deptOptions);
       });
     },
     /** 查询药品库存档案列表 */

+ 0 - 1
src/views/medicalhealth/bdgldurgguoqi/index.vue

@@ -369,7 +369,6 @@ export default {
     getList() {
       this.loading = true;
       exportYaoPing(this.queryParams).then((response) => {
-        // console.log(response);
         this.bdgldurgputinList = response.rows;
         this.total = response.total;
         this.loading = false;

+ 0 - 2
src/views/medicalhealth/bdgldurglingyong/index.vue

@@ -566,14 +566,12 @@ export default {
     getYaoPing() {
       exportYao().then((response) => {
         this.yaoList = response.data;
-        // console.log(response.data);
       });
     },
     /** 查询药品出库登记列表 */
     getList() {
       this.loading = true;
       listBdgldurgputout(this.queryParams).then((response) => {
-        // console.log(response);
         this.bdgldurgputoutList = response.rows;
         this.total = response.total;
         this.loading = false;

+ 1 - 1
src/views/medicalhealth/bdgldurgputin/index.vue

@@ -420,7 +420,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      // console.log(id);
+
       getBdgldurgputin(id).then((response) => {
         this.form = response.data;
         this.getYaoPing();

+ 0 - 1
src/views/medicalhealth/bdgldurgputout/index.vue

@@ -536,7 +536,6 @@ export default {
     },
     // 新增选择单位触发
     selectPeo(val) {
-      // console.log(val);
       this.form.unitId1 = val.id;
       this.form.unitName1 = val.label;
       // 选中单位触发获取人员

+ 0 - 1
src/views/medicalhealth/bdgldurgruin/index.vue

@@ -347,7 +347,6 @@ export default {
     // 获取药品名称
     getYaoPingMingCheng() {
       listBdgldurgarchives().then((response) => {
-        // console.log(response);
         this.yaoList = response.rows;
       });
     },

+ 0 - 1
src/views/medicalhealth/consumelingyong/index.vue

@@ -630,7 +630,6 @@ export default {
     getTreeselect() {
       getDept().then((response) => {
         this.deptOptions = response.data;
-        // console.log(this.deptOptions);
       });
     },
     /** 查询耗材出库登记列表 */

+ 0 - 1
src/views/medicalhealth/consumeputout/index.vue

@@ -643,7 +643,6 @@ export default {
     getTreeselect() {
       getDept().then((response) => {
         this.deptOptions = response.data;
-        // console.log(this.deptOptions);
       });
     },
     /** 查询耗材出库登记列表 */

+ 0 - 1
src/views/medicalhealth/consumeruin/index.vue

@@ -346,7 +346,6 @@ export default {
     // 获取耗材名称列表
     getHaoList() {
       listArchives().then((response) => {
-        // console.log(response);
         this.haoList = response.rows;
       });
     },

+ 0 - 2
src/views/medicalhealth/examine/index.vue

@@ -403,7 +403,6 @@ export default {
     },
     // 点击人员触发
     xingMing(data) {
-      // console.log(data);
       this.classId = data.classId;
       this.job = data.job;
       this.form.peopleName = data.name;
@@ -494,7 +493,6 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            // console.log(this.form);
             updateExamine(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;

+ 0 - 2
src/views/militaryvehicleManagement/thebus/index.vue

@@ -644,7 +644,6 @@ export default {
     getCatPai() {
       getDicts("brand").then((response) => {
         this.brand = response.data;
-        // console.log(this.brand);
       });
     },
     // 重置人员
@@ -683,7 +682,6 @@ export default {
     },
     // 选择车辆人员触发
     cheRen(item) {
-      console.log(item);
       this.form.contactnumber = item.contact;
       this.form.peopleNames = item.peopleName;
     },

+ 1 - 3
src/views/militaryvehicleManagement/thebusAccessLog/index.vue

@@ -340,9 +340,7 @@ export default {
   },
   methods: {
     // 车辆型号触发
-    model(val) {
-      console.log(val);
-    },
+    model(val) {},
     // 重置人员
     ChongZhi() {
       this.form.driverId = null;

+ 0 - 6
src/views/militaryvehicleManagement/thebusApply/index.vue

@@ -1123,7 +1123,6 @@ export default {
                 this.getList();
               });
             } else if (this.form.shenpijiedian == "3") {
-              console.log(1);
               this.form.isTongguo = "0";
               this.form.ojtsYuanyin = this.form.teShuYuanYing;
               this.form.isTeShu = "1";
@@ -1133,7 +1132,6 @@ export default {
                 this.opensTe = false;
               });
             } else if (this.form.shenpijiedian == "4") {
-              console.log(2);
               this.form.isTongguo = "0";
               this.form.tjtsYuanyin = this.form.teShuYuanYing;
               this.form.isTeShu = "1";
@@ -1143,7 +1141,6 @@ export default {
                 this.opensTe = false;
               });
             } else if (this.form.shenpijiedian == "5") {
-              console.log(3);
               this.form.isTongguo = "0";
               this.form.sjtsYuanyin = this.form.teShuYuanYing;
               this.form.isTeShu = "1";
@@ -1232,7 +1229,6 @@ export default {
     // 审批通过
     submitFormShenPi() {
       if (this.form.shenpijiedian == "1") {
-        // console.log("营级");
         this.form.isTongguo = "0";
         if (this.form.id != null) {
           exportThebusYin(this.form).then((response) => {
@@ -1324,7 +1320,6 @@ export default {
     },
     // 审批按钮
     handleShenPi(row) {
-      // console.log(row);
       this.reset();
       this.getTreeList();
       this.getYingJi();
@@ -1354,7 +1349,6 @@ export default {
     // 获取审批模板列表
     getShenPi() {
       listThebusConfig().then((response) => {
-        // console.log();
         this.shenPi = response.rows;
       });
     },

+ 1 - 6
src/views/militaryvehicleManagement/thebusList/index.vue

@@ -587,9 +587,6 @@ export default {
     getDicts("brand").then((response) => {
       this.brand = response.data;
     });
-    // sb().then((response) => {
-    //   console.log(response);
-    // });
   },
   methods: {
     getRen(id) {
@@ -632,9 +629,7 @@ export default {
         }
       });
     },
-    chuche(data) {
-      // console.log(data);
-    },
+    chuche(data) {},
     // 获取搜索所有人
     getSuo() {
       getAll().then((res) => {

+ 10 - 16
src/views/monitoring/camera/index.vue

@@ -544,14 +544,13 @@ export default {
           index + 1,
           this.$route.path.length
         );
-        console.log(str);
+
         // const a = this.$route.path.substring(this.$route.path.lastIndexOf("/"));
         this.getList(str);
       }
     },
     // 初始化视频
     singleplayvideo(name, url, num) {
-      // console.log(name);
       if (flvjs.isSupported()) {
         // debugger;
         name = flvjs.createPlayer(
@@ -585,7 +584,7 @@ export default {
               const end = videoElement1.buffered.end(0); // 视频结尾时间
               const current = videoElement1.currentTime; //  视频当前时间
               const diff = end - current; // 相差时间
-              // console.log(diff);
+
               const diffCritical = 4; // 这里设定了超过4秒以上就进行跳转
               const diffSpeedUp = 1; // 这里设置了超过1秒以上则进行视频加速播放
               const maxPlaybackRate = 4; // 自定义设置允许的最大播放速度
@@ -631,11 +630,10 @@ export default {
           this.destoryVideo(this.flvPlayerList1[0]);
           this.flvPlayerList1.shift();
         }
-        console.log(this.flvPlayerList1, 123456);
+
         this.url1 = this.cameraList[index].caddr;
         this.singleplayvideo("flvPlayer1", this.url1, "");
       } else if (this.btn == 1) {
-        console.log(this.flvPlayerList1, 123456);
         for (var j of this.flvPlayerList1) {
           this.destoryVideo(this.flvPlayerList1[0]);
           this.flvPlayerList1.shift();
@@ -669,7 +667,6 @@ export default {
         this.flvPlayerList1.shift();
       }
       this.oneVideo();
-      // console.log(this.flvPlayerList1)
     },
     // 四分屏播放
     four() {
@@ -678,18 +675,18 @@ export default {
       this.dan = false;
       $("#allvideos").attr({ disabled: "disabled" });
       $("#onevideos").removeAttr("disabled");
-      // console.log("######111######");
+
       for (var i of this.flvPlayerList1) {
         this.destoryVideo(this.flvPlayerList1[0]);
         this.flvPlayerList1.shift();
       }
-      console.log(this.cameraList);
+
       if (this.cameraList.length < this.fourvideo) {
         for (var i = 0; i < this.cameraList.length; i++) {
           this.url1 = this.cameraList[i].caddr;
 
           // 报错原因是这个地址没有视频
-          console.log(this.url1);
+          // console.log(this.url1);
           this.singleplayvideo("flvPlayer" + i, this.url1, i);
         }
       } else {
@@ -706,10 +703,9 @@ export default {
       // debugger
       this.loading = true;
       listCamera({ belongLocal: a }).then((response) => {
-        console.log(response);
         this.cameraList = response.rows;
         this.url1 = this.cameraList[0].caddr;
-        // console.log(this.url1);
+
         this.total = response.total;
         this.loading = false;
         // this.queryParams.type==""
@@ -733,9 +729,7 @@ export default {
       } else {
         try {
           this.createVideo();
-        } catch (e) {
-          console.log(e);
-        }
+        } catch (e) {}
       }
     },
     // 全通道
@@ -747,7 +741,7 @@ export default {
     //     this.destoryVideo(this.flvPlayerList1[0]);
     //     this.flvPlayerList1.shift();
     //   }
-    //   console.log(this.flvPlayerList1);
+    //
     //   for (var i = 0; i < this.sixvideo; i++) {
     //     this.url1 = this.cameraList[i].caddr;
     //     this.singleplayvideo("flvPlayer" + i, this.url1, i);
@@ -890,7 +884,7 @@ export default {
   color: #cccccc;
 }
 .isSubmit {
-  margin-left: 37% !important;
+  margin-left: 46% !important;
   margin-right: 20%;
   margin-bottom: 5px;
   padding-bottom: 5px;

+ 0 - 7
src/views/peopleChuRu/bdglLeave/index.vue

@@ -1465,7 +1465,6 @@ export default {
     },
     // 审批按钮操作
     handleUpdates(row) {
-      console.log(row);
       this.shenPis = row;
       this.statussp = "1";
       this.getBuMeng();
@@ -1568,19 +1567,15 @@ export default {
       if (this.shenPis.shenPiJiBie == "一级") {
         this.form.status1 = 1;
         this.form.contents = "一级审批通过";
-        // console.log("一级");
       } else if (this.shenPis.shenPiJiBie == "二级") {
         this.form.status2 = 1;
         this.form.contents = "二级审批通过";
-        // console.log("二级");
       } else if (this.shenPis.shenPiJiBie == "三级") {
         this.form.status3 = 1;
         this.form.contents = "三级审批通过";
-        // console.log("三级");
       } else if (this.shenPis.shenPiJiBie == "四级") {
         this.form.status4 = 1;
         this.form.contents = "四级审批通过";
-        // console.log("四级");
       }
       updateBdglLeave(this.form).then((response) => {
         this.$modal.msgSuccess("审批成功");
@@ -1648,7 +1643,6 @@ export default {
     TSboHui() {
       this.$refs["forms"].validate((valid) => {
         if (valid) {
-          console.log(this.teShu);
           if (this.teShu.shenPiJiBie == "一级") {
             this.form.status1 = 2;
             this.form.common = "1";
@@ -1738,7 +1732,6 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      console.log(row);
       this.statussp = "0";
       if (
         row.status1 != 0 ||

+ 0 - 1
src/views/peopleChuRu/peopleBorrow/index.vue

@@ -355,7 +355,6 @@ export default {
     },
     // 请假人选中
     jieRen(name, rankId, jobTitle, data) {
-      // console.log(name, rankId, jobTitle);
       this.form.transferPeople = name;
       this.form.rankId = rankId;
       this.form.jobTitle = jobTitle;

+ 0 - 3
src/views/peopleManage/people/index.vue

@@ -1572,7 +1572,6 @@ export default {
       }
     });
     treeselect().then((res) => {
-      console.log(res);
       if (res.code == 200) {
         this.deptOptions = res.data;
       }
@@ -1760,7 +1759,6 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      // console.log(this.form.laborContractUploading)
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.readmeFile) {
@@ -1928,7 +1926,6 @@ export default {
       var myDate = new Date();
       this.form.age = myDate.getFullYear() - this.form.idcard.substr(6, 4);
       listPeople({ idcard: this.form.idcard }).then((response) => {
-        console.log();
         if (response.rows.length > 0) {
           this.form.idcard = null;
           this.form.age = null;

+ 1 - 3
src/views/phone/cabinet/index.vue

@@ -318,7 +318,6 @@ export default {
       this.loading = true;
       const params = this.queryParams;
       xianPhoneOppe(params).then((res) => {
-        console.log(res);
         this.tableData = res.data.infos;
         this.total = res.data.totalCount;
         this.happenTime = res.data.infos[0].happenTime;
@@ -365,7 +364,7 @@ export default {
       this.cabinetNumber = cabinetNum;
       xianPhoneGeZi(this.cabinetNumber).then((res) => {
         this.gridList = res.data.infos;
-        console.log(res.data.infos);
+
         this.gridList.forEach((item) => {
           if (item.gridStateCode == "2") {
             this.red += 1;
@@ -402,7 +401,6 @@ export default {
     /** 查询手机柜列表 */
     getList() {
       xianPhone().then((res) => {
-        // console.log(res);
         this.cabinetList = res.data.infos;
       });
     },

+ 64 - 25
src/views/pt.vue

@@ -31,7 +31,18 @@
       <div class="centen">
         <!-- 左面盒子 -->
         <div class="boxx">
-          <ul class="ul"  v-if="str.includes('admin')||str.includes('基层登记')||str.includes('集中文印')||str.includes('工作安排')||str.includes('规章制度')||str.includes('态势分析')||str.includes('通知公告')">
+          <ul
+            class="ul"
+            v-if="
+              str.includes('admin') ||
+              str.includes('基层登记') ||
+              str.includes('集中文印') ||
+              str.includes('工作安排') ||
+              str.includes('规章制度') ||
+              str.includes('态势分析') ||
+              str.includes('通知公告')
+            "
+          >
             <li v-if="str.includes('基层登记') || str.includes('admin')">
               <div class="demo-box">
                 <div class="demo active" v-on:click="doThis">
@@ -118,11 +129,31 @@
               src="../assets/images/椭圆 513 (2).png"
               class="li-img"
               alt
-             v-if="str.includes('admin')||str.includes('基层登记')||str.includes('集中文印')||str.includes('工作安排')||str.includes('规章制度')||str.includes('态势分析')||str.includes('通知公告')"
+              v-if="
+                str.includes('admin') ||
+                str.includes('基层登记') ||
+                str.includes('集中文印') ||
+                str.includes('工作安排') ||
+                str.includes('规章制度') ||
+                str.includes('态势分析') ||
+                str.includes('通知公告')
+              "
             />
           </ul>
           <!-- <hr /> -->
-          <ul class="ul"  v-if=" str.includes('admin')||str.includes('战备值班')||str.includes('检查督导') ||str.includes('人员进出') || str.includes('安防监控') ||str.includes('门岗管理') ||str.includes('门禁管理')|| str.includes('手机管理')">
+          <ul
+            class="ul"
+            v-if="
+              str.includes('admin') ||
+              str.includes('战备值班') ||
+              str.includes('检查督导') ||
+              str.includes('人员进出') ||
+              str.includes('安防监控') ||
+              str.includes('门岗管理') ||
+              str.includes('门禁管理') ||
+              str.includes('手机管理')
+            "
+          >
             <li v-if="str.includes('战备值班') || str.includes('admin')">
               <div class="demo-box">
                 <div
@@ -225,12 +256,28 @@
               src="../assets/images/椭圆 513 (2).png"
               class="li-img"
               alt
-              v-if=" str.includes('admin')||str.includes('战备值班')||str.includes('检查督导') ||str.includes('人员进出') || str.includes('安防监控') ||str.includes('门岗管理') ||str.includes('门禁管理')|| str.includes('手机管理')"
+              v-if="
+                str.includes('admin') ||
+                str.includes('战备值班') ||
+                str.includes('检查督导') ||
+                str.includes('人员进出') ||
+                str.includes('安防监控') ||
+                str.includes('门岗管理') ||
+                str.includes('门禁管理') ||
+                str.includes('手机管理')
+              "
             />
           </ul>
           <!-- <hr /> -->
-          <ul class="ul" v-if="str.includes('admin')||str.includes('思想政治教育') ||str.includes('人力资源')">
-            <li v-if="str.includes('思想政治教育') || str.includes('admin')">
+          <ul
+            class="ul"
+            v-if="
+              str.includes('admin') ||
+              str.includes('思想政治') ||
+              str.includes('人力资源')
+            "
+          >
+            <li v-if="str.includes('思想政治') || str.includes('admin')">
               <div class="demo-box">
                 <div
                   class="demo active"
@@ -277,7 +324,11 @@
               src="../assets/images/椭圆 513 (2).png"
               class="li-img"
               alt
-              v-if="str.includes('admin')||str.includes('思想政治教育') ||str.includes('人力资源')"
+              v-if="
+                str.includes('admin') ||
+                str.includes('思想政治') ||
+                str.includes('人力资源')
+              "
             />
           </ul>
           <!-- <hr /> -->
@@ -724,7 +775,6 @@ export default {
     this.xianShang();
     getNone().then((res) => {
       this.str = res.msg;
-      console.log(res);
     });
   },
   mounted() {
@@ -733,7 +783,6 @@ export default {
     }
     this.getlist();
     this.getworklist();
-    // console.log(this.$route.params.name)
   },
   methods: {
     // 退出
@@ -767,7 +816,7 @@ export default {
       //   s = "0" + s;
       // }
       // let csrftoken = h + ":" + m + ":" + s;
-      // console.log(csrftoken);
+
       // document.cookie = "tiem" + "=" + new Date();
       axios
         .post("http://114.115.153.156:12090/wl/api/getAccessToken", {
@@ -789,7 +838,7 @@ export default {
     getlist() {
       listNotice().then((res) => {
         this.noticeList = res.data;
-        // console.log(this.noticeList);
+
         this.noticeList.forEach((item) => {
           // var newDate=/\d{4}-\d{1,2}-\d{1,2}/g.exec(item.createTime)
           var a = item.createTime.substring(0, 10).split("-");
@@ -799,7 +848,6 @@ export default {
     },
     getworklist() {
       getWorkTask().then((res) => {
-        // console.log(res);
         this.worklist = res.data;
       });
     },
@@ -960,27 +1008,19 @@ export default {
     },
     showfun() {
       this.open = false;
-      printTriggerClear().then((res) => {
-        // console.log(res)
-      });
+      printTriggerClear().then((res) => {});
     },
     showfun2() {
       this.open2 = false;
-      printTriggerClear().then((res) => {
-        // console.log(res)
-      });
+      printTriggerClear().then((res) => {});
     },
     showfun3() {
       this.open3 = false;
-      printTriggerClear().then((res) => {
-        // console.log(res)
-      });
+      printTriggerClear().then((res) => {});
     },
     showfun4() {
       this.open4 = false;
-      printTriggerClear().then((res) => {
-        // console.log(res)
-      });
+      printTriggerClear().then((res) => {});
     },
     quchulifun() {
       printTriggerClear().then((res) => {
@@ -1086,7 +1126,6 @@ export default {
       this.$router.push({ path: "/system/notice" }).catch(() => {});
     },
     tzggfun(item) {
-      // console.log(item);
       // item.start = 1;
       this.reset();
       this.form = item;

+ 57 - 65
src/views/regulations/fileinfo/index.vue

@@ -132,7 +132,11 @@
             </el-button>
             <el-button size="read" type="text" @click="handleupLoad(scope.row)">
               <span class="chakan1">
-                <a :href="downurl + scope.row.parentDirName" :download="scope.row.fileName">下载</a>
+                <a
+                  :href="downurl + scope.row.parentDirName"
+                  :download="scope.row.fileName"
+                  >下载</a
+                >
               </span>
             </el-button>
             <el-button size="dels" type="text" @click="handledels(scope.row)">
@@ -298,9 +302,11 @@
               <!-- <img src="../../../images/upRow.png" alt="" style="position:absolute;top:18px;right:158px" > -->
               <!-- <img src="../../../images/downRow.png" alt=""  style="position:absolute;top:17px;right:158px"> -->
               本月阅读量
-              <span style="margin-left: 5px" :class="index<3?'green':'red'">{{
-                item.readnumber1
-              }}</span>
+              <span
+                style="margin-left: 5px"
+                :class="index < 3 ? 'green' : 'red'"
+                >{{ item.readnumber1 }}</span
+              >
             </td>
           </tr>
         </table>
@@ -509,7 +515,7 @@
           <!-- <div style="margin-bottom:20px"> -->
           <div style="display: flex">
             <el-button
-              :class="gopage==true?'bg':''"
+              :class="gopage == true ? 'bg' : ''"
               class="gopage"
               :theme="'default'"
               type="submit"
@@ -518,11 +524,19 @@
             >
               上一页</el-button
             >
-            <div style="width: 50px; height: 28px; background: #f4f4f4;text-align:center;line-height:28px">
+            <div
+              style="
+                width: 50px;
+                height: 28px;
+                background: #f4f4f4;
+                text-align: center;
+                line-height: 28px;
+              "
+            >
               {{ pageNum }}/{{ pageTotalNum }}
             </div>
             <el-button
-             :class="gopage==false?'bg':''"
+              :class="gopage == false ? 'bg' : ''"
               :theme="'default'"
               class="downpage"
               type="submit"
@@ -703,9 +717,9 @@ export default {
       // 加载进度
       loadedRatio: 0,
       curPageNum: 0,
-      gopage:true,
+      gopage: true,
       // 多文件上传列表
-      moreFile:[]
+      moreFile: [],
     };
   },
 
@@ -719,7 +733,7 @@ export default {
     // });
     this.RankList();
     $(".app-wrapper").removeClass("openSidebar");
-    console.log($(".app-wrapper"));
+
     $(".app-wrapper").addClass("hideSidebar");
     $(".sidebar-logo-container").removeClass("collapse");
   },
@@ -732,18 +746,17 @@ export default {
      */
     previewPDF(row, index) {
       this.previewDialog = true;
-      console.log("", row, index);
     },
     // 上一页函数,
     prePage() {
-      this.gopage=true
+      this.gopage = true;
       var page = this.pageNum;
       page = page > 1 ? page - 1 : this.pageTotalNum;
       this.pageNum = page;
     },
     // 下一页函数
     nextPage() {
-       this.gopage=false
+      this.gopage = false;
       var page = this.pageNum;
       page = page < this.pageTotalNum ? page + 1 : 1;
       this.pageNum = page;
@@ -770,7 +783,7 @@ export default {
        * 打印界面字符乱码是因为你pdf中使用了自定义字体导致的,谷歌浏览器打印的时候预览界面真的变成了真·方块字 ,解决方案如下:
        * 用文章最后的pdfjsWrapper.js在替换掉node_modules/vue-pdf/src/pdfjsWrapper.js
        */
-      console.log("打印");
+
       this.$refs.pdf.print();
     },
     // 预览弹框
@@ -784,7 +797,6 @@ export default {
     },
     handleSizeChange(val) {},
     handleCurrentChange(val) {
-      // console.log(val)
       this.queryParams.pageNum = val;
       listFileinfo({
         pageNum: this.queryParams.pageNum,
@@ -795,17 +807,15 @@ export default {
         //   item.parentDirName='http://localhost:8089'+item.parentDirName;
 
         // })
-        console.log(1);
+
         this.total = res.total;
       });
     },
     handleCurrentChange1(val) {
-      // console.log(val)
       this.queryParams1.pageNum = val;
-      console.log(this.queryParams1.pageNum);
-      console.log(this.queryParams1.pageSize);
+
       // this.queryParams.common = "1";
-      console.log(this.parentId);
+
       if (this.parentId) {
         this.queryParams1.common = null;
       } else {
@@ -818,7 +828,7 @@ export default {
         common: this.queryParams1.common,
       }).then((res) => {
         this.directory = res.rows;
-        // console.log(this.directory)
+
         this.directory.map((item) => {
           if (item.subclassification != 0) {
             // this.queryParams1.pageNum=1
@@ -828,12 +838,10 @@ export default {
         // this.addbtn=true
         this.total1 = res.total;
         this.loading = false;
-        // console.log(this.directory)
       });
     },
     // 文件删除按钮操作
     handledels(row) {
-      console.log(row);
       this.$modal
         .confirm("是否确认删除该文件")
         .then(function () {
@@ -859,23 +867,19 @@ export default {
       this.queryParams1.common = "1";
       listDirectoryinfo(this.queryParams1).then((res) => {
         this.directory = res.rows;
-        console.log(this.directory);
+
         this.total1 = res.total;
         this.loading = false;
-        // console.log(this.directory);
       });
     },
     // 点击目录根据子目录的数量控制他是否可以点进去进行渲染
     mulus(row) {
-      console.log(row);
       if (row.parentId == 0) {
         this.parentId = row.id;
       } else {
         this.parentId = row.parentId;
       }
 
-      console.log(this.parentId);
-
       // if(this.parentId)
       this.form.directoryId = row.id;
       // 文件
@@ -891,7 +895,7 @@ export default {
         // })
         this.total = res.total;
       });
-      // console.log(row)
+
       // if (row.subclassification == 0) {
       //   this.parentId = "";
       //   return;
@@ -943,8 +947,7 @@ export default {
         //   item.parentDirName='http://localhost:8089'+item.parentDirName;
 
         // })
-        console.log(this.fileinfoList)
-        // console.log(this.fileinfoList);
+
         this.total = response.total;
         this.loading = false;
       });
@@ -1006,10 +1009,8 @@ export default {
     },
     /** 上传文件提交按钮 */
     submitForm() {
-      // console.log(this.form);
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          // console.log(this.form.file[0]);
           // 文件名
           // this.form.fileName = this.form.file[0].name;
           // // 路径
@@ -1022,24 +1023,23 @@ export default {
           // this.form.fileSize = this.form.file[0].fileLength;
           // // 目录名称
           this.form.directoryName = this.form.subclassification;
-          this.form.bdglFileInfos=this.moreFile
-          this.form.bdglFileInfos.forEach((item)=>{
+          this.form.bdglFileInfos = this.moreFile;
+          this.form.bdglFileInfos.forEach((item) => {
             // 文件大小
-            item.fileSize=item.fileLength
+            item.fileSize = item.fileLength;
             // 文件路径
-            item.parentDirName=item.url
+            item.parentDirName = item.url;
             // 文件后缀
-            item.parentDirId=item.houZUI
+            item.parentDirId = item.houZUI;
             // 页数
-            item.theNumberPages=item.pageCount
+            item.theNumberPages = item.pageCount;
             // 文件大小
-            item.fileName=item.name
-
-          })
+            item.fileName = item.name;
+          });
           // this.form.bdglFileInfo[0].directory=this.form.directoryId
           // this.form.bdglFileInfo[0].directoryName=this.form.directoryName
           //输出结果
-          console.log(this.form);
+
           // 上传文件接口
           addFileinfo(this.form).then((response) => {
             this.ListDirectoryinfo();
@@ -1069,7 +1069,6 @@ export default {
     // 添加子分类
     submitForm2() {
       this.$refs["form2"].validate((valid) => {
-        console.log(this.form2);
         if (valid) {
           addDirectoryinfo(this.form2).then((response) => {
             this.$modal.msgSuccess("上传子分类成功");
@@ -1084,8 +1083,7 @@ export default {
     handleDelete(row) {
       const ids = row.id;
       this.parentId = row.parentId;
-      console.log(row.parentId);
-      // console.log(ids);
+
       this.$modal
         .confirm("是否确认删除该文件?")
         .then(function () {
@@ -1101,7 +1099,6 @@ export default {
             pageSize: this.queryParams1.pageSize,
             //  common: this.queryParams1.common,
           }).then((res) => {
-            console.log(res);
             this.directory = res.rows;
             this.total1 = res.total;
 
@@ -1145,7 +1142,7 @@ export default {
       this.reset();
       this.open = true;
       this.title = "上传文件";
-      this.moreFile=""
+      this.moreFile = "";
       this.ListDirectoryinfo();
     },
     // 目录管理
@@ -1157,7 +1154,7 @@ export default {
     ViewProgress(row) {
       // 传入父亲目录id
       this.form2.parentId = row.id;
-      // console.log(this.form2.parentId)
+
       this.open2 = true;
       this.title2 = "请输入子分类名称";
     },
@@ -1171,7 +1168,6 @@ export default {
     },
     // 阅读按钮操作
     ViewRead(row) {
-      console.log(row);
       if (row.parentDirId == ".docx" || row.parentDirId == ".doc") {
         this.open33 = true;
         axios({
@@ -1179,16 +1175,14 @@ export default {
           responseType: "blob", // 设置响应文件格式
           url: process.env.VUE_APP_BASE_API + row.parentDirName,
         }).then(({ data }) => {
-          // console.log(11)
-          console.log(data);
           $(".docx").attr("id", "printArea");
-          // console.log($(".docx"));
+
           docx.renderAsync(data, this.$refs.file); // 渲染到页面预览
         });
       } else if (row.parentDirId == ".pdf") {
         this.previewDialog = true;
         this.pdfurl = process.env.VUE_APP_BASE_API + row.parentDirName;
-        this.pageNum=1
+        this.pageNum = 1;
       }
       row.common = "1";
       updateFileinfo(row).then((res) => {
@@ -1200,19 +1194,17 @@ export default {
       // window.open("www.baidu.com","_self");
     },
     // 下载按钮操作
-    handleupLoad(row) {
-      console.log(row)
-    },
+    handleupLoad(row) {},
   },
 };
 </script>
 
 <style scoped>
-.red{
-  color: #FF4949;
+.red {
+  color: #ff4949;
 }
-.green{
-  color: #13CE66;
+.green {
+  color: #13ce66;
 }
 /* ::v-deep .el-dialog__body{
   overflow: auto !important;
@@ -1232,7 +1224,7 @@ export default {
   padding: 0 !important;
   background: none !important;
 }
-::v-deep .docx{
+::v-deep .docx {
   width: 100% !important;
 }
 ::v-deep .vue-treeselect__placeholder {
@@ -1693,7 +1685,7 @@ body,
   width: 60px;
   height: 28px;
   background: #f4f4f4;
-  color:#60627d;
+  color: #60627d;
   border-radius: 14px 0px 0px 14px;
 }
 /* 下一页样式 */
@@ -1703,8 +1695,8 @@ body,
   background: #f4f4f4;
   border-radius: 0px 14px 14px 0px;
 }
-.bg{
-  background: #1D96FF;
+.bg {
+  background: #1d96ff;
   color: white;
 }
 </style>

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 192 - 192
src/views/taishi/index.vue


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 212 - 246
src/views/taishi/tanshi1.vue


+ 4 - 15
src/views/thought/getready/index.vue

@@ -795,7 +795,6 @@ export default {
     this.treeselect();
     allUser().then((res) => {
       this.rylist = res.rows;
-      // console.log(this.rylist)
     });
   },
   methods: {
@@ -803,9 +802,7 @@ export default {
     unit2Format(row) {
       var deptName = "";
       this.recodeexecutor.map((item) => {
-        // console.log(row.talkPeople)
         row.talkPeople.split(",").forEach((items, index) => {
-          // console.log(item.id,item.name)
           if (item.id == items) {
             deptName += item.name + "  ";
           }
@@ -815,16 +812,12 @@ export default {
     },
     returnExecutor(id, name) {
       // this.form.talkPeople=id
-      // console.log(id)
-      // console.log()
     },
     zuzhiPeople(id) {
-      // console.log(id)
       this.form.createId = id;
     },
     jiluPeople(id) {
       this.form.recorderId = id;
-      // console.log(id)
     },
     // 获取部门数据
     getShuJu(data) {
@@ -849,7 +842,6 @@ export default {
     treeselect() {
       getWeiShu().then((res) => {
         this.deptOptions = res.data;
-        console.log(this.deptOptions);
       });
     },
     //外面树形选择搜索
@@ -866,7 +858,6 @@ export default {
         this.executor = response.rows;
         // 记录人
         this.recodeexecutor = response.rows;
-        // console.log(this.executors);
       });
     },
     // 转义视图不加标签
@@ -938,7 +929,6 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      // console.log(row)
       this.reset();
       const id = row.id || this.ids;
       getGetready(id).then((response) => {
@@ -950,7 +940,6 @@ export default {
     },
     // 查看按钮操作
     handlelook(row) {
-      console.log(row);
       this.reset();
       const id = row.id || this.ids;
       getGetready(id).then((response) => {
@@ -958,7 +947,7 @@ export default {
         this.form1.talkPeople = this.form1.talkPeople.split(",").map(Number);
         this.form1.filePath =
           process.env.VUE_APP_BASE_API + this.form1.filePath;
-        console.log(this.form1);
+
         this.open1 = true;
         this.title1 = "查看教育准备会";
       });
@@ -1398,10 +1387,10 @@ export default {
   color: white !important;
 }
 /* 卡片样式 */
-.app-container{
- height: calc(100vh - 108px) !important;
+.app-container {
+  height: calc(100vh - 108px) !important;
 }
-::v-deep .el-select__input{
+::v-deep .el-select__input {
   color: white;
 }
 </style>

+ 7 - 20
src/views/thought/parliament/index.vue

@@ -735,9 +735,7 @@ export default {
   created() {
     this.getList();
     getDept2().then((res) => {
-      // console.log(res,2)
       this.userss = res.data;
-      // console.log(this.userss);
     });
     this.getSuoYou();
   },
@@ -746,9 +744,7 @@ export default {
     unit2Format(row) {
       var deptName = "";
       this.recodeexecutor.map((item) => {
-        // console.log(row.talkPeople)
         row.participants.split(",").forEach((items, index) => {
-          // console.log(item.id,item.name)
           if (item.id == items) {
             deptName += item.name + "  ";
           }
@@ -757,12 +753,10 @@ export default {
       return deptName;
     },
     zuzhiPeople(id) {
-      // console.log(id)
       this.form.organizerId = id;
     },
     jiluPeople(id) {
       this.form.recorderId = id;
-      // console.log(id)
     },
     // 获取所有人员
     getSuoYou() {
@@ -772,7 +766,6 @@ export default {
         this.executor = response.rows;
         // 记录人
         this.recodeexecutor = response.rows;
-        // console.log(this.executors);
       });
     },
     // 转义视图不加标签
@@ -785,26 +778,24 @@ export default {
       }
     },
     selectPeo(val) {
-      // console.log(val)
       this.queryParams.unitName = val.label;
       this.getList();
     },
     // 到访单位选中触发
     selectPeo1(val) {
-      // console.log(val)
       this.unitName = val.label;
       this.form.unitId = val.id;
-      // console.log(this.unitName)
+
       // 获取执行单位列表
       // getDept2().then((res) => {
-      //   // console.log(res,2)
+
       //   this.users = res.data;
-      //   // console.log(this.users);
+
       // });
       // this.queryParams.unitId = val.id;
       // this.queryParams.peopleName = "";
       // this.queryParams.unitName = val.label;
-      // // console.log(this.queryParams);
+
       // this.getZhuChi(this.queryParams.unitId);
       // this.getList();
     },
@@ -871,9 +862,7 @@ export default {
       this.open = true;
       this.title = "添加党委议教会";
       getDept2().then((res) => {
-        // console.log(res,2)
         this.users = res.data;
-        // console.log(this.users);
       });
     },
     /** 修改按钮操作 */
@@ -889,7 +878,6 @@ export default {
     },
     // 查看按钮操作
     handlelook(row) {
-      console.log(row);
       this.reset();
       const id = row.id || this.ids;
       getParliament(id).then((response) => {
@@ -899,7 +887,7 @@ export default {
           .map(Number);
         this.form1.filePath =
           process.env.VUE_APP_BASE_API + this.form1.filePath;
-        console.log(this.form1);
+
         this.open1 = true;
         this.title1 = "查看党委议教会";
       });
@@ -911,10 +899,9 @@ export default {
         this.form.fileName = this.form.fileName[0].name;
       }
 
-      // console.log(this.form)
       this.form.participants = this.form.participants.join(",");
       this.form.participantsId = this.form.participants;
-      // console.log(this.form)
+
       this.form.unitName = this.unitName;
       this.$refs["form"].validate((valid) => {
         if (valid) {
@@ -1178,7 +1165,7 @@ export default {
   color: white;
   text-indent: 0.5em;
 }
-::v-deep .el-select__input{
+::v-deep .el-select__input {
   color: white;
 }
 </style>

+ 2 - 3
src/views/thought/responses/index.vue

@@ -795,7 +795,6 @@ export default {
     // 获取部门数据
     getShuJu() {
       Exhibition().then((res) => {
-        console.log(res, 1);
         this.registrationData = res.data;
         this.cg = res.data[0];
         this.sb = res.data[1];
@@ -808,7 +807,7 @@ export default {
     submitForm1() {
       if (this.form.id != null) {
         this.form.state = "2";
-        // console.log(this.form);
+
         updateResponses(this.form).then((response) => {
           this.$modal.msgSuccess("审批成功");
           this.open2 = false;
@@ -822,7 +821,7 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             this.form.state = "3";
-            // console.log(this.form);
+
             updateResponses(this.form).then((response) => {
               this.$modal.msgSuccess("审批成功");
               this.open2 = false;

+ 2 - 10
src/views/thought/talk/index.vue

@@ -730,7 +730,6 @@ export default {
     unit2Format(row) {
       var deptName = "";
       this.getdeptList.map((item) => {
-        // console.log(item)
         // if(ite)
         if (item.deptId == row.unitId) {
           deptName = item.deptName;
@@ -749,11 +748,9 @@ export default {
     },
     peopleIds(item) {
       this.form.talkObjectId = item.id;
-      // console.log(item);
     },
     // 选中单位
     selectPeo(val) {
-      // console.log(val);
       this.form.talkObject = "";
       this.form.unitId = val.id;
       // this.unitName = val.label;
@@ -762,12 +759,11 @@ export default {
     },
     // 获取执行人
     getZhuChi(id) {
-      // console.log(id)
       deptUser(id).then((res) => {
         // 谈心对象
         this.tanxinexecutor = res.data;
         // this.executors = res.data;
-        // console.log(this.executor)
+
         // this.form.unitName=this.executor
       });
     },
@@ -779,16 +775,13 @@ export default {
         // this.executor = response.rows;
         // 记录人
         this.recodeexecutor = response.rows;
-        // console.log(this.executors);
       });
     },
     zuzhiPeople(id) {
-      // console.log(id)
       this.form.talkPeopleId = id;
     },
     jiluPeople(id) {
       this.form.recorderId = id;
-      // console.log(id)
     },
     // 获取部门数据
     getShuJu(data) {
@@ -893,7 +886,6 @@ export default {
     },
     // 查看按钮操作
     handlelook(row) {
-      console.log(row);
       this.reset();
       const id = row.id || this.ids;
       getTalk(id).then((response) => {
@@ -911,7 +903,7 @@ export default {
         this.form.fileName = this.form.fileName[0].name;
       }
       this.form.unitName = this.form.unitId;
-      // console.log(this.form);
+
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {

+ 27 - 30
src/views/thought/teacher/index.vue

@@ -132,7 +132,7 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          v-if="this.level==1"
+          v-if="this.level == 1"
           plain
           icon="el-icon-plus"
           size="mini"
@@ -153,7 +153,7 @@
         >修改</el-button>
       </el-col> -->
       <!-- <el-col :span="1.5"> -->
-        <!-- <el-button
+      <!-- <el-button
           type="danger"
           plain
           icon="el-icon-delete"
@@ -175,7 +175,10 @@
         >
       </el-col> -->
       <el-col :span="1.5">
-        <el-button class="turnback" @click.native="turnback" v-if="this.level!=1"
+        <el-button
+          class="turnback"
+          @click.native="turnback"
+          v-if="this.level != 1"
           >返回上级</el-button
         >
       </el-col>
@@ -381,7 +384,7 @@ import {
   updateTeacher,
   exportTeacher,
   listtree,
-  listTeachers
+  listTeachers,
 } from "@/api/thought/teacher";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -469,7 +472,7 @@ export default {
       // 子分类数量
       subclassification: "",
       // 父目录id
-      fatherparentId:""
+      fatherparentId: "",
     };
   },
   created() {
@@ -477,8 +480,7 @@ export default {
   },
   methods: {
     // 点击目录
-    mulus(row) {   
-      console.log(this.fatherparentId)
+    mulus(row) {
       this.parentId = row.id;
       this.parentDirectory = row.parentDirectory;
       this.subclassification = row.subclassification;
@@ -486,9 +488,9 @@ export default {
         return;
       } else {
         this.level += 1;
-         this.fatherparentId=row.id
-        console.log(this.level)
-        this.loading=true
+        this.fatherparentId = row.id;
+
+        this.loading = true;
         this.getLists();
       }
     },
@@ -506,7 +508,6 @@ export default {
     },
     // 返回上级
     turnback(row) {
-      console.log(this.fatherparentId)
       if (this.level == 1) {
         this.level == 1;
         return;
@@ -519,11 +520,10 @@ export default {
           level: this.level,
           pageNum: this.queryParams.pageNum,
           pageSize: this.queryParams.pageSize,
-          
         }).then((res) => {
           this.teacherList = res.rows;
-          // console.log(res.rows)
-          this.fatherparentId=res.rows[0].parentId
+
+          this.fatherparentId = res.rows[0].parentId;
           this.total = res.total;
           this.loading = false;
         });
@@ -533,12 +533,11 @@ export default {
           level: this.level,
           pageNum: this.queryParams.pageNum,
           pageSize: this.queryParams.pageSize,
-          parentId:this.fatherparentId
+          parentId: this.fatherparentId,
         }).then((res) => {
-          console.log(res);
           this.teacherList = res.rows;
-          this.fatherparentId=res.rows[0].parentId
-         console.log(this.fatherparentId)
+          this.fatherparentId = res.rows[0].parentId;
+
           this.total = res.total;
           this.loading = false;
         });
@@ -546,7 +545,6 @@ export default {
     },
     // 添加子目录
     ViewProgress(row) {
-      console.log(row);
       // 传入父亲目录id
       this.form2.parentId = row.id;
       this.form2.parentDirectory = row.parentDirectory;
@@ -554,7 +552,7 @@ export default {
       this.levels = (parseInt(row.level) + 1).toString();
       this.level = this.levels;
       this.parentIdss = row.id;
-      this.fatherparentId=row.id
+      this.fatherparentId = row.id;
       this.open2 = true;
       this.title2 = "添加子分类";
     },
@@ -577,7 +575,7 @@ export default {
       } else {
         listTeacher(this.queryParams).then((response) => {
           this.teacherList = response.rows;
-          console.log(this.teacherList)
+
           this.total = response.total;
           this.loading = false;
         });
@@ -664,7 +662,6 @@ export default {
     // 添加子分类
     submitForm2() {
       this.$refs["form2"].validate((valid) => {
-        console.log(this.form2);
         if (valid) {
           addTeacher(this.form2).then((response) => {
             this.$modal.msgSuccess("上传子分类成功");
@@ -689,21 +686,21 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      console.log(this.level)
+
       this.$modal
         .confirm("是否确认删除?")
         .then(function () {
           return delTeacher(ids);
         })
         .then(() => {
-          if(row.level==1){
-            row.parentDirectory=null
+          if (row.level == 1) {
+            row.parentDirectory = null;
           }
-          
+
           // if(row.pageX){
           //   row.parentId=0
           //   row.parentDirectory=""
-          //   console.log(this.level)
+
           //   row.level=this.level
           //   this.level=this.level
           // }
@@ -721,7 +718,7 @@ export default {
             } else {
               this.dellevel = (parseInt(row.level) - 1).toString();
               this.level = this.dellevel;
-              console.log(this.level)
+
               listTeacher({
                 parentDirectory: row.parentDirectory,
                 level: this.dellevel,
@@ -904,11 +901,11 @@ export default {
   color: #00f0ff;
   cursor: pointer;
 }
-::v-deep .el-input__suffix{
+::v-deep .el-input__suffix {
   right: 10px;
 }
 /* 树形样式 */
-.vue-treeselect__control{
+.vue-treeselect__control {
   background-color: #003156 !important;
 }
 </style>

+ 77 - 92
src/views/thought/teacherFile/index.vue

@@ -132,7 +132,11 @@
             </el-button>
             <el-button size="read" type="text" @click="handleupLoad(scope.row)">
               <span class="chakan1">
-                <a :href="downurl + scope.row.parentDirName" :download="scope.row.fileName">下载</a>
+                <a
+                  :href="downurl + scope.row.parentDirName"
+                  :download="scope.row.fileName"
+                  >下载</a
+                >
               </span>
             </el-button>
             <el-button size="dels" type="text" @click="handledels(scope.row)">
@@ -310,34 +314,35 @@
             </tr> -->
           </thead>
           <tbody>
-          <tr
-            class="borderBottom"
-            v-for="(item, index) in Ranking"
-            :key="item.id"
-          >
-            <!-- 作战类 documentCategory -->
-            <!-- 上月阅读量 readnumber1 -->
-            <!-- 本月阅读量 readnumber2 -->
-            <!-- 排序 -->
-            <td class="numbers">{{ index + 1 }}</td>
-            <!-- 作战类类别 -->
-            <td class="find">{{ item.directoryName }}</td>
-            <!-- 文件名 -->
-            <td class="thisweek" style="position: relative">
-              <!-- <img src="../../../images/upRow.png" alt="" style="position:absolute;top:18px;right:158px" > -->
-              <!-- <img src="../../../images/downRow.png" alt=""  style="position:absolute;top:17px;right:158px"> -->
-            
-              <span style="margin-left: 5px">{{
-                item.fileName
-              }}</span>
-            </td>
-            <!-- 阅读量 -->
-            <td class="readnumber">
-              阅读量
-              <span style="margin-left: 5px;" :class="index<3?'green':'red'">{{ item.readVolume }}</span>
-            </td>
-            
-          </tr>
+            <tr
+              class="borderBottom"
+              v-for="(item, index) in Ranking"
+              :key="item.id"
+            >
+              <!-- 作战类 documentCategory -->
+              <!-- 上月阅读量 readnumber1 -->
+              <!-- 本月阅读量 readnumber2 -->
+              <!-- 排序 -->
+              <td class="numbers">{{ index + 1 }}</td>
+              <!-- 作战类类别 -->
+              <td class="find">{{ item.directoryName }}</td>
+              <!-- 文件名 -->
+              <td class="thisweek" style="position: relative">
+                <!-- <img src="../../../images/upRow.png" alt="" style="position:absolute;top:18px;right:158px" > -->
+                <!-- <img src="../../../images/downRow.png" alt=""  style="position:absolute;top:17px;right:158px"> -->
+
+                <span style="margin-left: 5px">{{ item.fileName }}</span>
+              </td>
+              <!-- 阅读量 -->
+              <td class="readnumber">
+                阅读量
+                <span
+                  style="margin-left: 5px"
+                  :class="index < 3 ? 'green' : 'red'"
+                  >{{ item.readVolume }}</span
+                >
+              </td>
+            </tr>
           </tbody>
         </table>
       </div>
@@ -467,7 +472,7 @@ import {
   exportTeacherFile,
   listmulu,
   listread,
-  rankList
+  rankList,
 } from "@/api/thought/teacherFile";
 import {
   // 查询目录列表接口
@@ -619,16 +624,13 @@ export default {
 
       dir: "",
       // 多文件上传
-      moreFile:[]
+      moreFile: [],
     };
   },
   created() {
     // 获取执行单位列表
     listmulu({ parentId: 0 }).then((res) => {
-      // console.log(res,2)
-
       this.users = res.rows;
-      console.log(this.users);
     });
 
     this.getList();
@@ -637,11 +639,11 @@ export default {
     // 获取排行目录接口
     // rankList().then((res) => {
     //   this.Ranking = res.data;
-    //   console.log(this.RankList)
+
     // });
     this.RankList();
     $(".app-wrapper").addClass("openSidebar");
-    console.log($(".app-wrapper"));
+
     $(".app-wrapper").removeClass("hideSidebar");
     $(".sidebar-logo-container").addClass("collapse");
   },
@@ -653,14 +655,12 @@ export default {
     selectPeo1(row) {
       this.dir = row.directory;
       this.form.directoryId = row.id;
-      console.log(this.dir);
     },
     /**
      * 预览PDF
      */
     previewPDF(row, index) {
       this.previewDialog = true;
-      console.log("", row, index);
     },
     // 上一页函数,
     prePage() {
@@ -698,7 +698,7 @@ export default {
        * 打印界面字符乱码是因为你pdf中使用了自定义字体导致的,谷歌浏览器打印的时候预览界面真的变成了真·方块字 ,解决方案如下:
        * 用文章最后的pdfjsWrapper.js在替换掉node_modules/vue-pdf/src/pdfjsWrapper.js
        */
-      console.log("打印");
+
       this.$refs.pdf.print();
     },
     // 预览弹框
@@ -708,12 +708,10 @@ export default {
     RankList() {
       rankList().then((res) => {
         this.Ranking = res.data;
-        console.log(this.Ranking)
       });
     },
     handleSizeChange(val) {},
     handleCurrentChange(val) {
-      // console.log(val)
       this.queryParams.pageNum = val;
       listTeacherFile({
         pageNum: this.queryParams.pageNum,
@@ -724,16 +722,15 @@ export default {
       });
     },
     handleCurrentChange1(val) {
-      // console.log(val)
       this.queryParams1.pageNum = val;
       // this.queryParams.common = "1";
-      // console.log(this.parentId);
+
       // if (this.parentId) {
       //   this.queryParams1.common = null;
       // } else {
       //   this.queryParams1.common = "1";
       // }
-      console.log(this.parentId);
+
       if (this.level == 1) {
         listTeacher({
           level: this.level,
@@ -742,7 +739,7 @@ export default {
           pageSize: this.queryParams1.pageSize,
         }).then((res) => {
           this.teacherList = res.rows;
-          // console.log(this.directory)
+
           this.teacherList.map((item) => {
             if (item.subclassification != 0) {
               // this.queryParams1.pageNum=1
@@ -762,7 +759,7 @@ export default {
           pageSize: this.queryParams1.pageSize,
         }).then((res) => {
           this.teacherList = res.rows;
-          // console.log(this.directory)
+
           this.teacherList.map((item) => {
             if (item.subclassification != 0) {
               // this.queryParams1.pageNum=1
@@ -777,7 +774,6 @@ export default {
     },
     // 文件删除按钮操作
     handledels(row) {
-      console.log(row);
       this.$modal
         .confirm("是否确认删除该文件")
         .then(function () {
@@ -800,8 +796,7 @@ export default {
       this.loading = true;
       this.queryParams1.parentId = 0;
       if (this.level != 1) {
-
-        listTeacher({ 
+        listTeacher({
           parentDirectory: this.parentDirectory,
           level: this.level,
           pageNum: this.queryParams1.pageNum,
@@ -822,7 +817,7 @@ export default {
     // 点击目录
     mulus(row) {
       this.parentId = row.id;
-      console.log(row.id);
+
       this.parentDirectory = row.parentDirectory;
       this.subclassification = row.subclassification;
       // 文件
@@ -831,7 +826,6 @@ export default {
         pageNum: this.queryParams.pageNum,
         pageSize: this.queryParams.pageSize,
       }).then((res) => {
-        console.log(res);
         this.fileinfoList = res.rows;
         this.total = res.total;
       });
@@ -840,7 +834,7 @@ export default {
       } else {
         this.level += 1;
         this.fatherparentId = row.id;
-        console.log(this.level);
+
         this.loading = true;
         this.getLists();
       }
@@ -866,16 +860,15 @@ export default {
         this.level -= 1;
       }
       // this.loading=true
-      // console.log(this.parentId);
+
       if (this.level == 1) {
         listTeachers({
           level: this.level,
           pageNum: this.queryParams1.pageNum,
           pageSize: this.queryParams1.pageSize,
         }).then((res) => {
-          console.log(res);
           this.teacherList = res.rows;
-          // console.log(res.rows)
+
           this.fatherparentId = res.rows[0].parentId;
           this.total1 = res.total;
           this.loading = false;
@@ -888,10 +881,9 @@ export default {
           pageSize: this.queryParams1.pageSize,
           parentId: this.fatherparentId,
         }).then((res) => {
-          console.log(res);
           this.teacherList = res.rows;
           this.fatherparentId = res.rows[0].parentId;
-          console.log(this.fatherparentId);
+
           this.total1 = res.total;
           this.loading = false;
         });
@@ -973,25 +965,24 @@ export default {
     /** 上传文件提交按钮 */
     submitForm() {
       this.form.directoryName = this.dir;
-      // console.log(this.form);
-      // console.log(this.form.directoryName);
+
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          this.form.thoughtTeacherFiles=this.moreFile
-          console.log(this.form)
-          this.form.thoughtTeacherFiles.forEach((item)=>{
+          this.form.thoughtTeacherFiles = this.moreFile;
+
+          this.form.thoughtTeacherFiles.forEach((item) => {
             // 文件大小
-            item.fileSize=item.fileLength
+            item.fileSize = item.fileLength;
             // 文件路径
-            item.parentDirName=item.url
+            item.parentDirName = item.url;
             // 文件后缀
-            item.parentDirId=item.houZUI
+            item.parentDirId = item.houZUI;
             // 页数
-            item.theNumberPages=item.pageCount
+            item.theNumberPages = item.pageCount;
             // 文件名称
-            item.fileName=item.name
-          })
-          // console.log(this.form)
+            item.fileName = item.name;
+          });
+
           //输出结果
           // 上传文件接口
           addTeacherFile(this.form).then((response) => {
@@ -999,7 +990,7 @@ export default {
             this.$modal.msgSuccess("上传成功");
             this.open = false;
             this.getList();
-            this.RankList()
+            this.RankList();
           });
         }
       });
@@ -1008,17 +999,16 @@ export default {
     handleDelete(row) {
       const ids = row.id;
       this.parentId = row.parentId;
-      console.log(row.parentId);
-      // console.log(ids);
+
       this.$modal
         .confirm("是否确认删除该文件?")
         .then(function () {
           return delDirectoryinfo(ids);
-        }).then(()=>{
-           this.getList()
         })
         .then(() => {
-         
+          this.getList();
+        })
+        .then(() => {
           // this.loading = true;
           // listTeacherFile(this.queryParams).then((response) => {
           //   this.fileinfoList = response.rows;
@@ -1031,7 +1021,6 @@ export default {
             pageSize: this.queryParams1.pageSize,
             //  common: this.queryParams1.common,
           }).then((res) => {
-            console.log(res);
             this.directory = res.rows;
             this.total1 = res.total;
 
@@ -1087,7 +1076,7 @@ export default {
     ViewProgress(row) {
       // 传入父亲目录id
       this.form2.parentId = row.id;
-      // console.log(this.form2.parentId)
+
       this.open2 = true;
       this.title2 = "请输入子分类名称";
     },
@@ -1101,7 +1090,6 @@ export default {
     },
     // 阅读按钮操作
     ViewRead(row) {
-      console.log(row);
       if (row.parentDirId == ".docx" || row.parentDirId == ".doc") {
         this.open33 = true;
         axios({
@@ -1109,19 +1097,16 @@ export default {
           responseType: "blob", // 设置响应文件格式
           url: process.env.VUE_APP_BASE_API + row.parentDirName,
         }).then(({ data }) => {
-          // console.log(11)
-          console.log(data);
           $(".docx").attr("id", "printArea");
-          // console.log($(".docx"));
+
           docx.renderAsync(data, this.$refs.file); // 渲染到页面预览
         });
       } else if (row.parentDirId == ".pdf") {
-        this.pageNum=1
+        this.pageNum = 1;
         this.previewDialog = true;
         this.pdfurl = process.env.VUE_APP_BASE_API + row.parentDirName;
       }
       listread(row).then((res) => {
-        console.log(res)
         this.getList();
         rankList().then((res) => {
           this.Ranking = res.data;
@@ -1154,13 +1139,13 @@ export default {
   padding: 0 !important;
   background: none !important;
 }
-.red{
-  color: #FF4949;
+.red {
+  color: #ff4949;
 }
-.green{
-  color: #13CE66;
+.green {
+  color: #13ce66;
 }
-::v-deep .upload-file-list .el-upload-list__item{
+::v-deep .upload-file-list .el-upload-list__item {
   margin-left: -30px !important;
 }
 ::v-deep .vue-treeselect__placeholder {
@@ -1431,7 +1416,7 @@ table {
   color: white;
   text-indent: 0.5em;
 }
-::v-deep .el-upload-list__item a .el-link--inner{
+::v-deep .el-upload-list__item a .el-link--inner {
   padding: 8px;
   line-height: 10px;
 }
@@ -1654,14 +1639,14 @@ body,
 ::v-deep .vue-treeselect__single-value {
   color: white;
 }
-::v-deep .docx{
+::v-deep .docx {
   width: 100% !important;
 }
 /* 上传文件弹框样式 */
-::v-deep #uploadfile .el-dialog__body{
+::v-deep #uploadfile .el-dialog__body {
   padding: 30px 62px !important;
 }
-::v-deep .el-upload-list__item{
+::v-deep .el-upload-list__item {
   width: 350px;
 }
 </style>

+ 2 - 3
src/views/thought/thoughtPlan/index.vue

@@ -912,7 +912,6 @@ export default {
     // 获取登录信息
     getUser() {
       getUserProfile().then((response) => {
-        console.log(response.data);
         this.user = response.data;
         this.unitId = response.data.deptId;
         this.queryParams.unitId = this.unitId;
@@ -936,7 +935,7 @@ export default {
       this.form.planResponsefus = this.planResponsefus;
       this.form.responseContents = this.checkShop;
       this.thoughtPlanResponses = this.form;
-      // console.log(this.thoughtPlanResponses);
+
       JXxiangYingXiangYing(this.thoughtPlanResponses).then((response) => {
         this.$modal.msgSuccess("响应成功");
         this.open1 = false;
@@ -1006,7 +1005,7 @@ export default {
         this.form.responseContents = this.checkShop;
         this.form.planResponsefus = this.planResponsefus;
         this.thoughtPlanResponses = this.form;
-        console.log(this.form);
+
         xiangYing(this.thoughtPlanResponses).then((response) => {
           this.$modal.msgSuccess("响应成功");
           this.open1 = false;

+ 8 - 19
src/views/thought/weekjob/index.vue

@@ -937,9 +937,7 @@ export default {
     this.getSuoYou();
     // 获取执行单位列表
     getDept2().then((res) => {
-      // console.log(res,2)
       this.users = res.data;
-      console.log(this.users);
     });
     // 获取部门列表
     getDeptList().then((res) => {
@@ -950,10 +948,8 @@ export default {
     unit2Format(row) {
       var deptName = "";
       this.getdeptList.map((item) => {
-        // console.log(item)
         // if(ite)
         if (item.deptId == row.unitId) {
-          // console.log(item.deptName);
           deptName = item.deptName;
         }
       });
@@ -1002,13 +998,11 @@ export default {
 
     // 军事长官id
     zuzhiPeople(id) {
-      // console.log(id)
       this.form.militaryOfficerId = id;
     },
     // 政治长官id
     jiluPeople(id) {
       this.form.politicalOfficerId = id;
-      // console.log(id)
     },
     // 获取所有人员
     getSuoYou() {
@@ -1019,12 +1013,10 @@ export default {
         this.zhengzhiexecutor = response.rows;
         // // 记录人
         // this.recodeexecutor=response.rows
-        // console.log(this.executors);
       });
     },
     // 选中单位
     selectPeo(val) {
-      // console.log(val);
       this.form.dutyLeader = "";
       this.form.unitId = val.id;
       // this.unitName = val.label;
@@ -1034,17 +1026,16 @@ export default {
     // 获取电话
     peopleIds(item) {
       this.form.dutyLeaderId = item.id;
-      // console.log(item);
+
       this.form.phone = item.phone;
     },
     // 获取执行人
     getZhuChi(id) {
-      // console.log(id)
       deptUser(id).then((res) => {
         // 连值班领导
         this.executor = res.data;
         this.executors = res.data;
-        // console.log(this.executor)
+
         // this.form.unitName=this.executor
       });
     },
@@ -1052,7 +1043,6 @@ export default {
     treeselect() {
       getWeiShu().then((res) => {
         this.deptOptions = res.data;
-        // console.log(this.deptOptions);
       });
     },
     //外面树形选择搜索
@@ -1065,7 +1055,7 @@ export default {
       this.loading = true;
       listWeekjob(this.queryParams).then((response) => {
         this.weekjobList = response.rows;
-        console.log(this.weekjobList);
+
         this.total = response.total;
         this.loading = false;
       });
@@ -1139,13 +1129,12 @@ export default {
         this.form = response.data;
         this.form.unitName = this.form.unitName;
         this.tomList = this.form.thoughtWeekjobFuList;
-        console.log(this.form);
+
         this.open = true;
         this.title = "修改周工作";
       });
     },
     handlelook(row) {
-      console.log(row);
       this.reset();
       const id = row.id || this.ids;
       getWeekjob(id).then((response) => {
@@ -1158,11 +1147,11 @@ export default {
     /** 提交按钮 */
     submitForm() {
       this.form.unitName = this.form.unitId;
-      // console.log(this.tomList)
+
       if (this.tomList) {
         this.form.thoughtWeekjobFuList = this.tomList;
       }
-      console.log(this.form);
+
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
@@ -1605,7 +1594,7 @@ export default {
   background-repeat: no-repeat;
 }
 /* 卡片样式 */
-.app-container{
- height: calc(100vh - 108px) !important;
+.app-container {
+  height: calc(100vh - 108px) !important;
 }
 </style>

+ 7 - 32
src/views/workingArrangements/planTask/index.vue

@@ -872,9 +872,7 @@ export default {
       this.rylist = res.rows;
     });
     getDept2().then((res) => {
-      console.log(res);
       this.users = res.data;
-      // console.log(this.users)
     });
 
     getDeptList().then((res) => {
@@ -895,7 +893,6 @@ export default {
         return;
       } else {
         this.Progress.statu = this.Progress.comPlan;
-        console.log("输入成功");
       }
     },
     // 获取执行人
@@ -936,7 +933,6 @@ export default {
     // 查询计划类型
     getdict() {
       getDicts(this.dictType.dictType).then((res) => {
-        console.log(res);
         this.ziDian = res.data;
       });
     },
@@ -945,7 +941,7 @@ export default {
       this.loading = true;
       listPlanTask(this.queryParams).then((response) => {
         this.planTaskList = response.rows;
-        // console.log(this.planTaskList);
+
         this.total = response.total;
         this.loading = false;
       });
@@ -995,7 +991,6 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      console.log(this.queryParams);
       this.queryParams.pageNum = 1;
       this.getList();
     },
@@ -1011,7 +1006,6 @@ export default {
       this.ids = selection.map((item) => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
-      console.log(this.multiple);
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -1047,9 +1041,7 @@ export default {
       this.form.startTime = y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
       // 获取执行单位列表
       getDept2().then((res) => {
-        // console.log(res,2)
         this.users = res.data;
-        console.log(this.users);
       });
       this.getdict();
     },
@@ -1060,13 +1052,11 @@ export default {
       this.title = "进度录入";
       this.jinduId = row.id;
       singProgress(this.jinduId).then((res) => {
-        console.log(res.data);
         this.Progress.id = res.data.planProgress.id;
         this.Progress.taskId = res.data.id;
         this.Progress.planProgress = res.data.planProgress.schedule;
         this.Progress.peopleId = res.data.workProgress.peopleId;
         // this.Progress.fileName = res.data.fileName;
-        console.log(this.Progress.planProgress.schedule);
       });
     },
     // 进度查看单人进度
@@ -1076,11 +1066,10 @@ export default {
       this.title = "进度查看";
       // 获取当前行的id
       singProgress(row.id).then((res) => {
-        console.log(res);
         this.singleTable = res.data;
         this.singleTable.planProgresses =
           this.singleTable.planProgress.schedule;
-        console.log(this.singleTable);
+
         this.singleTable.peopleName = res.data.peopleName
           .split(",")
           .map(Number);
@@ -1088,7 +1077,6 @@ export default {
           process.env.VUE_APP_BASE_API + this.singleTable.file;
         this.getZhuChi(res.data.unitId);
         // this.singleTable.jindu=singleTable.planProgress.schedule
-        // console.log(this.singleTable)
       });
     },
     // 多人进度查看
@@ -1097,10 +1085,8 @@ export default {
       this.open3 = true;
       this.title = "进度查看";
       // 获取当前行的id
-      // console.log(row.id)
 
       moreProgress(row.id).then((res) => {
-        console.log(res);
         this.comstatus = 0;
         this.moreTable = res.data;
         this.moreTable.planProgresses.map((item) => {
@@ -1118,9 +1104,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       getDept2().then((res) => {
-        // console.log(res,2)
         this.users = res.data;
-        console.log(this.users);
       });
       const id = row.id || this.ids;
       getPlanTask(id).then((response) => {
@@ -1165,19 +1149,16 @@ export default {
       ) {
         this.getdeptList.map((item) => {
           if (item.deptId == row.adminId) {
-            console.log(item.deptName);
             deptName = item.deptName;
           }
         });
       } else if (parseInt(this.planTaskList[0].common) == 0) {
         this.getdeptList.map((item) => {
-          console.log(item);
           if (item.deptId == row.adminId) {
             deptName = item.deptName;
           }
         });
-        // console.log(this.part)
-        // console.log(this.part);
+
         // this.part[0].children.map((item) => {
         //   if (item.id == row.adminId) {
         //     deptName = item.label;
@@ -1188,7 +1169,7 @@ export default {
     },
     unit4Format(row, column) {
       var deptName = "";
-      // console.log(row.type)
+
       this.ziDian.map((item) => {
         if (item.dictValue == row.type) {
           deptName = item.dictLabel;
@@ -1199,11 +1180,9 @@ export default {
     zidainType(item) {
       this.queryParams.type = item.dictValue;
       this.getList();
-      // console.log(item)
     },
     /** 提交按钮 */
     submitForm() {
-      console.log(this.form.file);
       if (this.form.file) {
         this.form.fileName = this.form.file[0].name;
         this.form.file = this.form.file[0].url;
@@ -1215,7 +1194,7 @@ export default {
           } else {
             this.form.peopleName = this.form.peopleName.join(",");
             this.form.peopleId = this.form.peopleName;
-            console.log(this.form);
+
             if (this.form.id != null) {
               updatePlanTask(this.form).then((response) => {
                 this.$modal.msgSuccess("修改成功");
@@ -1243,9 +1222,8 @@ export default {
       this.$refs["Progress"].validate((valid) => {
         if (valid) {
           this.Progress.schedule = this.Progress.planProgress;
-          console.log(this.Progress);
+
           uploadProgress(this.Progress).then((res1) => {
-            console.log(res1);
             this.$modal.msgSuccess("上传成功");
             // this.Progress
             this.reset();
@@ -1296,9 +1274,7 @@ export default {
       });
     },
     // 发送执行人列表
-    returnExecutor(id, name) {
-      console.log(this.form.peopleName);
-    },
+    returnExecutor(id, name) {},
     // 计划编号
     planName() {
       let date = new Date();
@@ -1319,7 +1295,6 @@ export default {
     },
     // 选择计划
     chooseplan(item) {
-      console.log(item);
       this.form.type = item.dictValue;
     },
   },

+ 7 - 26
src/views/workingArrangements/workTask/index.vue

@@ -1073,7 +1073,6 @@ export default {
       this.title = "进度录入";
       this.jinduId = row.id;
       singProgress(this.jinduId).then((res) => {
-        console.log(res.data);
         this.Progress.id = res.data.workProgress.id;
         this.Progress.taskId = res.data.id;
         this.Progress.planProgress = res.data.workProgress.schedule;
@@ -1087,9 +1086,8 @@ export default {
       this.open2 = true;
       this.title = "进度查看";
       // 获取当前行的id
-      // console.log(row.id);
+
       singProgress(row.id).then((res) => {
-        console.log(res);
         this.singleTable = res.data;
         this.singleTable.planProgresses =
           this.singleTable.workProgress.schedule;
@@ -1097,7 +1095,7 @@ export default {
 
         this.singleTable.file =
           process.env.VUE_APP_BASE_API + this.singleTable.file;
-        console.log(this.singleTable.file, 1);
+
         this.singleTable.fileName = this.singleTable.workProgress.fileName;
         this.singleTable.peopleName = res.data.peopleName
 
@@ -1105,9 +1103,7 @@ export default {
           .map(Number);
         this.getZhuChi(res.data.unitId);
 
-        // console.log(this.Progress.id);
         // this.singleTable.jindu=singleTable.planProgress.schedule
-        // console.log(this.singleTable)
       });
     },
     // 多人进度查看
@@ -1117,16 +1113,15 @@ export default {
       this.title = "进度查看";
       // 获取当前行的id
       moreProgress(row.id).then((res) => {
-        // console.log(res)
         this.comstatus = 0;
         this.moreTable = res.data;
-        console.log(this.moreTable);
+
         this.moreTable.file =
           process.env.VUE_APP_BASE_API + this.moreTable.file;
         this.moreTable.workProgresses.map((item) => {
           item.file = process.env.VUE_APP_BASE_API + item.file;
         });
-        console.log(this.moreTable.file);
+
         this.moreTable.workProgresses.forEach((item) => {
           this.comstatus +=
             item.schedule / this.moreTable.workProgresses.length;
@@ -1183,7 +1178,6 @@ export default {
     zidainType(item) {
       // this.queryParams.type = item.dictValue;
       this.getList();
-      // console.log(item)
     },
     // 发布单位选中触发
     selectPeo3(val) {
@@ -1214,7 +1208,6 @@ export default {
       deptUser(id).then((res) => {
         // this.renYuan = res.data;
         this.executor = res.data;
-        console.log(this.executor);
       });
     },
     // 发布单位选中触发
@@ -1271,19 +1264,14 @@ export default {
 
       // 获取执行单位列表
       getDept2().then((res) => {
-        // console.log(res,2)
         this.users = res.data;
-
-        console.log(this.users);
       });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       getDept2().then((res) => {
-        // console.log(res,2)
         this.users = res.data;
-        console.log(this.users);
       });
       const id = row.id || this.ids;
       getWorkTask(id).then((response) => {
@@ -1305,7 +1293,6 @@ export default {
         this.rylist.map((item) => {
           row.peopleName.split(",").forEach((items, index) => {
             if (item.userId == items) {
-              // console.log(item.nickName)
               deptName += item.nickName + "  ";
             }
           });
@@ -1314,7 +1301,6 @@ export default {
         this.rylist.map((item) => {
           row.peopleName.split(",").forEach((items, index) => {
             if (item.userId == items) {
-              // console.log(item.nickName)
               deptName += item.nickName + " ";
             }
           });
@@ -1368,7 +1354,7 @@ export default {
           } else {
             this.form.peopleName = this.form.peopleName.join(",");
             this.form.peopleId = this.form.peopleName;
-            console.log(this.form);
+
             if (this.form.id != null) {
               updateWorkTask(this.form).then((response) => {
                 this.$modal.msgSuccess("修改成功");
@@ -1390,7 +1376,7 @@ export default {
       // if (valid) {
       //   this.form.peopleName = this.form.peopleName.join(",");
       //   this.form.peopleId = this.form.peopleName;
-      //   console.log(this.form);
+
       //   if (this.form.id != null) {
       //     updateWorkTask(this.form).then((response) => {
       //       this.$modal.msgSuccess("修改成功");
@@ -1408,7 +1394,6 @@ export default {
       // });
     },
     submitForm1() {
-      // console.log(this.Progress)
       this.$refs["Progress"].validate((valid) => {
         if (valid) {
           this.Progress.taskId = this.jinduId;
@@ -1418,7 +1403,6 @@ export default {
             this.Progress.file = this.Progress.file[0].url;
           }
 
-          console.log(this.Progress);
           uploadProgress(this.Progress).then((res1) => {
             this.$modal.msgSuccess("上传成功");
             // this.Progress
@@ -1490,12 +1474,11 @@ export default {
     getdeptlist() {
       getDeptList().then((res) => {
         this.ExecutableUnit = res.data;
-        console.log(this.ExecutableUnit);
       });
     },
     // 选中执行人id
     // choosedeptid(id) {
-    //   console.log(id)
+
     //   this.form.unitId = id;
     //   deptUser(id).then((res) => {
     //     this.executor = res.data;
@@ -1515,8 +1498,6 @@ export default {
       let minute =
         date.getMinutes <= 9 ? "0" + date.getMinutes() : date.getMinutes();
       this.form.number = year + month + day + hour + minute;
-      console.log(111);
-      console.log(this.form.number);
     },
     // 获取发布单位id
     issueunit(id) {

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно