Merge remote-tracking branch 'origin/master'

apps/wxapp/inspection_order/urls.py

@@ -2,11 +2,11 @@
 from django.conf.urls import url
 from rest_framework.routers import SimpleRouter
 
-from .views import InspectionOrderViewSet, InspectionOrderAllView, InspectionOrderDetailView
+from .views import InspectionOrderViewSet, InspectionOrderAllView
 
 urlpatterns = [
-    url(r'^all/$', InspectionOrderAllView.as_view()),  #
-    url(r'^(?P<pk>[0-9]+)/$', InspectionOrderDetailView.as_view()),
+    url(r'^all/$', InspectionOrderAllView.as_view()),
+    # url(r'^(?P<pk>[0-9]+)/$', InspectionOrderDetailView.as_view()),
 ]
 
 router = SimpleRouter()

apps/wxapp/inspection_order/views.py

@@ -9,12 +9,13 @@ from utils.permission import IsTenantUser, isLogin
 from apps.tenant.inspection_order.models import InspectionOrder
 from apps.tenant.inspection_order.filters import InspectionOrderFilter
 from apps.upload.models import Upload
-from .serializers import InspectionOrderSerializer, InspectionOrderListSerializer, InspectionOrderDetailSerializer
+from .serializers import InspectionOrderSerializer, InspectionOrderListSerializer,InspectionOrderDetailSerializer
 from apps.log.models import BizLog
 from apps.tenant import tenant_log
 
 
 class InspectionOrderDetailView(generics.RetrieveAPIView):
+    # 检修工单详情，已不用。
     permission_classes = [isLogin, ]
     queryset = InspectionOrder.objects.filter()
     serializer_class = InspectionOrderDetailSerializer
@@ -50,6 +51,12 @@ class InspectionOrderViewSet(CustomModelViewSet):
         f = InspectionOrderFilter(self.request.GET, queryset=queryset)
         return f.qs
 
+    def retrieve(self, request, *args, **kwargs):
+        # 巡检工单详情
+        instance = self.get_object()
+        serializer = InspectionOrderDetailSerializer(instance)
+        return response_ok(serializer.data)
+
     def perform_create(self, serializer):
         super(InspectionOrderViewSet, self).perform_create(serializer)
         instance = serializer.instance

apps/wxapp/repair_order/urls.py

@@ -2,8 +2,7 @@
 from django.conf.urls import url
 from rest_framework.routers import SimpleRouter
 
-from .views import RepairOrderViewSet, DispatchRepairOrderView, RepairOrderAllView, RepairOrderDetailView, \
-    RepairOrderMineView, RepairOrderCountView
+from .views import RepairOrderViewSet, DispatchRepairOrderView, RepairOrderAllView, RepairOrderMineView, RepairOrderCountView
 
 urlpatterns = [
     url(r'^dispatch/$', DispatchRepairOrderView.as_view()),  # 我的派单

uis/tenant/banner/index.html

@@ -71,6 +71,11 @@
                                     <input type="text" name="create_user" autocomplete="off" class="layui-input"
                                            placeholder="添加人"/>
                                 </div>
+                                <div class="seach_items">
+                                    <button class="layui-btn" lay-submit lay-filter="query-form-element"><i
+                                            class="layui-icon layui-icon-search"></i>查询
+                                    </button>
+                                </div>
                             </form>
                         </div>
                         <div style="clear: both;"></div>

uis/tenant/operation_help/edit.html

@@ -75,7 +75,7 @@
             height: 180,
             tool: [
                 'code', 'strong', 'italic', 'underline', 'del', 'addhr', '|', 'fontFomatt', 'colorpicker', 'face'
-                , '|', 'left', 'center', 'right', '|', 'link', 'unlink', 'image_alt', 'anchors'
+                , '|', 'left', 'center', 'right', '|', 'link', 'unlink', 'image_alt', 'video', 'anchors'
                 , '|', 'fullScreen'
             ],
              uploadImage: {
@@ -94,6 +94,36 @@
              }
         });
 
+        // function compareStr(oldStr, newStr){
+        //     //如果字符串相同的话就不在比较
+        //     if(oldStr === newStr) return [];
+        //     //   比较旧的字符串中的src是否还包含在新的字符串中，如果没有表示需要删掉该file
+        //     let srcReg = /src=[\'\"]?([^\'\"]*)[\'\"]?/i // 匹配字符串中的src
+        //     let imgReg = /<img.*?(?:>|\/>)/gi //匹配img标签
+        //     let videoReg = /<video.*?(?:>|\/>)/gi //匹配video标签
+        //     let arrImg = oldStr.match(imgReg);
+        //     let arrVideo = oldStr.match(videoReg);
+        //     let tagArr = [...arrImg, ...arrVideo];
+        //     let srcArr = [];
+        //     //获取旧字符串中的所有src，push进srcArr数组。
+        //     if(tagArr && tagArr.length > 0){
+        //         tagArr.forEach(item=>{
+        //             let src = item.match(srcReg);
+        //             srcArr.push(src[1])
+        //         })
+        //     }
+        //     //遍历srcArr数组，并与新字符串对比，获取需要删除的src（新字符串中不包含旧的路径需要删除）
+        //     let delArr = [];
+        //     if(srcArr && srcArr.length > 0){
+        //         srcArr.forEach(item=>{
+        //             if(newStr.indexOf(item) === -1){
+        //                 delArr.push(item)
+        //             }
+        //         })
+        //     }
+        //     return delArr
+        // }
+
         form.render(null, 'component-form-element');
 
         if (id) {
@@ -112,6 +142,7 @@
             //富文本中的内容
             data.field.content = layedit.getContent(editIndex);
             let newContent = data.field.content;
+           // let delArr = compareStr(oldContent, newContent);
             if(!data.field.enable){
                 data.field.enable = 0
             }

uis/tenant/operation_help/index.html

@@ -71,6 +71,11 @@
                                     <input type="text" name="create_user" autocomplete="off" class="layui-input"
                                            placeholder="添加人"/>
                                 </div>
+                                <div class="seach_items">
+                                    <button class="layui-btn" lay-submit lay-filter="query-form-element"><i
+                                            class="layui-icon layui-icon-search"></i>查询
+                                    </button>
+                                </div>
                             </form>
                         </div>
                         <div style="clear: both;"></div>