Merge branch 'master' of http://192.168.60.6:3000/siwei_shuma/real3d-portalsite

src/api/kfgx/gxzy.js

@@ -5,4 +5,36 @@ export function GetByBsm(params) {
         method: 'get',
         params
     })
+}
+
+export function ApplyResources(data) {
+    return request({
+        url: '/apply/share/resources',
+        method: 'post',
+        data: data
+    })
+}
+//申请资源查询
+export function GetResources(params) {
+    return request({
+        url: '/apply/share/resources/list',
+        method: 'get',
+        params
+    })
+}
+//申请资源列表
+export function GetApplication(params) {
+    return request({
+        url: '/apply/my/application/list',
+        method: 'get',
+        params
+    })
+}
+//撤销资源申请
+export function CancelApplication(data) {
+    return request({
+        url: '/apply/my/application',
+        method: 'get',
+        data
+    })
 }

src/components/mapView/tablePage.vue

@@ -21,6 +21,7 @@
         :key="index"
         show-overflow-tooltip
         :width="item.width || null"
+        :fixed="item.fixed"
       >
         <template #default="scope">
           <slot

src/views/Idleland/components/config.js

@@ -60,10 +60,11 @@ export const TableHeader = [
   { label: "操作", prop: "PHONE", slot: "action" },
 ]
 export const TableHeader2 = [
-  { label: "土地使用权人", prop: "srf", },
+  { label: "项目名称", prop: "xmmc" },
+  { label: "土地使用权人", prop: "srf",  },
   { label: "面积(亩)", prop: "crmj", width: '80px', slot: "mj" },
-  { label: "土地证号", prop: "cqzh" },
-  { label: "操作", prop: "PHONE", slot: "action" },
+  // { label: "土地证号", prop: "cqzh" },
+  { label: "操作", prop: "PHONE", slot: "action", fixed: "right", width: '100px' },
 ]
 
 // 详情字段

src/views/Idleland/components/list.vue

