Merge remote-tracking branch 'origin/master'

Oliver

2022-12-12 e0ec0403645eb0e467025814d1c6c6e790b586d2

Merge remote-tracking branch 'origin/master'

 src/views/operate/car/myIndex/index.vue

@@ -36,13 +36,16 @@
                    </el-table-column>
                    <el-table-column :prop="mystatus ===1 ? 'ownerName':'carOwner'" label="车主姓名" min-width="10">
                    </el-table-column>
                    <el-table-column v-if="mystatus ===2" :prop="mystatus ===1 ? 'vehicleUser' : 'carUser'" label="车辆使用人员" min-width="10">
                    <el-table-column v-if="mystatus === 2" :prop="mystatus === 1 ? 'vehicleUser' : 'carUser'"
                        label="车辆使用人员" min-width="10">
                    </el-table-column>
                    <el-table-column :prop="mystatus ===1 ? 'contact' : 'phone' " label="联系方式" min-width="10">
                    </el-table-column>
                    <el-table-column :prop="mystatus===1 ? 'pdepartName' : 'geographicPosition'" :label="mystatus === 1 ? '所属部门':'施工地址'" min-width="10">
                    <el-table-column :prop="mystatus === 1 ? 'pdepartName' : 'geographicPosition'"
                        :label="mystatus === 1 ? '所属部门' : '施工地址'" min-width="10">
                    </el-table-column>
                    <el-table-column :prop="mystatus===1 ? 'departName' : 'constructionOrg'" :label="mystatus === 1 ? '所属大队' : '施工单位'" min-width="10">
                    <el-table-column :prop="mystatus === 1 ? 'departName' : 'constructionOrg'"
                        :label="mystatus === 1 ? '所属大队' : '施工单位'" min-width="10">
                    </el-table-column>
                    <el-table-column prop="operation" label="操作" min-width="20">
                        <template slot-scope="scope">
@@ -57,20 +60,20 @@
                    </el-table-column>
                </el-table>
                <!-- 新增 -->
                <el-dialog :visible.sync="dialogAdd" width="60%" title="新增车辆"
                    v-if="dialogAdd" :before-close="handleClose">
                <el-dialog :visible.sync="dialogAdd" width="60%" title="新增车辆" v-if="dialogAdd"
                    :before-close="handleClose">
                    <Mycreate v-if="mystatus === 1"  @closeDialog="closeDialog"></Mycreate>
                    <MySoil v-else @closeDialog="closeDialog"></MySoil>
                </el-dialog>
                <!-- 查看 -->
                <el-dialog :visible.sync="dialogView" width="60%" title="查看车辆信息"
                    v-if="dialogView" :before-close="handleNoClose">
                <el-dialog :visible.sync="dialogView" width="60%" title="查看车辆信息" v-if="dialogView"
                    :before-close="handleNoClose">
                    <MyViewLaw v-if="mystatus === 1" :info="info"></MyViewLaw>
                    <MyViewSoil v-else :info="info"></MyViewSoil>
                </el-dialog>
                <!-- 编辑 -->
                <el-dialog :visible.sync="dialogEdit" width="60%" title="编辑车辆信息"
                    v-if="dialogEdit" :before-close="handleClose">
                <el-dialog :visible.sync="dialogEdit" width="60%" title="编辑车辆信息" v-if="dialogEdit"
                    :before-close="handleClose">
                    <MyEditLaw v-if="mystatus === 1" @closeDialog="closeDialog" :info="info"></MyEditLaw>
                    <MyEditSoil v-else @closeDialog="closeDialog" :info="info"></MyEditSoil>
                </el-dialog>
@@ -84,9 +87,9 @@
                            <el-checkbox v-model="unsame" @change="disSame(tableData)">反选</el-checkbox>
                        </div>
                        <div class="funsItem">
                            <el-select v-model="myIdx" placeholder="批量操作" disabled>
                            <el-select v-model="myIdx" placeholder="批量操作" >
                                <el-option v-for="item in options" :key="item.value" :label="item.label"
                                    :value="item.value" :disabled="item.disabled">
                                    :value="item.value" :disabled="item.disabled" @click.native="selectChange">
                                </el-option>
                            </el-select>
                        </div>
