Browse Source

PY-2022.1 <Faith@DESKTOP-FQ04LTL Merge branch 'master'

Conflicts:
	FeatureSuggester.xml
艽十艽 3 năm trước cách đây
mục cha
commit
727268f361

+ 0 - 10
FeatureSuggester.xml

@@ -1,10 +0,0 @@
-<application>
-  <component name="FeatureSuggesterSettings">
-    <option name="workingDays">
-      <list>
-        <option value="1650436929708" />
-        <option value="1650502878977" />
-      </list>
-    </option>
-  </component>
-</application>

+ 0 - 5
colors.scheme.xml

@@ -1,5 +0,0 @@
-<application>
-  <component name="EditorColorsManagerImpl">
-    <global_color_scheme name="Moonlight (Material)" />
-  </component>
-</application>

+ 0 - 3
databaseDrivers.xml

@@ -1,3 +0,0 @@
-<application>
-  <component name="LocalDatabaseDriverManager" version="201" />
-</application>

+ 0 - 13
debugger.xml

@@ -1,13 +0,0 @@
-<application>
-  <component name="XDebuggerSettings">
-    <data-views />
-    <general />
-    <debuggers>
-      <debugger id="javascript">
-        <configuration>
-          <custom-object-presentation />
-        </configuration>
-      </debugger>
-    </debuggers>
-  </component>
-</application>

+ 0 - 7
editor-font.xml

@@ -1,7 +0,0 @@
-<application>
-  <component name="DefaultFont">
-    <option name="VERSION" value="1" />
-    <option name="FONT_REGULAR_SUB_FAMILY" value="Regular" />
-    <option name="FONT_BOLD_SUB_FAMILY" value="Bold" />
-  </component>
-</application>

+ 0 - 6
editor.xml

@@ -1,6 +0,0 @@
-<application>
-  <component name="TodoConfiguration">
-    <pattern pattern="\btodo\b.*" />
-    <pattern pattern="\bfixme\b.*" />
-  </component>
-</application>

+ 0 - 5
filetypes.xml

@@ -1,5 +0,0 @@
-<application>
-  <component name="FileTypeManager" version="18">
-    <ignoreFiles list="*$py.class;*.pyc;*.pyo;*.rbc;*.yarb;*~;.DS_Store;.git;.hg;.svn;CVS;__pycache__;_svn;vssver.scc;vssver2.scc" />
-  </component>
-</application>

+ 0 - 9
find.xml

@@ -1,9 +0,0 @@
-<application>
-  <component name="FindSettings">
-    <mask>*.css</mask>
-    <mask>*.html</mask>
-    <mask>*.xml</mask>
-    <mask>*.pyw</mask>
-    <mask>*.py</mask>
-  </component>
-</application>

+ 0 - 7
gitee.xml

@@ -1,7 +0,0 @@
-<application>
-  <component name="GiteeAccounts">
-    <account name="gxlove_max@163.com" id="4a9f814c-1ea6-4c45-9d45-23db22b57623">
-      <Server host="gitee.com" clientid="fc439d90cb2ffc20cffeb70a6a4039e69847485e0fa56cfa0d1bf006098e24dd" clientsecret="386f187646ee361049f69cd213424bdba5af03e820d10a68a68e5fb520902596" />
-    </account>
-  </component>
-</application>

+ 0 - 6
ide.general.xml

@@ -1,6 +0,0 @@
-<application>
-  <component name="Registry">
-    <entry key="ide.balloon.shadow.size" value="0" />
-    <entry key="ide.experimental.ui" value="false" />
-  </component>
-</application>

+ 0 - 5
laf.xml

@@ -1,5 +0,0 @@
-<application>
-  <component name="LafManager" autodetect="false">
-    <laf class-name="com.intellij.ide.ui.laf.darcula.DarculaLaf" themeId="MOONLIGHT" />
-  </component>
-</application>

+ 0 - 9
material_theme.xml

@@ -1,9 +0,0 @@
-<application>
-  <component name="MaterialThemeConfig">
-    <option name="pristineConfig" value="false" />
-    <option name="accentColor" value="74a0f1" />
-    <option name="selectedTheme" value="MOONLIGHT" />
-    <option name="userId" value="1365161:1804546eb6b:-7fbc" />
-    <option name="version" value="7.3.2" />
-  </component>
-</application>

+ 0 - 5
nodejs.xml

@@ -1,5 +0,0 @@
-<application>
-  <component name="NodeJsLocalInterpreterManager">
-    <local-interpreter path="D:/Development/node/node.exe" />
-  </component>
-</application>

+ 0 - 7
shared-indexes.xml

@@ -1,7 +0,0 @@
-<application>
-  <component name="download-consent">
-    <option name="consentItems">
-      <item download="ALLOWED" kind="python" url="https://index-cdn.jetbrains.com/v2" />
-    </option>
-  </component>
-</application>

+ 8 - 0
src/api/thought/responses.js

@@ -50,4 +50,12 @@ export function exportResponses(query) {
     method: 'get',
     params: query
   })
+}
+
+// 数据的展示
+export function Exhibition() {
+  return request({
+    url: '/thought/thoughtPlan/getnumber',
+    method: 'get',
+  })
 }

+ 15 - 0
src/api/thought/thoughtPlan.js

@@ -85,3 +85,18 @@ export function getXiuGaiButton(id) {
     data: id
   })
 }
+
+// 响应按钮月教育计划
+export function getResponse(id) {
+  return request({
+    url: 'thought/thoughtPlan/getDetails' + id,
+    method: 'get'
+  })
+}
+// 修改按钮月教育计划
+export function getModify(id) {
+  return request({
+    url: 'thought/thoughtPlan/updatePlan' + id,
+    method: 'get'
+  })
+}

BIN
src/assets/images/phone.png


BIN
src/assets/images/phone1.png


BIN
src/assets/images/柜子1.png


BIN
src/assets/images/柜子2.png


+ 0 - 22
src/assets/styles/global.css

@@ -864,28 +864,6 @@ body #app .sidebar-container .theme-dark .nest-menu .el-submenu>.el-submenu__tit
   border-bottom: none;
 }
 
-/* 要事日记数据盒子的位置 */
-/* #dialoges .el-dialog {
-  width: 528px !important;
-  position: absolute;
-  right: -1300px;
-  top: 100px
-}
-#dialoges  .jiben {
-  width: 461px !important;
-  height: 32px;
-  background-image: url(/static/img/小标题底.b7c6f45a.png);
-  margin-bottom: 25px;
-  color: #fff;
-  padding-left: 16px;
-  line-height: 32px;
-}
-#dialoges .el-dialog__body{
-  margin: 11px 0px 21px 16px;
-  padding-top: 19px !important;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-} */
 
 /* 门岗管理 */
 

+ 497 - 78
src/views/PrintsManage/manage/index.vue