@@ -136,10 +136,7 @@ export default {
   mounted() {
     this.formConfig = this.$props.type == 0 ? ysForm : xzForm;
     this.cloumn = this.$props.type == 0 ? TableHeader : TableHeader2;
-    this.pageObj.isConfirm = this.$props.type != 0;
-    this.pageObj.isDisposal = this.$props.type == 2;
-    this.pageObj.startTime = store.state.cockpit_date[0];
-    this.pageObj.endTime = store.state.cockpit_date[1];
+    this.reset();
   },
   methods: {
     searchFun(page = {}) {
@@ -232,8 +229,8 @@ export default {
         pageNum: 1,
         pageSize: 10,
         isDisposal: this.$props.type == 2,
-        startTime: store.state.cockpit_date[0],
-        endTime: store.state.cockpit_date[1],
+        // startTime: store.state.cockpit_date[0],
+        // endTime: store.state.cockpit_date[1],
       };
     },
     detail(row) {

src/views/Idleland/components/tjzl.vue

@@ -83,8 +83,8 @@ export default {
       this.$emit("updateParent", "loading", true);
       this.params = {
         districtCode: this.region,
-        startTime: store.state.cockpit_date[0],
-        endTime: store.state.cockpit_date[1],
+        // startTime: store.state.cockpit_date[0],
+        // endTime: store.state.cockpit_date[1],
       };
       this.GetOverview();
       if (this.region == "4602") this.GetDistrict();
@@ -106,8 +106,8 @@ export default {
       district(this.params).then((res) => {
         res.data.forEach((jdData) => {
           this.jdData.x_data.push(jdData.districtName);
-          this.jdData.result[0].push(jdData.confirmAre);
-          this.jdData.result[1].push(jdData.disposalArea);
+          this.jdData.result[0].push(jdData.confirmAre.toFixed(2));
+          this.jdData.result[1].push(jdData.disposalArea.toFixed(2));
           this.jdData.result[2].push((jdData.idleRate * 100).toFixed(2));
           this.jdData.result[3].push((jdData.disposalRate * 100).toFixed(2));
         });

src/views/shareResources/components/ServiceDetails.vue

@@ -12,7 +12,7 @@
               label="服务名称"
               label-class-name="my-label"
               content-class-name="my-content"
-              >kooriookami</el-descriptions-item
+              >{{ detailObj.label }}</el-descriptions-item
             >
             <el-descriptions-item
               label="数据说明"
@@ -24,7 +24,12 @@
               >XXXXX</el-descriptions-item
             >
             <el-descriptions-item label="数据年份">XXXX</el-descriptions-item>
-            <el-descriptions-item label="服务类型">XXX</el-descriptions-item>
+            <el-descriptions-item label="服务类型">{{
+              detailObj.type
+            }}</el-descriptions-item>
+            <el-descriptions-item label="服务器类型">{{
+              detailObj.serverType
+            }}</el-descriptions-item>
             <el-descriptions-item label="服务发布时间"
               >XXX</el-descriptions-item
             >
@@ -33,7 +38,7 @@
         </div>
         <div class="btnCon">
           <span @click="dialogVisible = true">申请调用</span>
-          <span><i @click="dialogVisible2 = true">申请记录</i></span>
+          <span><i @click="applicationRecord">申请记录</i></span>
         </div>
       </div>
     </div>
@@ -42,6 +47,7 @@
       :visible.sync="dialogVisible"
       width="30%"
       :before-close="handleClose"
+      :close-on-click-modal="false"
     >
       <div>
         <el-form
@@ -53,34 +59,35 @@
         >
           <el-form-item label-width="0px">
             <el-col :span="12">
-              <el-form-item prop="date1" label="申请时间">
-                <el-date-picker
+              <el-form-item prop="sqTime" label="申请时间">
+                <!-- <el-date-picker
                   type="date"
                   placeholder="选择日期"
                   v-model="ruleForm.date1"
                   style="width: 100%"
-                ></el-date-picker>
+                ></el-date-picker> -->
+                <el-input v-model="ruleForm.sqTime"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item prop="sqbm" label="申请部门">
-                <el-input v-model="ruleForm.sqbm"></el-input>
+              <el-form-item prop="sqDepartmentBy" label="申请部门">
+                <el-input v-model="ruleForm.sqDepartmentBy"></el-input>
               </el-form-item>
             </el-col>
           </el-form-item>
           <el-form-item label-width="0px">
             <el-col :span="12">
-              <el-form-item prop="sjfw" label="数据服务">
-                <el-input v-model="ruleForm.sjfw"></el-input>
+              <el-form-item prop="zymlBy" label="服务器类型">
+                <el-input v-model="ruleForm.zymlBy"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item prop="sjlx" label="数据类型">
-                <el-input v-model="ruleForm.sjlx"></el-input>
+              <el-form-item prop="zymlTypeName" label="服务类型">
+                <el-input v-model="ruleForm.zymlTypeName"></el-input>
               </el-form-item>
             </el-col>
           </el-form-item>
-          <el-form-item label="申请范围" prop="xzqTreeValue">
+          <el-form-item label="申请范围" prop="sqFw">
             <el-cascader
               :show-all-levels="false"
               :options="xzqTreeData"
@@ -90,24 +97,34 @@
               v-model="xzqTreeValue"
             ></el-cascader>
           </el-form-item>
-          <el-form-item label="申请理由" prop="sqly">
-            <el-input type="textarea" v-model="ruleForm.sqly"></el-input>
+          <el-form-item label="申请理由" prop="sqReason">
+            <el-input
+              type="textarea"
+              v-model="ruleForm.sqReason"
+              placeholder="请输入申请理由"
+            ></el-input>
           </el-form-item>
-          <el-form-item label="系统名称" prop="name">
-            <el-input v-model="ruleForm.name"></el-input>
+          <el-form-item label="系统名称" prop="systemName">
+            <el-input
+              v-model="ruleForm.systemName"
+              placeholder="请输入使用数据服务的系统名称"
+            ></el-input>
           </el-form-item>
-          <el-form-item label="调用IP" prop="dyip">
-            <el-input v-model="ruleForm.name"></el-input>
+          <el-form-item label="调用IP" prop="callIp">
+            <el-input
+              v-model="ruleForm.callIp"
+              placeholder="请输入使用数据服务的IP地址，多个用;隔开，最多支持3个"
+            ></el-input>
           </el-form-item>
-          <el-form-item label="预期截止时间" prop="yqjzsj">
+          <el-form-item label="预期截止时间" prop="sqDeadline">
             <el-date-picker
               type="date"
               placeholder="选择日期"
-              v-model="ruleForm.yqjzsj"
+              v-model="ruleForm.sqDeadline"
               style="width: 100%"
             ></el-date-picker>
           </el-form-item>
-          <el-form-item label="附件材料" prop="fjcl">
+          <el-form-item label="附件材料" prop="attachment">
             <el-upload
               class="upload-demo"
               :on-change="handleChange"
@@ -125,10 +142,11 @@
         </el-form>
       </div>
       <span slot="footer" class="dialog-footer">
+        <el-button @click="resetForm('ruleForm')">取消</el-button>
+
         <el-button type="primary" @click="submitForm('ruleForm')"
-          >取消</el-button
+          >确定</el-button
         >
-        <el-button @click="resetForm('ruleForm')">确定</el-button>
       </span>
     </el-dialog>
 
@@ -140,21 +158,16 @@
     >
       <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="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-column>
+          <el-table-column prop="yqTime" label="预期使用时间">
+          </el-table-column>
         </el-table>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -169,54 +182,68 @@
 
 <script>
 import { GetXzqhTree } from "@/api/map";
+import { ApplyResources, GetResources } from "../../../api/kfgx/gxzy";
+import moment from "moment";
 export default {
   props: {
-    detailObj:{
+    detailObj: {
       type: Object,
     },
   },
   data() {
     return {
+      xzqTreeValue: "",
       isDetailsShow: false,
       dialogVisible: false,
       dialogVisible2: false,
       xzqTreeData: [], //申请范围
       fileList: [], //文件
       ruleForm: {
-        name: "", //系统名称
-        date1: "", //申请时间
-        sqbm: "", //申请部门
-        sqly: "", //申请理由
-        sjfw: "", //数据服务
-        sjlx: "", //数据类型
-        // sqfw:'',//申请范围
-        xzqTreeValue: "", //申请范围
-        dyip: "", //调用ip
-        yqjzsj: "", //预期服务截止时间
-        fjcl: "", //附件材料
+        sqTime: moment(new Date()).format("YYYY-MM-DD HH:mm:ss"), //申请时间
+        sqDepartmentBy: "海南省国土空间治理平台", //申请部门
+        sqReason: "", //申请理由
+        systemName: "", //系统名称
+        sqFw: "", //申请范围
+        zymlBy: this.detailObj.serverType, //数据服务
+        zymlTypeName: this.detailObj.type, //数据类型
+        callIp: "", //调用ip
+        sqDeadline: "", //预期服务截止时间
+        attachment: "", //附件材料
       },
       rules: {
-        name: [
-          { required: true, message: "请输入活动名称", trigger: "blur" },
-          { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" },
-        ],
-        sqly: [{ required: true, message: "请填写活动形式", trigger: "blur" }],
-        xzqTreeValue: [
+        systemName: [
+          {
+            required: true,
+            message: "请输入使用数据服务的系统名称",
+            trigger: "blur",
+          },
+          { min: 1, message: "长度至少为一个字符", trigger: "blur" },
+        ], //系统名称
+        sqReason: [
+          { required: true, message: "请填写活动形式", trigger: "blur" },
+        ], //申请理由
+        sqFw: [
           { required: true, message: "请选择申请范围", trigger: "change" },
         ],
-        dyip: [{ required: true, message: "请填写调用IP", trigger: "blur" }],
+        callIp: [
+          {
+            required: true,
+            message: "请输入使用数据服务的IP地址，多个用;隔开，最多支持3个",
+            trigger: "blur",
+          },
+        ], //请输入使用数据服务的IP地址，多个用;隔开，最多支持3个
       },
       tableData: [
         {
           date: "2016-05-02",
           sqbm: "研发部",
           sjfw: "XXXXXX",
-          fwlx:'iServer',
-          sqfw:'吉阳区',
-          sqly:'申请理由',
-          xtmc:'系统名称',
-          dyip:'调用ip',
-          yqTime:'预期时间',
+          fwlx: "iServer",
+          sqfw: "吉阳区",
+          sqly: "申请理由",
+          xtmc: "系统名称",
+          dyip: "调用ip",
+          yqTime: "预期时间",
         },
       ],
     };
@@ -228,6 +255,13 @@ export default {
     closeBox() {
       this.$emit("updateParent", "isShowService", false);
     },
+    //申请记录
+    applicationRecord() {
+      GetResources().then((res) => {
+        console.log(res, "|||||||||||||||");
+        this.dialogVisible2 = true
+      });
+    },
     getXzqTreeData() {
       GetXzqhTree().then((res) => {
         if (res.data.length > 0) {
@@ -269,7 +303,11 @@ export default {
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          alert("submit!");
+          ApplyResources(this.ruleForm).then((res) => {
+            console.log(res, "+++++++++++++");
+            this.$message.success("成功!");
+            this.dialogVisible = false;
+          });
         } else {
           console.log("error submit!!");
           return false;
@@ -277,16 +315,23 @@ export default {
       });
     },
     resetForm(formName) {
+      this.dialogVisible = false;
       this.$refs[formName].resetFields();
     },
   },
+  watch: {
+    xzqTreeValue(val) {
+      // console.log(val,'***************');
+      this.ruleForm.sqFw = val[0];
+    },
+  },
 };
 </script>
 
 <style lang="scss" scoped>
 .ServiceCon {
   height: 760px;
-//   background-color: aliceblue;
+  //   background-color: aliceblue;
   cursor: auto;
 
   .btnCon {
@@ -344,17 +389,17 @@ export default {
   top: 38px;
 }
 
-/deep/ .el-icon-close:before{
-    right: 2px;
-    top: 0px;
+/deep/ .el-icon-close:before {
+  right: 2px;
+  top: 0px;
 }
-/deep/ .el-descriptions-item__label.is-bordered-label{
-    color: #fff;
-    background-color: transparent;
+/deep/ .el-descriptions-item__label.is-bordered-label {
+  color: #fff;
+  background-color: transparent;
 }
-/deep/ .el-descriptions__body{
-    color: #fff;
-    background-color: transparent;
+/deep/ .el-descriptions__body {
+  color: #fff;
+  background-color: transparent;
 }
 </style>
 <style>