南昌市物联网技防平台-前端
Administrator
2021-03-30 4158c289179fc69ae13ae6cb9b8dd37b63a07a0f
在线设备修改,包裹,违禁品搜索框信息回填
4 files modified
59 ■■■■ changed files
src/views/clientManagement/clientManagement.vue 12 ●●●●● patch | view | raw | blame | history
src/views/home/home.vue 5 ●●●●● patch | view | raw | blame | history
src/views/parcel/parcel.vue 23 ●●●● patch | view | raw | blame | history
src/views/parcel/parcelKind.vue 19 ●●●● patch | view | raw | blame | history
src/views/clientManagement/clientManagement.vue
@@ -473,7 +473,7 @@
              valueFormat: "yyyy-MM-dd HH:mm:ss",
              width: 130
            }, {
              label: "最后上传时间",
              label: "心跳时间",
              prop: "heartbeat",
              type: "datetime",
              format: "yyyy-MM-dd",
@@ -648,6 +648,16 @@
            ...this.query
          };
        }
        //在线设备
        if(this.$route.query.dxtype != undefined){
          values = {
            ...params,
            dxtype: this.$route.query.dxtype,
            ...this.query,
          };
        }
        this.loading = true;
        getList(page.currentPage, page.pageSize, values, this.treeDeptId).then(res => {
          const data = res.data.data;
src/views/home/home.vue
@@ -55,9 +55,10 @@
        });
      },
      //在线设备分页数据
      handleStartEquipment(){
      handleStartEquipment(data){
         this.$router.push({
          path: `/clientManagement/index`
          path: `/clientManagement/index`,
          query: data[0]
        });
      },
      //客户管理分页数据
src/views/parcel/parcel.vue
@@ -61,9 +61,6 @@
        showViewer: false, // 显示查看器
        imgUrl:'',
        loading: true,
        dialogTableVisible: false,
        parcelConversation:false,
        oldParcelSatart:false,
        page: {
          pageSize: 10,
          currentPage: 1,
@@ -139,6 +136,7 @@
              valueFormat: "yyyy-MM-dd HH:mm:ss",
              searchRange: true,
              searchSpan: 8,
              searchValue:[this.getStartTime(),this.getEndTime()],
              hide: true,
              addDisplay: false,
              editDisplay: false,
@@ -169,6 +167,7 @@
            {
              label: "是否违禁",
              search: true,
              searchValue: this.getIsKindParams(),
              searchLabelWidth: 120,
              searchSpan: 4,
              hide: true,
@@ -247,6 +246,23 @@
      refreshChange() {
        this.onLoad(this.page, this.query);
      },
      getStartTime(){
           if (this.$route.query.startTime != undefined && this.$route.query.startTime != null && this.$route.query.startTime != "" ) {
             return this.$route.query.startTime
           }
      },
      getEndTime(){
           if (this.$route.query.endTime != undefined && this.$route.query.endTime != null && this.$route.query.endTime != "" ) {
             return this.$route.query.endTime
           }
      },
      getIsKindParams(){
        if(this.$route.query.decisioDiagramResult && this.$route.query!='' && this.$route.query!=null && this.$route.query!=undefined){
          //回显
          return this.$route.query.decisioDiagramResult
        }
      },
      //给行加颜色
      rowStyle({row, column, rowIndex}){
         if(row.mechineMark==1){
           return {
@@ -283,7 +299,6 @@
              }
            }
        }
        if (dateTime) {
          values = {
src/views/parcel/parcelKind.vue
@@ -123,6 +123,7 @@
              format: "yyyy-MM-dd HH:mm:ss",
              valueFormat: "yyyy-MM-dd HH:mm:ss",
              searchRange: true,
              searchValue: [this.getStartTime(),this.getEndTime()],
              searchSpan: 8,
              hide: true,
              addDisplay: false,
@@ -229,6 +230,18 @@
      refreshChange() {
        this.onLoad(this.page, this.query);
      },
      //获取开始时间返回搜索框
      getStartTime(){
           if (this.$route.query.startTime != undefined && this.$route.query.startTime != null && this.$route.query.startTime != "" ) {
             return this.$route.query.startTime
           }
      },
      //获取结束时间返回搜索框
      getEndTime(){
           if (this.$route.query.endTime != undefined && this.$route.query.endTime != null && this.$route.query.endTime != "" ) {
             return this.$route.query.endTime
           }
      },
      onLoad(page, params = {}) {
        const { dateTime } = this.query;
        let values = {
@@ -284,9 +297,9 @@
          });
      },
      // 关闭查看器
        closeViewer() {
          this.showViewer = false
        }
      closeViewer() {
        this.showViewer = false
      }
    }
  };
</script>