@@ -9,6 +9,7 @@
     >
       <el-form-item prop="name">
         <el-input
+
           v-model="queryParams.name"
           placeholder="请输入文件名称"
           clearable
@@ -326,10 +327,11 @@
     <el-dialog
       :title="title"
       :visible.sync="open"
-      width="1030px"
+      width="1010px"
       append-to-body
       :close-on-click-modal="false"
     >
+    <div class="userAgree">
       <el-form
         ref="form"
         :model="form"
@@ -359,31 +361,17 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <div class="jiben">文件信息</div>
-        <el-form-item label="上传文件" 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-upload>
+        <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>
-        <el-form-item label="文件名称">
+        <div class="jiben">文件信息</div>
+        <!-- <el-form-item label="文件名称">
           <el-input v-model="form.name" placeholder="请输入文件名称" />
         </el-form-item>
         <el-form-item label="打印份数" prop="printNumber">
@@ -395,20 +383,17 @@
         </el-form-item>
         <el-form-item label="文件大小" prop="size">
           <el-input v-model="form.size" placeholder="请输入文件大小" />
-        </el-form-item>
+        </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-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-select v-model="form.type" placeholder="请选择类型">
-            <el-option label="请选择字典生成" value />
-          </el-select>-->
-        </el-form-item>
-        <el-form-item label="级别" prop="levelM">
+        </el-form-item> -->
+        <!-- <el-form-item label="级别" prop="levelM">
           <el-select v-model="form.levelM" clearable placeholder="请选择级别">
             <el-option
               v-for="dict in levelMs"
@@ -417,14 +402,14 @@
               :value="parseInt(dict.dictValue)"
             ></el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <!-- <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"
@@ -443,6 +428,152 @@
             <el-radio label="1">是</el-radio>
             <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="请选择类型">
+            <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
+                type="primary"
+                icon="el-icon-plus"
+                size="mini"
+                style="padding: 11px 10px 10px 10px"
+                @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-input v-model="form.unitId" placeholder="请输入单位ID" />
+        </el-form-item>-->
+            <!-- <el-form-item label="单位名称" prop="unitName">
+          <el-input v-model="form.unitName" placeholder="请输入单位名称" />
+        </el-form-item>-->
+        
+           
+            
+            <!-- <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
+            v-model="item.isPrintColor"
+            style="width: 200px"
+            size="mini"
+          >
+            <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>
+              <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
+                v-model="item.isPrintTwo"
+                style="width: 200px"
+                size="mini"
+              >
+                <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-upload>
         </el-form-item>
         <!-- <el-form-item label="发送人ID" prop="sendId">
           <el-input v-model="form.sendId" placeholder="请输入发送人ID" />
@@ -457,15 +588,7 @@
             placeholder="选择创建时间"
           ></el-date-picker>
         </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>
+
         <!-- <el-form-item label="打印状态(1 打印中  2 已打印)">
           <el-radio-group v-model="form.printStatus">
             <el-radio label="1">请选择字典生成</el-radio>
@@ -484,11 +607,158 @@
           <el-input v-model="form.printInfo" placeholder="请输入打印回复信息" />
         </el-form-item>-->
       </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>
       </div>
     </el-dialog>
+    <!-- 修改集中文印 -->
+    <el-dialog
+      :title="title1"
+      :visible.sync="open1"
+      width="900px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="form1"
+        :model="form1"
+        :inline="true"
+        :rules="rules"
+        label-width="120px"
+        style="margin-left:15px"
+      >
+        <div class="jiben">发送人信息</div>
+        <el-form-item label="发送人" prop="sendName">
+          <el-input
+            v-model="form1.sendName"
+            disabled
+            placeholder="请输入发送人"
+          />
+        </el-form-item>
+        <el-form-item label="文印室" prop="printRoom">
+          <el-select
+            v-model="form1.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="form1.explainInfo"
+            type="textarea"
+            placeholder="请输入打印说明"
+            class="textarea-explainInfo1"
+          />
+        </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-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
+                v-model="item.isPrintTwo"
+                style="width: 200px"
+                size="mini"
+              >
+                <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">
+          <!-- <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-upload>
+        </el-form-item>
+          </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>
+      </div>
+    </el-dialog>
     <el-dialog
       :title="title"
       :visible.sync="dyopen"