@@ -134,14 +137,14 @@
                    label: '批量操作',
                    disabled: true,
                },
                {
                    value: 1,
                    label: '批量启用',
                },
                {
                    value: 2,
                    label: '批量禁用',
                },
                // {
                //     value: 1,
                //     label: '批量启用',
                // },
                // {
                //     value: 2,
                //     label: '批量禁用',
                // },
                {
                    value: 3,
                    label: '批量删除',
@@ -163,6 +166,7 @@
            mystatus:1,
            caseId:'',
            timer:null,
            currentState: 1
        }
    },
    created() {
@@ -191,7 +195,7 @@
        tableChange(list) {
            this.tempList = [];
            list.forEach(item => {
                this.tempList.push(item.code);
                this.tempList.push(item.id);
            })
            if (list.length === this.tableData.length) {
                this.all = true;
@@ -271,6 +275,7 @@
            this.typeList.forEach((item, index) => {
                if (index === idx) {
                    item.checked = true;
                    this.currentState=item.value;
                } else {
                    item.checked = false;
                }
@@ -330,7 +335,54 @@
        handleView(data){
            this.info = data;
            this.dialogView = true;
        },
        selectChange(list) {
            if (this.tempList.length !== 0) {
                
                this.preMyIdx = list;
                this.mulDelete(this.tempList);
                
            } else {
                this.myIdx = this.preMyIdx;
                this.$message({
                    type: "warning",
                    message: "您还没选中任何数据",
                });
        }
        },
        // 多条数据删除
        mulDelete(idArr) {
            var path=""
            if(this.currentState==1){
                path="/sccg/car_Manage/batch_deletion_enforce?ids="
            }
            else{
                path="/sccg/car_Manage/batch_deletion_slag?ids="
            }
            this.$confirm("您确定要批量删除车辆信息吗?")
                .then((_) => {
                    this.$axios({
                        method: "delete",
                        url: path + idArr,
                    }).then((res) => {
                        if (res.code === 200) {
                            this.$message({
                                type: "success",
                                message: "批量删除车辆信息成功",
                            });
                            this.getCarList();
                        } else {
                            this.$message({
                                type: "error",
                                message: res.message,
                            });
                        }
                    });
                })
                .catch((err) => {
                    console.log(err);
                });
        },
    }
}
</script>
@@ -339,6 +391,7 @@
    text-align: left;
    margin: 10px 20px;
    color: #4b9bb7;

    header {
        background-color: #09152f;
        border: 1pox solid #fff;
@@ -391,18 +444,22 @@
            }
        }
    }

    &::v-deep .el-input__inner {
        background-color: #09152f;
        border: 1px solid #17324c;
    }

    main {
        background-color: #09152f;
        margin-top: 20px;
        padding-bottom: 50px;
        border: 1pox solid #fff;

        .btn span:hover{
            cursor: pointer;
        }

        .type-nav {
            display: flex;
            line-height: 40px;
@@ -434,9 +491,11 @@

            .funs {
                display: flex;

                .funs-sp{
                    border: 1px solid #17324c;
                }

                .funsItem {
                    line-height: 28px;
                    display: flex;
@@ -561,9 +620,11 @@
            width: 50px !important;
        }
    }

    .line{
        padding: 0 5px;
    }

    &::v-deep .el-dialog__header,
    &::v-deep .el-dialog__body {
        background-color: #06122c;

 src/views/operate/images/index.vue

@@ -21,6 +21,11 @@
            >
          </div>
        </div>
        <div class="addBtn">
            <el-button type="primary" @click="handleUpdateImageResource(null,'create')"
              >新增</el-button
            >
          </div>
      </div>
    </header>
    <main>
@@ -50,7 +55,7 @@
          :row-class-name="tableRowClassName"
          @selection-change="tableChange"
        >
          <el-table-column type="selection" min-width="5"> </el-table-column>
          <el-table-column type="selection" min-width="5" :selectable="selectable"> </el-table-column>
          <el-table-column prop="code" label="所属事件编号" min-width="18">
          </el-table-column>
          <el-table-column prop="category" label="问题类别" min-width="8">
@@ -79,7 +84,7 @@
                  >查看</span
                >
                <span v-if="mystatus === 3" class="line">|</span>
                <span v-if="mystatus === 3" @click="handleUpdateImageResource(scope.row, 'update')"
                <span v-if="mystatus === 3" @click="handleUdeletepdateImageResource(scope.row, 'update')"
                  >修改</span
                >
                <span v-if="mystatus === 3"  class="line">|</span>
@@ -118,8 +123,6 @@
              <el-select
                v-model="myIdx"
                placeholder="批量操作"
                @change="selectChange"
                disabled
              >
                <el-option
                  v-for="item in options"
@@ -127,6 +130,7 @@
                  :label="item.label"
                  :value="item.value"
                  :disabled="item.disabled"
                  @click.native="selectChange"
                >
                </el-option>
              </el-select>
@@ -199,14 +203,14 @@
          label: "批量操作",
          disabled: true,
        },
        {
          value: 1,
          label: "批量启用",
        },
        {
          value: 2,
          label: "批量禁用",
        },
        // {
        //   value: 1,
        //   label: "批量启用",
        // },
        // {
        //   value: 2,
        //   label: "批量禁用",
        // },
        {
          value: 3,
          label: "批量删除",
@@ -246,21 +250,36 @@

    // 批量删除
    mulDelete(idArr) {
      imageManagement
        .deleteImageResources({ ids: idArr })
        .then(() => {
          this.$message.success("操作成功");
      this.$confirm("您确定要批量删除图片吗?")
                .then((_) => {
                    this.$axios({
                        method: "delete",
                        url: "/sccg/image_resources/deletion_batch?ids=" + idArr,
                    }).then((res) => {
                        if (res.code === 200) {
                            this.$message({
                                type: "success",
                                message: "批量删除图片成功",
                            });
          this.getImageResourceList();
                        } else {
                            this.$message({
                                type: "error",
                                message: res.message,
                            });
                        }
                    });
        })
        .catch((err) => this.$message.error(`${err}`));
                .catch((err) => {
                    console.log(err);
                });
    },
    // 执行下拉框操作
    selectChange(list) {
      debugger
      if (this.tempList.length !== 0) {
        if (list === 3) {
          this.preMyIdx = list;
          this.mulDelete(this.tempList);
        }
      } else {
        this.myIdx = this.preMyIdx;
        this.$message({
@@ -273,7 +292,7 @@
    tableChange(list) {
      this.tempList = [];
      list.forEach((item) => {
        this.tempList.push(item.code);
        this.tempList.push(item.id);
      });
      this.all = list.length === this.tableData.length;
    },
@@ -359,6 +378,13 @@
    getEventSource(value) {
      return EVENT_SOURCE.find((item) => item.value === value);
    },
    selectable(row,index){
         if(this.mystatus == '1'){
           return false;//禁用状态
         }else{
           return true;//非禁用状态
         }
    },
  },
};
</script>
@@ -411,7 +437,7 @@
      }

      .addBtn {
        background-color: #eb5d01;
        // background-color: #eb5d01;
        border: none;
        border-radius: 20px;
        padding: 12px 30px;

 src/views/operate/images/updateUser/index.vue

@@ -11,7 +11,7 @@
          ref="user"
          style="width: 100%"
        >
          <el-form-item prop="belongToId" label="所属事件编号">
          <!-- <el-form-item prop="belongToId" label="所属事件编号">
            <el-input v-model="imagedata.code"></el-input>
          </el-form-item>
          <el-form-item prop="eventSource" label="事件来源">
@@ -39,7 +39,7 @@
          </el-form-item>
          <el-form-item prop="id" label="图片Id">
            <el-input v-model="imagedata.id"></el-input>
          </el-form-item>
          </el-form-item> -->
          <el-form-item prop="url" label="图片:" min-width="8">
            <my-upload
              :picture-list="imageList"

 src/views/operate/management/myIndex/index.vue

@@ -88,7 +88,7 @@
                    <MyIllDetail :info=info v-else :mycode="code"></MyIllDetail>
                </el-dialog>
                <!-- tools -->
                <div class="tools">
                <!-- <div class="tools">
                    <div class="funs">
                        <div class="funsItem funs-sp">
                            <el-checkbox v-model="all" @change="selectAll()">全选</el-checkbox>
@@ -110,7 +110,7 @@
                            @prev-click="handlePrev" @next-click="handleNext">
                        </el-pagination>
                    </div>
                </div>
                </div> -->
            </div>
        </main>
    </div>
@@ -468,6 +468,9 @@
                text-overflow: ellipsis;
                white-space: nowrap;
                overflow: hidden;
                .el-checkbox {
                    display: none;
                }
            }

            &::v-deep .el-table__empty-block {

 src/views/operate/video/index.vue

@@ -18,6 +18,9 @@
            <el-button type="primary" @click="searchVideoList">查询</el-button>
          </div>
        </div>
        <div class="addBtn">
            <el-button type="primary" @click="handleOpera(null, 'create')">新增</el-button>
          </div>
      </div>
    </header>
    <main>
@@ -47,7 +50,7 @@
          :row-class-name="tableRowClassName"
          @selection-change="tableChange"
        >
          <el-table-column type="selection" min-width="5"> </el-table-column>
          <el-table-column v-show="mystatus == 1" type="selection" min-width="5" :selectable="selectable"> </el-table-column>
          <el-table-column prop="code" label="所属事件编号" min-width="18">
          </el-table-column>
          <el-table-column prop="category" label="问题类别" min-width="8">
@@ -109,8 +112,6 @@
              <el-select
                v-model="myIdx"
                placeholder="批量操作"
                @change="selectChange"
                disabled
              >
                <el-option
                  v-for="item in options"
@@ -118,6 +119,7 @@
                  :label="item.label"
                  :value="item.value"
                  :disabled="item.disabled"
                  @click.native="selectChange"
                >
                </el-option>
              </el-select>
@@ -169,14 +171,14 @@
          label: "批量操作",
          disabled: true,
        },
        {
          value: 1,
          label: "批量启用",
        },
        {
          value: 2,
          label: "批量禁用",
        },
        // {
        //   value: 1,
        //   label: "批量启用",
        // },
        // {
        //   value: 2,
        //   label: "批量禁用",
        // },
        {
          value: 3,
          label: "批量删除",
@@ -224,22 +226,35 @@
    },
    // 批量删除
    mulDelete(idArr) {
      videoManagement.deleteVideoRescources({ ids: idArr })
          .then(() => {
            this.$message.success('操作成功');
      this.$confirm("您确定要批量删除视频吗?")
                .then((_) => {
                    this.$axios({
                        method: "delete",
                        url: "/sccg/video_resources/deletion_batch?ids=" + idArr,
                    }).then((res) => {
                        if (res.code === 200) {
                            this.$message({
                                type: "success",
                                message: "批量删除视频成功",
                            });
            this.searchVideoList();
                        } else {
                            this.$message({
                                type: "error",
                                message: res.message,
                            });
                        }
                    });
          })
          .catch(err => {
            this.$message.error(`${err}`);
          })
                .catch((err) => {
                    console.log(err);
                });
    },
    // 执行下拉框操作
    selectChange(list) {
      if (this.tempList.length !== 0) {
        if (list === 3) {
          this.preMyIdx = list;
          this.mulDelete(this.tempList);
        }
      } else {
        this.myIdx = this.preMyIdx;
        this.$message({
@@ -252,7 +267,7 @@
    tableChange(list) {
      this.tempList = [];
      list.forEach((item) => {
        this.tempList.push(item.code);
        this.tempList.push(item.id);
      });
      this.all = list.length === this.tableData.length;
    },
@@ -339,7 +354,14 @@

    getEventSource(value) {
      return EVENT_SOURCE.find(item => item.value === value);
    },
    selectable(row,index){
         if(this.mystatus == '1'){
           return false;//禁用状态
         }else{
           return true;//非禁用状态
    }
    },
  },
};
</script>
@@ -393,7 +415,7 @@
      }

      .addBtn {
        background-color: #eb5d01;
        // background-color: #eb5d01;
        border: none;
        border-radius: 20px;
        padding: 12px 30px;