Merge remote-tracking branch 'origin/master'

# Conflicts:
#	uis/zzlyadmin/banner/edit.html
#	uis/zzlyadmin/banner/index.html

uis/api/banner.json

@@ -6,7 +6,7 @@
         {
             "title": "测试数据",
             "image": "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fa0.att.hudong.com%2F30%2F29%2F01300000201438121627296084016.jpg&refer=http%3A%2F%2Fa0.att.hudong.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1618368355&t=5388aa359630b1ffdef3179b2b52729d",
-            "content": "测试内容",
+            "content": "<h4>测试<img src='http://127.0.0.1:8000/layuiadmin/layui/images/face/54.gif' alt='[good]'></h4>",
             "create_user": "张三",
             "create_time": "2020-12-12",
             "usable": true,

uis/api/equipment.json

@@ -0,0 +1,14 @@
+{
+    "code": 0,
+    "msg": "",
+    "count": 1,
+    "data": [
+        {
+            "name": "测试1",
+            "number": "123456",
+            "type": "测试型号",
+            "big_address": "大地点数据",
+            "small_address": "小地点数据"
+        }
+    ]
+}

uis/tenant/equipment/edit.html

@@ -32,38 +32,38 @@
                 <form class="layui-form" action="" lay-filter="component-form-element">
                     <div class="layui-row layui-col-space10 layui-form-item">
                         <div>
-                            <label class="layui-form-label"><font color='red' size="4">*</font>设备分类：</label>
+                            <label class="layui-form-label"><font color='red' size="4">*</font>名称：</label>
                             <div class="layui-input-block">
-                                <select id="id_type" name="type" lay-verify="required">
-                                </select>
+                                <input type="text" name="name" lay-verify="required" placeholder="请输入名称"
+                                       autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div>
-                            <label class="layui-form-label"><font color='red' size="4">*</font>设备名称：</label>
+                            <label class="layui-form-label"><font color='red' size="4">*</font>编号：</label>
                             <div class="layui-input-block">
-                                <input type="text" name="name" lay-verify="required" placeholder="请输入设备名称"
+                                <input type="text" name="number" lay-verify="required" placeholder="请输入编号"
                                        autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div>
-                            <label class="layui-form-label"><font color='red' size="4">*</font>设备位置：</label>
+                            <label class="layui-form-label"><font color='red' size="4">*</font>型号：</label>
                             <div class="layui-input-block">
-                                <input id="id_location" name="location" class="layui-input" placeholder="请输入设备位置"
+                                <input type="text" name="type" class="layui-input" placeholder="请输入设备型号"
                                        autocomplete="off" lay-verify="required"/>
                             </div>
                         </div>
                         <div>
-                            <label class="layui-form-label">质保到期：</label>
-                            <div class="layui-inline">
-                                <input id="date1" type="text" name="quality_date" placeholder="请输入质保到期日期"
-                                       autocomplete="off" class="input">
+                            <label class="layui-form-label"><font color='red' size="4">*</font>大地点：</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="big_address" placeholder="请输入大地点"
+                                       autocomplete="off" class="layui-input" lay-verify="required">
                             </div>
                         </div>
                         <div>
-                            <label class="layui-form-label"><font color='red' size="4">*</font>供应商：</label>
+                            <label class="layui-form-label"><font color='red' size="4">*</font>小地点：</label>
                             <div class="layui-input-block">
-                                <select id="id_supplier" name="supplier" lay-verify="required">
-                                </select>
+                                <input type="text" name="big_address" placeholder="请输入小地点"
+                                       autocomplete="off" class="layui-input" lay-verify="required">
                             </div>
                         </div>
 
@@ -94,61 +94,13 @@
             , autocomplete = layui.autocomplete
             , form = layui.form;
         var id = layui.view.getParameterByName('id');
-        var location = null
-
-        laydate.render({
-            elem: '#date1'
-            , type: 'date'
-            , trigger: 'click'
-        });
-        autocomplete.render({
-            elem: $('#id_location'),
-            url: '/tenant/building/location/search/',
-            template_val: '',
-            template_txt: '<span class=\'layui-badge layui-bg-gray\'>{{d.area_name}} - {{d.building}} -{{d.floor}} - {{d.location}}',
-            onselect: function (resp) {
-                $('#id_location').val(resp.area_name + '-' + resp.building + '-' + resp.floor + '-' + resp.location);
-                location = resp.id;
-            }
-        });
-        admin.req({
-            url: '/tenant/equipment/dict/',
-            done: function (res) {
-                var types = res.data.types;
-                var type_node = $('#id_type');
-                for (var i in types) {
-                    var pid = types[i].id;
-                    var value = types[i].name;
-                    type_node.append("<option value='" + pid + "'>" + value + "</option>");
-                }
-
-                var suppliers = res.data.suppliers;
-                var supplier_node = $('#id_supplier');
-                for (var i in suppliers) {
-                    var pid = suppliers[i].id;
-                    var value = suppliers[i].name;
-                    supplier_node.append("<option value='" + pid + "'>" + value + "</option>");
-                }
-                form.render();
-                loadData();
-            }
-        });
-        var loadData = function () {
-            if (id) {
-                var editdata = JSON.parse(JSON.stringify(parent.layui.table.editdata)); // 框架有Bug所以这么转换
-                form.val("component-form-element", editdata);
-                location = editdata.location;
-                $('#id_location').val(editdata.location_text);
-            }
-        };
+        if (id) {
+            var editdata = JSON.parse(JSON.stringify(parent.layui.table.editdata)); // 框架有Bug所以这么转换
+            form.val("component-form-element", editdata);
+        }
         form.render(null, 'component-form-element');
 
         form.on('submit(component-form-element)', function (data) {
-            if (!location) {
-                layer.msg('请搜索并选择位置');
-                return false;
-            }
-            data.field['location'] = location;
             if (id) {
                 var url = '/tenant/equipment/' + id + '/';
                 var type = 'put';

uis/tenant/equipment/index.html

@@ -77,6 +77,14 @@
                                         class="layui-icon layui-icon-search"></i>查询
                                 </button>
                             </div>
+                            <div class="seach_items">
+                                <input type="text" name="type" autocomplete="off" class="layui-input"
+                                       placeholder="设备型号"/>
+                            </div>
+                            <div class="seach_items">
+                                <input type="text" name="number" autocomplete="off" class="layui-input"
+                                       placeholder="设备编号"/>
+                            </div>
                             <div class="seach_items">
                                 <input type="text" name="name" autocomplete="off" class="layui-input"
                                        placeholder="设备名称"/>
@@ -114,13 +122,13 @@
 
         table.render({
             elem: '#equipment_datagrid'
-            , url: '/tenant/equipment/'
+            , url: '../../api/equipment.json'
             , cols: [[
-                {field: 'type_text', title: '设备分类', width: 200}
-                , {field: 'name', title: '设备名称', width: 200}
-                , {field: 'location_text', title: '设备位置', width: 350}
-                , {field: 'quality_date', title: '质保到期', width: 150}
-                , {field: 'supplier_text', title: '供应商', width: 200}
+                {field: 'name', title: '名称', width: 200}
+                , {field: 'number', title: "编号", width: 200}
+                , {field: 'type', title: '型号', width: 350}
+                , {field: 'big_address', title: '大地点', width: 150}
+                , {field: 'small_address', title: '小地点', width: 200}
                 , {width: 110, align: 'center', fixed: 'right', toolbar: '#equipment-operate-bar'}
             ]]
             , page: true

uis/zzlyadmin/banner/detail.html

@@ -27,15 +27,16 @@
     </style>
 </head>
 <body>
-<div class="layui-card" style="height: 400px; padding: 10px" id="tenant_detail"></div>
+<div class="layui-card" style="min-height: 400px; padding: 10px" id="tenant_detail"></div>
 <script id="tenant_detail_demo" type="text/html">
     <div class="layui-tab-item layui-show">
         <ui>
             <li class="tenant-li layui-col-md6">
                 <h3>标题：{{ d.title }}</h3>
             </li>
-            <li class="tenant-li">
-                <h3>内容：{{ d.content }}</h3>
+            <li class="tenant-li layui-col-md6">
+                <h3>内容:</h3>
+                <div id="content_demo"></div>
             </li>
             <li class="tenant-li">
                 <h3>添加人：{{ d.create_user_name }}</h3>
@@ -74,6 +75,10 @@
         laytpl(getTpl).render(data, function (html) {
             tenant_detail.innerHTML = html;
         });
+        var dom = document.getElementById("content_demo");
+        if(data.content && dom){
+           dom.innerHTML = data.content;
+        }
     });
 </script>
 </body>

uis/zzlyadmin/banner/edit.html

@@ -32,8 +32,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label"><font color='red' size="4">*</font>内容：</label>
                             <div class="layui-input-block">
-                                <input type="text" name="content" lay-verify="required" placeholder="请输入内容"
-                                       autocomplete="off" class="layui-input">
+                                <textarea class="layui-textarea" placeholder="请输内容" id="content_demo"></textarea>
                             </div>
                         </div>
                         <div class="layui-col-lg6">
@@ -82,19 +81,43 @@
     }).extend({
         index: 'lib/index',
         formSelects: 'formSelects-v4'
-    }).use(['index', 'form', 'utils', 'laydate', 'upload'], function () {
+    }).use(['index', 'form', 'utils', 'laydate', 'upload', 'layedit'], function () {
         var $ = layui.$
             , laydate = layui.laydate
             , admin = layui.admin
-            , upload = layui.upload
+            ,upload = layui.upload
+            ,layedit = layui.layedit
             , form = layui.form;
         var id = layui.view.getParameterByName('id');
 
+
+        var editIndex = layedit.build('content_demo', {
+            height: 180,
+            /**富文本内容如果需要上传图片时候的配置
+            * 接口返回的数据格式如：
+            * {
+                "code": 0 //0表示成功，其它失败
+                ,"msg": "" //提示信息 //一般上传失败后返回
+                ,"data": {
+                    "src": "图片路径"
+                    ,"title": "图片名称" //可选
+                  }
+               }
+            */
+            uploadImage: {
+                url: '../../api/upload.json' //接口url
+                ,type: 'post' //默认post
+             }
+        });
+
         form.render(null, 'component-form-element');
 
         if (id) {
             var editdata = JSON.parse(JSON.stringify(parent.layui.table.editdata)); // 框架有Bug所以这么转换
             form.val("component-form-element", editdata);
+            if(editdata.content){
+              layedit.setContent(editIndex, editdata.content, false);
+            }
             $('#banner_img_demo').attr('src', editdata.image);
         }
         var form_data = {},
@@ -150,6 +173,9 @@
             } else {
                 banner_img = data.field.banner_img
             }
+            //富文本中的内容
+            data.field.content = layedit.getContent(editIndex);
+
             if (!id) {
                 if (!data.field.banner_img) {
                     layer.msg('请选择轮播图图片');

uis/zzlyadmin/banner/index.html

@@ -147,7 +147,7 @@
                     type: 2,
                     title: '修改',
                     shadeClose: false,
-                    area: ['700px', '450px'],
+                    area: ['700px', '600px'],
                     btn: ['保存', '取消'],
                     yes: function (index, dom) {
                         layui.submitChild();
@@ -166,7 +166,7 @@
                 title: '添加',
                 shadeClose: false,
                 btn: ['保存', '取消'],
-                area: ['700px', '450px'],
+                area: ['700px', '600px'],
                 yes: function (index, dom) {
                     layui.submitChild();
                 },

uis/zzlyadmin/index.html

@@ -76,10 +76,10 @@
                         </dd>
                         <dd data-name="nav">
                             <a lay-href="config/index.html">基础设置</a>
-                        </dd><dd data-name="nav">
+                        </dd>
+                        <dd data-name="nav">
                             <a lay-href="banner/index.html">轮播管理</a>
                         </dd>
-
                     </li>
                 </ul>
             </div>