fdg

src/api/pt.js

@@ -0,0 +1,27 @@
+import request from "@/utils/request";
+// 轮训每人
+export function workEachTrigger(data) {
+  return request({
+    url: '/workingArrangements/workProgress/workEachTrigger',
+    method: 'post',
+    data: data
+  })
+}
+
+// 任务
+export function workTrigger(data) {
+  return request({
+    url: '/workingArrangements/workProgress/workTrigger',
+    method: 'post',
+    data: data
+  })
+}
+
+// 新增公告
+export function addNotice(data) {
+  return request({
+    url: '/system/notice',
+    method: 'post',
+    data: data
+  })
+}

src/layout/components/AppMain.vue

@@ -42,7 +42,7 @@
         </p>
       </div>
       <div class="tkbox-footer">
-        <button @click="quchulifun">去处理</button>
+        <button @click="quchulifun2">去处理</button>
       </div>
     </div>
     <div class="tkbox3" v-if="open3">
@@ -62,7 +62,7 @@
         </p>
       </div>
       <div class="tkbox-footer">
-        <el-button type="primary" style="width:55px;height:25px;" @click="quchulifun3">去处理</el-button>
+        <button @click="quchulifun3">去处理</button>
       </div>
     </div>
     <div class="tkbox4" v-if="open4">
@@ -82,7 +82,7 @@
         </p>
       </div>
       <div class="tkbox-footer">
-        <el-button type="primary" style="width:55px;height:25px;" @click="quchulifun4">去处理</el-button>
+        <button @click="quchulifun4">去处理</button>
       </div>
     </div>
   </section>
@@ -149,6 +149,22 @@ export default {
         }
       });
     },
