Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/views/shareResources/components/ServiceDetails.vue

@@ -18,12 +18,12 @@
               label="数据说明"
               content-class-name="my-content"
               :span="3"
-              >客观地说广东省帝黑XXXXXXXX</el-descriptions-item
+              >测试数据</el-descriptions-item
             >
             <el-descriptions-item label="数据所有者"
               >管理员</el-descriptions-item
             >
-            <el-descriptions-item label="数据年份">XXXX</el-descriptions-item>
+            <el-descriptions-item label="数据年份">2024</el-descriptions-item>
             <el-descriptions-item label="服务类型">{{
               detailObj.type
             }}</el-descriptions-item>
@@ -31,9 +31,9 @@
               detailObj.serverType
             }}</el-descriptions-item>
             <el-descriptions-item label="服务发布时间"
-              >XXX</el-descriptions-item
+              >2024</el-descriptions-item
             >
-            <el-descriptions-item label="联系人">XXX</el-descriptions-item>
+            <el-descriptions-item label="联系人">张百仪</el-descriptions-item>
           </el-descriptions>
         </div>
         <div class="btnCon">
@@ -43,18 +43,20 @@
       </div>
     </div>
     <el-dialog
-      title="提示"
+      title="申请调用"
       :visible.sync="dialogVisible"
       width="30%"
       :before-close="handleClose"
       :close-on-click-modal="false"
+      :append-to-body="false"
+      :modal-append-to-body="false"
     >
-      <div>
+      <div class="diaoCon">
         <el-form
           :model="ruleForm"
           :rules="rules"
           ref="ruleForm"
-          label-width="100px"
+          label-width="110px"
           class="demo-ruleForm"
         >
           <el-form-item label-width="0px">
@@ -125,18 +127,40 @@
             ></el-date-picker>
           </el-form-item>
           <el-form-item label="附件材料" prop="attachment">
-            <el-upload
+            <!-- <el-upload
               class="upload-demo"
               :on-change="handleChange"
+              :action="uploadFileUrl"
               :auto-upload="false"
               :show-file-list="false"
               :file-list="fileList"
               :limit="1"
               accept=".zip"
+              :on-preview="handlePreview"
+              :on-remove="handleRemove"
+              :before-remove="beforeRemove"
+              multiple
+              :on-exceed="handleExceed"
+            >
+              <el-button class="upload-btn" icon="Upload" size="mini"
+                >上传</el-button
+              >
+            </el-upload> -->
+            <el-upload
+              class="upload-demo"
+              :action="uploadFileUrl"
+              :before-upload="handleBeforeUpload"
+              :on-error="handleUploadError"
+              :on-success="handleUploadSuccess"
+              :limit="1"
+              accept=".docx,.doc,.pdf"
+              :file-list="fileList"
+              :show-file-list="true"
             >
               <el-button class="upload-btn" icon="Upload" size="mini"
                 >上传</el-button
               >
+              <div class="el-upload__tip" slot="tip">只能上传docx文件</div>
             </el-upload>
           </el-form-item>
         </el-form>
@@ -154,30 +178,54 @@
       title="提示"
       :visible.sync="dialogVisible2"
       width="50%"
-      :before-close="handleClose"
+      :before-close="handleClose2"
     >
       <div>