@@ -746,7 +1016,7 @@ export default {
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {
       type: Array,
-      default: () => ["doc", "xls", "ppt", "pdf", "zip"],
+      default: () => ["doc", "xls", "ppt", "pdf"],
     },
     // 是否显示提示
     isShowTip: {
@@ -804,14 +1074,16 @@ export default {
         printRoom: null,
       },
       // 表单参数
-      form: {},
+      form: {
+        printsManageList:[],
+      },
       dyform: {},
       // 表单校验
       rules: {
-        name: [
-          // { required: true, message: "发送文件不能为空", trigger: "click" },
-          { required: true },
-        ],
+        // name: [
+        //   // { required: true, message: "发送文件不能为空", trigger: "click" },
+        //   { required: true },
+        // ],
         printRoom: [
           { required: true, message: "打印室不能为空", trigger: "change" },
         ],
@@ -859,7 +1131,29 @@ export default {
       open44: false,
       // 确定按钮
       printshow: false,
-      printManage:{}
+      printManage: {},
+      //添加文件为空
+      tomList: [
+        {
+          // 文件名称
+          name: null,
+          // 打印份数
+          printNumber: null,
+          // 文件大小
+          size: null,
+          // 级别
+          levelM: null,
+          // 是否为彩打
+          isPrintColor: null,
+          // 是否为双面打
+          isPrintTwo: null,
+        },
+      ],
+      // 上传文件
+      tomLists:[],
+      form1:{},
+      open1:false,
+      title1:""
     };
   },
   created() {
@@ -885,11 +1179,33 @@ export default {
     this.roles = Cookies.get("roles");
   },
   methods: {
+    // 增加工作登记
+    addForms() {
+      this.tomList.push({
+        // 文件名称
+        name: null,
+        // 打印份数
+        printNumber: null,
+        // 文件大小
+        size: null,
+        // 级别
+        levelM: null,
+        // 是否为彩打
+        isPrintColor: null,
+        // 是否为双面打
+        isPrintTwo: null,
+      });
+    },
+    // 删除对话框工作登记
+    delForms(i) {
+      this.tomList.splice(i, 1);
+    },
     /** 查询集中文印主列表 */
     getList() {
       this.loading = true;
       listManage(this.queryParams).then((response) => {
         this.manageList = response.rows;
+        console.log(this.manageList)
         this.total = response.total;
         this.loading = false;
       });
@@ -968,7 +1284,24 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
+      this.tomList = [
+        {
+          // 文件名称
+          name: null,
+          // 打印份数
+          printNumber: null,
+          // 文件大小
+          size: null,
+          // 级别
+          levelM: null,
+          // 是否为彩打
+          isPrintColor: null,
+          // 是否为双面打
+          isPrintTwo: null,
+        },
+      ],
+       this.fileList=[]
+        this.reset();
       this.open = true;
       this.title = "添加集中文印";
       this.form.sendName = Cookies.get("nickName");
@@ -976,28 +1309,73 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      // this.tomList=[]
+      this.tomList=[
+        {
+          // 文件名称
+          name: null,
+          // 打印份数
+          printNumber: null,
+          // 文件大小
+          size: null,
+          // 级别
+          levelM: null,
+          // 是否为彩打
+          isPrintColor: null,
+          // 是否为双面打
+          isPrintTwo: null,
+        },
+      ],
+      this.fileList=[]
       this.reset();
       const id = row.id || this.ids;
       getManage(id).then((response) => {
-        this.form = response.data;
-        this.form.isPrintColor = response.data.isPrintColor + "";
-        this.form.isPrintTwo = response.data.isPrintTwo + "";
-        this.open = true;
-        this.title = "修改集中文印";
+        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
+        // this.tomList[0].type=this.form.type
+        // this.tomList[0].file=this.form.file
+        // this.tomList[0].printNumber=this.form.printNumber
+        // this.tomList[0].size=this.form.size
+        // 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(){
+      this.$refs["form1"].validate((valid) => {
+        if (valid) {
+            updateManage(this.form1).then((response) => {
+              console.log(this.form1)
+              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 {
-            addManage(this.form).then((response) => {
+            this.form.printsManageList=this.tomList
+            console.log(this.form)
+            addManage(this.form).then((response) => {  
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -1037,23 +1415,28 @@ export default {
     },
     // 上传前校检格式和大小
     handleBeforeUpload(file) {
+      // console.log(file)
       // 校检文件类型
-      this.form.name = file.name;
+      this.tomLists.name = file.name;
+      this.form1.name=file.name
       if (file.size == 0) {
-        this.form.size = "0 B";
+        this.tomLists.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.form.size = file.size;
-      this.form.size =
+      this.tomLists.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]
       if (this.fileType) {
         let fileExtension = "";
         if (file.name.lastIndexOf(".") > -1) {
           fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
-          this.form.type = fileExtension;
+          this.tomLists.type = fileExtension;
+          this.form1.type=fileExtension
         }
         const isTypeOk = this.fileType.some((type) => {
           if (file.type.indexOf(type) > -1) return true;
@@ -1064,9 +1447,12 @@ export default {
           this.$message.error(
             `文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`
           );
-          this.form.name = null;
-          this.form.size = null;
-          this.form.type = null;
+          this.tomLists.name = null;
+          this.tomLists.size = null;
+          this.tomLists.type = null;
+          this.form1.name=null
+          this.form1.size = null;
+          this.form1.type = null;
           return false;
         }
       }
@@ -1091,13 +1477,18 @@ export default {
     // 上传成功回调
     handleUploadSuccess(res, file) {
       this.$message.success("上传成功");
-      this.fileList.push({ name: file.name, url: res.fileName });
+      this.fileList.push({ name: file.name, file: res.url , size :this.tomLists.size,type:this.tomLists.type });
+      
       this.$emit("input", this.fileList);
-      this.form.file = res.url;
+      console.log(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);
+      // console.log(row);
       this.dyreset();
       this.dyopen = true;
       this.title = "打印";
@@ -1133,7 +1524,6 @@ export default {
     handlelook(row) {
       // console.log(row);
       if (row.type == "docx" || row.type == "doc") {
-        console.log(11);
         this.open33 = true;
         axios({
           method: "get",
@@ -1148,7 +1538,10 @@ export default {
       } else if (row.type == "pdf") {
         this.previewDialog = true;
         this.pdfurl = row.file;
+        this.pageNum=1
       } else if (row.type == "xlsx") {
+        console.log(222)
+        console.log(row.file)
         axios
           .get(row.file, {
             responseType: "arraybuffer", // 设置响应体类型为arraybuffer
@@ -1198,7 +1591,9 @@ export default {
                 // link.click();
                 // link.remove();
                 let xhr = new XMLHttpRequest();
-                xhr.open("get", this.dyform.file, 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;
@@ -1230,12 +1625,9 @@ 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(); //点击下载
@@ -1267,7 +1659,7 @@ export default {
       // this.dyform.type = row.type;
       // console.log(this.dyform);
       // console.log(row)
-      this.printManage=row
+      this.printManage = row;
       // console.log(this.dyform)
       tkbox(this.printManage).then((res) => {
         console.log(res);
@@ -1375,7 +1767,13 @@ export default {
   display: none;
 }
 ::v-deep .textarea-explainInfo .el-textarea__inner {
-  width: 980px;
+  margin-left: 20px;
+  width: 880px;
+  height: 104px;
+}
+::v-deep .textarea-explainInfo1 .el-textarea__inner {
+  /* margin-left: 20px; */
+  width: 833px;
   height: 104px;
 }
 ::v-deep .dyform-textarea .el-textarea__inner {
@@ -1573,4 +1971,25 @@ export default {
   background: #1d96ff;
   color: white;
 }
+.greed {
+  position: absolute;
+  top: 26px;
+  right: -10px;
+  color: #13ce66;
+}
+.CCC {
+  position: absolute;
+  top: 26px;
+  right: 118px;
+  color: #cccccc;
+}
+/* 文件名称表格 */
+::v-deep .fileName .el-input__inner{
+  width: 316px !important;
+  text-indent: 1em;
+  /* background-color: #196299; */
+}
+::v-deep .fileName .el-input__suffix{
+  left: -280px;
+}
 </style>

+ 7 - 6
src/views/grassrootsregistration/bdglweekwork/index.vue

@@ -887,12 +887,13 @@ export default {
     submitForm() {
       this.$refs["refform"].validate((valid) => {
         if (valid) {
-          if (
-            new Date(this.gongZuoTiem) >= new Date(this.form.startTime) &&
-            new Date(this.gongZuoTiem) <= new Date(this.form.endTime)
-          ) {
-            this.form.bdglWeekworkRegisterList = this.tomList;
-            if (this.form.id != null) {
+          if (this.form.id != null) {
+            if (
+              new Date(this.gongZuoTiem) >= new Date(this.form.startTime) &&
+              new Date(this.gongZuoTiem) <= new Date(this.form.endTime)
+            ) {
+              this.form.bdglWeekworkRegisterList = this.tomList;
+
               updateBdglweekwork(this.form).then((response) => {
                 this.$modal.msgSuccess("修改成功");
                 this.open = false;

+ 5 - 0
src/views/militaryvehicleManagement/thebusAccessLog/index.vue

@@ -176,6 +176,7 @@
               :label="item.dictLabel"
               :value="item.dictValue"
               class="input_xiala"
+              @click.native="model(item)"
             >
             </el-option>
           </el-select>
@@ -338,6 +339,10 @@ export default {
     });
   },
   methods: {
+    // 车辆型号触发
+    model(val) {
+      console.log(val);
+    },
     // 重置人员
     ChongZhi() {
       this.form.driverId = null;

+ 81 - 70
src/views/peopleChuRu/bdglLeave/index.vue

@@ -314,6 +314,13 @@
       </el-table-column>
     </el-table>
 
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
     <!-- 添加或修改人员请假对话框 -->
     <el-dialog
       :title="title"
@@ -532,7 +539,7 @@
       </div>
       <div v-if="statussp == '1'" class="dialog-footer" slot="footer">
         <el-button type="primary" @click="submitForms">通过</el-button>
-        <el-button @click="boHui">驳回</el-button>
+        <el-button @click="boHui" size="btn">驳回</el-button>
       </div>
     </el-dialog>
 
@@ -725,7 +732,7 @@
       </el-form>
       <div class="dialog-footer" slot="footer">
         <el-button type="primary" @click="TSsubmitForms">通过</el-button>
-        <el-button @click="TSboHui">驳回</el-button>
+        <el-button @click="TSboHui" size="btn">驳回</el-button>
       </div>
     </el-dialog>
   </div>
@@ -859,6 +866,10 @@ export default {
       trueng: true,
       // 归队数据
       guidui: {},
+      // 审批对象
+      shenPis: {},
+      // 特殊审批对象
+      teShu: {},
     };
   },
   created() {
@@ -890,6 +901,7 @@ export default {
     },
     // // 特殊审批按钮触发
     handleUpdatess(row) {
+      this.teShu = row;
       this.statussp = "2";
       this.getBuMeng();
       // 获取字典类型
@@ -906,6 +918,8 @@ export default {
     },
     // 审批按钮操作
     handleUpdates(row) {
+      console.log(row);
+      this.shenPis = row;
       this.statussp = "1";
       this.getBuMeng();
       // 获取字典类型
@@ -914,6 +928,7 @@ export default {
       const id = row.id || this.ids;
       getBdglLeave(id).then((response) => {
         this.form = response.data;
+        console.log(this.form);
         this.getYong(this.form.unitId);
         this.getRen(this.form.unitId);
         this.open = true;
@@ -1002,21 +1017,22 @@ export default {
     },
     //审批通过按钮
     submitForms() {
-      this.bdglLeaveList.forEach((item) => {
-        if (item.shenPiJiBie == "一级") {
-          this.form.status1 = 1;
-          this.form.contents = "一级审批通过";
-        } else if (item.shenPiJiBie == "二级") {
-          this.form.status2 = 1;
-          this.form.contents = "二级审批通过";
-        } else if (item.shenPiJiBie == "三级") {
-          this.form.status3 = 1;
-          this.form.contents = "三级审批通过";
-        } else if (item.shenPiJiBie == "四级") {
-          this.form.status4 = 1;
-          this.form.contents = "四级审批通过";
-        }
-      });
+      if (this.shenPis.shenPiJiBie == "一级") {
+        this.form.status1 = 1;
+        this.form.contents = "一级审批通过";
+      } 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("审批成功");
         this.open = false;
@@ -1027,21 +1043,19 @@ export default {
     boHui() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          this.bdglLeaveList.forEach((item) => {
-            if (item.shenPiJiBie == "一级") {
-              this.form.status1 = 2;
-              return (this.form.contents = "一级审批驳回");
-            } else if (item.shenPiJiBie == "二级") {
-              this.form.status2 = 2;
-              return (this.form.contents = "二级审批驳回");
-            } else if (item.shenPiJiBie == "三级") {
-              this.form.status3 = 2;
-              return (this.form.contents = "三级审批驳回");
-            } else if (item.shenPiJiBie == "四级") {
-              this.form.status4 = 2;
-              return (this.form.contents = "四级审批驳回");
-            }
-          });
+          if (this.shenPis.shenPiJiBie == "一级") {
+            this.form.status1 = 2;
+            return (this.shenPis.form.contents = "一级审批驳回");
+          } else if (item.shenPiJiBie == "二级") {
+            this.form.status2 = 2;
+            return (this.shenPis.form.contents = "二级审批驳回");
+          } else if (item.shenPiJiBie == "三级") {
+            this.form.status3 = 2;
+            return (this.shenPis.form.contents = "三级审批驳回");
+          } else if (item.shenPiJiBie == "四级") {
+            this.form.status4 = 2;
+            return (this.shenPis.form.contents = "四级审批驳回");
+          }
           updateBdglLeave(this.form).then((response) => {
             this.$modal.msgSuccess("审批成功");
             this.open = false;
@@ -1054,25 +1068,23 @@ export default {
     TSsubmitForms() {
       this.$refs["forms"].validateField("specialApproval", (valid) => {
         if (!valid) {
-          this.bdglLeaveList.forEach((item) => {
-            if (item.shenPiJiBie == "一级") {
-              this.form.status1 = 3;
-              this.form.common = "1";
-              this.form.contents = "一级审批通过";
-            } else if (item.shenPiJiBie == "二级") {
-              this.form.status2 = 3;
-              this.form.common = "2";
-              this.form.contents = "二级审批通过";
-            } else if (item.shenPiJiBie == "三级") {
-              this.form.status3 = 3;
-              this.form.common = "3";
-              this.form.contents = "三级审批通过";
-            } else if (item.shenPiJiBie == "四级") {
-              this.form.status4 = 3;
-              this.form.common = "4";
-              this.form.contents = "四级审批通过";
-            }
-          });
+          if (this.teShu.shenPiJiBie == "一级") {
+            this.form.status1 = 3;
+            this.form.common = "1";
+            this.form.contents = "一级审批通过";
+          } else if (this.teShu.shenPiJiBie == "二级") {
+            this.form.status2 = 3;
+            this.form.common = "2";
+            this.form.contents = "二级审批通过";
+          } else if (this.teShu.shenPiJiBie == "三级") {
+            this.form.status3 = 3;
+            this.form.common = "3";
+            this.form.contents = "三级审批通过";
+          } else if (this.teShu.shenPiJiBie == "四级") {
+            this.form.status4 = 3;
+            this.form.common = "4";
+            this.form.contents = "四级审批通过";
+          }
           if (this.form.id != null) {
             updateBdglLeave(this.form).then((response) => {
               this.$modal.msgSuccess("审批成功");
@@ -1087,25 +1099,24 @@ export default {
     TSboHui() {
       this.$refs["forms"].validate((valid) => {
         if (valid) {
-          this.bdglLeaveList.forEach((item) => {
-            if (item.shenPiJiBie == "一级") {
-              this.form.status1 = 2;
-              this.form.common = "1";
-              return (this.form.contents = "一级审批驳回");
-            } else if (item.shenPiJiBie == "二级") {
-              this.form.status2 = 2;
-              this.form.common = "2";
-              return (this.form.contents = "二级审批驳回");
-            } else if (item.shenPiJiBie == "三级") {
-              this.form.status3 = 2;
-              this.form.common = "3";
-              return (this.form.contents = "三级审批驳回");
-            } else if (item.shenPiJiBie == "四级") {
-              this.form.status4 = 2;
-              this.form.common = "4";
-              return (this.form.contents = "四级审批驳回");
-            }
-          });
+          console.log(this.teShu);
+          if (this.teShu.shenPiJiBie == "一级") {
+            this.form.status1 = 2;
+            this.form.common = "1";
+            this.form.contents = "一级审批驳回";
+          } else if (this.teShu.shenPiJiBie == "二级") {
+            this.form.status2 = 2;
+            this.form.common = "2";
+            this.form.contents = "二级审批驳回";
+          } else if (this.teShu.shenPiJiBie == "三级") {
+            this.form.status3 = 2;
+            this.form.common = "3";
+            this.form.contents = "三级审批驳回";
+          } else if (this.teShu.shenPiJiBie == "四级") {
+            this.form.status4 = 2;
+            this.form.common = "4";
+            this.form.contents = "四级审批驳回";
+          }
           if (this.form.id != null) {
             updateBdglLeave(this.form).then((response) => {
               this.$modal.msgSuccess("审批成功");

+ 129 - 157
src/views/phone/cabinet/index.vue

@@ -1,133 +1,28 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="手机柜编号" prop="number">
-        <el-input
-          v-model="queryParams.number"
-          placeholder="请输入手机柜编号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="手机柜位置" prop="address">
-        <el-input
-          v-model="queryParams.address"
-          placeholder="请输入手机柜位置"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="格子数量" prop="gridNumber">
-        <el-input
-          v-model="queryParams.gridNumber"
-          placeholder="请输入格子数量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="存放数量" prop="storageQuantity">
-        <el-input
-          v-model="queryParams.storageQuantity"
-          placeholder="请输入存放数量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="异常数量" prop="exceptionsNumber">
-        <el-input
-          v-model="queryParams.exceptionsNumber"
-          placeholder="请输入异常数量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="所属单位id" prop="unitId">
-        <el-input
-          v-model="queryParams.unitId"
-          placeholder="请输入所属单位id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="所属单位名称" prop="unitName">
-        <el-input
-          v-model="queryParams.unitName"
-          placeholder="请输入所属单位名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['phone:cabinet:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['phone:cabinet:edit']"
-        >修改</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="['phone:cabinet:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['phone:cabinet:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="cabinetList" @selection-change="handleSelectionChange">
+    <!-- <el-table
+      v-loading="loading"
+      :data="cabinetList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="主键" align="center" prop="id" />
       <el-table-column label="手机柜编号" align="center" prop="number" />
       <el-table-column label="手机柜位置" align="center" prop="address" />
       <el-table-column label="格子数量" align="center" prop="gridNumber" />
       <el-table-column label="存放数量" align="center" prop="storageQuantity" />
-      <el-table-column label="异常数量" align="center" prop="exceptionsNumber" />
+      <el-table-column
+        label="异常数量"
+        align="center"
+        prop="exceptionsNumber"
+      />
       <el-table-column label="所属单位id" align="center" prop="unitId" />
       <el-table-column label="所属单位名称" align="center" prop="unitName" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -135,27 +30,29 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['phone:cabinet:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['phone:cabinet:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
 
-    <!-- 添加或修改手机柜对话框 -->
+    添加或修改手机柜对话框
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="手机柜编号" prop="number">
@@ -168,10 +65,16 @@
           <el-input v-model="form.gridNumber" placeholder="请输入格子数量" />
         </el-form-item>
         <el-form-item label="存放数量" prop="storageQuantity">
-          <el-input v-model="form.storageQuantity" placeholder="请输入存放数量" />
+          <el-input
+            v-model="form.storageQuantity"
+            placeholder="请输入存放数量"
+          />
         </el-form-item>
         <el-form-item label="异常数量" prop="exceptionsNumber">
-          <el-input v-model="form.exceptionsNumber" placeholder="请输入异常数量" />
+          <el-input
+            v-model="form.exceptionsNumber"
+            placeholder="请输入异常数量"
+          />
         </el-form-item>
         <el-form-item label="所属单位id" prop="unitId">
           <el-input v-model="form.unitId" placeholder="请输入所属单位id" />
@@ -184,12 +87,52 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-dialog>
+    </el-dialog> -->
+    <div class="box">
+      <ul class="oneUl">
+        <li>
+          <div class="title">参谋部</div>
+          <table class="table">
+            <tr>
+              <td style="text-align: right; width: 86px">柜子编号</td>
+              <td style="text-align: right; width: 145px">AE302046</td>
+            </tr>
+            <tr>
+              <td>柜子位置</td>
+              <td>值班室门口</td>
+            </tr>
+            <tr>
+              <td>格子数量</td>
+              <td>18 格</td>
+            </tr>
+            <tr>
+              <td>已存放</td>
+              <td>14 格</td>
+            </tr>
+            <tr>
+              <td>异常格子</td>
+              <td>0 格</td>
+            </tr>
+          </table>
+        </li>
+        <li></li>
+        <li></li>
+        <li></li>
+        <li></li>
+      </ul>
+    </div>
   </div>
 </template>
 
 <script>
-import { listCabinet, getCabinet, delCabinet, addCabinet, updateCabinet, exportCabinet } from "@/api/phone/cabinet";
+import {
+  listCabinet,
+  getCabinet,
+  delCabinet,
+  addCabinet,
+  updateCabinet,
+  exportCabinet,
+} from "@/api/phone/cabinet";
 
 export default {
   name: "Cabinet",
@@ -225,13 +168,12 @@ export default {
         storageQuantity: null,
         exceptionsNumber: null,
         unitId: null,
-        unitName: null
+        unitName: null,
       },
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      }
+      rules: {},
     };
   },
   created() {
@@ -241,7 +183,7 @@ export default {
     /** 查询手机柜列表 */
     getList() {
       this.loading = true;
-      listCabinet(this.queryParams).then(response => {
+      listCabinet(this.queryParams).then((response) => {
         this.cabinetList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -262,7 +204,7 @@ export default {
         storageQuantity: null,
         exceptionsNumber: null,
         unitId: null,
-        unitName: null
+        unitName: null,
       };
       this.resetForm("form");
     },
@@ -278,9 +220,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -291,8 +233,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
-      getCabinet(id).then(response => {
+      const id = row.id || this.ids;
+      getCabinet(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改手机柜";
@@ -300,16 +242,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateCabinet(this.form).then(response => {
+            updateCabinet(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addCabinet(this.form).then(response => {
+            addCabinet(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -321,24 +263,54 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除手机柜编号为"' + ids + '"的数据项?').then(function() {
-        return delCabinet(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm("是否确认删除手机柜的数据项?")
+        .then(function () {
+          return delCabinet(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$modal.confirm('是否确认导出所有手机柜数据项?').then(() => {
-        this.exportLoading = true;
-        return exportCabinet(queryParams);
-      }).then(response => {
-        this.$download.name(response.msg);
-        this.exportLoading = false;
-      }).catch(() => {});
-    }
-  }
+      this.$modal
+        .confirm("是否确认导出所有手机柜数据项?")
+        .then(() => {
+          this.exportLoading = true;
+          return exportCabinet(queryParams);
+        })
+        .then((response) => {
+          this.$download.name(response.msg);
+          this.exportLoading = false;
+        })
+        .catch(() => {});
+    },
+  },
 };
 </script>
+<style scoped>
+ul {
+  list-style-type: none;
+}
+.oneUl {
+  display: flex;
+}
+.oneUl li {
+  background: url("../../../assets/images/柜子2.png") no-repeat;
+  width: 306px;
+  height: 285px;
+  padding: 22px;
+}
+.title {
+  text-align: center;
+  color: #fff;
+}
+.table {
+  margin-top: 18px;
+  line-height: 32px;
+}
+</style>

+ 15 - 12
src/views/pt.vue

@@ -5,7 +5,7 @@
       <!-- 头部区域 -->
       <div class="tou">
         <div class="yong_hu">
-          <span style="color: ">单位 :</span>
+          <!-- <span style="color: ">单位 :</span> -->
           <span class="span" style="padding-left: 4px">{{ danWie }}</span>
           <span style="color: #00f6ff">用户名 :</span>
           <span style="padding-left: 4px; color: #00f6ff">{{ yongHu }}</span>
@@ -205,56 +205,56 @@
               <div class="demo-box">
                 <div
                   class="demo active"
-                  v-on:click="renlifun"
+                  v-on:click="zhinengfun"
                   data-url="/diary?ref=addtabs"
                 >
-                  <img src="../images/rl.png" alt />
+                  <img src="../assets/images/phone1.png" alt class="phone" />
                 </div>
               </div>
               <div class="demo-a">
-                <a href="#" class="a">人力资源</a>
+                <a href="#" class="a">智能手机柜</a>
               </div>
             </li>
             <li>
               <div class="demo-box">
                 <div
                   class="demo active"
-                  v-on:click="xitongfun"
+                  v-on:click="renlifun"
                   data-url="/diary?ref=addtabs"
                 >
-                  <img src="../images/xt.png" alt />
+                  <img src="../images/rl.png" alt />
                 </div>
               </div>
               <div class="demo-a">
-                <a href="#" class="a">系统管理</a>
+                <a href="#" class="a">人力资源</a>
               </div>
             </li>
             <li>
               <div class="demo-box">
                 <div
                   class="demo active"
-                  v-on:click="gongju"
+                  v-on:click="xitongfun"
                   data-url="/diary?ref=addtabs"
                 >
                   <img src="../images/xt.png" alt />
                 </div>
               </div>
               <div class="demo-a">
-                <a href="#" class="a">系统工具</a>
+                <a href="#" class="a">系统管理</a>
               </div>
             </li>
             <li>
               <div class="demo-box">
                 <div
                   class="demo active"
-                  v-on:click="zhinengfun"
+                  v-on:click="gongju"
                   data-url="/diary?ref=addtabs"
                 >
-                  <img src="../images/sx.png" alt />
+                  <img src="../images/xt.png" alt />
                 </div>
               </div>
               <div class="demo-a">
-                <a href="#" class="a">智能手机柜</a>
+                <a href="#" class="a">系统工具</a>
               </div>
             </li>
             <img src="../assets/images/椭圆 513 (2).png" class="li-img" alt />
@@ -1624,4 +1624,7 @@ hr {
   background-color: #409eff;
   margin-right: 10px;
 }
+.phone {
+  margin-top: 40px !important;
+}
 </style>

+ 1 - 0
src/views/regulations/fileinfo/index.vue

@@ -1187,6 +1187,7 @@ export default {
       } else if (row.parentDirId == ".pdf") {
         this.previewDialog = true;
         this.pdfurl = process.env.VUE_APP_BASE_API + row.parentDirName;
+        this.pageNum=1
       }
       row.common = "1";
       updateFileinfo(row).then((res) => {

+ 27 - 9
src/views/taishi/index.vue

@@ -881,22 +881,22 @@
           <div class="right1-main">
             <div class="right2-main-title">
               <p>
-                <span style="width:15%;">序号</span>
+                <span>序号</span>
                 <span>防疫名称</span>
                 <span>防疫数量</span>
               </p>
             </div>
             <vueSeamlessScroll
-              :data="djlslist"
+              :data="fylist"
               class="seamless-warp"
-              :class-option="defaultOption"
+              :class-option="defaultOption2"
             >
               <div
                 class="right2-main-box"
                 v-for="(item, index) in fylist"
                 :key="index"
               >
-                <span style="color: #fff; font-size: 12px;width:15%;">
+                <span style="color: #fff; font-size: 12px;">
                   {{ index }}
                 </span>
                 <span>{{item.durgName}}</span>
@@ -1979,6 +1979,18 @@ export default {
         singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
         waitTime: 1000 // 单步运动停止的时间(默认值1000ms)
       };
+    },
+    defaultOption2() {
+      return {
+        step: 0.2, // 数值越大速度滚动越快
+        limitMoveNum: this.fylist.length, // 开始无缝滚动的数据量 this.dataList.length
+        hoverStop: true, // 是否开启鼠标悬停stop
+        direction: 1, // 0向下 1向上 2向左 3向右
+        openWatch: true, // 开启数据实时监控刷新dom
+        singleHeight: 0, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
+        singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
+        waitTime: 1000 // 单步运动停止的时间(默认值1000ms)
+      };
     }
   },
   destroyed() {
@@ -2542,11 +2554,16 @@ export default {
 }
 .right1-main {
   width: 100%;
-  height: 85%;
+  height: 90%;
+  margin: 0;
+  padding: 0;
 }
 .right1-main-title {
   width: 100%;
   height: 30px;
+  margin: 0;
+  padding: 0;
+  margin-top: -15px;
 }
 .right1-main-title p {
   width: 100%;
@@ -2558,13 +2575,14 @@ export default {
   display: inline-block;
   text-align: center;
   line-height: 30px;
-  font-size: 12px;
+  font-size: 14px;
   color: #fff;
 }
 
 .right2-main-title {
   width: 100%;
   height: 30px;
+  margin-top: -15px;
 }
 .right2-main-title p {
   width: 100%;
@@ -2572,11 +2590,11 @@ export default {
   list-style: none;
 }
 .right2-main-title p span {
-  width: 40%;
+  width: 33.3%;
   display: inline-block;
   text-align: center;
   line-height: 30px;
-  font-size: 12px;
+  font-size: 14px;
   color: #fff;
 }
 .right2 {
@@ -2765,7 +2783,7 @@ export default {
   height: 30px;
 }
 .seamless-warp .right2-main-box span {
-  width: 40%;
+  width: 33.3%;
   display: inline-block;
   text-align: center;
   line-height: 30px;

+ 3 - 0
src/views/thought/getready/index.vue

@@ -1401,4 +1401,7 @@ export default {
 .app-container{
  height: calc(100vh - 108px) !important;
 }
+::v-deep .el-select__input{
+  color: white;
+}
 </style>

+ 3 - 0
src/views/thought/parliament/index.vue

@@ -1178,4 +1178,7 @@ export default {
   color: white;
   text-indent: 0.5em;
 }
+::v-deep .el-select__input{
+  color: white;
+}
 </style>

+ 141 - 18
src/views/thought/responses/index.vue

@@ -131,8 +131,14 @@
           ></el-tree>
         </div>
       </el-col>
-      <el-col :span="1.5" class="mb8">
+      <el-col :span="2" class="mb8">
+        <div class="shuJu" @click="dengJI">
+          <!-- <span class="box44 public"> 当前数据为 : {{ time }}</span> -->
+          <span class="box5 public"> 已响应部门 : {{ yishenpi }}</span>
+          <span class="box6"> 未响应部门 : {{ weishenpi }}</span>
+        </div>
         <!-- <el-button
+          v-show="true"
           type="primary"
           plain
           icon="el-icon-plus"
@@ -219,7 +225,7 @@
               <span>{{ parseTime(scope.row.planEndTime, "{y}-{m}-{d}") }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="计划个数" align="center" prop="planNumber" />
+          <!-- <el-table-column label="计划个数" align="center" prop="planNumber" /> -->
           <el-table-column
             label="需响应计划数"
             align="center"
@@ -235,10 +241,10 @@
               <span v-if="scope.row.state == '0'" style="color: #00eaff"
                 >未响应</span
               >
-              <span v-if="scope.row.state == '1'" style="color: #13ce66"
-                >已完成</span
+              <span v-if="scope.row.state == '1'" style="color: #ffba00"
+                >待审批</span
               >
-              <span v-if="scope.row.state == '2'" style="color: #ffba00"
+              <span v-if="scope.row.state == '2'" style="color: #13ce66"
                 >已审批</span
               >
               <span
@@ -561,6 +567,7 @@
               v-model="form.planIntroduction"
               placeholder="请输入计划简介"
               readonly
+              autosize
             />
           </el-form-item>
           <div class="jiben">计划条数</div>
@@ -590,6 +597,7 @@
                   v-model="item.planContent"
                   placeholder="请输入计划详情"
                   readonly
+                  autosize
                 />
               </el-form-item>
             </el-form>
@@ -615,6 +623,34 @@
           </el-form>
         </el-form>
       </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel" size="btn">取消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 数据查看弹出层 -->
+    <el-dialog
+      :visible.sync="dialogVisible"
+      title="统计详情"
+      append-to-body
+      id="dialoges"
+      :close-on-click-modal="false"
+    >
+      <div class="zuiDa">
+        <!-- <div class="shuJuTime">当前数据为 : {{ time }}</div> -->
+        <div class="jiben">已响应部门:{{ yishenpi }}个</div>
+        <div class="boxxx">
+          <div v-for="(item, i) in cg" :key="i" class="greed">
+            <span class="greedss"> </span><span>{{ item }}</span>
+          </div>
+        </div>
+        <div class="jiben">未响应部门:{{ weishenpi }}个</div>
+        <div class="boxxx">
+          <div v-for="(item, i) in sb" :key="i" class="red">
+            <span class="greeds"> </span><span>{{ item }}</span>
+          </div>
+        </div>
+      </div>
     </el-dialog>
   </div>
 </template>
@@ -627,8 +663,10 @@ import {
   addResponses,
   updateResponses,
   exportResponses,
+  Exhibition,
 } from "@/api/thought/responses";
 import { getWeiShu } from "@/api/grassrootsregistration/bdglmeeting";
+import { exportBdgShuju } from "@/api/grassrootsregistration/bdgldiary";
 
 export default {
   name: "responses",
@@ -711,13 +749,61 @@ export default {
           { required: true, message: "请输入驳回原因", trigger: "blur" },
         ],
       },
+      // 数据时间的保存
+      tiems: "",
+      // 获取成功对象
+      cg: {},
+      // 获取失败对象
+      sb: {},
+      // 获取登记部门数量
+      yishenpi: null,
+      // 获取未登记数量
+      weishenpi: null,
+      // 数据查看的弹出层
+      dialogVisible: false,
+      //  右边登记数据
+      registrationData: {},
+      time: "",
     };
   },
   created() {
     this.getList();
     this.treeselect();
+    // 获取数据
+    this.getShuJu();
+    this.startTime();
   },
   methods: {
+    // 时间
+    startTime() {
+      var today = new Date();
+      var y = today.getFullYear();
+      var M = today.getMonth() + 1;
+      var d = today.getDate();
+      if (M < 10) {
+        M = "0" + M;
+      }
+      if (d < 10) {
+        d = "0" + d;
+      }
+      this.time = y + "-" + M + "-" + d;
+    },
+    // 点击数据盒子
+    dengJI() {
+      this.dialogVisible = true;
+    },
+    // 获取部门数据
+    getShuJu() {
+      Exhibition().then((res) => {
+        console.log(res, 1);
+        this.registrationData = res.data;
+        this.cg = res.data[0];
+        this.sb = res.data[1];
+        this.yishenpi = res.data[2];
+        this.weishenpi = res.data[3];
+        this.tiems = res.time;
+      });
+    },
     // 审批确定提交操作
     submitForm1() {
       if (this.form.id != null) {
@@ -791,7 +877,7 @@ export default {
     },
     // 取消按钮
     cancel() {
-      this.open = false;
+      this.open3 = false;
       this.reset();
     },
     // 表单重置
@@ -909,16 +995,6 @@ export default {
         })
         .catch(() => {});
     },
-    // 获取部门数据
-    getShuJu(data) {
-      exportBdgShuju(data).then((res) => {
-        this.DataTime = data;
-        this.registrationData = res;
-        this.cg = res.cg;
-        this.sb = res.sb;
-        this.tiems = res.time;
-      });
-    },
     // 搜索时间触发
     shiJian(data) {
       this.queryParams.diaryTime = data;
@@ -1011,9 +1087,15 @@ export default {
   min-height: 80px !important;
 }
 ::v-deep .el-dialog__body {
-  padding-left: 76px !important;
+  padding-left: 0px !important;
   padding-right: 0px !important;
-  padding-bottom: 20px !important;
+  padding-bottom: 0px !important;
+}
+::v-deep .el-dialog__body {
+  margin: 0px 0px 10px 68px;
+  padding-top: 20px !important;
+  box-sizing: border-box;
+  /* padding: 30px 12px 30px 28px; */
 }
 /* 富文本内容 */
 /* ::v-deep .editor{
@@ -1280,4 +1362,45 @@ export default {
 .app-container {
   height: calc(100vh - 108px) !important;
 }
+.shuJu {
+  height: 16px;
+  margin-top: 13px;
+  margin-right: 90px;
+  float: right;
+  /* background-color: red; */
+  color: #fff;
+  font-size: 14px;
+  position: absolute;
+  right: 10px;
+}
+.box44::before {
+  display: inline-block;
+  content: "";
+  width: 8px;
+  height: 8px;
+  /* border-radius: 50%; */
+  background-color: #1d96ff;
+  margin-left: 26px;
+}
+.box5::before {
+  display: inline-block;
+  content: "";
+  width: 8px;
+  height: 8px;
+  /* border-radius: 50%; */
+  background-color: #67c23a;
+  margin-left: 26px;
+}
+.box6::before {
+  display: inline-block;
+  content: "";
+  width: 8px;
+  height: 8px;
+  /* border-radius: 50%; */
+  background-color: #ff4949;
+  margin-left: 26px;
+}
+.mb8 {
+  height: 40px;
+}
 </style>

+ 34 - 29
src/views/thought/thoughtPlan/index.vue

@@ -165,7 +165,7 @@
             size="btc"
             type="text"
             @click="handleUpdate1(scope.row)"
-            v-hasPermi="['thought:thoughtPlan:query']"
+            v-hasPermi="['thought:thoughtPlan:getDetails']"
             >响应</el-button
           >
           <el-button
@@ -173,7 +173,7 @@
             size="btu"
             type="text"
             @click="handleUpdate4(scope.row)"
-            v-hasPermi="['thought:thoughtPlan:query']"
+            v-hasPermi="['thought:thoughtPlan:updatePlan']"
             >修改</el-button
           >
           <el-button
@@ -406,11 +406,11 @@
                 >
                 </el-switch>
                 <span class="greed" v-if="item.responseStatus == '1'"
-                  >需要响应</span
+                  >响应</span
                 >
-                <span class="CCC" v-if="item.responseStatus == '0'"
+                <!-- <span class="CCC" v-if="item.responseStatus == '0'"
                   >非必要响应</span
-                >
+                > -->
               </el-form-item>
             </el-form>
           </div>
@@ -521,11 +521,11 @@
                 >
                 </el-switch>
                 <span class="greed" v-if="item.responseStatus == '1'"
-                  >需要响应</span
+                  >响应</span
                 >
-                <span class="CCC" v-if="item.responseStatus == '0'"
+                <!-- <span class="CCC" v-if="item.responseStatus == '0'"
                   >非必要响应</span
-                >
+                > -->
               </el-form-item>
             </el-form>
           </div>
@@ -646,11 +646,11 @@
                 >
                 </el-switch>
                 <span class="greed" v-if="item.responseStatus == '1'"
-                  >需要响应</span
+                  >响应</span
                 >
-                <span class="CCC" v-if="item.responseStatus == '0'"
+                <!-- <span class="CCC" v-if="item.responseStatus == '0'"
                   >非必要响应</span
-                >
+                > -->
               </el-form-item>
             </el-form>
           </div>
@@ -775,6 +775,13 @@
             </el-form-item>
           </el-form>
         </el-form>
+        <!-- <div
+          slot="footer"
+          class="dialog-footer"
+          style="text-align: right; margin-right: 76px; margin-top: 54px"
+        >
+          <el-button @click="cancel" size="btn">取 消</el-button>
+        </div> -->
       </div>
     </el-dialog>
   </div>
@@ -792,6 +799,8 @@ import {
   JXxiangYing,
   JXxiangYingXiangYing,
   getXiuGaiButton,
+  getResponse,
+  getModify,
 } from "@/api/thought/thoughtPlan";
 import { getWeiShu } from "@/api/grassrootsregistration/bdglmeeting";
 import { getUserProfile } from "@/api/system/user";
@@ -970,7 +979,7 @@ export default {
     handleUpdate1(row) {
       this.reset();
       const id = row.id || this.ids;
-      getThoughtPlan(id).then((response) => {
+      getResponse(id).then((response) => {
         this.form = response.data;
         this.checkShop = response.data.planFus;
         this.open1 = true;
@@ -1095,6 +1104,7 @@ export default {
       this.open = false;
       this.open1 = false;
       this.open2 = false;
+      this.open3 = false;
       this.reset();
     },
     // 表单重置
@@ -1178,20 +1188,16 @@ export default {
     handleUpdate4(row) {
       this.reset();
       const id = row.id || this.ids;
-      getXiuGaiButton(id).then((res) => {
-        if (res.code == "200") {
-          getThoughtPlan(id).then((response) => {
-            this.form = response.data;
-            this.checkShops = response.data.planFus;
-            response.data.planFujians.forEach((element) => {
-              element.name = element.fileName;
-              element.url = element.filePath;
-            });
-            this.planResponsefus = response.data.planFujians;
-            this.open = true;
-            this.title = "修改月教育计划";
-          });
-        }
+      getModify(id).then((response) => {
+        this.form = response.data;
+        this.checkShops = response.data.planFus;
+        response.data.planFujians.forEach((element) => {
+          element.name = element.fileName;
+          element.url = element.filePath;
+        });
+        this.planResponsefus = response.data.planFujians;
+        this.open = true;
+        this.title = "修改月教育计划";
       });
     },
     /** 提交按钮 */
@@ -1306,7 +1312,6 @@ export default {
 /* 标题弹框 */
 ::v-deep .el-dialog__title {
   color: white;
-  /* border-bottom: 1px solid white; */
 }
 /* 标题下划线 */
 ::v-deep .el-dialog__header {
@@ -1693,13 +1698,13 @@ export default {
 .greed {
   position: absolute;
   top: 26px;
-  right: 104px;
+  right: 97px;
   color: #13ce66;
 }
 .CCC {
   position: absolute;
   top: 26px;
-  right: 104px;
+  right: 92px;
   color: #cccccc;
 }
 /* 附件下载 */

+ 0 - 5
web-types-npm-loader.xml

@@ -1,5 +0,0 @@
-<application>
-  <component name="WebTypesNpmLoader">
-    <enabled />
-  </component>
-</application>