执行任务，态势

src/components/FileUpload/index.vue

@@ -156,7 +156,7 @@ export default {
     // 删除文件
     handleDelete(index) {
       this.fileList.splice(index, 1);
-      this.$emit("input", this.listToString(this.fileList));
+      this.$emit("input", this.fileList);
     },
     // 获取文件名称
     getFileName(name) {

src/views/PrintsLog/printlog/index.vue

@@ -245,12 +245,12 @@
             >查看</el-button
           >
           <!-- <el-button size="mini" type="text" v-if="scope.row.statusG==1||scope.row.statusG==2">已归还</el-button> -->
-          <!-- <el-button
+          <el-button
             size="btd"
             type="text"
             @click="handleDelete(scope.row)"
             v-hasPermi="['PrintsLog:printlog:remove']"
-          >删除</el-button>-->
+          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>

src/views/combatduty/taskdutyinfo/index.vue

@@ -175,7 +175,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" type="index" />
       <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
-      <el-table-column label="单位" align="center" prop="unitName" />
+      <!-- <el-table-column label="单位" align="center" prop="unitName" /> -->
       <!-- <el-table-column label="部门ID" align="center" prop="unitId" /> -->
       <el-table-column label="指挥员" align="center" prop="commanderName" />
       <!-- <el-table-column label="指挥员ID" align="center" prop="commanderId" /> -->
@@ -187,10 +187,9 @@
       <!-- <el-table-column label="参加人员" align="center" prop="participantsName" /> -->
       <!-- <el-table-column label="参加人员ID" align="center" prop="participantsId" /> -->
       <el-table-column
-        label="参加人员"
+        label="参加人数"
         align="center"
-        prop="participantsIds"
-        :formatter="unit2Format"
+        prop="participantsName"
       />
       <el-table-column
         label="开始时间"
@@ -232,6 +231,13 @@
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
+          <el-button
+            size="btk"
+            type="text"
+            @click="handlelook(scope.row)"
+            v-hasPermi="['combatduty:taskdutyinfo:edit']"
+            >查看</el-button
+          >
           <el-button
             size="btu"
             type="text"
@@ -316,8 +322,8 @@
         <el-form-item label="指挥员电话" prop="commanderPhone">
           <el-input v-model="form.commanderPhone" placeholder="" />
         </el-form-item>
-        <el-form-item label="参加人数" prop="commanderPhone">
-          <el-input v-model="form.unitId" placeholder="" />
+        <el-form-item label="参加人数" prop="participantsName">
+          <el-input v-model="form.participantsName" placeholder="" />
         </el-form-item>
         <!-- <el-form-item label="参加人员">
           <el-select
@@ -355,7 +361,7 @@
         </el-form-item>
         <div class="jiben">人员名册</div>
         <el-form-item>
-          <FileUpload v-model="form.fileName" />
+          <FileUpload v-model="form.taskdutyFus" />
         </el-form-item>
         <!-- <el-form-item label="" prop="participantsIds">
           <el-select
@@ -387,6 +393,104 @@
         <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
+    <!-- 查看执行任务对话框 -->
+    <el-dialog
+      :title="title1"
+      :visible.sync="open1"
+      width="1016px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+        :inline="true"
+      >
+        <div class="jiben">基本信息</div>
+        <el-form-item label="指挥员" prop="commanderName">
+          <el-select
+            v-model="form.commanderName"
+            @change="driverNamefun"
+            filterable
+            clearable
+            disabled
+            placeholder=""
+          >
+            <el-option
+              v-for="item in rylist"
+              :key="item.id"
+              :label="item.name"
+              :value="item"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="指挥员电话" prop="commanderPhone">
+          <el-input disabled v-model="form.commanderPhone" placeholder="" />
+        </el-form-item>
+        <el-form-item label="参加人数" prop="participantsName">
+          <el-input disabled v-model="form.participantsName" placeholder="" />
+        </el-form-item>
+        <el-form-item label="开始时间" prop="startTime">
+          <el-date-picker
+            clearable
+            disabled
+            size="small"
+            v-model="form.startTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder=""
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="endTime">
+          <el-date-picker
+            disabled
+            clearable
+            size="small"
+            v-model="form.endTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder=""
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="所在位置" prop="adress">
+          <el-input disabled v-model="form.adress" placeholder="" />
+        </el-form-item>
+        <div class="jiben">人员名册</div>
+        <!-- <el-form-item>
+          <FileUpload v-model="form.taskdutyFus" />
+        </el-form-item> -->
+        <div v-for="item in this.form.taskdutyFus" :key="item" style="margin-bottom:10px">
+          <span class="wordfile" style="color: white; margin-left: 10px">{{item.filename}}</span>
+          <!-- <div> -->
+            <span href="item.filepath" style="color: white; margin-left: 10px;cursor:pointer;" @click="downloadss(item.filepath,item.filename)">下载附件</span>
+          <!-- </div> -->
+        </div>
+        <div class="jiben">事由</div>
+        <el-form-item label prop="question">
+          <el-input
+            disabled
+            v-model="form.question"
+            type="textarea"
+            placeholder=""
+          />
+        </el-form-item>
+        <div class="jiben">备注</div>
+        <el-form-item label prop="remarks">
+          <el-input
+            disabled
+            v-model="form.remarks"
+            type="textarea"
+            placeholder=""
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <!-- <el-button type="primary" @click="submitForm">确 定</el-button> -->
+        <el-button @click="open1 = false" size="btn">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -425,8 +529,10 @@ export default {
       taskdutyinfoList: [],
       // 弹出层标题
       title: "",
+      title1: "",
       // 是否显示弹出层
       open: false,
+      open1: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -447,7 +553,11 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        // participantsName:[
+        //     { type: 'Number', required: true, message: '请选择日期', trigger: 'change' }
+        //   ],
+      },
       //人员数据
       rylist: [],
       //单位数据
@@ -461,6 +571,37 @@ export default {
     this.getrylist();
   },
   methods: {
+     downloadss(URL,name) {
+      // console.log(URL)
+      let xhr = new XMLHttpRequest();
+      xhr.open("get", URL, true);
+      xhr.setRequestHeader("Content-Type", `application/pdf`);
+      xhr.responseType = "blob";
+      let that = this;
+      xhr.onload = function () {
+        if (this.status == 200) {
+          //接受二进制文件流
+          var blob = this.response; // that.downloadExportFile(blob, fileName);
+          let downloadElement = document.createElement("a");
+          let href = blob;
+          if (typeof blob == "string") {
+            downloadElement.target = "_blank";
+          } else {
+            href = window.URL.createObjectURL(blob); //创建下载的链接
+          }
+          downloadElement.href = href;
+          // console.log(that.dyform.printName);
+          downloadElement.download = name; // tagFileName + //下载后文件名
+          document.body.appendChild(downloadElement);
+          downloadElement.click(); //点击下载
+          document.body.removeChild(downloadElement); //下载完成移除元素
+          if (typeof blob != "string") {
+            window.URL.revokeObjectURL(href); //释放掉blob对象
+          }
+        }
+      };
+      xhr.send();
+    },
     //获取人员
     getrylist() {
       listPeople().then((res) => {
@@ -560,12 +701,72 @@ export default {
       const id = row.id || this.ids;
       getTaskdutyinfo(id).then((response) => {
         this.form = response.data;
+
+        this.form.taskdutyFus.forEach((item) => {
+          // 文件路径
+          item.url = item.filepath;
+          // 文件名称
+          item.name = item.filename;
+        });
+        console.log(this.form);
+        //  var fileNameS=[];
+        //  var filename= this.form.filename.split(',')
+        //  var filepath= this.form.filepath.split(',')
+        //   filename.map((item,i)=>{
+        //       fileNameS.push({name:filename[i],url: filepath[i]})
+        //   })
+        //    this.form.fileNameS=fileNameS
+
         this.open = true;
         this.title = "修改执行任务";
       });
     },
+    // 查看按钮操作
+    handlelook(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getTaskdutyinfo(id).then((response) => {
+        this.form = response.data;
+        this.form.taskdutyFus.forEach(item=>{
+          item.filepath=process.env.VUE_APP_BASE_API+item.filepath
+        })
+        console.log(this.form)
+        this.open1 = true;
+        this.title1 = "查看执行任务";
+      });
+    },
     /** 提交按钮 */
     submitForm() {
+      // console.log(this.form.fileName)
+      // this.form.filename = "";
+      // this.form.filepath = "";
+      // console.log(this.form.fileNameS)
+      // for (var i of this.form.fileNameS) {
+      //   // console.log(i)
+      //   this.form.filename += i.name + ",";
+      //   this.form.filepath += i.url + ",";
+      // }
+      // this.form.filename = this.form.filename.substring(
+      //   0,
+      //   this.form.filename.length - 1
+      // );
+      // this.form.filepath = this.form.filepath.substring(
+      //   0,
+      //   this.form.filepath.length - 1
+      // );
+      console.log(this.form);
+      if(this.form.taskdutyFus){
+        this.form.taskdutyFus.forEach((item) => {
+        // 文件路径
+        item.filepath = item.url;
+        item.url=item.filepath;
+        // 文件名称
+        item.filename = item.name;
+        item.name=item.filename
+      });
+      }
+      
+      console.log(this.form);
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
@@ -769,11 +970,21 @@ export default {
   color: white;
   text-indent: 0.5em;
 }
-::v-deep .el-upload-list__item a .el-link--inner{
+::v-deep .el-upload-list__item a .el-link--inner {
   padding: 8px;
   line-height: 10px;
 }
 ::v-deep .el-select-dropdown__item {
   color: white;
 }
+.wordfile{
+  width: 840px;
+  display: inline-block;
+  height: 30px;
+  line-height: 30px;
+  border: 1px solid white;
+  text-indent: 20px;
+  /* text-align: center; */
+  margin-bottom: 10px;
+}
 </style>

src/views/taishi/index.vue

@@ -968,7 +968,7 @@
           </div>
           <div class="right3-r">
             <div class="left1-head2">
-              <span>涉密载体统计</span>
+              <span>涉密载体外借统计</span>
             </div>
             <div id="right3-r-main">
               <div class="right3-r-main-item">
@@ -1185,7 +1185,17 @@ export default {
     rizongwenyin().then(res => {
       // console.log(res.data[0])
       this.wylist = res.data;
-      console.log(this.wylist)
+      if(this.wylist[1]){
+        console.log(this.wylist[1])
+      }else{
+        this.wylist[1]=0
+      }
+       if(this.wylist[0]){
+        console.log(this.wylist[0])
+      }else{
+        this.wylist[0]=0
+      }
+      // console.log(this.wylist)
     });
     //军车
     juncheguanli().then(res => {