-        <el-table :data="tableData" style="width: 100%"  height="460">
-          <el-table-column prop="sqTime" label="申请时间" show-overflow-tooltip > </el-table-column>
-          <el-table-column prop="sqDepartmentBy" label="申请部门" show-overflow-tooltip> </el-table-column>
-          <el-table-column prop="zymlBy" label="数据服务" > </el-table-column>
-          <el-table-column prop="zymlTypeName" label="服务类型"> </el-table-column>
-          <el-table-column prop="sqFw" label="申请范围" show-overflow-tooltip> </el-table-column>
-          <el-table-column prop="sqReason" label="申请理由" show-overflow-tooltip> </el-table-column>
-          <el-table-column prop="systemName" label="系统名称" show-overflow-tooltip> </el-table-column>
-          <el-table-column prop="callIp" label="调用IP" show-overflow-tooltip> </el-table-column>
-          <el-table-column prop="sqDeadline" label="预期使用时间" show-overflow-tooltip>
+        <el-table :data="tableData" style="width: 100%" height="460">
+          <el-table-column prop="sqTime" label="申请时间" show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="sqDepartmentBy"
+            label="申请部门"
+            show-overflow-tooltip
+          >
+          </el-table-column>
+          <el-table-column prop="zymlBy" label="数据服务"> </el-table-column>
+          <el-table-column prop="zymlTypeName" label="服务类型">
+          </el-table-column>
+          <el-table-column prop="sqFw" label="申请范围" show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="sqReason"
+            label="申请理由"
+            show-overflow-tooltip
+          >
+          </el-table-column>
+          <el-table-column
+            prop="systemName"
+            label="系统名称"
+            show-overflow-tooltip
+          >
+          </el-table-column>
+          <el-table-column prop="callIp" label="调用IP" show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="sqDeadline"
+            label="预期使用时间"
+            show-overflow-tooltip
+          >
           </el-table-column>
         </el-table>
         <el-pagination
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page="page"
-      :page-sizes="[10, 20, 30, 40]"
-      :page-size="10"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="400">
-    </el-pagination>
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="pageNum"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+        >
+        </el-pagination>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible2 = false">取 消</el-button>
@@ -203,8 +251,10 @@ export default {
   },
   data() {
     return {
-      page:1,
-      total:0,
+      uploadFileUrl: window.axiosURI + "/file/upload", // 上传文件服务器地址
+      total: 0,
+      pageNum: 1,
+      pageSize: 10,
       xzqTreeValue: "",
       isDetailsShow: false,
       dialogVisible: false,
@@ -217,13 +267,13 @@ export default {
         sqReason: "", //申请理由
         systemName: "", //系统名称
         sqFw: "", //申请范围
-        zymlId:this.detailObj.id,
+        zymlId: this.detailObj.id,
         zymlBy: this.detailObj.serverType, //数据服务
         zymlTypeName: this.detailObj.type, //数据类型
         callIp: "", //调用ip
         sqDeadline: "", //预期服务截止时间
         attachment: "", //附件材料
-        sqDepartmentId:''
+        sqDepartmentId: "",
       },
       rules: {
         systemName: [
@@ -247,6 +297,14 @@ export default {
             trigger: "blur",
           },
         ], //请输入使用数据服务的IP地址，多个用;隔开，最多支持3个
+        sqDeadline: [
+          {
+            type: "date",
+            required: true,
+            message: "请选择日期",
+            trigger: "change",
+          },
+        ],
       },
       tableData: [
         {
@@ -270,29 +328,50 @@ export default {
   mounted() {
     getInfo().then((res) => {
       this.userMsg = res.user;
-      this.ruleForm.sqDepartmentBy = res.user.dept.deptName
-      this.ruleForm.sqDepartmentId = res.user.deptId
+      this.ruleForm.sqDepartmentBy = res.user.dept.deptName;
+      this.ruleForm.sqDepartmentId = res.user.deptId;
     });
-    
   },
   methods: {
+    handleBeforeUpload(file) {
+      // this.$modal.loading("正在上传文件，请稍候...");
+      console.log(file, "上传中");
+      return true;
+    },
+    // 上传失败
+    handleUploadError(err) {
+      this.$message.error("上传文件失败,请重试");
+    },
+    // 上传成功回调
+    handleUploadSuccess(res, file) {
+      this.ruleForm.attachment = res.data.url;
+    },
     handleSizeChange(val) {
-        console.log(`每页 ${val} 条`);
-      },
-      handleCurrentChange(val) {
-        console.log(`当前页: ${val}`);
-      },
+      console.log(`每页 ${val} 条`);
+      this.pageSize = val;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+      this.pageNum = val;
+      this.getList();
+    },
     closeBox() {
       this.$emit("updateParent", "isShowService", false);
     },
     //申请记录
     applicationRecord() {
-      GetResources().then((res) => {
-        this.tableData = res.rows
-        this.total = res.total
-        console.log(res,'//////');
-        this.dialogVisible2 = true;
-      });
+      this.dialogVisible2 = true;
+      this.getList();
+    },
+    getList() {
+      GetResources({ pageSize: this.pageSize, pageNum: this.pageNum }).then(
+        (res) => {
+          this.tableData = res.rows;
+          this.total = res.total;
+          console.log(res, "//////");
+        }
+      );
     },
     getXzqTreeData() {
       GetXzqhTree().then((res) => {
@@ -326,7 +405,13 @@ export default {
     },
     handleClose(done) {
       this.dialogVisible = false;
-      this.reset()
+      this.reset();
+    },
+    handleClose2(done) {
+      this.dialogVisible = false;
+      this.pageNum = 1;
+      this.pageSize = 10;
+      // this.reset();
     },
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {
@@ -334,7 +419,7 @@ export default {
           ApplyResources(this.ruleForm).then((res) => {
             this.$message.success("成功!");
             this.dialogVisible = false;
-            this.reset()
+            this.reset();
           });
         } else {
           console.log("error submit!!");
@@ -345,24 +430,25 @@ export default {
     resetForm(formName) {
       this.dialogVisible = false;
       this.$refs[formName].resetFields();
-      this.reset()
+      this.reset();
     },
-    reset(){
-      this.ruleForm= {
+    reset() {
+      this.ruleForm = {
         sqTime: moment(new Date()).format("YYYY-MM-DD HH:mm:ss"), //申请时间
         sqDepartmentBy: "海南省国土空间治理平台", //申请部门
         sqReason: "", //申请理由
         systemName: "", //系统名称
         sqFw: "", //申请范围
-        zymlId:this.detailObj.id,
+        zymlId: this.detailObj.id,
         zymlBy: this.detailObj.serverType, //数据服务
         zymlTypeName: this.detailObj.type, //数据类型
         callIp: "", //调用ip
         sqDeadline: "", //预期服务截止时间
         attachment: "", //附件材料
-        sqDepartmentId:this.userMsg.deptId
-      }
-    }
+        sqDepartmentId: this.userMsg.deptId,
+      };
+      this.fileList = [];
+    },
   },
   watch: {
     xzqTreeValue(val) {
@@ -446,6 +532,33 @@ export default {
   color: #fff;
   background-color: transparent;
 }
+.diaoCon {
+  height: 500px;
+  overflow: hidden;
+  overflow-y: auto;
+  /deep/ .el-input__inner {
+    color: #fff;
+    background: #041c3273 !important;
+    border: 1px dashed #0f7ac8;
+  }
+  /deep/ .el-textarea__inner {
+    color: #fff;
+    background: #041c3273 !important;
+    border: 1px dashed #0f7ac8 !important;
+  }
+  /deep/ .el-upload__tip {
+    color: #fff;
+  }
+  /deep/ .el-form-item {
+    margin-bottom: 4px;
+  }
+  /deep/ .el-upload-list__item-name{
+    color: #fff;
+  }
+  /deep/  .el-upload-list__item:hover{
+    background: transparent !important;
+  }
+}
 </style>
 <style>
 .my-content {