Merge branch 'dev-yjl' into 'shenzhen-dev'

升降机/塔吊管理/中建四局 See merge request !165
2023-05-16 14:42:12 +08:00 · 2023-05-16 14:42:12 +08:00 · 2ecd788753
commit 2ecd788753
parent 6c48e5d249 b93c2d64a8
17 changed files with 282 additions and 123 deletions
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@ -42,7 +42,6 @@ if (process.env.NODE_ENV == 'development') {
  // axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地
  // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋
  // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上（旧）地址
-  // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
  // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
  // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上旧
  // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地
@ -87,7 +86,11 @@ if (process.env.NODE_ENV == 'development') {
  // axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新
  // axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上（新）地址
  // axios.defaults.baseURL = 'http://101.43.164.214:12350'//中建五局线上
-  axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上
+  // axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1)
+  axios.defaults.baseURL = 'http://182.90.224.147:30262/'//港投(成润)项目线上(2)
+    // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
+
+
 } else if (process.env.NODE_ENV == 'debug') {
  axios.defaults.baseURL = 'https://www.ceshi.com'
 } else if (process.env.NODE_ENV == 'production') {
--- a/src/components/GlobalUploader.vue
+++ b/src/components/GlobalUploader.vue
@ -51,7 +51,7 @@
        data() {
            return {
                options: {
-                    target: this.$http.defaults.baseURL+'filetransfer/uploadfile?projectSn='+this.$store.state.projectSn, // 目标上传 URL
+                    target: this.$http.defaults.baseURL+'filetransfer/uploadfile', // 目标上传 URL
                    chunkSize: 1024 * 1024,
                    fileParameterName: 'file',
                    maxChunkRetries: 3,
@ -90,7 +90,7 @@
        mounted() {

            this.$EventBus.$on('openUploader', query => {
-                console.log('openUploader')
+                console.log('openUploader',query)
                this.params = query || {};
                // this.$refs.uploadBtn.click()
                var e = document.createEvent('MouseEvent');
--- a/src/pages/index/index.js
+++ b/src/pages/index/index.js
@ -277,7 +277,7 @@ Vue.prototype.getViewFilePath = function(row) {

 //路由监听
 router.beforeEach((to, form, next) => {
-  const whitepage = ["/authentication", "/test", "/videoLearning",'/pages/projectEnd/safetyEducation/authentication'];
+  const whitepage = ["/authentication", "/test", "/videoLearning",'/pages/projectEnd/safetyEducation/authentication','/companyAdmin/docManage'];

  console.log('白名单跳转生效了嘛==============11111111111 :',to);

--- a/src/store/index.js
+++ b/src/store/index.js
@ -94,11 +94,9 @@ export default new Vuex.Store({
    // UPLOADURL: 'http://101.43.164.214:12345/upload/image',//内蒙古
    // FILEURL: 'http://101.43.164.214:12345/image/',//内蒙古
    // UPLOADURL: 'http://42.194.144.62:8088/upload/image',//中建四
-    // FILEURL: 'http://42.194.144.62:8088/image/',//中建四
-    // UPLOADURL: 'http://42.194.144.62:8088/upload/image',//中建四
-    // FILEURL: 'http://42.194.144.62:8088/image/',//中建四
-    // UPLOADURL: 'http://182.90.224.147:15551/upload/image',//中建四
-    // FILEURL: 'http://182.90.224.147:15551/image/',//中建四
+    // FILEURL: 'http://42.194.144.62:8088/image/',//中建四   
+    // UPLOADURL: 'http://182.90.224.147:30262/upload/image',//四川成润
+    // FILEURL: 'http://182.90.224.147:30262/image/',//四川成润

    ACCOUNTTYPE: [
      "系统管理员",
--- a/src/views/companyAdmin/docManage.vue
+++ b/src/views/companyAdmin/docManage.vue
@ -92,14 +92,20 @@
        <el-table-column
          :label="$t('message.docManage.table.operation')"
          align="center"
-          width="250"
+          width="270"
        >
          <template slot-scope="scope">
            <div class="tableBtns">
-              <div @click="downFn(scope.row)" class="operationText">
-                <!-- <el-link class="downfn" type="primary">{{$t('message.docManage.table.download')}}</el-link> -->
+              <el-button
+              class="operationText"
+                  @click="downFn(scope.row.filePath)"
+                  type="text"
+                  size="small"
+                  >下载附件</el-button
+                >
+              <!-- <div @click="downFn(scope.row)" class="operationText">
                <a :href="downloadUrl" class="downfn">下载</a>
-              </div>
+              </div> -->
              <div @click="editFn(scope.row)" class="operationText">
                <img
                  src="@/assets/images/icon-edit.png"
@ -376,14 +382,26 @@ export default {
    },
    //下载文件
    downFn(item) {
-      updateFileDownloadNumApi({ id: item.id }).then((res) => {
-        // window.open(this.$store.state.FILEURL+item.filePath)
-        // var a = document.createElement("a");
-        // a.href = this.$store.state.FILEURL + item.filePath
-        // a.download = item.fileName;
-        // a.click();
-        this.downloadUrl = this.$store.state.FILEURL + item.filePath
-      })
+      // console.log('http://182.90.224.147:30262/image/'+item);
+      // if (item) {
+      //   let arr = []
+      //   arr = JSON.parse(item)
+      //   arr.forEach(element => {
+          window.location.href = this.$store.state.FILEURL+item;
+        // });
+      // } else {
+      //   this.$message.success('未查询到附件')
+      // }
+      // updateFileDownloadNumApi({ id: item.id }).then((res) => {
+      //   // window.open(this.$store.state.FILEURL+item.filePath)
+      //   // var a = document.createElement("a");
+      //   // a.href = this.$store.state.FILEURL + item.filePath
+      //   // a.download = item.fileName;
+      //   // a.click();
+      //   this.$message.error(res.message);
+        // this.downloadUrl = this.$store.state.FILEURL + item.filePath
+
+      // })
    },
    //查看条数
    handleSizeChange(val) {
--- a/src/views/homeTwo/homeIntro.vue
+++ b/src/views/homeTwo/homeIntro.vue
@ -152,9 +152,9 @@ export default {
  data() {
    return {
      navigationList: [
-        { name: '产品服务', id: 1 },
-        { name: 'SDK&工具', id: 2 },
-        { name: '文档', id: 3 }
+        // { name: '产品服务', id: 1 },
+        // { name: 'SDK&工具', id: 2 },
+        // { name: '文档', id: 3 }
      ],
      checked: 1,
      LOGO_white: LOGO_white,
--- a/src/views/projectAdmin/fileCenter.vue
+++ b/src/views/projectAdmin/fileCenter.vue
@ -46,7 +46,7 @@
                {{ item.fileName }}
              </div>
              <div class="right">
-                <img src="@/assets/images/eye.png" @click="viewFn(item)" />
+                <!-- <img src="@/assets/images/eye.png" @click="viewFn(item)" /> -->
                <img src="@/assets/images/download.png" @click="downFn(item)" />
              </div>
            </div>
@ -140,24 +140,25 @@ export default {
    },
    //下载文件
    downFn(item) {
-      updateFileDownloadNumApi({ id: item.id }).then((res) => {
-        let blob = new Blob([this.$store.state.FILEURL + item.filePath], {
-          type: 'application/octet-stream'
-        })
-        // application/octet-stream //下载文件的通用格式
-        if (window.navigator.msSaveBlob) {
-          window.navigator.msSaveBlob(blob, item.fileName) //处理IE下载的兼容性
-        } else {
-          let downloadElement = document.createElement('a')
-          let href = window.URL.createObjectURL(blob) //创建下载的链接
-          downloadElement.href = href
-          downloadElement.download = item.fileName //下载后文件名
-          document.body.appendChild(downloadElement)
-          downloadElement.click() //点击下载
-          document.body.removeChild(downloadElement) //下载完成移除元素
-          window.URL.revokeObjectURL(href) //释放掉blob对象
-        }
-      })
+      window.location.href = this.$store.state.FILEURL+item.filePath;
+      // updateFileDownloadNumApi({ id: item.id }).then((res) => {
+      //   let blob = new Blob([this.$store.state.FILEURL + item.filePath], {
+      //     type: 'application/octet-stream'
+      //   })
+      //   // application/octet-stream //下载文件的通用格式
+      //   if (window.navigator.msSaveBlob) {
+      //     window.navigator.msSaveBlob(blob, item.fileName) //处理IE下载的兼容性
+      //   } else {
+      //     let downloadElement = document.createElement('a')
+      //     let href = window.URL.createObjectURL(blob) //创建下载的链接
+      //     downloadElement.href = href
+      //     downloadElement.download = item.fileName //下载后文件名
+      //     document.body.appendChild(downloadElement)
+      //     downloadElement.click() //点击下载
+      //     document.body.removeChild(downloadElement) //下载完成移除元素
+      //     window.URL.revokeObjectURL(href) //释放掉blob对象
+      //   }
+      // })
    },
    resetForm() {
      this.$refs['searchForm'].resetFields()
--- a/src/views/projectAdmin/fourEngin/command/rightFour.vue
+++ b/src/views/projectAdmin/fourEngin/command/rightFour.vue
@ -21,8 +21,7 @@
      <div class="titleText" >
        <p><i class="el-icon-circle-close" @click="closeDialog"></i></p>
        <p>  <span style="float:left;font-size:20px;margin: 35px 0 0 32px;">{{ itemVar.title }}</span> <span style="float:right;margin: 39px -12px 0px 0;">{{itemVar.updateTime }}</span></p>
-        <div class="content" v-html="itemVar.content">
-         <!-- {{  itemVar.content}} -->
+        <div class="content ql-editor" style="white-space: pre-line" v-html="itemVar.content">
      </div>
      </div>
      
--- a/src/views/projectFront/electricityManage/alarmValueSet.vue
+++ b/src/views/projectFront/electricityManage/alarmValueSet.vue
@ -460,7 +460,7 @@ export default {
      if (typeof obj.alarmPushWorkerId === "string"&& obj.alarmPushWorkerId != '') {
        this.addEditForm.alarmPushWorkerId = obj.alarmPushWorkerId
          .split(",")
-          .map(Number);
+         
      }
      this.handle("edit", true);
    },
--- a/src/views/projectFront/environmentalMonitor/alarmValueSet.vue
+++ b/src/views/projectFront/environmentalMonitor/alarmValueSet.vue
@ -292,7 +292,7 @@
                console.log('编辑', obj);
                this.addEditForm = JSON.parse(JSON.stringify(obj));
                if (typeof obj.alarmPushWorkerId === 'string'&& obj.alarmPushWorkerId != '') {
-                    this.addEditForm.alarmPushWorkerId = obj.alarmPushWorkerId.split(',').map(Number);
+                    this.addEditForm.alarmPushWorkerId = obj.alarmPushWorkerId.split(',')
                }
                this.handle('edit', true);
            },
--- a/src/views/projectFront/fileManage/components/FileList/components/OperationMenu.vue
+++ b/src/views/projectFront/fileManage/components/FileList/components/OperationMenu.vue
@ -127,14 +127,17 @@ export default {
      get() {
        let res = {
          filePath: this.filePath,
-          isDir: 0
+          isDir: 0,
+          projectSn:this.$store.state.projectSn
+
        }
        return res
      },
      set() {
        return {
          filePath: '/',
-          isDir: 0
+          isDir: 0,
+          projectSn:this.$store.state.projectSn
        }
      }
    },
--- a/src/views/projectFront/informatioBroadcast/broadcast.vue
+++ b/src/views/projectFront/informatioBroadcast/broadcast.vue
@ -176,7 +176,7 @@ export default {
            [{ align: [] }], //对齐方式

            ['clean'], //清除字体样式
-            ['image', 'video'] //上传图片、上传视频
+            ['image'] //上传图片、上传视频
          ]
        },
        theme: 'snow'
--- a/src/views/projectFront/laborManage/dormitoryMod/checkIn.vue
+++ b/src/views/projectFront/laborManage/dormitoryMod/checkIn.vue
@ -525,7 +525,8 @@ export default {
            element.discernCode = "100" + index;
          });
          this.tableData = res.result;
-        } else {
+        } 
+        else {
          this.$message.error(res.message);
        }
      });
--- a/src/views/projectFront/lifter/devMaintain.vue
+++ b/src/views/projectFront/lifter/devMaintain.vue
@ -27,8 +27,9 @@
              ></el-option>
            </el-select>
          </el-form-item>
-          <!-- <el-form-item :label="$t('message.lifter.alarmTime')">
+          <el-form-item label="维保日期">
            <el-date-picker
+              @change="getTime"
              v-model="time"
              type="daterange"
              value-format="yyyy-MM-dd"
@ -37,26 +38,26 @@
              :end-placeholder="$t('message.lifter.deadline')"
            >
            </el-date-picker>
-          </el-form-item> -->
+          </el-form-item>
          <el-form-item>
            <!-- 查询 -->
            <el-button
              type="primary"
              @click="
-                pageNo = 1;
-                pageSize = 10;
-                getListData();
+                pageNo = 1
+                pageSize = 10
+                getListData()
              "
              plain
-              >{{ $t("message.lifter.demand") }}</el-button
+              >{{ $t('message.lifter.demand') }}</el-button
            >
            <!-- 刷新 -->
            <el-button type="warning" plain @click="onSubmit">{{
-              $t("message.lifter.refresh")
+              $t('message.lifter.refresh')
            }}</el-button>
            <!-- 新增 -->
            <el-button type="primary" @click="addBtn">{{
-              $t("message.videoManage.add")
+              $t('message.videoManage.add')
            }}</el-button>
          </el-form-item>
        </el-form>
@ -68,38 +69,46 @@
          style="width: 100%"
          height="600px"
        >
-        <!-- 设备名称 -->
-          <el-table-column prop="devName" :label="$t('message.lifter.devName')">
+          <!-- 设备名称 -->
+          <el-table-column align="center" prop="devName" :label="$t('message.lifter.devName')">
          </el-table-column>
          <!-- 设备编号 -->
-          <el-table-column prop="devSn" :label="$t('message.lifter.devNumber')">
+          <el-table-column align="center" prop="devSn" :label="$t('message.lifter.devNumber')">
          </el-table-column>
          <!-- 维保单位 -->
          <el-table-column
+          align="center"
            prop="maintenanceUnit"
            :label="$t('message.lifter.maintenanceUnit')"
          >
          </el-table-column>
          <!-- 维保负责人 -->
          <el-table-column
+          align="center"
            prop="personLiable"
            :label="$t('message.lifter.maintenanceSupervisor')"
          >
          </el-table-column>
          <!-- 维保时间 -->
          <el-table-column
+          align="center"
            prop="maintenanceTime"
            :label="$t('message.lifter.maintenanceTime')"
          >
          </el-table-column>
          <!-- 维保状态 -->
          <el-table-column
+          align="center"
            prop="maintenanceStatus"
            :label="$t('message.lifter.maintenanceState')"
          >
-          <!-- normal正常   abnormalTow不正常 -->
+            <!-- normal正常   abnormalTow不正常 -->
            <template slot-scope="scope">
-              {{ scope.row.maintenanceStatus == 1 ? $t('message.lifter.normal') : $t('message.lifter.abnormalTow') }}
+              {{
+                scope.row.maintenanceStatus == 1
+                  ? $t('message.lifter.normal')
+                  : $t('message.lifter.abnormalTow')
+              }}
            </template>
          </el-table-column>
          <!-- <el-table-column
@ -109,21 +118,26 @@
          </el-table-column> -->

          <!-- 维保照片 -->
-          <el-table-column prop="maintenanceImage" :label="$t('message.lifter.maintenancePhotos')">
+          <el-table-column
+          align="center"
+            prop="maintenanceImage"
+            :label="$t('message.lifter.maintenancePhotos')"
+          >
            <template slot-scope="scope">
              <!-- <img
                :src="fileUrl + scope.row.maintenanceImage"
                style="width: 40px; heigth: auto"
              /> -->
-               <el-image 
+              <el-image
                style="width: 40px; heigth: auto"
-                :src="fileUrl + scope.row.maintenanceImage" 
-                :preview-src-list="[fileUrl + scope.row.maintenanceImage]">
+                :src="fileUrl + scope.row.maintenanceImage"
+                :preview-src-list="[fileUrl + scope.row.maintenanceImage]"
+              >
              </el-image>
            </template>
          </el-table-column>
          <!-- 描述 -->
-          <el-table-column prop="remark" :label="$t('message.lifter.describe')">
+          <el-table-column align="center" prop="remark" :label="$t('message.lifter.describe')">
          </el-table-column>
        </el-table>
        <el-pagination
@ -141,7 +155,6 @@

      <!-- 新增 -->

-
      <!-- addMaintenanceInfo 新增维保信息 -->
      <el-dialog
        :modal-append-to-body="false"
@ -155,10 +168,14 @@
            ref="maintenanceForm"
            label-width="100px"
            class="demo-ruleForm"
-            :rules="rules" size="medium"
+            :rules="rules"
+            size="medium"
          >
            <!-- 维保设备 -->
-            <el-form-item :label="$t('message.lifter.maintenanceEquipment')" prop="devSn">
+            <el-form-item
+              :label="$t('message.lifter.maintenanceEquipment')"
+              prop="devSn"
+            >
              <el-select
                v-model="maintenanceForm.devSn"
                :placeholder="
@ -178,7 +195,10 @@
              </el-select>
            </el-form-item>
            <!-- 维保后状态 -->
-            <el-form-item :label="$t('message.lifter.afterStatus')" prop="maintenanceStatus">
+            <el-form-item
+              :label="$t('message.lifter.afterStatus')"
+              prop="maintenanceStatus"
+            >
              <el-select
                v-model="maintenanceForm.maintenanceStatus"
                :placeholder="
@ -187,12 +207,21 @@
                "
                style="width: 100%"
              >
-                <el-option :label="$t('message.lifter.normal')" :value="1"></el-option>
-                <el-option :label="$t('message.lifter.abnormalTow')" :value="0"></el-option>
+                <el-option
+                  :label="$t('message.lifter.normal')"
+                  :value="1"
+                ></el-option>
+                <el-option
+                  :label="$t('message.lifter.abnormalTow')"
+                  :value="0"
+                ></el-option>
              </el-select>
            </el-form-item>
            <!-- 维保时间 -->
-            <el-form-item :label="$t('message.lifter.maintenanceTime')" prop="maintenanceTime">
+            <el-form-item
+              :label="$t('message.lifter.maintenanceTime')"
+              prop="maintenanceTime"
+            >
              <el-date-picker
                value-format="yyyy-MM-dd HH:mm:ss"
                v-model="maintenanceForm.maintenanceTime"
@ -203,7 +232,10 @@
              </el-date-picker>
            </el-form-item>
            <!-- 维保人 -->
-            <el-form-item :label="$t('message.lifter.maintainer')" prop="personLiable">
+            <el-form-item
+              :label="$t('message.lifter.maintainer')"
+              prop="personLiable"
+            >
              <el-input
                v-model="maintenanceForm.personLiable"
                :placeholder="$t('message.lifter.pleaseEnter')"
@ -225,7 +257,10 @@
              </el-select> -->
            </el-form-item>
            <!-- 维保单位 -->
-            <el-form-item :label="$t('message.lifter.maintenanceUnit')" prop="maintenanceUnit">
+            <el-form-item
+              :label="$t('message.lifter.maintenanceUnit')"
+              prop="maintenanceUnit"
+            >
              <el-input
                v-model="maintenanceForm.maintenanceUnit"
                :placeholder="$t('message.lifter.pleaseEnter')"
@ -239,7 +274,10 @@
              ></el-input>
            </el-form-item>
            <!-- 上传图片 -->
-            <el-form-item :label="$t('message.lifter.uploadPictures')" prop="maintenanceImage">
+            <el-form-item
+              :label="$t('message.lifter.uploadPictures')"
+              prop="maintenanceImage"
+            >
              <el-upload
                :action="uploadUrl"
                list-type="picture-card"
@ -258,13 +296,13 @@
          </el-form>
          <span slot="footer" class="dialog-footer">
            <!-- 取 消 -->
-            <el-button @click="dialogVisible = false" size="medium"
-              >{{ $t('message.lifter.cancel') }}</el-button
-            >
+            <el-button @click="dialogVisible = false" size="medium">{{
+              $t('message.lifter.cancel')
+            }}</el-button>
            <!-- 确 定 -->
-            <el-button type="primary" @click="saveBtn" size="medium"
-              >{{ $t('message.lifter.determine') }}</el-button
-            >
+            <el-button type="primary" @click="saveBtn" size="medium">{{
+              $t('message.lifter.determine')
+            }}</el-button>
          </span>
        </div>
      </el-dialog>
@ -326,6 +364,10 @@ export default {
          { required: true, message: this.$t('message.lifter.pleaseUploadPictures'), trigger: "change" },
        ],
      },
+      maintenanceEndTime: '',
+      maintenanceStartTime: '',
+      time: [],
+
    };
  },
  created() {
@ -337,6 +379,16 @@ export default {
  },

  methods: {
+    //选择时间
+    getTime(val) {
+      if (val || val.length > 0) {
+        this.maintenanceEndTime = val[1];
+        this.maintenanceStartTime = val[0];
+      } else {
+        this.maintenanceEndTime = "";
+        this.maintenanceStartTime = "";
+      }
+    },
    //获取设备列表下拉
    getLifterList() {
      let data = {
@ -357,6 +409,9 @@ export default {
        pageNo: this.pageNo,
        pageSize: this.pageSize,
        devSn: this.devSn,
+        maintenanceStartTime: this.maintenanceStartTime,
+        maintenanceEndTime: this.maintenanceEndTime,
+
      };
      getMaintenanceListApi(data).then((res) => {
        if (res.code == 200) {
@ -426,6 +481,7 @@ export default {
      this.pageSize = 10;
      this.devSn = "";
      this.getListData();
+      this.time=[]
    },

    handleSizeChange(val) {
@ -444,26 +500,26 @@ export default {
 // .alarmInfo {
 //   width: 100%;
 //   height: 100%;
-  // .title {
-  //   background-color: #ffffff;
-  //   padding: 0 20px;
-  //   padding-top: 17px;
-  //   height: 70px;
-  //   box-sizing: border-box;
-  // }
-  // .content {
-  //   margin-top: 10px;
-  //   box-sizing: border-box;
-  //   width: 100%;
-  //   height: 720px;
-  //   background-color: #ffffff;
-  // }
+// .title {
+//   background-color: #ffffff;
+//   padding: 0 20px;
+//   padding-top: 17px;
+//   height: 70px;
+//   box-sizing: border-box;
 // }
-.dialog-footer{
-    display: flex;
-    justify-content: flex-end;
+// .content {
+//   margin-top: 10px;
+//   box-sizing: border-box;
+//   width: 100%;
+//   height: 720px;
+//   background-color: #ffffff;
+// }
+// }
+.dialog-footer {
+  display: flex;
+  justify-content: flex-end;
 }
-.dialog_content{
+.dialog_content {
  margin: 0 20px;
 }
 </style>
--- a/src/views/projectFront/projectSummary/panoramaPlan.vue
+++ b/src/views/projectFront/projectSummary/panoramaPlan.vue
@ -32,7 +32,8 @@
          <vue-scroll style="height: 668px">
              <el-table :data="tableData">
                <!-- 标段名称 -->
-                  <el-table-column align="center" prop="projectfName" :label="$t('message.projectInfo.sectionName')"></el-table-column>
+                  <el-table-column v-if="COMPANY=='sccr'" align="center" prop="crSectionName" :label="$t('message.projectInfo.sectionName')"></el-table-column>
+                  <el-table-column v-else align="center" prop="projectfName" :label="$t('message.projectInfo.sectionName')"></el-table-column>
                 <!-- 节点编号 -->
                  <el-table-column align="center" prop="nodeCode" :label="$t('message.projectInfo.nodeNumber')"></el-table-column>
                  <!-- 节点名称 -->
--- a/src/views/projectFront/towerCrane/devMaintain.vue
+++ b/src/views/projectFront/towerCrane/devMaintain.vue
@ -26,8 +26,9 @@
              ></el-option>
            </el-select>
          </el-form-item>
-          <!-- <el-form-item :label="$t('message.lifter.alarmTime')">
+          <el-form-item label="维保日期">
            <el-date-picker
+              @change="getTime"
              v-model="time"
              type="daterange"
              value-format="yyyy-MM-dd"
@ -36,7 +37,7 @@
              :end-placeholder="$t('message.lifter.deadline')"
            >
            </el-date-picker>
-          </el-form-item> -->
+          </el-form-item>
          <el-form-item>
            <el-button type="primary" @click="getMaintenanceList" plain>{{
              $t('message.lifter.demand')
@ -285,7 +286,11 @@ export default {
        maintenanceImage: [
          { required: true, message: '请上传图片', trigger: 'change' }
        ]
-      }
+      },
+      maintenanceEndTime: '',
+      maintenanceStartTime: '',
+      time: [],
+
    }
  },

@ -298,6 +303,16 @@ export default {
  },

  methods: {
+     //选择时间
+     getTime(val) {
+      if (val || val.length > 0) {
+        this.maintenanceEndTime = val[1];
+        this.maintenanceStartTime = val[0];
+      } else {
+        this.maintenanceEndTime = "";
+        this.maintenanceStartTime = "";
+      }
+    },
    //获取设备下拉
    getTowerList() {
      let data = {
@ -317,7 +332,9 @@ export default {
        projectSn: this.projectSn,
        devSn: this.devSn,
        pageNo: this.pageNo,
-        pageSize: this.pageSize
+        pageSize: this.pageSize,
+        maintenanceStartTime: this.maintenanceStartTime,
+        maintenanceEndTime: this.maintenanceEndTime,
      }
      getMaintenanceListApi(data).then((res) => {
        if (res.code == 200) {
@ -333,6 +350,7 @@ export default {
      this.pageNo = 1
      this.pageSize = 10
      this.getMaintenanceList()
+      this.time=[]
    },
    //新增按钮
    addMaintenanceBtn() {
--- a/src/views/projectFront/uavLnspection/uavview.vue
+++ b/src/views/projectFront/uavLnspection/uavview.vue
@ -26,11 +26,15 @@
            prop="updateTime"
            label="更新时间"
          ></el-table-column>
-          <el-table-column
-            align="center"
-            prop="videoUrl"
-            label="视频URL"
-          ></el-table-column>
+          <el-table-column align="center" prop="videoUrl" label="无人机视频">
+            <template slot-scope="scope">
+              <i
+                @click.stop="playerVideo(scope.row.videoUrl)"
+                class="el-icon-video-play"
+                style="font-size: 25px; cursor: pointer"
+              ></i>
+            </template>
+          </el-table-column>
          <el-table-column width="200">
            <template slot-scope="scope">
              <div class="tableBtns">
@ -73,6 +77,7 @@
      :title="type"
      :visible.sync="dialogVisible"
      width="667px"
+      @close="close"
    >
      <div class="dialog_content">
        <el-form
@ -86,7 +91,7 @@
            label="巡检名称"
            prop="name"
            :rules="[
-              { required: true, message: '请输入巡检名称', trigger: 'blur' }
+              { required: true, message: '请输入巡检名称', trigger: 'blur' },
            ]"
          >
            <el-input placeholder="请输入" v-model="workerInfo.name"></el-input>
@ -95,7 +100,7 @@
            label="拍摄时间"
            prop="shootingTime"
            :rules="[
-              { required: true, message: '请选择拍摄时间', trigger: 'blur' }
+              { required: true, message: '请选择拍摄时间', trigger: 'blur' },
            ]"
          >
            <el-date-picker
@ -110,7 +115,7 @@
            label="巡检视频"
            prop="videoUrl"
            :rules="[
-              { required: true, message: '请上传巡检视频', trigger: 'blur' }
+              { required: true, message: '请上传巡检视频', trigger: 'blur' },
            ]"
          >
            <div class="videoUpload">
@ -128,7 +133,7 @@
              <template>
                <div class="videos">
                  <video
-                    v-if="workerInfo.videoUrl"
+                    v-if="addPlayer||workerInfo.videoUrl"
                    width="120"
                    height="80"
                    controls
@ -172,6 +177,34 @@
        </el-form>
      </div>
    </el-dialog>
+    <!-- 视频播放 -->
+    <div class="video" style="position: absolute; top: 12%; left: 17%">
+      <video
+        v-if="isShow || player"
+        width="100%"
+        height="600"
+        controls
+        autoplay
+        style="margin-left: 10px"
+      >
+        <source :src="player" type="video/mp4" />
+        <source :src="player" type="video/mp4" />
+        <source :src="player" type="video/mp4" />
+        您的浏览器不支持 video 标签。
+      </video>
+      <i
+        style="
+          position: absolute;
+          top: 1%;
+          left: 97%;
+          color: #fff;
+          font-size: 30px;
+          cursor: pointer;
+        "
+        class="el-icon-circle-close"
+        @click.stop="closeBtn"
+      ></i>
+    </div>
  </div>
 </template>
 <script>
@ -198,7 +231,10 @@ export default {
        videoUrl: '', //视频
        projectSn: '' //项目sn
      }, //表单
-      fileList: []
+      fileList: [],
+      player: '',
+      isShow: false,
+      addPlayer:false
    }
  },
  created() {
@ -206,6 +242,21 @@ export default {
    this.getWorkerList()
  },
  methods: {
+    //关闭视频
+    closeBtn(){
+      this.isShow =false
+      this.player=''
+    },
+    //视频播放
+    playerVideo(item) {
+      console.log('点击', this.$store.state.FILEURL + item);
+      this.isShow = false
+      this.$nextTick(() => {
+        this.player = this.$store.state.FILEURL + item
+        this.isShow = true
+
+      })
+    },
    // 获取所有无人机列表
    // getWorkerList() {
    //   getUavVideoListApi({ projectSn: this.$store.state.projectSn }).then(
@ -241,10 +292,12 @@ export default {
    },
    //编辑
    editBtn(val) {
-      console.log('编辑的数据', val)
+      console.log('val------',val);
      this.type = '编辑巡检视频'
      this.dialogVisible = true
-      this.workerInfo = JSON.parse(JSON.stringify(val))
+    
+        this.workerInfo = JSON.parse(JSON.stringify(val))
+       
    },
    //删除楼栋
    deleteBtn(val) {
@ -305,7 +358,7 @@ export default {
    },
    handleSuccess(file, fileList) {
      console.log('成功的file', file)
-      this.workerInfo.videoUrl = file.data[0].filename
+        this.workerInfo.videoUrl = file.data[0].filename
      if (file.status == 'SUCCESS') {
        this.$message({ message: '视频上传成功', type: 'success' })
      } else {
@ -327,7 +380,15 @@ export default {
        this.$message({ message: '只能上传视频', type: 'error' })
      }
      return flag
-    }
+    },
+    close(){
+      this.workerInfo = {
+        name: '', //巡检名称
+        shootingTime: '', //拍摄时间
+        videoUrl: '', //视频
+        projectSn: '' //项目sn
+      }
+    },
  }
 }
 </script>