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

src/views/shareResources/components/ServiceDetails.vue

@@ -21,7 +21,7 @@
               >客观地说广东省帝黑XXXXXXXX</el-descriptions-item
             >
             <el-descriptions-item label="数据所有者"
-              >XXXXX</el-descriptions-item
+              >管理员</el-descriptions-item
             >
             <el-descriptions-item label="数据年份">XXXX</el-descriptions-item>
             <el-descriptions-item label="服务类型">{{
@@ -66,24 +66,24 @@
                   v-model="ruleForm.date1"
                   style="width: 100%"
                 ></el-date-picker> -->
-                <el-input v-model="ruleForm.sqTime"></el-input>
+                <el-input v-model="ruleForm.sqTime" disabled></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item prop="sqDepartmentBy" label="申请部门">
-                <el-input v-model="ruleForm.sqDepartmentBy"></el-input>
+                <el-input v-model="ruleForm.sqDepartmentBy" disabled></el-input>
               </el-form-item>
             </el-col>
           </el-form-item>
           <el-form-item label-width="0px">
             <el-col :span="12">
               <el-form-item prop="zymlBy" label="服务器类型">
-                <el-input v-model="ruleForm.zymlBy"></el-input>
+                <el-input v-model="ruleForm.zymlBy" disabled></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item prop="zymlTypeName" label="服务类型">
-                <el-input v-model="ruleForm.zymlTypeName"></el-input>
+                <el-input v-model="ruleForm.zymlTypeName" disabled></el-input>
               </el-form-item>
             </el-col>
           </el-form-item>
@@ -153,22 +153,31 @@
     <el-dialog
       title="提示"
       :visible.sync="dialogVisible2"
-      width="30%"
+      width="50%"
       :before-close="handleClose"
     >
       <div>
-        <el-table :data="tableData" style="width: 100%">
-          <el-table-column prop="date" label="申请时间"> </el-table-column>
-          <el-table-column prop="sqbm" label="申请部门"> </el-table-column>
-          <el-table-column prop="sjfw" label="数据服务"> </el-table-column>
-          <el-table-column prop="fwlx" label="服务类型"> </el-table-column>
-          <el-table-column prop="sqfw" label="申请范围"> </el-table-column>
-          <el-table-column prop="sqly" label="申请理由"> </el-table-column>
-          <el-table-column prop="xtmc" label="系统名称"> </el-table-column>
-          <el-table-column prop="dyip" label="调用IP"> </el-table-column>
-          <el-table-column prop="yqTime" label="预期使用时间">
+        <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>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible2 = false">取 消</el-button>
@@ -184,6 +193,8 @@
 import { GetXzqhTree } from "@/api/map";
 import { ApplyResources, GetResources } from "../../../api/kfgx/gxzy";
 import moment from "moment";
+import { getInfo } from "@/api/login";
+import user from "../../../store/modules/user";
 export default {
   props: {
     detailObj: {
@@ -192,6 +203,8 @@ export default {
   },
   data() {
     return {
+      page:1,
+      total:0,
       xzqTreeValue: "",
       isDetailsShow: false,
       dialogVisible: false,
@@ -204,11 +217,13 @@ export default {
         sqReason: "", //申请理由
         systemName: "", //系统名称
         sqFw: "", //申请范围
+        zymlId:this.detailObj.id,
         zymlBy: this.detailObj.serverType, //数据服务
         zymlTypeName: this.detailObj.type, //数据类型
         callIp: "", //调用ip
         sqDeadline: "", //预期服务截止时间
         attachment: "", //附件材料
+        sqDepartmentId:''
       },
       rules: {
         systemName: [
@@ -246,20 +261,37 @@ export default {
           yqTime: "预期时间",
         },
       ],
+      userMsg: null, //用户信息
     };
   },
   created() {
     this.getXzqTreeData();
   },
+  mounted() {
+    getInfo().then((res) => {
+      this.userMsg = res.user;
+      this.ruleForm.sqDepartmentBy = res.user.dept.deptName
+      this.ruleForm.sqDepartmentId = res.user.deptId
+    });
+    
+  },
   methods: {
+    handleSizeChange(val) {
+        console.log(`每页 ${val} 条`);
+      },
+      handleCurrentChange(val) {
+        console.log(`当前页: ${val}`);
+      },
     closeBox() {
       this.$emit("updateParent", "isShowService", false);
     },
     //申请记录
     applicationRecord() {
       GetResources().then((res) => {
-        console.log(res, "|||||||||||||||");
-        this.dialogVisible2 = true
+        this.tableData = res.rows
+        this.total = res.total
+        console.log(res,'//////');
+        this.dialogVisible2 = true;
       });
     },
     getXzqTreeData() {
@@ -294,19 +326,15 @@ export default {
     },
     handleClose(done) {
       this.dialogVisible = false;
-      // this.$confirm('确认关闭？')
-      //   .then(_ => {
-      //     done();
-      //   })
-      //   .catch(_ => {});
+      this.reset()
     },
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           ApplyResources(this.ruleForm).then((res) => {
-            console.log(res, "+++++++++++++");
             this.$message.success("成功!");
             this.dialogVisible = false;
+            this.reset()
           });
         } else {
           console.log("error submit!!");
@@ -317,7 +345,24 @@ export default {
     resetForm(formName) {
       this.dialogVisible = false;
       this.$refs[formName].resetFields();
+      this.reset()
     },
+    reset(){
+      this.ruleForm= {
+        sqTime: moment(new Date()).format("YYYY-MM-DD HH:mm:ss"), //申请时间
+        sqDepartmentBy: "海南省国土空间治理平台", //申请部门
+        sqReason: "", //申请理由
+        systemName: "", //系统名称
+        sqFw: "", //申请范围
+        zymlId:this.detailObj.id,
+        zymlBy: this.detailObj.serverType, //数据服务
+        zymlTypeName: this.detailObj.type, //数据类型
+        callIp: "", //调用ip
+        sqDeadline: "", //预期服务截止时间
+        attachment: "", //附件材料
+        sqDepartmentId:this.userMsg.deptId
+      }
+    }
   },
   watch: {
     xzqTreeValue(val) {