修改 设备管理查询

haiwei-admin/src/main/java/com/haiwei/web/controller/common/CommonController.java

@@ -2,6 +2,8 @@ package com.haiwei.web.controller.common;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

haiwei-manage/src/main/java/com/haiwei/manage/service/impl/BaseDeviceTypeServiceImpl.java

@@ -16,7 +16,7 @@ import com.haiwei.common.core.text.Convert;
  * @author ruoyi
  * @date 2023-08-10
  */
-@Service
+@Service("baseDeviceTypeService")
 public class BaseDeviceTypeServiceImpl implements IBaseDeviceTypeService 
 {
     @Autowired

haiwei-manage/src/main/resources/templates/manage/base_customer/add.html

@@ -25,7 +25,7 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">客户介绍：</label>
                 <div class="col-sm-8">
-                    <input name="customerInfo" class="form-control" type="text">
+                    <textarea  name="customerInfo" class="form-control" type="text"></textarea>
                 </div>
             </div>
         </form>

haiwei-manage/src/main/resources/templates/manage/base_customer/base_customer.html

@@ -70,7 +70,10 @@
                 },
                 {
                     field: 'customerLogo',
-                    title: '客户logo'
+                    title: '客户logo',
+                    formatter: function (value, row, index) {
+                        return $.table.imageView(value);
+                    }
                 },
                 {
                     field: 'customerInfo',

haiwei-manage/src/main/resources/templates/manage/base_device_info/add.html

@@ -17,9 +17,12 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">设备类型：</label>
                 <div class="col-sm-8">
-                    <select name="deviceTypeName" class="form-control m-b"  >
+                    <select name="deviceTypeName" id="deviceTypeName" class="form-control m-b"
-<!--                        <option value="">所有</option>-->
+                            th:with="type=${@baseDeviceTypeService.selectBaseDeviceTypeList(null)}">
+                        <option value=""></option>
+                        <option th:each="dict : ${type}" th:text="${dict.deviceTypeName}" th:value="${dict.deviceTypeName}"></option>
                     </select>
+
                 </div>
             </div>
             <div class="form-group">    
@@ -61,6 +64,12 @@
         });
 
         function submitHandler() {
+            var res= $('#deviceTypeName').select2('val');
+            console.log(res)
+            if(res==undefined || res == '') {
+                $.modal.alertError("你没有选中任何项");
+                return
+            }
             if ($.validate.form()) {
                 $.operate.save(prefix + "/add", $('#form-base_device_info-add').serialize());
             }
@@ -75,6 +84,13 @@
         }).on('fileremoved', function (event, id, index) {
             $("input[name='" + event.currentTarget.id + "']").val('')
         })
+
+        $(function() {
+            $('#deviceTypeName').select2({
+                placeholder: "请选择设备类型",
+                allowClear: true
+            });
+        })
     </script>
 </body>
 </html>

haiwei-manage/src/main/resources/templates/manage/base_device_info/base_device_info.html

@@ -81,7 +81,10 @@
                 },
                 {
                     field: 'deviceMode',
-                    title: '设备模型图片'
+                    title: '设备模型图片',
+                    formatter: function (value, row, index) {
+                        return $.table.imageView(value);
+                    }
                 },
                 {
                     field: 'deviceSpe',

haiwei-manage/src/main/resources/templates/manage/base_device_info/edit.html

@@ -17,10 +17,11 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">设备类型：</label>
                 <div class="col-sm-8">
-                    <select name="deviceTypeName" class="form-control m-b">
+                    <select name="deviceTypeName" id="deviceTypeName" class="form-control m-b"
-                        <option value="">所有</option>
+                            th:with="type=${@baseDeviceTypeService.selectBaseDeviceTypeList(null)}">
+                        <option th:each="dict : ${type}" th:text="${dict.deviceTypeName}"
+                                th:value="${dict.deviceTypeName}" th:field="*{deviceTypeName}"  ></option>
                     </select>
-                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
                 </div>
             </div>
             <div class="form-group">