From c8a1a20ba1ca73bef0cc3bbac652014367d05d75 Mon Sep 17 00:00:00 2001
From: zhanmingkan <496160012@qq.com>
Date: 星期一, 16 五月 2022 19:34:19 +0800
Subject: [PATCH] 完善了shp的 控制开关,利用checkbox ,取消了点击。 完善了颜色参数

---
 view/project/shpAdd.html |  158 +++++++++++++++++++++++++++-------------------------
 1 files changed, 83 insertions(+), 75 deletions(-)

diff --git a/view/project/shpAdd.html b/view/project/shpAdd.html
index 1678f21..69b7132 100644
--- a/view/project/shpAdd.html
+++ b/view/project/shpAdd.html
@@ -13,19 +13,10 @@
             margin-top: 5px;
         }
 
-        .text2 {
-            float: left;
-            color: white;
-            font-size: 14px;
-            margin-left: 30px;
-            margin-top: 20px;
-        }
-
-        .labelInput {
-            width: 150px;
+        .input {
+            width: 100%;
+ 
             height: 30px;
-            margin-left: 25px;
-            margin-right: 50px;
             line-height: 40px;
             font-size: 14px;
             text-indent: 8px;
@@ -40,29 +31,10 @@
             color: white;
         }
 
-        .textarea {
-            width: 240px;
-            height: 140px;
-            margin-left: 25px;
-            margin-right: 50px;
-            margin-top: 20px;
-            font-size: 16px;
-            text-indent: 8px;
-            outline: 0;
-            border: none;
-            border-color: #3b403f;
-            /* box-shadow: 0 2px 6px #3a3c42; */
-            border-top-left-radius: 2px;
-            border-bottom-left-radius: 2px;
-            background-color: rgba(63, 72, 84, 0.7);
-            color: white;
-            resize: none;
-        }
 
         .my-save-btn {
-            margin-top: 20px;
             margin-left: 50px;
-            width: 200px;
+            width: 250px;
             height: 30px;
             color: white;
             background-color: rgba(35, 68, 117, 0.85);
@@ -97,6 +69,19 @@
             color: white;
             height: 100px;
         }
+
+        .layui-colorpicker {
+            width: 20px !important;
+            height: 20px !important;
+            border: 1px solid #e6e6e6;
+            padding: 5px;
+            border-radius: 2px;
+            line-height: 24px;
+            display: inline-block;
+            cursor: pointer;
+            transition: all .3s;
+            -webkit-transition: all .3s;
+        }
     </style>
     <link href="../../libs/layui/css/layui.css" rel="stylesheet">
     <script type="text/javascript" src="../../libs/jquery/jquery-3.5.1.min.js"></script>
@@ -105,43 +90,65 @@
 
 <body>
     <div style="margin-top: 20px;">
-        <form class="layui-form" action="">
-            <div>
-                <span class="text">鍚嶅瓧</span>
-                <input id="name" class="labelInput" type="text" placeholder="杈撳叆鍚嶇О" autocomplete="off" />
-            </div>
-            <div>
-                <div style="display:inline-block;margin-top: 20px;margin-left: 30px;color:white">
-                    棰滆壊
+        <form class="layui-form">
+            <div style="height: 40px;width: 100%;margin-top: 10px;">
+                <div
+                    style="width: 20%; float:left;text-align: center;color: white;font-size:14px;line-height: 14px;line-height: 30px;">
+                    鍚嶅瓧:
                 </div>
-                <div id="colorSelect" style="display:inline-block;margin-top: 5px;margin-left: 20px;">
+                <div style="width: 70%; float:left;">
+                    <input id="name" class="input" type="text" placeholder="杈撳叆鍚嶇О" autocomplete="off" />
                 </div>
             </div>
 
-            <div>
-                <div style="display:inline-block;margin-top: 20px;margin-left: 30px;color:white">
-                    绫诲瀷
+            <div style="height:40px;width: 100%;margin-top: 10px;">
+                <div
+                    style="width: 20%; float:left;text-align: center;color: white;font-size:14px;line-height: 14px;line-height: 30px;">
+                    棰滆壊:
                 </div>
-                <div style="display:inline-block;margin-top: 5px;width: 150px;margin-left:  20px;">
-                    <select id="type" lay-verify="required" class="my-select" lay-filter="fontfamily">
+                <div style="width: 70%; float:left;">
+                    <div id="colorSelect" style="display:inline-block;margin-top: 5px;">
+                    </div>
+                </div>
+            </div>
+
+            <div style="height: 40px;width: 100%;margin-top: 10px;">
+                <div
+                    style="width: 20%; float:left;text-align: center;color: white;font-size:14px;line-height: 14px;line-height: 30px;">
+                    绫诲瀷:
+                </div>
+                <div style="width: 70%; float:left;">
+
+                    <select id="type" lay-verify="required" lay-filter="fontfamily" style="margin-top: 10px;">
                         <option value="point">鐐�</option>
                         <option value="line">绾�</option>
                         <option value="polygon">闈�</option>
                     </select>
+
                 </div>
             </div>
-            <div>
-                <span class="text2">鏂囦欢</span>
-                <button type="button" class="layui-btn layui-bg-black"
-                    style="width:150px;height:30px;margin-top:15px;margin-left: 25px;line-height: 30px;float: left;"
-                    id="uploadIcon">
-                    <i class="layui-icon">&#xe67c;</i>涓婁紶shp
-                </button>
-                <input type="hidden" id="path">
-            </div>
-            <br />
 
-            <button class="my-save-btn" onclick="uploadShp()">涓婁紶</button>
+            <div style="height: 40px;width: 100%;margin-top: 10px;">
+                <div style="width: 20%; float:left;text-align: center;color: white;font-size:14px;line-height: 14px;line-height: 30px;">
+                    鏂囦欢
+                </div>
+                <div style="width: 70%; float:left;">
+                    <button type="button" class="layui-btn layui-bg-black"
+                        style="width:150px;height:35px;float: left;" id="uploadIcon">
+                        <i class="layui-icon">&#xe67c;</i>涓婁紶shp
+                    </button>
+                    <input type="hidden" id="path">
+                    <input type="hidden" id="color" value="#ffde06">
+                </div>
+            </div>
+            <div style="width: 100%;margin-top: 10px; color: white;">
+                <div id="tips" style="margin-left: 50px;color: white;font-family: emoji;font-size: 14px;font-style: italic;"></div> 
+            </div>
+            <div style="height: 40px;width: 100%;margin-top: 10px;">
+                <button class="my-save-btn" onclick="uploadShp()">涓婁紶</button>
+            </div>
+
+        
         </form>
     </div>
     <script>
@@ -153,11 +160,15 @@
             var upload = layui.upload;
             colorpicker.render({
                 elem: '#colorSelect',
-                color: "red",
+                color: "#ffde06",
                 size: '20px',
                 done: function (color) {
 
                 },
+                change: function(color){
+                   console.log(color);
+                   $("#color").val(color);
+                }
             });
 
             upload.render({
@@ -166,38 +177,29 @@
                 url: parent.httpConfig.webApiUrl + "landstamp/front/uploadShp",
                 done: function (res) {
                     if (res.code == 0) {
-                        console.log(res.msg);
-                        $("#path").val(res.msg);
+                        $("#path").val(res.url);
+                        $("#tips").html("涓婁紶鏂囦欢:"+res.filename);
 
                     } else {
-                        layui.use('layer', function () {
-                            var layer = layui.layer;
-                            layer.msg(res.msg, { time: 1000 });
-                        });
+                        parent.vMsg.warning(res.msg);
                     }
                 }
             });
-            form.render();
         });
 
         function uploadShp() {
             var name = $("#name").val();
-            var color = $("#colorSelect").val();
+            var color = $("#color").val();
             var type = $("#type").val();
             var path = $("#path").val();
             if (name == "") {
-            
                 parent.vMsg.warning("璇疯緭鍏ュ悕瀛�");
                 return;
             }
-            if(path == ""){
-                layui.use('layer', function () {
-                    var layer = layui.layer;
-                    layer.msg("璇蜂笂浼爏hp鏂囦欢");
-                });
+            if (path == "") {
+                parent.vMsg.warning("璇蜂笂浼爏hp鏂囦欢");
                 return;
             }
-            console.log(name, color, type, path);
             var obj = {
                 "name": name,
                 "color": color,
@@ -209,14 +211,20 @@
             $.ajax({
                 url: parent.httpConfig.webApiUrl + "landstamp/front/saveShp",
                 type: 'POST',
-                contentType: "application/json;charset=utf-8",
+                dataType: "json",   
+                async:false,  
                 data: JSON.stringify(obj),
+                contentType: "application/json;charset=utf-8",
                 beforeSend: function (request) {
                     request.setRequestHeader("token", token);
                 },
                 success: function (result) {
-
                     console.log(result);
+                    if(result.code ==0){
+                        parent.vMsg.warning("涓婁紶鎴愬姛");
+                    }else{
+                        parent.vMsg.warning("涓婁紶澶辫触");
+                    }
                 }
             });
 

--
Gitblit v1.9.1