+    quchulifun2() {
+      printTriggerClear().then(res => {
+        if (res.code == 200) {
+          this.open = false;
+          window.open(`/print/manage`, "_self");
+        }
+      });
+    },
+    quchulifun3() {
+      this.open3 = false;
+      window.open(`/workingArrangements/workTask`, "_self");
+    },
+    quchulifun4() {
+      this.open4 = false;
+      window.open(`/workingArrangements/workTask`, "_self");
+    },
     startTime() {
       this.timer = setInterval(() => {
         printTrigger().then(res => {

src/views/bdglregular/regularinfo/index.vue

@@ -494,9 +494,7 @@
         </el-form-item>
         <div class="jiben" v-if="jiannum!=0">文件举证</div>
         <el-form-item label prop="documentProof" v-if="jiannum!=0">
-          <!-- <fileUpload v-model="form.documentProof" /> -->
-          <fileUpload v-model="form.documentProof"  />
-          <!-- <el-input v-model="form.documentProof" placeholder="请输入文件举证" /> -->
+          <fileUpload v-model="form.documentProof" />
         </el-form-item>
         <div class="jiben" v-if="currentState==1">未通过原因</div>
         <el-form-item label prop="score" v-if="currentState==1">
@@ -621,8 +619,8 @@ export default {
       jiannum: null,
       btnnum: null,
       disabled: false,
-      currentState:null,
-      curr:null,
+      currentState: null,
+      curr: null
     };
   },
   created() {
@@ -734,7 +732,7 @@ export default {
         this.btnnum = null;
         if (this.form.currentState == "未通过") {
           this.currentState = 1;
-          this.curr=true
+          this.curr = true;
         }
       });
     },
@@ -766,8 +764,8 @@ export default {
       this.jiannum = 0;
       this.btnnum = 1;
       this.disabled = false;
-      this.currentState=1;
-      this.curr=false;
+      this.currentState = 1;
+      this.curr = false;
       // this.reset();
       // editissuccess().then(res => {
       //   if (res.code == 200) {
@@ -787,6 +785,10 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          if(this.form.documentProof[0].url){
+              this.form.documentProof=this.form.documentProof[0].url
+          }
+          
           if (this.form.id != null) {
             this.form.caoZuoType = this.queryParams.caoZuoType;
             editquestion(this.form).then(response => {

src/views/bdglregular/specialinfo/index.vue

@@ -685,6 +685,9 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          if(this.form.documentProof[0].url){
+              this.form.documentProof=this.form.documentProof[0].url
+          }
           if (this.form.id != null) {
             this.form.caoZuoType = this.queryParams.caoZuoType;
             editquestion(this.form).then(response => {

src/views/medicalhealth/antiepidemicamount/index.vue

@@ -0,0 +1,376 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="防疫品ID" prop="durgArchivesId">
+        <el-input
+          v-model="queryParams.durgArchivesId"
+          placeholder="请输入防疫品ID"
+          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="storeHouse">
+        <el-input
+          v-model="queryParams.storeHouse"
+          placeholder="请输入库房"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="库存数量" prop="amount">
+        <el-input
+          v-model="queryParams.amount"
+          placeholder="请输入库存数量"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="入库数量" prop="putIn">
+        <el-input
+          v-model="queryParams.putIn"
+          placeholder="请输入入库数量"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="出库数量" prop="putOut">
+        <el-input
+          v-model="queryParams.putOut"
+          placeholder="请输入出库数量"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="录入人" prop="adminId">
+        <el-input
+          v-model="queryParams.adminId"
+          placeholder="请输入录入人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="录入时间" prop="createtime">
+        <el-input
+          v-model="queryParams.createtime"
+          placeholder="请输入录入时间"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="更新时间" prop="updatetime">
+        <el-input
+          v-model="queryParams.updatetime"
+          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="['medicalhealth:antiepidemicamount: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="['medicalhealth:antiepidemicamount: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="['medicalhealth:antiepidemicamount: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="['medicalhealth:antiepidemicamount:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="antiepidemicamountList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键ID" align="center" prop="id" />
+      <el-table-column label="防疫品ID" align="center" prop="durgArchivesId" />
+      <el-table-column label="单位ID" align="center" prop="unitId" />
+      <el-table-column label="库房" align="center" prop="storeHouse" />
+      <el-table-column label="库存数量" align="center" prop="amount" />
+      <el-table-column label="入库数量" align="center" prop="putIn" />
+      <el-table-column label="出库数量" align="center" prop="putOut" />
+      <el-table-column label="录入人" align="center" prop="adminId" />
+      <el-table-column label="录入时间" align="center" prop="createtime" />
+      <el-table-column label="更新时间" align="center" prop="updatetime" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['medicalhealth:antiepidemicamount:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['medicalhealth:antiepidemicamount:remove']"
+          >删除</el-button>
+        </template>
+      </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" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="防疫品ID" prop="durgArchivesId">
+          <el-input v-model="form.durgArchivesId" placeholder="请输入防疫品ID" />
+        </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="storeHouse">
+          <el-input v-model="form.storeHouse" placeholder="请输入库房" />
+        </el-form-item>
+        <el-form-item label="库存数量" prop="amount">
+          <el-input v-model="form.amount" placeholder="请输入库存数量" />
+        </el-form-item>
+        <el-form-item label="入库数量" prop="putIn">
+          <el-input v-model="form.putIn" placeholder="请输入入库数量" />
+        </el-form-item>
+        <el-form-item label="出库数量" prop="putOut">
+          <el-input v-model="form.putOut" placeholder="请输入出库数量" />
+        </el-form-item>
+        <el-form-item label="录入人" prop="adminId">
+          <el-input v-model="form.adminId" placeholder="请输入录入人" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listAntiepidemicamount, getAntiepidemicamount, delAntiepidemicamount, addAntiepidemicamount, updateAntiepidemicamount, exportAntiepidemicamount } from "@/api/medicalhealth/antiepidemicamount";
+
+export default {
+  name: "Antiepidemicamount",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 防疫用品库存数据表格数据
+      antiepidemicamountList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        durgArchivesId: null,
+        unitId: null,
+        storeHouse: null,
+        amount: null,
+        putIn: null,
+        putOut: null,
+        adminId: null,
+        createtime: null,
+        updatetime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询防疫用品库存数据列表 */
+    getList() {
+      this.loading = true;
+      listAntiepidemicamount(this.queryParams).then(response => {
+        this.antiepidemicamountList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        durgArchivesId: null,
+        unitId: null,
+        storeHouse: null,
+        amount: null,
+        putIn: null,
+        putOut: null,
+        adminId: null,
+        createtime: null,
+        updatetime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加防疫用品库存数据";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getAntiepidemicamount(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改防疫用品库存数据";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateAntiepidemicamount(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAntiepidemicamount(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除防疫用品库存数据编号为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delAntiepidemicamount(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有防疫用品库存数据数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportAntiepidemicamount(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/pt.vue

@@ -5,8 +5,8 @@
       <!-- 头部区域 -->
       <div class="tou">
         <span style="color:#00ccff;font-size:1.2vw;">{{ times }}</span>
-        <img class="liuxian" src="../assets/images/流线.gif" alt />
-        <img class="img-left" src="../assets/images/闪烁GIF-慢.gif" alt />
+        <!-- <img class="liuxian" src="../assets/images/流线.gif" alt />
+        <img class="img-left" src="../assets/images/闪烁GIF-慢.gif" alt /> -->
       </div>
       <!-- 主体区域 -->
       <div class="centen">
@@ -325,7 +325,7 @@
         </p>
       </div>
       <div class="tkbox-footer">
-        <el-button type="primary" style="width:55px;height:25px;" @click="quchulifun2">去处理</el-button>
+        <button @click="quchulifun2">去处理</button>
       </div>
     </div>
     <div class="tkbox" v-if="open">
@@ -345,7 +345,7 @@
         </p>
       </div>
       <div class="tkbox-footer">
-        <el-button type="primary" style="width:55px;height:25px;" @click="quchulifun">去处理</el-button>
+         <button @click="quchulifun">去处理</button>
       </div>
     </div>
     <div class="tkbox3" v-if="open3">
@@ -365,7 +365,7 @@
         </p>
       </div>
       <div class="tkbox-footer">
-        <el-button type="primary" style="width:55px;height:25px;" @click="quchulifun3">去处理</el-button>
+         <button @click="quchulifun3">去处理</button>
       </div>
     </div>
     <div class="tkbox4" v-if="open4">
@@ -385,7 +385,7 @@
         </p>
       </div>
       <div class="tkbox-footer">
-        <el-button type="primary" style="width:55px;height:25px;" @click="quchulifun4">去处理</el-button>
+         <button @click="quchulifun4">去处理</button>
       </div>
     </div>
     <!-- 添加或修改集中文印记录对话框 -->
@@ -446,7 +446,6 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button
-          type="primary"
           style="margin-top:15px;width:55px;height:25px;"
           @click="submitForm"
         >确 定</el-button>
@@ -654,9 +653,11 @@ export default {
     },
     quchulifun3() {
       this.open3 = false;
+      window.open(`/workingArrangements/workTask`, "_self");
     },
     quchulifun4() {
       this.open4 = false;
+      window.open(`/workingArrangements/workTask`, "_self");
     },
     startTime2() {
       this.timer = setInterval(() => {
@@ -849,8 +850,8 @@ hr {
   background-size: 100% 100%;
 }
 .num1 img {
-  width: 20px;
-  height: 20px;
+  /* width: 20px;
+  height: 20px; */
   vertical-align: bottom;
   margin-right: 10px;
 }
@@ -1121,8 +1122,8 @@ hr {
   background: #004d86 !important;
   color: #fff !important;
 }
- .el-select-dropdown__item {
-  left:10px !important;
+.el-select-dropdown__item {
+  left: 10px !important;
 }
 </style>
 <style lang="scss" scoped>

src/views/system/user/index.vue

@@ -334,6 +334,7 @@
                 @change="deptIdClick"
                 clearable
                 placeholder="请选择归属部门"
+                :disabled='disabled'
               >
                 <el-option
                   v-for="dict in unitId"
@@ -588,6 +589,7 @@ export default {
       loading: true,
       // 导出遮罩层
       exportLoading: false,
+      disabled:false,
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -836,6 +838,7 @@ export default {
     handleAdd() {
       this.reset();
       this.getTreeselect();
+      this.disabled=false;
       getUser().then(response => {
         this.postOptions = response.posts;
         this.roleOptions = response.roles;
@@ -848,6 +851,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       this.getTreeselect();
+      this.disabled=true;
       const userId = row.userId || this.ids;
       getUser(userId).then(response => {
         this.form = response.data;
@@ -1010,6 +1014,9 @@ export default {
 ::v-deep .el-tree-node__content:hover {
   background-color: #004d86 !important;
 } */
+/* .el-input.is-disabled .el-input__inner{
+  background: #004d86 !important;
+} */
 /* 对话框背景颜色 */
 ::v-deep .el-dialog {
   background: #004d86 !important;

src/views/taishi/index.vue

@@ -671,7 +671,7 @@
                 <div class="right3-r-main-item-r">
                   <div class="s1">未归还数量</div>
                   <div class="s2">
-                    <b style="color:#30AAFF">{{this.wylist[0]}}</b>台
+                    <b style="color:#FF5A5A ">{{this.wylist[0]}}</b>台
                   </div>
                 </div>
               </div>
@@ -682,7 +682,7 @@
                 <div class="right3-r-main-item-r">
                   <div class="s1">无需归还数量</div>
                   <div class="s2">
-                    <b style="color:#9D83FF ">{{this.wylist.notreturns}}</b>台
+                    <b style="color:#738C97">{{this.wylist.notreturns}}</b>台
                   </div>
                 </div>
               </div>
@@ -1345,7 +1345,7 @@ export default {
     defaultOption() {
       return {
         step: 0.2, // 数值越大速度滚动越快
-        limitMoveNum: 9, // 开始无缝滚动的数据量 this.dataList.length
+        limitMoveNum: this.djlslist.length, // 开始无缝滚动的数据量 this.dataList.length
         hoverStop: true, // 是否开启鼠标悬停stop
         direction: 1, // 0向下 1向上 2向左 3向右
         openWatch: true, // 开启数据实时监控刷新dom
@@ -1385,7 +1385,7 @@ export default {
 }
 .title {
   width: 100%;
-  height: 100px;
+  height: 87px;
   background-image: url("../../assets/images/顶部.png");
   background-size: 100% 100%;
   background-repeat: no-repeat;
@@ -1394,16 +1394,16 @@ export default {
 .title-left {
   position: absolute;
   left: 115px;
-  top: 23px;
-  width: 250px;
-  height: 68px;
+  top: 40px;
+  width: 179px;
+  height: 51px;
   background-image: url("../../assets/images/主控台按钮底.png");
   background-size: 100% 100%;
   background-repeat: no-repeat;
   text-align: center;
-  line-height: 68px;
+  line-height: 51px;
   color: #fff;
-  font-size: 2rem;
+  font-size:1.2vw;
   font-weight: bold;
   cursor: pointer;
 }
@@ -1412,8 +1412,8 @@ export default {
 }
 .title-right {
   position: absolute;
-  color: #64f5fc;
-  font-size: 1.8rem;
+  color: #00F6FF;
+  font-size:1.2vw;
   right: 100px;
   top: 36px;
 }
@@ -1491,7 +1491,7 @@ export default {
   height: 25px;
   background-image: url("../../assets/images/集中文印标题底.png");
   background-repeat: no-repeat;
-  background-size: 100% 100%;
+  background-size: 100%;
   margin-top: 5px;
   margin-left: 2%;
 }
@@ -1877,7 +1877,7 @@ export default {
   font-size: 1.5rem;
   margin-left: 10px;
   font-family: "IMPACT";
-  line-height: 40px;
+  line-height: 48px;
 }
 
 .right2_b {
@@ -1899,7 +1899,7 @@ export default {
   font-size: 1.5rem;
   margin-left: 10px;
   font-family: "IMPACT";
-  line-height: 40px;
+  line-height: 48px;
 }
 
 .right1 {