Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

feige

2024-08-27 76a3eb05129f0af9f9b5798b1c8abbf9afaf7f19

 ruoyi-ui/src/views/clean/index.vue

@@ -64,7 +64,20 @@
            border-radius: 6px 6px 6px 6px;opacity:1;">重置</el-button>
        </el-form-item>
      </el-form>

      <el-row :gutter="10" >
         <el-col>
    <el-input
      v-model="searchQuery"
      placeholder="搜索百度"
      clearable
      style="width: 320px;
           height: 15px;
           margin-bottom: 23px;
           opacity: 0.5;"
      @keyup.enter.native="searchBaidu"
    />
    </el-col>
</el-row>
      <el-row :gutter="10" class="mb8" v-if="userId != 2">
        <el-col :span="1.5">
          <el-button
@@ -122,53 +135,33 @@

            </el-upload>
          </el-col>
        <el-col :span="1.5">
 <el-dropdown placement="分享相关">
     <el-button size="mini"   type="primary"
                plain
                icon="el-icon-top">分享相关</el-button>
      <template #dropdown>
        <el-dropdown-menu>
          <el-dropdown-item     :disabled="multiple" icon="el-icon-top" style="height: 32px;width:240px;color: #0099ff;" @click.native="handleShare">分享</el-dropdown-item>
      
                <el-dropdown-item    icon="el-icon-top" @click.native="whoShare">分享给我的数据</el-dropdown-item>
            <el-dropdown-item    icon="el-icon-top" @click.native="handleWho">分享给谁了什么数据</el-dropdown-item>
          <el-dropdown-item    icon="el-icon-top" @click.native="showData">展示下载的分享数据</el-dropdown-item>
        </el-dropdown-menu>
      </template>
	  
     </el-dropdown>
	   
</el-col>

          <el-col :span="1.5">
            <el-button
              type="primary"
              plain
              icon="el-icon-top"
              size="mini"
              :disabled="multiple"
              @click="handleShare"

            >分享</el-button>
          </el-col>
     
         	  

          <el-col :span="1.5">
            <el-button
              type="primary"
              plain
              icon="el-icon-top"
              size="mini"
              @click="handleWho"
            >分享给谁了什么数据</el-button>
          </el-col>

          <el-col :span="1.5">
            <el-button
              type="primary"
              plain
              icon="el-icon-top"
              size="mini"
              @click="whoShare"
            >分享给我的数据</el-button>
          </el-col>

          <el-col :span="1.5">
            <el-button
              type="primary"
              plain
              icon="el-icon-top"
              size="mini"
              @click="showData"
            >展示下载的分享数据</el-button>
          </el-col>

        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
        <right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
      </el-row>

      <el-table v-loading="loading" :data="cleanList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
      <el-table v-loading="loading" border :data="cleanList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
        <el-table-column type="selection" :reserve-selection="true"  width="55"  align="center" />
        <el-table-column fixed label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>

@@ -256,7 +249,8 @@
      />

      <!-- 添加或修改资产信息配置对话框 -->
      <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
      <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body     @click.native="handleDialogClick"
>
        <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">

            <el-form-item label="类型" prop="kind">
@@ -273,7 +267,9 @@
            </el-input>
          </el-form-item>
          <el-form-item label="时间" prop="happenTime">
            <el-date-picker v-model="formDat.happenTime" type="date" placeholder="请选择日期"
            <el-date-picker v-model="formDat.happenTime" type="date" placeholder="请选择日期"       @click.native.stop
                           ref="datePicker"

                            :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
            ></el-date-picker>
          </el-form-item>
@@ -567,6 +563,7 @@
    data() {
      return {
        // 分享给谁的list
      searchQuery: undefined,
        listRoot: [],
        open1:false,
        open2:false,
@@ -597,7 +594,7 @@
        dateRange1: [],
        total1:0,


valueFromParent: "保洁收纳",
        userId: undefined,
        // 遮罩层
        disabled: false,
@@ -630,7 +627,7 @@
        dateRange: [],
        // 数据范围选项
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','m4a'],

        fileList:[
        ],
@@ -728,6 +725,17 @@

    },
    methods: {
   handleDialogClick()
   {
      // 关闭日期选择器
            this.$refs.datePicker.handleClose();
   },
        searchBaidu() {
            // 打开百度搜索结果
            window.open(`https://www.baidu.com/s?wd=${encodeURIComponent(this.searchQuery)}`);
            // 清空搜索框
            this.searchQuery = '';
          },
      // 分页
      fenYe(){
        // @pagination='ifNum === 1 ? selectValue : (ifNum === 2 ? whoShare : showData)'