zcdsj
/
cma_search
mirror of https://e.coding.net/ctcdevteam/cma_search.git
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search

This commit is contained in:
shilixia 2021-04-27 15:18:33 +08:00
parent b452d91b9f b9204670aa
commit 291294cbcd
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/.env.production
View File

@ -2,5 +2,5 @@
ENV = 'production' ENV = 'production'
# base api # base api
VUE_APP_BASE_API = 'http://testsearch.ctc.ac.cn:8000/api' VUE_APP_BASE_API = 'https://testsearch.ctc.ac.cn/api'

2
client_mp/pages/subtask/subtaskdetail.vue
View File

@ -23,7 +23,7 @@
<span style="color:darkblue;" v-if="subtask.members">{{subtask.members.length}}</span>人 <span style="color:darkblue;" v-if="subtask.members">{{subtask.members.length}}</span>人
</view> </view>
<view style="margin-top: 6rpx;"> <view style="margin-top: 6rpx;">
<u-gap height="0.5" bg-color="#bbb"></u-gap> <u-gap height="2" bg-color="#ececec"></u-gap>
</view> </view>
<u-collapse-item title="巡查组组成" :open="true"> <u-collapse-item title="巡查组组成" :open="true">
<view> <view>

3
server/apps/quality/urls.py
View File

@ -1,6 +1,6 @@
from django.urls import path, include from django.urls import path, include
from rest_framework import routers from rest_framework import routers
from .views import InspectItemViewSet, InspectTaskViewSet, SubtaskViewSet, InspectRecordViewSet, InspectDeptViewSet from .views import InspectItemViewSet, InspectTaskViewSet, InspectTemplateViewSet, SubtaskViewSet, InspectRecordViewSet, InspectDeptViewSet, InspectTemplate
router = routers.DefaultRouter() router = routers.DefaultRouter()
router.register('inspectitem', InspectItemViewSet, basename="inspectitem") router.register('inspectitem', InspectItemViewSet, basename="inspectitem")
@ -8,6 +8,7 @@ router.register('inspecttask', InspectTaskViewSet, basename="inspecttask")
router.register('subinspecttask', SubtaskViewSet, basename="subinspecttask") router.register('subinspecttask', SubtaskViewSet, basename="subinspecttask")
router.register('inspectrecord', InspectRecordViewSet, basename='inspectrecord') router.register('inspectrecord', InspectRecordViewSet, basename='inspectrecord')
router.register('inspectdept', InspectDeptViewSet, basename='inspectdept') router.register('inspectdept', InspectDeptViewSet, basename='inspectdept')
router.register('inspecttemplate', InspectTemplateViewSet, basename='inspecttemplate')
urlpatterns = [ urlpatterns = [
path('', include(router.urls)) path('', include(router.urls))
] ]